diff --git a/COPYRIGHT b/COPYRIGHT
index a961a442507..519910ea1b1 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -28,10 +28,10 @@ Restler                3.0           LGPL-3+                     Yes
 TCPDF                  6.2.6         LGPL-3+                     Yes             PDF generation
 
 JS libraries:
-jQuery                 1.8.2         MIT License                 Yes             JS library
-jQuery UI              1.9.1         GPL and MIT License         Yes             JS library plugin UI
+jQuery                 1.11.3        MIT License                 Yes             JS library
+jQuery UI              1.11.4        GPL and MIT License         Yes             JS library plugin UI
 jQuery select2         3.5.2         GPL and Apache License      Yes             JS library plugin for sexier multiselect
-jQuery blockUI         2.43          GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
+jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
 jQuery DataTables      1.9.4         BSD                         Yes             JS library for tables output
 jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
diff --git a/ChangeLog b/ChangeLog
index fca13478c08..399df7ada05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,29 +11,209 @@ make a Dolibarr upgrade.
 
 ***** ChangeLog for 3.8 compared to 3.7.* *****
 For users:
-- New: Add Option to not change date on cloning project
-- New: Add check list from table for extrafield type
-- New: Use new combobox.
-- New: Add hidden option MAXTABS_IN_CARD.
-- New: A default label is suggested for stock correction and transfer instead of empty string.
-- Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
-- Add Weighted average price as default price for buying price for margin calculation. Add option 
-  MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.
-- Introduce option MAIN_HTML_TITLE to start to control format of html title content.
-- Add extrafields on bank account cards.
-- Added delay between mails in Newsletter module.
-- [ task #1793 ] Create new permission to restrict commercial agent margin to logged user.
-- Add experimental module ask supplier price to request supplier quotation.
-- Add experimental module batch management.
-- Fix: Corrected user timezone detection
+FIX: #2519
+FIX: #2758 Product::update sets product note to "null" when $prod->note is null
+FIX: #2832: Fixed a problem with special characters in expense report PDF model
+FIX: #2856 : Wrong table design
+FIX: #2901
+FIX: #2957 : missing $langs object for trigger
+FIX: #2983 Load gravatar avatar images securely over HTTPS
+FIX: #2987: removed dead function moneyMeter()
+FIX: #3009: Better filtering to prevent SQL injection
+FIX: #3009: Better filtering to prevent SQL injection
+FIX: #3091 TotalHT amount in supplier order is bold unlike the rest of Dolibarr
+FIX: #3138 - Too much visible thing when access is denied on public pages
+FIX: #3173 Overlapping of shipment ref
+FIX: Adding 5 more choice link into survey module was not working with chrome
+FIX: bad calculation for stock value
+FIX: Bad link to login page into email for password renewal.
+FIX: Bad logo for status "Do not contact" of thirdparty.
+FIX: Bad variable usage
+FIX: Better management error into the color conversion functions
+FIX: [bug #1883] missing field in SQL installation
+FIX: Bug on order and supplier invoice numeration mask when use supplier code
+FIX: Bug on order and supplier invoice numeration mask when use supplier code
+FIX: button create payment hide if tax amount is less than 1
+FIX: can receive new batch product on supplier order
+FIX: can show print page after product save
+FIX: Close #2835 Customer prices of a product shows incorrect history order
+FIX: Close #2837 Product list table column header does not match column body
+FIX: Close bug #2855 Wrong translation key in localtax report page
+FIX: Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0
+FIX: Close bug #2891 Category hooks do not work
+FIX: Close bug #2900 Courtesy title is not stored in create thirdparty form
+FIX: Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI
+FIX: Correct migration script
+FIX: create contact with extrafiel is null when it is require
+FIX: Description of contract line was not visible.
+FIX: Correct path of loan class
+FIX: Correct problem field with note - Add note_private & use wysiwyg editor
+FIX: Edit in place of "Outstanding Limit"
+FIX: Module Expense Report - Correct init
+FIX: Update licence to GPLv3
+FIX: End log must use same level then start log.
+FIX: event for restricted user was restricted if company null
+FIX: event not linked to contact on creation
+FIX: Export of tags for contact and member
+FIX: extrafields required on thirdparty
+FIX: Force ref
+FIX: Function expects an int, not a boolean
+FIX: Function was expecting a boolean not a string
+FIX: hide category if it's not enable
+FIX: If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)
+FIX: jdate returning -62169955200 on x64 machine
+FIX: Let ability to use IDPROF verifications even if new entry is "private"
+FIX: migration error
+FIX: moved built-in bug report system to GitHub Issues
+FIX: Moved code to where the variable is defined
+FIX: No check warehouse is provided if module stock is not enabled.
+FIX: Payed invoices are showed as canceled FIX: Bad date filter on customer order
+FIX: Ref/label of product on contract line was not visible, nor into page, nor into PDF.
+FIX: Removed concatenation on undeclared variable
+FIX: remove deprecated property 'libelle' on product object
+FIX: Removed HTML file preventing PHP service
+FIX: Removed undeclared variable
+FIX: Removed undeclared variables
+FIX: Removed unused variable
+FIX: Replaced deprecated call
+FIX: Replaced deprecated property
+FIX: Save of filters into export profiles failed.
+FIX: "script" balise with wrong syntax
+FIX: send mail, copy sendto don't read the list of contact
+FIX: top links menu have target attribute with wrong value
+FIX: total amount in tpl linked object are not reset
+FIX: Typo
+FIX; Unknown field 'sc.fk_soc' in field list
+FIX: update usergroup name
+FIX: Variable declared boolean
+FIX: Variable might not be traversable
+FIX: We did a test on a permission to export contract when permission did not exists.
+FIX: when mailing is deleted, the targets list was kept in database
+FIX: when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)
+FIX: When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table.
+FIX: When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third.
+FIX: when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status
+FIX: width multiselect
+FIX: Wrong type hinting
+FIX: XSS security using the onerror and missing escapement on type of member page.
+FIX: Missing visibility of static property
+NEW: Add a button to purge criteria in user list
+NEW: add all assigned users and all extrafields data in new event when we createFromClone
+NEW: Add a new component to select categories/tags from the main edit page of product. The dedicated tab is also removed.
+NEW: add an explorer for REST API consultation & documentation
+NEW: Add a search field and report on hrm area
+NEW: Add a tab document in donation card
+NEW: Add bank account owner in invoice/proposal/orders footer
+NEW: Add button to purge search criteria into list
+NEW: Add close date and user for projects.
+NEW: Add company information into  category contact export
+NEW: Add current salary on list of payment
+NEW: add date value filter on account records list
+NEW: Add exemple of setup for multitail to render dolibarr log files
+NEW: Add filter on status on invoice list
+NEW: Add filter on task ref and task label into list of tasks
+NEW: Add filter on user contact or user task into task list
+NEW: Add function dolCopyDir to copy directory with recursive content.
+NEW: Add gender property managed on user card FIX: Better error messages when uploading photo of user when permission to write are not granted
+NEW: Add help tooltips on fields of dictionary edit pages. Fix: visible list of tasks are for opened project only.
+NEW: Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key enter into the form to send email.
+NEW: add hook in send mail
+NEW: Add hooks on list of members to allow an external module to add more fields into list view.
+NEW: Add hooks to allow an external module to complete list of events into calendar views.
+NEW: Add opportunity amount on project card.
+NEW: Add option THEME_ELDY_DISABLE_IMAGE to disable images into menu eldy.
+NEW: add PDF icon on linked element into project
+NEW: add "productpricecard" hook and uniformize code
+NEW: Add ref and label of project into export
+NEW: add restler framework First step to build REST API into Dolibarr
+NEW: Add search box for supplier order search.
+NEW: Add status into filters of graph
+NEW: Add tab document on salaries payment
+NEW: A link to the bugtracker can be enabled in the GUI
+NEW: A module can add its entries into cron module.
+NEW: autofocus on product selection dropdown list or search field
+NEW: Backup and restore tool is easier to use
+NEW: Can add all user of a project as user of a task, in one step.
+NEW: Can add project search on left menu search area
+NEW: Can assign a task to yourself to have it appear on timesheet
+NEW: Can close a project that has draft status with no need to switch it to validate status before.
+NEW: Can edit Background color for Top menu and Background color for table title line (works only with theme menu eldy).
+NEW: Can edit email template using WYSIWYG editor
+NEW: Can edit internal label of invoice even when closed (this is a private information)
+NEW: Can edit list of prospect status for customers/prospects. Add a new entry into dictionary table to manage list fo status. Removed deprecated files.
+NEW: Can filter on contact status in prospect list. Removed deprecated menu entry.
+NEW: Can filter proposal on a tag of a product Enhance also the prototype test_arrays to include select form before table.
+NEW: Can filter proposal, orders or invoices with criteria "contain at least one product with following tag"
+NEW: Can install an external module from admin pages, if web server has permission for and if setup is ok for.
+NEW: Can search on customer order amount into customer order list.
+NEW: Can upload files on leave requests. Use more standard permissions.
+NEW: Can use a "|" to make a OR search on several different criterias into text filters of tables.
+NEW: Clean code into salary module, debug and add indexes NEW: Can filter on user list and salary payments on user with naural search.
+NEW: clone action on agenda events
+NEW: dev feature : replace conf filename with "conf" parameter on url by GET
+NEW: display linked object in edit mode when we create an event from an order, propal...
+NEW: Enhancement of module 'Notification by Email'. Show nb of notifications set. Can set several emails. Can set a threshold on amount for notifications. Add notification on supplier order validation.
+NEW: Enhance prototype, project list and proposal list with new hook to have an external module able to add more fields.
+NEW: Enhance the natural_search function so we can use it to search numeric fields with criteria with operator <>= inside (< 100, >= 1000)
+NEW: Enter amount for withdraws requests
+NEW: Feature request: A page to merge two thirdparties into one #2613
+NEW: Feature to build a merged pdf with all unpaid invoice can work for paid invoices.
+NEW: Filter "active" by default on user list. Fix label of permission of project module
+NEW: For a contract line, price is no more mandatory.
+NEW: Forms are using the tab look, even in creation mode.
+NEW: Hidden option THEME_ELDY_USE_HOVER is stable enough to become officialy visible into setup.
+NEW: If module salaries is on, you can set a hourly value for tome consumed by users. Each time a user enter its time consumed on a project, a calculation is done to provide the cost for human services. This value appears into the "Transversal view" of project.
+NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status into each dispathing line of supplier order to "verify" a reception is ok. Status of order can be set to "total/done" only if line is verified.
+NEW: Into the overview of projects, the name of thirdparty appears into combo lists of elements to link to project.
+NEW: Introduce function dolGetFirstLineOfText
+NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval.
+NEW: Introduce TCPDI as replacement of FPDI.
+NEW: List of recent modified supplier product prices in Supplier card
+NEW: Module notification should details of emails into confirm box, not only number.
+NEW: On page to see/edit contact of an ojbect, the status of contact is visible (for both external and internal users).
+NEW: Product stock and subproduct stock are independant
+NEW: Propal merge product card PDF into azur
+NEW: Rename install etape to step
+NEW: Replace category edition page on members with new select2 component.
+NEW: script to build API class from existing class
+NEW: Show difference between timespent by everybody and time spent by user making timesheet into timesheet pages. NEW: Can enter start hours of task when creating timesheet
+NEW: Show last official stable version into system - update page.
+NEW: Show photo of logged user into login top right block. NEW: If no photo is available for user, we show a generic photo depending on gender
+NEW: [T1758] Merge bank card & account card
+NEW: [ task 1191 ] AJAX selector for projects
+NEW: [ task #851 ] Add a new field: Commercial name
+NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
+NEW: The line where mouse is over can be highlight with option THEME_ELDY_USE_HOVER (on by default)
+NEW: The notification module accept keyword __SUPERVISOR__ to send notification to supervisor of user.
+NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
+NEW: Title of page project contains project ref and label
+NEW: update skeleton and class builder
+NEW: Use new select2 component for juridical status, country and state selection.
+NEW: Web service to create or update product can correct stock during creation/update.
+NEW: When creating order, proposal or invoice from thirdparty card, the project is asked during creation. A link to create project if it does not exists is also available. NEW: Uniformize form creation of proposal to add public and private notes during creation like done for order and invoice.
+NEW: When using transfer or correct stock from warehouse, after recording we go back to the warehouse page.
+NEW: Add Option to not change date on cloning project
+NEW: Add check list from table for extrafield type
+NEW: Use new combobox.
+NEW: Add hidden option MAXTABS_IN_CARD.
+NEW: A default label is suggested for stock correction and transfer instead of empty string.
+NEW: Add Weighted average price as default price for buying price for margin calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.
+NEW: Introduce option MAIN_HTML_TITLE to start to control format of html title content.
+NEW: Add extrafields on bank account cards.
+NEW: Added delay between mails in Newsletter module.
+NEW: [ task #1793 ] Create new permission to restrict commercial agent margin to logged user.
+NEW: Add experimental module ask supplier price to request supplier quotation.
+NEW: Add module batch management.
 
 For translators:
-- Update language files.
-- New: When a translation is not available we always jump to en_US and only en_US.
+NEW: Update language files.
+NEW: When a translation is not available we always jump to en_US and only en_US.
 
 For developers:
-- New: Function yn can show a visual checkbox.
-- New: Introduced select2 jquery plugin.
+NEW: Function yn can show a visual checkbox.
+NEW: Introduced select2 jquery plugin.
+NEW: Possibility to add javascript in main login page with "getLoginPageOptions" hook
+NEW: possibility to defined a tab for all entities in module descriptor
 
 WARNING: Following changes may create regression for some external modules, but was necessary to make
 Dolibarr better:
@@ -42,7 +222,10 @@ Dolibarr better:
 - Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook development rules. They are
   "addreplace" hooks, so you must return content with "->resprints='mycontent'" and not with "return 'mycontent'"  
 - All fields "fk_societe" were renamed into "fk_soc".
-- Method select_PriceBaseType and load_PriceBaseType were merged into selectPriceBaseType
+- Method select_PriceBaseType and load_PriceBaseType were merged into selectPriceBaseType.
+- The trigger USER_LOGIN* are deprecated. They are still working but you should prefer use the 
+  hook afterLogin or afterLoginFailed instead.
+
 
 
 ***** ChangeLog for 3.7.2 compared to 3.7.1 *****
diff --git a/build/debian/README.howto b/build/debian/README.howto
index da7077f1f26..6140412b831 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -38,6 +38,15 @@ filter-pristine-tar = True
 END
 
 
+# Complete .bashrc with DEBEMAIL and DEBFULLNAME
+Example:
+export DEBFULLNAME="Laurent Destailleur (eldy)" 
+export DEBEMAIL=eldy@users.sourceforge.net
+Other example:
+export DEBFULLNAME="Laurent Destailleur" 
+export DEBEMAIL="eldy@destailleur.fr"
+
+
 # To use Alioth.debian.org
 * Create an account login
 * Update your ~/.ssh/config file to add:
@@ -111,7 +120,7 @@ severity 123 xxx
 ##### Update but tracker system
 
 To set status of a bug to "pending"
-> bts tag 999999 +pending
+> bts --smtp-host=yoursmtpserver tag 999999 +pending
 
 or replay to email 999999@bugs.debian.org + submitter of bug
 With a message starting with: 
diff --git a/build/debian/changelog b/build/debian/changelog
index 72718de7c6c..326405a6d2b 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,4 +1,4 @@
-dolibarr (3.8.0-3) UNRELEASED; urgency=low
+dolibarr (__VERSION__) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 62ce7345217..80279012761 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -64,6 +64,13 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
+if ($SOURCE !~ /^\//)
+{
+	print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
+	print "$PROG.$Extension aborted.\n";
+	sleep 2;
+	exit 1;
+}
 if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
 	print "Error: Missing environment variables.\n";
@@ -337,8 +344,8 @@ foreach my $target (sort keys %CHOOSEDPUBLISH) {
 
 if ($nboftargetok) {
 
-	# Update CVS if required
-	#-----------------------
+	# Update GIT tag if required
+	#---------------------------
 	if ($nbofpublishneedtag)
 	{
 		print "Go to directory $SOURCE\n";
@@ -455,13 +462,15 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
+
 		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`;	# For custom we want to keep dir
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
@@ -681,7 +690,7 @@ if ($nboftargetok) {
 			use Date::Language;
 			$lang=Date::Language->new('English');
 			$datestring = $lang->time2str("%a %b %e %Y", time);
-    		$changelogstring="* ".$datestring." Laurent Destailleur $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
+    		$changelogstring="* ".$datestring." Laurent Destailleur (eldy) $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
 
 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
 			open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
@@ -713,7 +722,7 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
 			$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
-			$ret=`$cmd`;
+			#$ret=`$cmd`;
 			next;
 		}
 
@@ -803,8 +812,17 @@ if ($nboftargetok) {
 			print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
 			$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
 			print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
+			# Add files for dpkg-source (changelog)
+			#$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			open (SPECFROM,"<$SOURCE/build/debian/changelog") || die "Error";
+			open (SPECTO,">$BUILDROOT/$PROJECT.tmp/debian/changelog") || die "Error";
+			while (<SPECFROM>) {
+				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
+				print SPECTO $_;
+			}
+			close SPECFROM;
+			close SPECTO;
 			# Add files for dpkg-source
-			$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
 			$ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
 			$ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
 			$ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index 2cc29a14a9a..173c01c6f8b 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -8,11 +8,11 @@ This files describe steps made by Dolibarr packaging team to make a
 beta version of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog. To generate a changelog, you can do "git log `git merge-base (x.y)-1 origin/develop`..x.y(.z) --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -i -e '^FIX\|NEW'"
+- Update version/info in ChangeLog. To generate a changelog, you can do "git log `git merge-base 3.7.0 origin/develop`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - Update version number with x.y.z-w in build/debian/changelog
 - Commit all changes.
-- Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
+- Add a Tag (x.y.z-beta) and push it: git push --tags
 - Create a branch (x.y).
 
 - Run makepack-dolibarr.pl to generate all packages.
@@ -29,7 +29,7 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog. To generate a changelog, you can do "git log `git merge-base (x.y)-1 origin/develop`..x.y(.z) --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -i -e '^FIX\|NEW'"
+- Update version/info in ChangeLog. To generate a changelog, you can do "git log `git merge-base 3.7.0 origin/develop`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 - Update version number with x.y.z in htdocs/filefunc.inc.php
 - Update version number with x.y.z in build/debian/changelog
 - Commit all changes.
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index f105a89bc4d..31578905202 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -242,7 +242,7 @@ if ($upgrade) {
 			  [ "versionfrom", $upgrade->{'version'} ],
 			  [ "versionto", $ver ],
 			 );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, "step5", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Remove the installation directory.
@@ -268,12 +268,12 @@ else {
 			  [ "usealternaterootdir", "1" ],
 			  [ "main_alt_dir_name", "custom" ],
 			 );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, "step1", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Second page (Populate database)
 	local @params = ( [ "action", "set" ] );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape2", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, "step2", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Third page (Add administrator account)
@@ -282,7 +282,7 @@ else {
 			  [ "pass", $dompass ],
 			  [ "pass_verif", $dompass ],
 	 		 );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, "step5", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Remove the installation directory and protect config file.
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index f4e1fe2b330..7189b7b6dc2 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -159,6 +159,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 171132aaf51..0e28ff594ea 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -239,6 +239,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 4d020ad97de..639ec2b52dd 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -156,6 +156,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index f92bf828ed9..23f42adaa0a 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -167,6 +167,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
diff --git a/dev/optimize_images.sh b/dev/optimize_images.sh
index 0d532d054ad..2f8a84c57e7 100755
--- a/dev/optimize_images.sh
+++ b/dev/optimize_images.sh
@@ -6,7 +6,7 @@ PROGNAME=${0##*/}
 INPUT=''
 QUIET='0'
 NOSTATS='0'
-INPLACE='0'
+INPLACE='0'				 # (1=Images are replaced, 0=New images are stored into $OUTPUT)
 max_input_size=0
 max_output_size=0
 
diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 7c207e9877b..7eebdee8bcd 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -34,11 +34,11 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 class modMyModule extends DolibarrModules
 {
 	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 * Constructor. Define names, constants, directories, boxes, permissions
 	 *
-	 *   @param      DoliDB		$db      Database handler
+	 * @param DoliDB $db Database handler
 	 */
-	function __construct($db)
+	public function __construct($db)
 	{
         global $langs,$conf;
 
@@ -249,24 +249,24 @@ class modMyModule extends DolibarrModules
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	public function init($options='')
 	{
 		$sql = array();
 
-		$result=$this->_load_tables('/mymodule/sql/');
+		//$this->_load_tables('/mymodule/sql/');
 
 		return $this->_init($sql, $options);
 	}
 
 	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             	1 if OK, 0 if KO
 	 */
-	function remove($options='')
+	public function remove($options = '')
 	{
 		$sql = array();
 
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index 21c1beda9a1..eef777a03ca 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -86,10 +86,9 @@ class Skeleton_Class extends CommonObject
 	 *
 	 * @param DoliDb $db Database handler
 	 */
-	public function __construct( DoliDB $db )
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
-
 		return 1;
 	}
 
@@ -101,18 +100,18 @@ class Skeleton_Class extends CommonObject
 	 *
 	 * @return int <0 if KO, Id of created object if OK
 	 */
-	public function create( User $user, $notrigger = false )
+	public function create(User $user, $notrigger = false)
 	{
-		dol_syslog( __METHOD__, LOG_DEBUG );
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
 
 		// Clean parameters
-		if (isset( $this->prop1 )) {
-			$this->prop1 = trim( $this->prop1 );
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
 		}
-		if (isset( $this->prop2 )) {
-			$this->prop2 = trim( $this->prop2 );
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
 		}
 		//...
 
@@ -132,15 +131,15 @@ class Skeleton_Class extends CommonObject
 
 		$this->db->begin();
 
-		$resql = $this->db->query( $sql );
+		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog( __METHOD__ . ' ' . join( ',', $this->errors ), LOG_ERR );
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id( MAIN_DB_PREFIX . $this->table_element );
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 
 			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
@@ -173,9 +172,9 @@ class Skeleton_Class extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch( $id, $ref = null )
+	public function fetch($id, $ref = null)
 	{
-		dol_syslog( __METHOD__, LOG_DEBUG );
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
@@ -189,18 +188,18 @@ class Skeleton_Class extends CommonObject
 			$sql .= ' WHERE t.rowid = ' . $id;
 		}
 
-		$resql = $this->db->query( $sql );
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$numrows = $this->db->num_rows( $resql );
+			$numrows = $this->db->num_rows($resql);
 			if ($numrows) {
-				$obj = $this->db->fetch_object( $resql );
+				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
 				$this->prop1 = $obj->field1;
 				$this->prop2 = $obj->field2;
 				//...
 			}
-			$this->db->free( $resql );
+			$this->db->free($resql);
 
 			if ($numrows) {
 				return 1;
@@ -209,7 +208,7 @@ class Skeleton_Class extends CommonObject
 			}
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog( __METHOD__ . ' ' . join( ',', $this->errors ), LOG_ERR );
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
 			return - 1;
 		}
@@ -226,9 +225,9 @@ class Skeleton_Class extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll( $sortorder, $sortfield, $limit, $offset, array $filter = array() )
+	public function fetchAll($sortorder, $sortfield, $limit, $offset, array $filter = array())
 	{
-		dol_syslog( __METHOD__, LOG_DEBUG );
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
@@ -239,23 +238,23 @@ class Skeleton_Class extends CommonObject
 
 		// Manage filter
 		$sqlwhere = array();
-		if (count( $filter ) > 0) {
+		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = ' AND ' . $key . ' LIKE \'%' . $this->db->escape( $value ) . '%\'';
+				$sqlwhere [] = ' AND ' . $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 			}
 		}
-		if (count( $sqlwhere ) > 0) {
-			$sql .= ' WHERE ' . implode( ' AND ', $sqlwhere );
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ' . implode(' AND ', $sqlwhere);
 		}
-		$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder . ' ' . $this->db->plimit( $limit + 1, $offset );
+		$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder . ' ' . $this->db->plimit($limit + 1, $offset);
 
 		$this->lines = array();
 
-		$resql = $this->db->query( $sql );
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$num = $this->db->num_rows( $resql );
+			$num = $this->db->num_rows($resql);
 
-			while ($obj = $this->db->fetch_object( $resql )) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new Skeleton_ClassLine();
 
 				$line->id = $obj->rowid;
@@ -265,12 +264,12 @@ class Skeleton_Class extends CommonObject
 				$this->lines[] = $line;
 				//...
 			}
-			$this->db->free( $resql );
+			$this->db->free($resql);
 
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog( __METHOD__ . ' ' . join( ',', $this->errors ), LOG_ERR );
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
 			return - 1;
 		}
@@ -284,18 +283,18 @@ class Skeleton_Class extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function update( User $user, $notrigger = false )
+	public function update(User $user, $notrigger = false)
 	{
 		$error = 0;
 
-		dol_syslog( __METHOD__, LOG_DEBUG );
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		// Clean parameters
-		if (isset( $this->prop1 )) {
-			$this->prop1 = trim( $this->prop1 );
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
 		}
-		if (isset( $this->prop2 )) {
-			$this->prop2 = trim( $this->prop2 );
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
 		}
 		//...
 
@@ -304,13 +303,13 @@ class Skeleton_Class extends CommonObject
 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		if (isset( $this->field1 )) {
-			$sql .= ' field1=\'' . $this->db->escape( $this->field1 ) . '\',';
+		if (isset($this->field1)) {
+			$sql .= ' field1=\'' . $this->db->escape($this->field1) . '\',';
 		} else {
 			$sql .= ' field1=null' . ',';
 		}
-		if (isset( $this->field2 )) {
-			$sql .= ' field2=\'' . $this->db->escape( $this->field2 ) . '\'';
+		if (isset($this->field2)) {
+			$sql .= ' field2=\'' . $this->db->escape($this->field2) . '\'';
 		} else {
 			$sql .= ' field2=null';
 		}
@@ -319,11 +318,11 @@ class Skeleton_Class extends CommonObject
 
 		$this->db->begin();
 
-		$resql = $this->db->query( $sql );
+		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog( __METHOD__ . ' ' . join( ',', $this->errors ), LOG_ERR );
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error && !$notrigger) {
@@ -356,9 +355,9 @@ class Skeleton_Class extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function delete( User $user, $notrigger = false )
+	public function delete(User $user, $notrigger = false)
 	{
-		dol_syslog( __METHOD__, LOG_DEBUG );
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
 
@@ -380,11 +379,11 @@ class Skeleton_Class extends CommonObject
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
 
-			$resql = $this->db->query( $sql );
+			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error ++;
 				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog( __METHOD__ . ' ' . join( ',', $this->errors ), LOG_ERR );
+				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -407,18 +406,18 @@ class Skeleton_Class extends CommonObject
 	 *
 	 * @return int New id of clone
 	 */
-	public function createFromClone( $fromid )
+	public function createFromClone($fromid)
 	{
-		dol_syslog( __METHOD__, LOG_DEBUG );
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		global $user;
 		$error = 0;
-		$object = new Skeleton_Class( $this->db );
+		$object = new Skeleton_Class($this->db);
 
 		$this->db->begin();
 
 		// Load source object
-		$object->fetch( $fromid );
+		$object->fetch($fromid);
 		// Reset object
 		$object->id = 0;
 
@@ -426,13 +425,13 @@ class Skeleton_Class extends CommonObject
 		// ...
 
 		// Create clone
-		$result = $object->create( $user );
+		$result = $object->create($user);
 
 		// Other options
 		if ($result < 0) {
 			$error ++;
 			$this->errors = $object->errors;
-			dol_syslog( __METHOD__ . ' ' . join( ',', $this->errors ), LOG_ERR );
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
 
 		// End
diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php
index 334980b1470..7665ce9986a 100644
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -74,6 +74,7 @@ if (($id > 0 || ! empty($ref)) && $action != 'add')
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('skeleton'));
+$extrafields = new ExtraFields($db);
 
 
 
@@ -217,7 +218,7 @@ jQuery(document).ready(function() {
 	}
 	init_myfunc();
 	jQuery("#mybutton").click(function() {
-		init_needroot();
+		init_myfunc();
 	});
 });
 </script>';
@@ -230,8 +231,18 @@ if ($action == 'list' || empty($id))
     $sql.= " t.rowid,";
     $sql.= " t.field1,";
     $sql.= " t.field2";
+	// Add fields for extrafields
+	foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
     $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
     $sql.= " WHERE field3 = 'xxx'";
+	// Add where from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
     $sql.= " ORDER BY field1 ASC";
 
 	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -241,7 +252,8 @@ if ($action == 'list' || empty($id))
 		print '<div class="liste_titre">';
 		print $moreforfilter;
     	$parameters=array();
-    	$formconfirm=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	    print $hookmanager->resPrint;
 	    print '</div>';
 	}
 
@@ -252,7 +264,8 @@ if ($action == 'list' || empty($id))
     print_liste_field_titre($langs->trans('field1'),$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans('field2'),$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
     $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     print '</tr>'."\n";
 
     // Fields title search
@@ -264,7 +277,8 @@ if ($action == 'list' || empty($id))
 	print '<input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10">';
 	print '</td>';
     $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     print '</tr>'."\n";
 
 
@@ -287,8 +301,9 @@ if ($action == 'list' || empty($id))
                 print $obj->field2;
                 print '</td>';
 		        $parameters=array('obj' => $obj);
-        		$formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-                print '</tr>';
+        		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+                print $hookmanager->resPrint;
+        		print '</tr>';
             }
             $i++;
         }
@@ -302,7 +317,8 @@ if ($action == 'list' || empty($id))
     $db->free($resql);
 
 	$parameters=array('sql' => $sql);
-	$formconfirm=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print "</table>\n";
 	print "</form>\n";
diff --git a/dev/test/testdiv.php b/dev/test/testdiv.php
index 2f1bd9182ae..5b57f0a3667 100644
--- a/dev/test/testdiv.php
+++ b/dev/test/testdiv.php
@@ -9,10 +9,10 @@
 <link rel="shortcut icon" type="image/x-icon" href="/dolibarrnew/theme/eldy/img/favicon.ico"/>
 <title>Login Dolibarr 3.4.0-alpha</title>
 <!-- Includes for JQuery (Ajax library) -->
-<link rel="stylesheet" type="text/css" href="/dolibarrnew/includes/jquery/css/smoothness/jquery-ui-latest.custom.css" />
+<link rel="stylesheet" type="text/css" href="/dolibarrnew/includes/jquery/css/smoothness/jquery-ui.custom.css" />
 <link rel="stylesheet" type="text/css" title="default" href="/dolibarrnew/custom/filemanager/css/filemanager.css.php"><!-- Added by module filemanager-->
 <!-- Includes JS for JQuery -->
-<script type="text/javascript" src="/dolibarrnew/includes/jquery/js/jquery-latest.min.js"></script>
+<script type="text/javascript" src="/dolibarrnew/includes/jquery/js/jquery.min.js"></script>
 <script type="text/javascript" src="/dolibarrnew/core/js/dst.js"></script>
 <link rel="stylesheet" type="text/css" href="/dolibarrnew/theme/eldy/style.css.php?lang=fr_FR" />
 <!-- HTTP_USER_AGENT = Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22 -->
diff --git a/dev/translation/txpush.sh b/dev/translation/txpush.sh
index 34ab5c97f5d..75b21ede212 100755
--- a/dev/translation/txpush.sh
+++ b/dev/translation/txpush.sh
@@ -2,9 +2,9 @@
 #------------------------------------------------------
 # Script to push language files to Transifex
 #
-# Laurent Destailleur - eldy@users.sourceforge.net
+# Laurent Destailleur (eldy) - eldy@users.sourceforge.net
 #------------------------------------------------------
-# Usage: txpush.sh (source|all|xx_XX) [-r dolibarr.file] [-f]
+# Usage: txpush.sh (source|xx_XX) [-r dolibarr.file] [-f]
 #------------------------------------------------------
 
 # Syntax
@@ -13,7 +13,7 @@ then
 	echo "This push local files to transifex."
 	echo "Note:  If you push a language file (not source), file will be skipped if transifex file is newer."
 	echo "       Using -f will overwrite translation but not memory."
-	echo "Usage: ./dev/translation/txpush.sh (source|all|xx_XX) [-r dolibarr.file] [-f] [--no-interactive]"
+	echo "Usage: ./dev/translation/txpush.sh (source|xx_XX) [-r dolibarr.file] [-f] [--no-interactive]"
 	exit
 fi
 
@@ -23,20 +23,15 @@ then
 	exit
 fi
 
-if [ "x$1" = "xall" ]
-then
-	for fic in ar_SA bg_BG bs_BA ca_ES cs_CZ da_DK de_DE el_GR es_ES et_EE eu_ES fa_IR fi_FI fr_FR he_IL hr_HR hu_HU id_ID is_IS it_IT ja_JP ka_GE ko_KR lt_LT lv_LV mk_MK nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sk_SK sl_SI sq_AL sv_SE th_TH tr_TR uk_UA uz_UZ vi_VN zh_CN zh_TW
-	do
-		echo "tx push --skip -t -l $fic $2 $3"
-		tx push --skip -t -l $fic $2 $3
-	done
-else
 if [ "x$1" = "xsource" ]
 then
 	echo "tx push -s $2 $3"
 	tx push -s $2 $3 
 else
-	echo "tx push --skip -t -l $1 $2 $3 $4"
-	tx push --skip -t -l $1 $2 $3 $4
-fi
+	for file in `find htdocs/langs/$1/*.lang -type f`
+	do
+		export basefile=`basename $file | sed -s s/\.lang//g`
+		echo "tx push --skip -r dolibarr.$basfile -t -l $1 $2 $3 $4"
+		tx push --skip -r dolibarr.$basefile -t -l $1 $2 $3 $4
+	done
 fi
diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index bf99a2deebe..bd9c176df9b 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -10,3 +10,4 @@
 /ovh*
 /pos
 /ultimatepdf*
+/lead
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 0c2a825604b..d935eb025dc 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -154,7 +154,7 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Accountparent"), $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Active"), $_SERVER["PHP_SELF"], "aa.active", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Activated"), $_SERVER["PHP_SELF"], "aa.active", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
 	print '</tr>';
 	
@@ -174,12 +174,17 @@ if ($result) {
 	
 	$var = true;
 	
+	$accountstatic=new AccountingAccount($db);
+	
 	while ( $i < min($num, $limit) ) {
 		$obj = $db->fetch_object($resql);
 		
-		$var = ! $var;
+		$accountstatic->id=$obj->rowid;
+		$accountstatic->label=$obj->label;
+		$accountstatic->account_number=$obj->account_number;
+
 		print '<tr ' . $bc[$var] . '>';
-		print '<td><a href="./card.php?id=' . $obj->rowid . '">' . $obj->account_number . '</td>';
+		print '<td>' . $accountstatic->getNomUrl(1) . '</td>';
 		print '<td>' . $obj->label . '</td>';
 		print '<td>' . $obj->account_parent . '</td>';
 		print '<td>' . $obj->pcg_type . '</td>';
@@ -210,6 +215,7 @@ if ($result) {
 		print '</td>' . "\n";
 		
 		print "</tr>\n";
+		$var=!$var;
 		$i ++;
 	}
 	
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 51517993bb5..092122a653d 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -39,6 +39,7 @@ $mesg = '';
 $action = GETPOST('action');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
+$cancel = GETPOST('cancel');
 
 // Security check
 if (!$user->admin)
@@ -49,7 +50,7 @@ $accounting = new AccountingAccount($db);
 // Action
 if ($action == 'add')
 {
-	if (! GETPOST('cancel', 'alpha')) {
+	if (! $cancel) {
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
 
 		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
@@ -59,7 +60,7 @@ if ($action == 'add')
 		$accounting->fk_pcg_version = $obj->pcg_version;
 		$accounting->pcg_type = GETPOST('pcg_type');
 		$accounting->pcg_subtype = GETPOST('pcg_subtype');
-		$accounting->account_number = GETPOST('account_number', 'int');
+		$accounting->account_number = GETPOST('account_number');
 		$accounting->account_parent = GETPOST('account_parent', 'int');
 		$accounting->label = GETPOST('label', 'alpha');
 		$accounting->active = 1;
@@ -94,7 +95,7 @@ else if ($action == 'edit')
 		$accounting->fk_pcg_version = $obj->pcg_version;
 		$accounting->pcg_type = GETPOST('pcg_type');
 		$accounting->pcg_subtype = GETPOST('pcg_subtype');
-		$accounting->account_number = GETPOST('account_number', 'int');
+		$accounting->account_number = GETPOST('account_number');
 		$accounting->account_parent = GETPOST('account_parent', 'int');
 		$accounting->label = GETPOST('label', 'alpha');
 
@@ -261,7 +262,7 @@ else if ($id)
 			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 			print '<td colspan="2">' . $accounting->pcg_subtype . '</td></tr>';
 
-			print '<tr><td>' . $langs->trans("Active") . '</td>';
+			print '<tr><td>' . $langs->trans("Activated") . '</td>';
 			print '<td colspan="2">';
 
 			if (empty($accounting->active)) {
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index c1ad179342a..dfc25161718 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,6 +48,8 @@ $action = GETPOST('action', 'alpha');
 // Other parameters ACCOUNTING_*
 $list = array (
 		'ACCOUNTING_LIMIT_LIST_VENTILATION',
+        'ACCOUNTING_LENGTH_DESCRIPTION',				// adjust size displayed for lines description for dol_trunc
+		'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT',		// adjust size displayed for select account description for dol_trunc
 		'ACCOUNTING_LENGTH_GACCOUNT',
 		'ACCOUNTING_LENGTH_AACCOUNT',
 		'ACCOUNTING_ACCOUNT_CUSTOMER',
@@ -56,6 +58,8 @@ $list = array (
 		'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
 		'ACCOUNTING_SERVICE_BUY_ACCOUNT',
 		'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+		'ACCOUNTING_VAT_BUY_ACCOUNT',
+		'ACCOUNTING_VAT_SOLD_ACCOUNT',
 		'ACCOUNTING_ACCOUNT_SUSPENSE',
 		'ACCOUNTING_ACCOUNT_TRANSFER_CASH' 
 );
@@ -285,7 +289,6 @@ if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
 }
 print '</tr>';
 
-
 print "</table>\n";
 
 print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 402ff72ed84..52c4a0d1862 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -2,7 +2,9 @@
 /*
  * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
- * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
+
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,129 +21,404 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/productaccount.php
- * \ingroup		Accounting Expert
- * \brief		Onglet de gestion de parametrages des ventilations
+ * \file        htdocs/accountancy/admin/productaccount.php
+ * \ingroup     Accounting Expert
+ * \brief       Onglet de gestion de parametrages des ventilations
  */
 
-// Dolibarr environment
-$res = @include ("../main.inc.php");
-if (! $res && file_exists("../main.inc.php"))
-	$res = @include ("../main.inc.php");
-if (! $res && file_exists("../../main.inc.php"))
-	$res = @include ("../../main.inc.php");
-if (! $res && file_exists("../../../main.inc.php"))
-	$res = @include ("../../../main.inc.php");
-if (! $res)
-	die("Include of main fails");
+require '../../main.inc.php';
 
-	// Class
-dol_include_once("/core/lib/report.lib.php");
-dol_include_once("/core/lib/date.lib.php");
-dol_include_once("/product/class/product.class.php");
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
+// Langs
 $langs->load("companies");
 $langs->load("compta");
 $langs->load("main");
 $langs->load("accountancy");
 
-// Security check
-if (!$user->admin)
-    accessforbidden();
+// Search & action GETPOST
+$action = GETPOST('action');
+$codeventil_buy = GETPOST('codeventil_buy', 'array');
+$codeventil_sell = GETPOST('codeventil_sell', 'array');
+$mesCasesCochees = GETPOST('mesCasesCochees', 'array');
+$account_number_buy  = GETPOST('account_number_buy');
+$account_number_sell = GETPOST('account_number_sell');
+$changeaccount  = GETPOST('changeaccount','array');
+$changeaccount_buy   = GETPOST('changeaccount_buy','array');
+$changeaccount_sell  = GETPOST('changeaccount_sell','array');
+$search_ref     = GETPOST('search_ref','alpha');
+$search_label   = GETPOST('search_label','alpha');
+$search_desc    = GETPOST('search_desc','alpha');
 
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page < 0) $page = 0;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+//bug in page limit if ACCOUNTING_LIMIT_LIST_VENTILATION < $conf->liste_limit there is no pagination displayed !
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) && $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION >= $conf->liste_limit) {
+    $limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+//} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+//  $limit = $conf->liste_limit;
+} else {
+    $limit = $conf->liste_limit;
+}
+$offset = $limit * $page;
+
+if (! $sortfield) $sortfield="p.ref";
+if (! $sortorder) $sortorder="ASC";
+
+// Security check
+if ($user->societe_id > 0)
+    accessforbidden();
+// TODO after adding menu
+// if (! $user->rights->accounting->ventilation->dispatch)
+// accessforbidden();
+
+$form = new FormVentilation($db);
+
+//Defaut AccountingAccount RowId Product / Service
+//at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
+//so we need to get those default value rowid first
+$accounting = new AccountingAccount($db);
+//TODO: we should need to check if result is a really exist accountaccount rowid.....
+$aarowid_servbuy  = $accounting->fetch('', ACCOUNTING_SERVICE_BUY_ACCOUNT);
+$aarowid_prodbuy  = $accounting->fetch('', ACCOUNTING_PRODUCT_BUY_ACCOUNT);
+$aarowid_servsell = $accounting->fetch('', ACCOUNTING_SERVICE_SOLD_ACCOUNT);
+$aarowid_prodsell = $accounting->fetch('', ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
+
+$aacompta_servbuy  = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodbuy  = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref='';
+    $search_label='';
+    $search_desc='';
+}
+
+//debug move header to top
 llxHeader('', $langs->trans("Accounts"));
 
-$form = new Form($db);
 
-print '<input type="button" class="button" style="float: right;" value="Renseigner les comptes comptables produits manquant" onclick="launch_export();" />';
+//TODO: modify to update all selected product with a sell account
+if (is_array($changeaccount) && count($changeaccount) > 0 && $action == $langs->trans("Accountancy_code_sell")) {
+//print_r ($changeaccount);
+    $error = 0;
+    
+    $db->begin();
+    
+    $sql1 = "UPDATE " . MAIN_DB_PREFIX . "product as p";
+    $sql1 .= " SET p.accountancy_code_sell=" . $account_number_sell;
+    $sql1 .= ' WHERE p.rowid IN (' . implode(',', $changeaccount) . ')';
+    
+    dol_syslog('accountancy/customer/lines.php::changeaccount product sell sql= ' . $sql1);
+print_r ($sql1);
+    $resql1 = $db->query($sql1);
+    if (! $resql1) {
+        $error ++;
+        setEventMessage($db->lasterror(), 'errors');
+    }
+    if (! $error) {
+        $db->commit();
+        setEventMessage($langs->trans('Save'), 'mesgs');
+    } else {
+        $db->rollback();
+        setEventMessage($db->lasterror(), 'errors');
+    }
+}
 
-print '
-	<script type="text/javascript">
-		function launch_export() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
-			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
-		}
+
+//TODO: modify to update all selected product with a buy account
+if (is_array($changeaccount) && count($changeaccount) > 0 && $action == $langs->trans("Accountancy_code_buy")) {
+    $error = 0;
+    
+    $db->begin();
+    
+    $sql1 = "UPDATE " . MAIN_DB_PREFIX . "product as p";
+    $sql1 .= " SET p.accountancy_code_buy=" . $account_number_buy;
+    $sql1 .= ' WHERE p.rowid IN (' . implode(',', $changeaccount) . ')';
+print_r ($sql1);    
+    dol_syslog('accountancy/customer/lines.php::changeaccount product buy sql= ' . $sql1);
+    $resql1 = $db->query($sql1);
+    if (! $resql1) {
+        $error ++;
+        setEventMessage($db->lasterror(), 'errors');
+    }
+    if (! $error) {
+        $db->commit();
+        setEventMessage($langs->trans('Save'), 'mesgs');
+    } else {
+        $db->rollback();
+        setEventMessage($db->lasterror(), 'errors');
+    }
+}
+
+/*
+ * View
+ */
+//DEBUG elarifr 
+//llxHeader('', $langs->trans("Accounts"));
+
+//For updating account export
+print '<script type="text/javascript">
+
+        function launch_export() {
+            $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+            $("div.fiche div.tabBar form input[type=\"submit\"]").click();
+            $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+        }
 </script>';
 
-$sql = "SELECT p.rowid, p.ref , p.label, p.description , p.accountancy_code_sell as codesell, p.accountancy_code_buy, p.tms, p.fk_product_type as product_type , p.tosell , p.tobuy ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "product as p";
-$sql .= " WHERE p.accountancy_code_sell IS NULL  AND p.tosell = 1  OR p.accountancy_code_buy IS NULL AND p.tobuy = 1";
+//TODO For select box
+print  '<script type="text/javascript">
+            $(function () {
+                $(\'#select-all\').click(function(event) {
+                    // Iterate each checkbox
+                    $(\':checkbox\').each(function() {
+                        this.checked = true;
+                    });
+                });
+                $(\'#unselect-all\').click(function(event) {
+                    // Iterate each checkbox
+                    $(\':checkbox\').each(function() {
+                        this.checked = false;
+                    });
+                });
+            });
+             </script>';
 
-dol_syslog('accountancy/admin/productaccount.php:: $sql=' . $sql);
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
+/*
+ * Action
+ */
+//TODO 
+/*
+if ($action == 'ventil') {
+    print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
+    if (! empty($codeventil_buy) && ! empty($mesCasesCochees)) {
+    if (! empty($codeventil_sell) && ! empty($mesCasesCochees)) {
 
-	/*
-* view
-*/
-
-	print '<br><br>';
-
-	print '<table class="noborder" width="100%">';
-	print '<td align="left">' . $langs->trans("Ref") . '</td>';
-	print '<td align="left">' . $langs->trans("Label") . '</td>';
-	print '<td align="left">' . $langs->trans("Description") . '</td>';
-	print '<td align="left">' . $langs->trans("Accountancy_code_buy") . '</td>';
-	print '<td align="left">' . $langs->trans("Accountancy_code_buy_suggest") . '</td>';
-	print '<td align="left">' . $langs->trans("Accountancy_code_sell") . '</td>';
-	print '<td align="left">' . $langs->trans("Accountancy_code_sell_suggest") . '</td>';
-
-	$var = true;
-
-	while ( $i < min($num, 250) ) {
-		$obj = $db->fetch_object($resql);
-		$var = ! $var;
-
-		$compta_prodsell = $obj->accountancy_code_sell;
-		if (empty($compta_prodsell)) {
-			if ($obj->product_type == 0)
-				$compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-			else
-				$compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-		}
-
-		$compta_prodbuy = $obj->accountancy_code_buy;
-		if (empty($compta_prodbuy)) {
-			if ($obj->product_type == 0)
-				$compta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-			else
-				$compta_prodbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-		}
-
-		$product_static = new Product($db);
-
-		print "<tr $bc[$var]>";
-		// Ref produit
-		$product_static->ref = $objp->ref;
-		$product_static->id = $objp->rowid;
-		$product_static->type = $objp->type;
-		print '<td>';
-		if ($product_static->id)
-			print $product_static->getNomUrl(1);
-		else
-			print '&nbsp;';
-		print '</td>';
-		print '<td align="left">' . $obj->ref . '</td>';
-		print '<td align="left">' . $obj->label . '</td>';
-		print '<td align="left">' . $obj->description . '</td>';
-
-		print '<td align="left">' . $obj->accountancy_code_buy . '</td>';
-		print '<td align="left">' . $compta_prodbuy . '</td>';
-
-		print '<td align="left">' . $obj->accountancy_code_sell . '</td>';
-		print '<td align="left">' . $compta_prodsell . '</td>';
-
-		print "</tr>\n";
-		$i ++;
-	}
-	print "</table>";
-	$db->free($resql);
-} else {
-	dol_print_error($db);
+    } else {
+        print '<div><font color="red">' . $langs->trans("AnyLineVentilate") . '</font></div>';
+    }
+    print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
 }
+*/
+//do we really need to exclude old product not tosell / tobuy ?
+//$sql = "SELECT p.rowid, p.ref , p.label, p.description , p.accountancy_code_sell, p.accountancy_code_buy, p.tms, p.fk_product_type as product_type , p.tosell , p.tobuy ";
+//$sql .= " WHERE p.accountancy_code_sell IS NULL  AND p.tosell = 1  OR p.accountancy_code_buy IS NULL AND p.tobuy = 1";
+//$sql .= " WHERE p.accountancy_code_sell ='' AND p.tosell = 1  OR p.accountancy_code_buy ='' AND p.tobuy = 1";
+$sql  = "SELECT p.rowid, p.ref , p.label, p.description , p.accountancy_code_sell, p.accountancy_code_buy, p.tms, p.fk_product_type as product_type";
+$sql .= " FROM " . MAIN_DB_PREFIX . "product as p";
+//$sql .= " , " . MAIN_DB_PREFIX . "accountingaccount as aa";
+$sql .= " WHERE (";
+$sql .= " p.accountancy_code_sell ='' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_buy ='' OR p.accountancy_code_buy IS NULL";
+
+//Search on correct pcg version
+$pcgver = $conf->global->CHARTOFACCOUNTS;
+$sql .= " OR (p.accountancy_code_sell IS NOT NULL AND p.accountancy_code_sell != '' AND p.accountancy_code_sell NOT IN
+    (SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accountingaccount as aa , " . MAIN_DB_PREFIX . "accounting_system as asy  WHERE fk_pcg_version = asy.pcg_version AND asy.rowid = " . $pcgver . "))";
+   //(SELECT account_number FROM " . MAIN_DB_PREFIX . "accountingaccount as aa WHERE fk_pcg_version='PCG99-BASE'))";
+$sql .= " OR (p.accountancy_code_buy  IS NOT NULL AND p.accountancy_code_buy  != '' AND p.accountancy_code_buy  NOT IN
+    (SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accountingaccount as aa , " . MAIN_DB_PREFIX . "accounting_system as asy  WHERE fk_pcg_version = asy.pcg_version AND asy.rowid = " . $pcgver . "))";
+   //(SELECT account_number FROM " . MAIN_DB_PREFIX . "accountingaccount as aa WHERE fk_pcg_version='PCG99-BASE'))";
+$sql .= ")";
+//Add search filter like
+if (strlen(trim($search_ref))) {
+    $sql .= " AND (p.ref like '" . $search_ref . "%')";
+}
+if (strlen(trim($search_label))) {
+    $sql .= " AND (p.label like '" . $search_label . "%')";
+}
+if (strlen(trim($search_desc))) {
+    $sql .= " AND (p.description like '%" . $search_desc . "%')";
+}
+$sql.= $db->order($sortfield,$sortorder);
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog("/accountancy/admin/productaccount.php:: sql=" . $sql, LOG_DEBUG);
+$result = $db->query($sql);
+if ($result) {
+    $num_lines = $db->num_rows($result);
+    $i = 0;
+
+/*
+
+
+ * View
+ */
+    print_barre_liste($langs->trans("ProductAccountingAccountSelect"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
+
+    print '<td align="left"><b>' . $langs->trans("DescProductAccountingAccount") . '</b></td>&nbsp;';
+    print_liste_field_titre($langs->trans("RowId"), $_SERVER["PHP_SELF"],"p.rowid","",$param,'',$sortfield,$sortorder);
+    print '&nbsp;&nbsp;';
+
+
+//DEBUG
+//print $sql;
+
+    print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post"><br />';
+//  print '<input type="hidden" name="action" value="ventil">';
+
+    print '<table class="noborder" width="100%">';
+    print '<tr>';
+    print '<td width="33%">';
+    print '<div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br />';
+    print $langs->trans("Accountancy_code_buy") . ': ' . $form->select_account($account_number_buy, 'account_number_buy', 1,'', 0, 1);
+    print '<input type="submit" class="butAction" name="action" value="' . $langs->trans("Accountancy_code_buy") . '"/></div>';
+    print '</td>';
+
+    print '<td width="33%">';
+    print '<div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br />';
+    print $langs->trans("Accountancy_code_sell") . ': ' . $form->select_account($account_number_sell, 'account_number_sell', 1, '', 0, 1);
+    print '<input type="submit" class="butAction" name="action" value="' . $langs->trans("Accountancy_code_sell") . '"/></div>';
+    print '</td>';
+    print '<td width="33%">';
+    //TODO change button
+    print '<input type="button" class="button" style="float: right;" value="Renseigner les comptes comptables produits manquant" onclick="launch_export();" />';
+    print '</td>';
+    print '</tr>';
+    print '</table>';
+
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+//  print '<td align="left">' . $langs->trans("Ref") . '</td>';
+//  print '<td align="left">' . $langs->trans("Label") . '</td>';
+//  print '<td align="left">' . $langs->trans("Description") . '</td>';
+    print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
+    print '<td align="left">' . $langs->trans("Accountancy_code_buy") . '</td>';
+    print '<td align="left">' . $langs->trans("Accountancy_code_buy_suggest") . '</td>';
+    print '<td align="left">' . $langs->trans("Accountancy_code_sell") . '</td>';
+    print '<td align="left">' . $langs->trans("Accountancy_code_sell_suggest") . '</td>';
+    print_liste_field_titre('');
+//  print_liste_field_titre('');
+    print '<td align="center" colspan="2">' . $langs->trans("Ventilate") . '<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>'.'</td>';
+    print '</tr>';
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre">%<input type="text" class="flat" size="20" name="search_ref" value="' . $search_ref . '"></td>';
+    print '<td class="liste_titre">%<input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
+    print '<td class="liste_titre"><input type="text" class="flat" size="30" name="search_desc" value="' . $search_desc . '"></td>';
+
+    print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+    print '<td align="right" colspan="4" class="liste_titre">';
+    print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+//  print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+    print '&nbsp;';
+    print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+//  print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print '</td>';
+//  print '<td class="liste_titre" colspan="2">&nbsp;</td>';
+    print '</tr>';
+    
+    $var = true;
+
+    
+    while ( $i < min($num_lines, 250) ) {
+        $obj = $db->fetch_object($result);
+        $var = ! $var;
+
+        
+        $compta_prodsell = $obj->accountancy_code_sell;
+        if (empty($compta_prodsell)) {
+            if ($obj->product_type == 0) {
+                $compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+                $compta_prodsell_id  = $aarowid_prodsell;
+            } else {
+                $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+                $compta_prodsell_id  = $aarowid_servsell;
+            }
+        }
+
+        
+        $compta_prodbuy = $obj->accountancy_code_buy;
+        if (empty($compta_prodbuy)) {
+            if ($obj->product_type == 0) {
+                $compta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+                $compta_prodbuy_id  = $aarowid_prodbuy;
+            } else {
+                $compta_prodbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+                $compta_prodbuy_id  = $aarowid_servbuy;
+            }
+        }
+
+        
+        $product_static = new Product($db);
+        
+        print "<tr $bc[$var]>";
+//debug
+print '<td align="left" colspan="6">Compte Suggeres compta_prodbuy=' . $compta_prodbuy . '  -- compta_prodbuy_id' . $compta_prodbuy_id . '-- compta_prodsell:' . $compta_prodsell . '-- compta_prodsell_id' . $compta_prodsell_id . '</td>';
+
+        print "</tr>";
+        print "<tr $bc[$var]>";
+        // Ref produit as link
+        $product_static->ref = $obj->ref;
+        $product_static->id = $obj->rowid;
+        $product_static->type = $obj->type;
+        print '<td>';
+        if ($product_static->id)
+            print $product_static->getNomUrl(1);
+        else
+            print '-&nbsp;';
+        print '</td>';
+
+        print '<td align="left">' . $obj->label . '</td>';
+//TODO ADJUST DESCRIPTION SIZE
+//      print '<td align="left">' . $obj->description . '</td>';
+        //TODO: we shoul set a user defined value to adjust user square / wide screen size
+        $trunclengh = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+        print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($obj->description, $trunclengh)) . '</td>';
+
+        //acountingaccount buy
+        print '<td align="left">' . $obj->accountancy_code_buy . '</td>';
+//TODO: replace by select
+//      print '<td align="left">' . $compta_prodbuy . '</td>';
+        //TODO: we shoul set a user defined value to adjust user square / wide screen size
+        //$trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
+        print '<td align="center">';
+        print $form->select_account($compta_prodbuy_id, 'codeventil[]', 1);
+        print '</td>';
+
+        //acountingaccount sel
+        print '<td align="left">' . $obj->accountancy_code_sell . '</td>';
+
+//TODO: replace by select
+        //TODO: we shoul set a user defined value to adjust user square / wide screen size
+        //$trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
+        print '<td align="center">';
+        print $form->select_account($compta_prodsell_id, 'codeventil[]', 1);
+        print '</td>';
+        //action edit & select box
+        print '<td align="center">' . $obj->rowid . '</td>';
+        print '<td><a href="./card.php?id=' . $obj->rowid . '">';
+        print img_edit();
+        print '</a></td>';
+        //Checkbox select
+        print '<td align="center">';
+        print '<input type="checkbox" name="changeaccount[]" value="' . $obj->rowid . '"/></td>';
+
+        print "</tr>";
+        $i ++;
+    }
+
+    $db->free($result);
+} else {
+//  print $db->error();
+    dol_print_error($db);
+}
+
+print "</table></form>";
 
 llxFooter();
 $db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index e25ceb976ff..c1101fb6349 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2015 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,23 +18,23 @@
  */
 
 /**
- * \file		htdocs/accountancy/bookkeeping/card.php
- * \ingroup		Accounting Expert
- * \brief		Page to show account
+ * \file        htdocs/accountancy/bookkeeping/card.php
+ * \ingroup     Accounting Expert
+ * \brief       Page to show account
  */
 
 require '../../main.inc.php';
-	
+
 // Class
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
 // Langs
-$langs->load("accounting");
+$langs->load("accountancy");
 
 // Security check
 $id = GETPOST('id', 'int');
 if ($user->societe_id > 0)
-	accessforbidden();
+    accessforbidden();
 
 $action = GETPOST('action');
 $piece_num = GETPOST("piece_num");
@@ -48,132 +48,132 @@ $debit = price2num(GETPOST('debit'));
 $credit = price2num(GETPOST('credit'));
 
 if ($action == "confirm_update") {
-	
-	$error = 0;
-	
-	if ((intval($debit) != 0) && (intval($credit) != 0)) {
-		setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
-		$error ++;
-	}
-	
-	if (empty($error)) {
-		$book = new BookKeeping($db);
-		
-		$result = $book->fetch($id);
-		if ($result < 0) {
-			setEventMessage($book->errors, 'errors');
-		} else {
-			$book->numero_compte = $numero_compte;
-			$book->code_tiers = $code_tiers;
-			$book->label_compte = $label_compte;
-			$book->debit = $debit;
-			$book->credit = $credit;
-			
-			if (! empty($debit)) {
-				$book->montant = $debit;
-				$book->sens = 'D';
-			}
-			if (! empty($credit)) {
-				$book->montant = $credit;
-				$book->sens = 'C';
-			}
-			
-			$result = $book->update();
-			if ($result < 0) {
-				setEventMessage($book->errors, 'errors');
-			} else {
-				setEventMessage($langs->trans('Saved'), 'mesgs');
-				$action = '';
-			}
-		}
-	}
-} 
+
+    $error = 0;
+
+    if ((intval($debit) != 0) && (intval($credit) != 0)) {
+        setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
+        $error ++;
+    }
+
+    if (empty($error)) {
+        $book = new BookKeeping($db);
+
+        $result = $book->fetch($id);
+        if ($result < 0) {
+            setEventMessage($book->errors, 'errors');
+        } else {
+            $book->numero_compte = $numero_compte;
+            $book->code_tiers = $code_tiers;
+            $book->label_compte = $label_compte;
+            $book->debit = $debit;
+            $book->credit = $credit;
+
+            if (! empty($debit)) {
+                $book->montant = $debit;
+                $book->sens = 'D';
+            }
+            if (! empty($credit)) {
+                $book->montant = $credit;
+                $book->sens = 'C';
+            }
+
+            $result = $book->update();
+            if ($result < 0) {
+                setEventMessage($book->errors, 'errors');
+            } else {
+                setEventMessage($langs->trans('Saved'), 'mesgs');
+                $action = '';
+            }
+        }
+    }
+}
 
 else if ($action == "add") {
-	
-	$error = 0;
-	if ((intval($debit) != 0) && (intval($credit) != 0)) {
-		setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
-		$error ++;
-	}
-	
-	if (empty($error)) {
-		$book = new BookKeeping($db);
-		
-		$book->numero_compte = $numero_compte;
-		$book->code_tiers = $code_tiers;
-		$book->label_compte = $label_compte;
-		$book->debit = $debit;
-		$book->credit = $credit;
-		$book->doc_date = GETPOST('doc_date');
-		$book->doc_type = GETPOST('doc_type');
-		$book->piece_num = $piece_num;
-		$book->doc_ref = GETPOST('doc_ref');
-		$book->code_journal = GETPOST('code_journal');
-		$book->fk_doc = GETPOST('fk_doc');
-		$book->fk_docdet = GETPOST('fk_docdet');
-		
-		if (! empty($debit)) {
-			$book->montant = $debit;
-			$book->sens = 'D';
-		}
-		if (! empty($credit)) {
-			$book->montant = $credit;
-			$book->sens = 'C';
-		}
-		
-		$result = $book->create_std($user);
-		if ($result < 0) {
-			setEventMessage($book->errors, 'errors');
-		} else {
-			setEventMessage($langs->trans('Saved'), 'mesgs');
-			$action = '';
-		}
-	}
-} 
+    $error = 0;
+
+    if ((intval($debit) != 0) && (intval($credit) != 0)) {
+        setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
+        $error ++;
+    }
+
+    if (empty($error)) {
+        $book = new BookKeeping($db);
+
+        $book->numero_compte = $numero_compte;
+        $book->code_tiers = $code_tiers;
+        $book->label_compte = $label_compte;
+        $book->debit = $debit;
+        $book->credit = $credit;
+        $book->doc_date = GETPOST('doc_date');
+        $book->doc_type = GETPOST('doc_type');
+        $book->piece_num = $piece_num;
+        $book->doc_ref = GETPOST('doc_ref');
+        $book->code_journal = GETPOST('code_journal');
+        $book->fk_doc = GETPOST('fk_doc');
+        $book->fk_docdet = GETPOST('fk_docdet');
+
+        if (! empty($debit)) {
+            $book->montant = $debit;
+            $book->sens = 'D';
+        }
+        if (! empty($credit)) {
+            $book->montant = $credit;
+            $book->sens = 'C';
+        }
+
+        $result = $book->create_std($user);
+        if ($result < 0) {
+            setEventMessage($book->errors, 'errors');
+        } else {
+            setEventMessage($langs->trans('Saved'), 'mesgs');
+            $action = '';
+        }
+    }
+}
 
 else if ($action == "confirm_delete") {
-	$book = new BookKeeping($db);
-	
-	$result = $book->fetch($id);
-	
-	$piece_num = $book->piece_num;
-	
-	if ($result < 0) {
-		setEventMessage($book->errors, 'errors');
-	} else {
-		$result = $book->delete($user);
-		if ($result < 0) {
-			setEventMessage($book->errors, 'errors');
-		}
-	}
-	$action = '';
-} 
+    $book = new BookKeeping($db);
+
+    $result = $book->fetch($id);
+
+    $piece_num = $book->piece_num;
+
+    if ($result < 0) {
+        setEventMessage($book->errors, 'errors');
+    } else {
+        $result = $book->delete($user);
+        if ($result < 0) {
+            setEventMessage($book->errors, 'errors');
+        }
+    }
+    $action = '';
+}
 
 else if ($action == "confirm_create") {
-	$book = new BookKeeping($db);
-	
-	$book->label_compte = '';
-	$book->debit = 0;
-	$book->credit = 0;
-	$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
-	$book->doc_type = GETPOST('doc_type');
-	$book->piece_num = GETPOST('next_num_mvt');
-	$book->doc_ref = GETPOST('doc_ref');
-	$book->code_journal = GETPOST('code_journal');
-	$book->fk_doc = 0;
-	$book->fk_docdet = 0;
-	
-	$book->montant = 0;
-	
-	$result = $book->create_std($user);
-	if ($result < 0) {
-		setEventMessage($book->errors, 'errors');
-	} else {
-		setEventMessage($langs->trans('Saved'), 'mesgs');
-		$action = '';
-		$piece_num = $book->piece_num;
-	}
+    $book = new BookKeeping($db);
+
+    $book->label_compte = '';
+    $book->debit = 0;
+    $book->credit = 0;
+    $book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
+    $book->doc_type = GETPOST('doc_type');
+    $book->piece_num = GETPOST('next_num_mvt');
+    $book->doc_ref = GETPOST('doc_ref');
+    $book->code_journal = GETPOST('code_journal');
+    $book->fk_doc = 0;
+    $book->fk_docdet = 0;
+
+    $book->montant = 0;
+
+    $result = $book->create_std($user);
+    if ($result < 0) {
+        setEventMessage($book->errors, 'errors');
+    } else {
+        setEventMessage($langs->trans('Saved'), 'mesgs');
+        $action = '';
+        $piece_num = $book->piece_num;
+    }
 }
 
 llxHeader();
@@ -181,197 +181,194 @@ llxHeader();
 $html = new Form($db);
 
 /*
- *	Confirmation to delete the command
+ *  Confirmation to delete the command
  */
 if ($action == 'delete') {
-	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
-	print $formconfirm;
+    $formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+    print $formconfirm;
 }
 
 if ($action == 'create') {
-	
-	print_fiche_titre($langs->trans("CreateMvts"));
-	
-	$code_journal_array = array (
-			$conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
-			$conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
-			$conf->global->ACCOUNTING_BANK_JOURNAL => $conf->global->ACCOUNTING_BANK_JOURNAL,
-			$conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL 
-	);
-	
-	$book = new BookKeeping($db);
-	$next_num_mvt = $book->getNextNumMvt();
-	
-	print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" method="POST">';
-	print '<input type="hidden" name="action" value="confirm_create">' . "\n";
-	print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
+    print_fiche_titre($langs->trans("CreateMvts"));
 
-	dol_fiche_head();
+    $code_journal_array = array (
+            $conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
+            $conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
+            $conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL,
+            $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL => $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL,
+            $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL => $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL
+    );
 
-	print '<table class="border" width="100%">';
-	print '<tr>';
-	print '<td>' . $langs->trans("NumMvts") . '</td>';
-	print '<td>' . $next_num_mvt . '</td>';
-	print '</tr>';
-	print '<tr>';
-	print '<td>' . $langs->trans("Docdate") . '</td>';
-	print '<td>';
-	print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
-	print '</td>';
-	
-	print '</tr>';
-	print '<tr>';
-	print '<td>' . $langs->trans("Codejournal") . '</td>';
-	
-	print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
-	print '</tr>';
-	print '<tr>';
-	print '<td>' . $langs->trans("Docref") . '</td>';
-	print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
-	print '</tr>';
-	print '<tr>';
-	print '<td>' . $langs->trans("Doctype") . '</td>';
-	print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
-	print '</tr>';
-	print '</table>';
+    $book = new BookKeeping($db);
+    $next_num_mvt = $book->getNextNumMvt();
+
+    print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" method="POST">';
+    print '<input type="hidden" name="action" value="confirm_create">' . "\n";
+    print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
+
+    dol_fiche_head();
+
+    print '<table class="border" width="100%">';
+    print '<tr>';
+    print '<td>' . $langs->trans("NumMvts") . '</td>';
+    print '<td>' . $next_num_mvt . '</td>';
+    print '</tr>';
+    print '<tr>';
+    print '<td>' . $langs->trans("Docdate") . '</td>';
+    print '<td>';
+    print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
+    print '</td>';
+
+    print '</tr>';
+    print '<tr>';
+    print '<td>' . $langs->trans("Codejournal") . '</td>';
+
+    print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
+    print '</tr>';
+    print '<tr>';
+    print '<td>' . $langs->trans("Docref") . '</td>';
+    print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
+    print '</tr>';
+    print '<tr>';
+    print '<td>' . $langs->trans("Doctype") . '</td>';
+    print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
+    print '</tr>';
+    print '</table>';
 
     dol_fiche_end();
 
-	print '<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Save") . '">';
+    print '<div align="center"><input type="submit" class="button" value="' . $langs->trans("Create") . '">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)" />';
     print '</div>';
 
-	print '</form>';
-} 
-else
-{
-	$book = new BookKeeping($db);
-	$result = $book->fetch_per_mvt($piece_num);
-	if ($result < 0) {
-		setEventMessage($book->errors, 'errors');
-	}
-	if (! empty($book->piece_num)) {
-		
-		print_fiche_titre($langs->trans("UpdateMvts"));
-		
-		print '<table class="border" width="100%">';
-		print '<tr class="pair">';
-		print '<td>' . $langs->trans("NumMvts") . '</td>';
-		print '<td>' . $book->piece_num . '</td>';
-		print '</tr>';
-		print '<tr class="impair">';
-		print '<td>' . $langs->trans("Docdate") . '</td>';
-		print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
-		print '</tr>';
-		print '<tr class="pair">';
-		print '<td>' . $langs->trans("Codejournal") . '</td>';
-		print '<td>' . $book->code_journal . '</td>';
-		print '</tr>';
-		print '<tr class="impair">';
-		print '<td>' . $langs->trans("Docref") . '</td>';
-		print '<td>' . $book->doc_ref . '</td>';
-		print '</tr>';
-		print '<tr class="pair">';
-		print '<td>' . $langs->trans("Doctype") . '</td>';
-		print '<td>' . $book->doc_type . '</td>';
-		print '</tr>';
-		print '</table>';
-		
-		$result = $book->fetch_all_per_mvt($piece_num);
-		if ($result < 0) {
-			setEventMessage($book->errors, 'errors');
-		} else {
-			
-			print_fiche_titre($langs->trans("ListeMvts"));
-			print "<table class=\"noborder\" width=\"100%\">";
-			if (count($book->linesmvt) > 0) {
-				
-				print '<tr class="liste_titre">';
-				
-				print_liste_field_titre($langs->trans("Numerocompte"));
-				print_liste_field_titre($langs->trans("Code_tiers"));
-				print_liste_field_titre($langs->trans("Labelcompte"));
-				print_liste_field_titre($langs->trans("Debit"));
-				print_liste_field_titre($langs->trans("Credit"));
-				print_liste_field_titre($langs->trans("Amount"));
-				print_liste_field_titre($langs->trans("Sens"));
-				
-				print '<td></td>';
-				print "</tr>\n";
-				
-				foreach ( $book->linesmvt as $line ) {
-					$var = ! $var;
-					print "<tr $bc[$var]>";
-					
-					if ($action == 'update' && $line->id == $id) {
-						
-						print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
-						print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
-						print '<input type="hidden" name="action" value="confirm_update">' . "\n";
-						print '<td><input type="text" size="6" name="numero_compte" value="' . $line->numero_compte . '"/></td>';
-						print '<td><input type="text" size="15" name="code_tiers" value="' . $line->code_tiers . '"/></td>';
-						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
-						print '<td><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
-						print '<td><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
-						print '<td>' . $line->montant . '</td>';
-						print '<td>' . $line->sens . '</td>';
-						print '<td>';
-						print '<input type="submit" class="button" value="' . $langs->trans("Update") . '">';
-						print '</form>';
-						print '</td>';
-					}
-					else {
-						print '<td>' . $line->numero_compte . '</td>';
-						print '<td>' . $line->code_tiers . '</td>';
-						print '<td>' . $line->label_compte . '</td>';
-						print '<td>' . $line->debit . '</td>';
-						print '<td>' . $line->credit . '</td>';
-						print '<td>' . $line->montant . '</td>';
-						print '<td>' . $line->sens . '</td>';
-							
-						print '<td>';
-						print '<a href="./card.php?action=update&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
-						print img_edit();
-						print '</a>&nbsp;';
-						print '<a href="./card.php?action=delete&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
-						print img_delete();
-						print '</a>';
-						
-						print '</td>';
-					}
-					print "</tr>\n";
-				}
-				
-				if ($action == "" || $action == 'add') {
-					$var = ! $var;
-					print "<tr $bc[$var]>";
-						
-					print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
-					print '<input type="hidden" name="action" value="add">' . "\n";
-					print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
-					print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
-					print '<input type="hidden" name="doc_ref" value="' . $book->doc_ref . '">' . "\n";
-					print '<input type="hidden" name="code_journal" value="' . $book->code_journal . '">' . "\n";
-					print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
-					print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
-					print '<td><input type="text" size="6" name="numero_compte" value="' . $numero_compte . '"/></td>';
-					print '<td><input type="text" size="15" name="code_tiers" value="' . $code_tiers . '"/></td>';
-					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
-					print '<td><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
-					print '<td><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
-					print '<td></td>';
-					print '<td></td>';
-					print '<td><input type="submit" class="button" value="' . $langs->trans("Save") . '"></td>';
-					print '</tr>';
-				}
-				print '</table>';
-				print '</form>';
-			}
-		}
-	}
-	else {
-		print_fiche_titre($langs->trans("NoRecords"));
-	}
+    print '</form>';
+} else {
+    $book = new BookKeeping($db);
+    $result = $book->fetch_per_mvt($piece_num);
+    if ($result < 0) {
+        setEventMessage($book->errors, 'errors');
+    }
+    if (! empty($book->piece_num)) {
+
+        print_fiche_titre($langs->trans("UpdateMvts"));
+
+        print '<table class="border" width="100%">';
+        print '<tr class="pair">';
+        print '<td>' . $langs->trans("NumMvts") . '</td>';
+        print '<td>' . $book->piece_num . '</td>';
+        print '</tr>';
+        print '<tr class="impair">';
+        print '<td>' . $langs->trans("Docdate") . '</td>';
+        print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
+        print '</tr>';
+        print '<tr class="pair">';
+        print '<td>' . $langs->trans("Codejournal") . '</td>';
+        print '<td>' . $book->code_journal . '</td>';
+        print '</tr>';
+        print '<tr class="impair">';
+        print '<td>' . $langs->trans("Docref") . '</td>';
+        print '<td>' . $book->doc_ref . '</td>';
+        print '</tr>';
+        print '<tr class="pair">';
+        print '<td>' . $langs->trans("Doctype") . '</td>';
+        print '<td>' . $book->doc_type . '</td>';
+        print '</tr>';
+        print '</table>';
+
+        $result = $book->fetch_all_per_mvt($piece_num);
+        if ($result < 0) {
+            setEventMessage($book->errors, 'errors');
+        } else {
+
+            print_fiche_titre($langs->trans("ListeMvts"));
+            print "<table class=\"noborder\" width=\"100%\">";
+            if (count($book->linesmvt) > 0) {
+
+                print '<tr class="liste_titre">';
+
+                print_liste_field_titre($langs->trans("Numerocompte"));
+                print_liste_field_titre($langs->trans("Code_tiers"));
+                print_liste_field_titre($langs->trans("Labelcompte"));
+                print_liste_field_titre($langs->trans("Debit"));
+                print_liste_field_titre($langs->trans("Credit"));
+                print_liste_field_titre($langs->trans("Amount"));
+                print_liste_field_titre($langs->trans("Sens"));
+                print_liste_field_titre('');
+
+                print "</tr>\n";
+
+                foreach ( $book->linesmvt as $line ) {
+                    $var = ! $var;
+                    print "<tr $bc[$var]>";
+
+                    if ($action == 'update' && $line->id == $id) {
+
+                        print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+                        print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
+                        print '<input type="hidden" name="action" value="confirm_update">' . "\n";
+                        print '<td><input type="text" size="6" name="numero_compte" value="' . $line->numero_compte . '"/></td>';
+                        print '<td><input type="text" size="15" name="code_tiers" value="' . $line->code_tiers . '"/></td>';
+                        print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+                        print '<td><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
+                        print '<td><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
+                        print '<td>' . $line->montant . '</td>';
+                        print '<td>' . $line->sens . '</td>';
+                        print '<td>';
+                        print '<input type="submit" class="button" value="' . $langs->trans("Update") . '">';
+                        print '</form>';
+                        print '</td>';
+                    } else {
+                        print '<td>' . $line->numero_compte . '</td>';
+                        print '<td>' . $line->code_tiers . '</td>';
+                        print '<td>' . $line->label_compte . '</td>';
+                        print '<td>' . $line->debit . '</td>';
+                        print '<td>' . $line->credit . '</td>';
+                        print '<td>' . $line->montant . '</td>';
+                        print '<td>' . $line->sens . '</td>';
+
+                        print '<td>';
+                        print '<a href="./card.php?action=update&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
+                        print img_edit();
+                        print '</a>&nbsp;';
+                        print '<a href="./card.php?action=delete&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
+                        print img_delete();
+                        print '</a>';
+
+                        print '</td>';
+                    }
+                    print "</tr>\n";
+                }
+
+                if ($action == "" || $action == 'add') {
+                    $var = ! $var;
+                    print "<tr $bc[$var]>";
+
+                    print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+                    print '<input type="hidden" name="action" value="add">' . "\n";
+                    print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
+                    print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
+                    print '<input type="hidden" name="doc_ref" value="' . $book->doc_ref . '">' . "\n";
+                    print '<input type="hidden" name="code_journal" value="' . $book->code_journal . '">' . "\n";
+                    print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
+                    print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
+                    print '<td><input type="text" size="6" name="numero_compte" value="' . $numero_compte . '"/></td>';
+                    print '<td><input type="text" size="15" name="code_tiers" value="' . $code_tiers . '"/></td>';
+                    print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
+                    print '<td><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
+                    print '<td><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
+                    print '<td></td>';
+                    print '<td></td>';
+                    print '<td><input type="submit" class="button" value="' . $langs->trans("Save") . '"></td>';
+                    print '</tr>';
+                }
+                print '</table>';
+                print '</form>';
+            }
+        }
+    }
+    else {
+        print_fiche_titre($langs->trans("NoRecords"));
+    }
 }
 
 llxFooter();
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 6c06c2ba3d7..cc90b3873db 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com> 
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.com> 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
+// Langs
+$langs->load("accountancy");
 
 $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
@@ -155,8 +157,6 @@ else {
 		
 		print '</form>';
 		
-		print '<a href="./card.php?action=create" class="butAction">' . $langs->trans("NewAccountingMvt") . '</a></div>';
-		
 		print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="export_csv">';
@@ -209,7 +209,7 @@ else {
 			print "<tr $bc[$var]>";
 			
 			print '<td>' . $obj->doc_type . '</td>';
-			print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
+			print '<td align="center">' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
 			print '<td>' . $obj->doc_ref . '</td>';
 			print '<td>' . length_accountg($obj->numero_compte) . '</td>';
 			print '<td>' . length_accounta($obj->code_tiers) . '</td>';
@@ -224,6 +224,11 @@ else {
 			$i ++;
 		}
 		print "</table>";
+
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="./card.php?action=create">'.$langs->trans("NewAccountingMvt").'</a>';
+		print '</div>';
+
 		$db->free($resql);
 	} else {
 		dol_print_error($db);
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 26f0469c1a0..0135f073427 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -90,7 +90,7 @@ if ($resql) {
 	print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "bk.montant", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "bk.sens", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "bk.code_journal", "", "", "", $sortfield, $sortorder);
-	print_liste_field_titre("&nbsp;");
+	print_liste_field_titre('');
 	print "</tr>\n";
 	
 	$var = True;
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 1161e83004c..5fc546a8ce9 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014 	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,8 +67,7 @@ class AccountingAccount extends CommonObject
 	 */
 	function fetch($rowid = null, $account_number = null)
 	{
-		if ($rowid || $account_number)
-		{
+		if ($rowid || $account_number) {
 			$sql = "SELECT rowid, datec, tms, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, fk_user_author, fk_user_modif, active";
 			$sql.= " FROM " . MAIN_DB_PREFIX . "accountingaccount WHERE";
 			if ($rowid) {
@@ -78,12 +78,10 @@ class AccountingAccount extends CommonObject
 
 			dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$obj = $this->db->fetch_object($result);
 
-				if ($obj)
-				{
+				if ($obj) {
 					$this->id = $obj->rowid;
 					$this->rowid = $obj->rowid;
 					$this->datec = $obj->datec;
@@ -99,18 +97,13 @@ class AccountingAccount extends CommonObject
 					$this->active = $obj->active;
 
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
-
 		return -1;
 	}
 
@@ -127,8 +120,6 @@ class AccountingAccount extends CommonObject
 		$error = 0;
 		$now = dol_now();
 
-		$now=dol_now();
-
 		// Clean parameters
 		if (isset($this->fk_pcg_version))
 			$this->fk_pcg_version = trim($this->fk_pcg_version);
@@ -344,6 +335,31 @@ class AccountingAccount extends CommonObject
 		}
 	}
 
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@return		string					Chaine avec URL
+	 */
+	function getNomUrl($withpicto=0)
+	{
+		global $langs;
+
+		$result='';
+
+		$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$this->id.'">';
+		$linkend='</a>';
+
+		$picto='billr';
+
+		$label=$langs->trans("Show").': '.$this->account_number.' - '.$this->label;
+
+		if ($withpicto) $result.=($link.img_object($label,$picto).$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto != 2) $result.=$link.$this->account_number.$linkend;
+		return $result;
+	}
+
 	/**
 	 * Information on record
 	 *
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
index abd66a7885d..a596d481d9c 100644
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -91,10 +92,13 @@ class FormVentilation extends Form
 	 *	@param	string	$htmlname		Name of field in html form
 	 *	@param	int		$showempty		Add an empty field
 	 *  @param	array	$event			Event options
+     *	@param	int		$select_in		$selectid value is a aa.rowid (0 default) or aa.account_number (1)
+     *	@param	int		$select_out		set value returned by select 0=rowid (default), 1=account_number
+     *	@param	int		$aabase			set accountingaccount base class to display empty=all or from 1 to 8 will display only account beginning by
      *
 	 *	@return	string					String with HTML select
 	 */
-	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array())
+	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
 	{
 		global $conf;
 
@@ -116,21 +120,26 @@ class FormVentilation extends Form
 			if ($showempty)
 				$out .= '<option value="-1"></option>';
 			$num = $this->db->num_rows($resql);
+            $trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : '50';
 
 			$i = 0;
 			if ($num) {
 				while ( $i < $num ) {
 					$obj = $this->db->fetch_object($resql);
 					$label = $obj->account_number . ' - ' . $obj->label;
-
+					$label = dol_trunc($label, $trunclength);
+					if ($select_in == 0 )  $select_value_in =  $obj->rowid;
+					if ($select_in == 1 )  $select_value_in =  $obj->account_number;
+					if ($select_out == 0 ) $select_value_out = $obj->rowid;
+					if ($select_out == 1 ) $select_value_out = $obj->account_number;
 					// Remember guy's we store in database llx_facturedet the rowid of accountingaccount and not the account_number
 					// Because same account_number can be share between different accounting_system and do have the same meaning
-					if (($selectid != '') && $selectid == $obj->rowid) {
+					if (($selectid != '') && $selectid == $select_value_in) {
 						// $out .= '<option value="' . $obj->account_number . '" selected>' . $label . '</option>';
-						$out .= '<option value="' . $obj->rowid . '" selected>' . $label . '</option>';
+						$out .= '<option value="' . $select_value_out . '" selected>' . $label . '</option>';
 					} else {
 						// $out .= '<option value="' . $obj->account_number . '">' . $label . '</option>';
-						$out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';
+						$out .= '<option value="' . $select_value_out . '">' . $label . '</option>';
 					}
 					$i ++;
 				}
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index fa549487fbb..d00296ed2b9 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2014      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>   
  *
@@ -39,7 +39,7 @@ $langs->load("accountancy");
 $account_parent = GETPOST('account_parent');
 $changeaccount  = GETPOST('changeaccount');
 $search_ref     = GETPOST('search_ref','alpha');
-$search_facture = GETPOST('search_facture','alpha');
+$search_invoice = GETPOST('search_invoice','alpha');
 $search_label   = GETPOST('search_label','alpha');
 $search_desc    = GETPOST('search_desc','alpha');
 $search_amount  = GETPOST('search_amount','alpha');
@@ -49,13 +49,37 @@ $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
 
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
+//if ($page == -1) { $page = 0; }
+if ($page < 0) $page = 0;
+
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = $conf->liste_limit;
-if (! $sortfield) $sortfield="f.facnumber";
-if (! $sortorder) $sortorder="DESC";
+//$limit = $conf->liste_limit;
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
+	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+	$limit = $conf->liste_limit;
+} else {
+	$limit = $conf->liste_limit;
+}
+//$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
+
+// TODO : remove comment
+//elarifr we can not use only
+//$sql .= " ORDER BY l.rowid";
+// f.datef will order like FA08 FA09 FA10 FA05 FA06 FA07 FA04...
+// f.facnumber will not order properly invoice / avoir / accompte you can have All AC then All AV and all FA
+// l.rowid when an invoice is edited rowid are added at end of table & facturedet.rowid are not ordered
+//if (! $sortfield) $sortfield="f.facnumber";
+if (! $sortfield) $sortfield="f.datef, f.facnumber, l.rowid";
+
+//if (! $sortorder) $sortorder="DESC";
+if (! $sortorder) {
+	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
+		$sortorder = " DESC ";
+	}
+}
 
 // Security check
 if ($user->societe_id > 0)
@@ -69,7 +93,7 @@ $formventilation = new FormVentilation($db);
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
     $search_ref='';
-    $search_facture='';
+    $search_invoice='';
     $search_label='';
     $search_desc='';
     $search_amount='';
@@ -106,20 +130,31 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 
 llxHeader('', $langs->trans("CustomersVentilation") . ' - ' . $langs->trans("Dispatched"));
 
-$page = GETPOST("page");
-if ($page < 0)
-	$page = 0;
+print  '<script type="text/javascript">
+			$(function () {
+				$(\'#select-all\').click(function(event) {
+				    // Iterate each checkbox
+				    $(\':checkbox\').each(function() {
+				    	this.checked = true;
+				    });
+			    });
+			    $(\'#unselect-all\').click(function(event) {
+				    // Iterate each checkbox
+				    $(\':checkbox\').each(function() {
+				    	this.checked = false;
+				    });
+			    });
+			});
+			 </script>';
 
-if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
-	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
-} elseif ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = $conf->liste_limit;
-} else {
-	$limit = $conf->liste_limit;
-}
+/*
+ * Action
+ */
 
-$offset = $limit * $page;
 
+/*
+ * Customer Invoice lines
+ */
 $sql = "SELECT l.rowid , f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht, l.qty, l.tva_tx, l.fk_code_ventilation, aa.label, aa.account_number,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
@@ -128,8 +163,8 @@ $sql .= " , " . MAIN_DB_PREFIX . "facturedet as l";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql .= " WHERE f.rowid = l.fk_facture AND f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 $sql .= " AND aa.rowid = l.fk_code_ventilation";
-if (strlen(trim(GETPOST("search_facture")))) {
-	$sql .= " AND f.facnumber like '%" . $search_facture . "%'";
+if (strlen(trim($search_invoice))) {
+	$sql .= " AND f.facnumber like '%" . $search_invoice . "%'";
 }
 if (strlen(trim($search_ref))) {
 	$sql .= " AND p.ref like '%" . $search_ref . "%'";
@@ -165,12 +200,12 @@ if ($result) {
 	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
 	print '<table class="noborder" width="100%">';
 	
-	print '<br><br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
+	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
 	print $formventilation->select_account($account_parent, 'account_parent', 1);
 	print '<input type="submit" class="butAction" value="' . $langs->trans("Validate") . '"/></div>';
 	
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Invoices"), $_SERVER["PHP_SELF"],"f.facnumber","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"],"f.facnumber","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
@@ -178,10 +213,11 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"],"aa.account_number","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre('');
 	print_liste_field_titre('');
-	print_liste_field_titre('');
+	print_liste_field_titre($langs->trans("Ventilate").'<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>','','','','','align="center"');
 	print "</tr>\n";
-	
-	print '<tr class="liste_titre"><td><input name="search_facture" size="8" value="' . $search_facture . '"></td>';
+
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_invoice" size="10" value="' . $search_invoice . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . $search_ref . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_desc" value="' . $search_desc . '"></td>';
@@ -202,12 +238,12 @@ if ($result) {
 		
 		print "<tr $bc[$var]>";
 		
-		// Ref facture
+		// Ref Invoice
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->facid;
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 		
-		// Ref produit
+		// Ref Product
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->type;
@@ -222,8 +258,8 @@ if ($result) {
 		print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . $codecompta . '</td>';
-		print '<td>' . $objp->rowid . '</td>';
-		print '<td><a href="./card.php?id=' . $objp->rowid . '">';
+		print '<td align="right">' . $objp->rowid . '</td>';
+		print '<td align="left"><a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a></td>';
 		
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index ac1c3429658..eb6446ae13d 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  *
@@ -31,16 +31,52 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 // Langs
 $langs->load("compta");
 $langs->load("bills");
+$langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");
 
 $action = GETPOST('action');
 $codeventil = GETPOST('codeventil', 'array');
 $mesCasesCochees = GETPOST('mesCasesCochees', 'array');
+$search_ref     = GETPOST('search_ref','alpha');
+$search_label   = GETPOST('search_label','alpha');
+$search_desc    = GETPOST('search_desc','alpha');
+
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+//Should move to top with all GETPOST
+$page = GETPOST('page');
+if ($page < 0) $page = 0;
+
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
+	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+	$limit = $conf->liste_limit;
+} else {
+	$limit = $conf->liste_limit;
+}
+$offset = $limit * $page;
+//End Should move to top with all GETPOST
+
+// TODO : remove comment 
+//elarifr we can not use only
+//$sql .= " ORDER BY l.rowid";
+// f.datef will order like FA08 FA09 FA10 FA05 FA06 FA07 FA04...
+// f.facnumber will not order properly invoice / avoir / accompte you can have All AC then All AV and all FA
+// l.rowid when an invoice is edited rowid are added at end of table & facturedet.rowid are not ordered
+//if (! $sortfield) $sortfield="l.rowid";
+if (! $sortfield) $sortfield="f.datef, f.facnumber, l.rowid";
+//if (! $sortorder) $sortorder="DESC";
+if (! $sortorder) {
+	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+		$sortorder = " DESC ";
+	}
+}
 
 // Security check
 if ($user->societe_id > 0)
@@ -50,8 +86,31 @@ if (! $user->rights->accounting->ventilation->dispatch)
 
 $formventilation = new FormVentilation($db);
 
+//Defaut AccountingAccount RowId Product / Service
+//at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
+//so we need to get those default value rowid first
+$accounting = new AccountingAccount($db);
+//TODO: we should need to check if result is a really exist accountaccount rowid.....
+$aarowid_s = $accounting->fetch('', ACCOUNTING_SERVICE_SOLD_ACCOUNT);
+$aarowid_p = $accounting->fetch('', ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
+
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref='';
+    $search_label='';
+    $search_desc='';
+}
+/*
+ * View
+ */
+
 llxHeader('', $langs->trans("Ventilation"));
 
+//debug
+//print_r($aarowid_s);
+//print_r($aarowid_p);
+
 print  '<script type="text/javascript">
 			$(function () {
 				$(\'#select-all\').click(function(event) {
@@ -68,6 +127,7 @@ print  '<script type="text/javascript">
 			    });
 			});
 			 </script>';
+
 /*
  * Action
  */
@@ -123,7 +183,13 @@ $offset = $limit * $page;
 
 $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell";
+// A REVOIR elarifr si vraiment necessaire de rajouter , p.fk_product_type as type. le type produit / service est de facto defini pour chaque ligne de facturedet.product_type
+// il est donc plus logique de se servir de l.product_type au lieu de p.fk_product_type
 $sql .= " , aa.rowid as aarowid";
+// we need f.datef to reorder lines
+$sql .= " , f.datef";
+// we need to use llx_facturedet l.product_type as used at the time on invoice. if llx_product fk_product_type is changed later it could not change the sell already made !
+$sql .= " , l.product_type as type_l";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as l ON f.rowid = l.fk_facture";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
@@ -131,14 +197,27 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON p.accountan
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
 $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation <= 0";
 $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')";
+// Add search filter like
+if (strlen(trim($search_ref))) {
+	$sql .= " AND (p.ref like '%" . $search_ref . "%')";
+}
+if (strlen(trim($search_label))) {
+	$sql .= " AND (p.label like '%" . $search_label . "%')";
+}
+if (strlen(trim($search_desc))) {
+	$sql .= " AND (l.description like '%" . $search_desc . "%')";
+}
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")";
 }
+//TODO: Remove comment
+//replaced by default value $sortfield,$sortorder
+//$sql .= " ORDER BY l.rowid";
+//if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+//	$sql .= " DESC ";
+//}
+$sql.= $db->order($sortfield,$sortorder);
 
-$sql .= " ORDER BY l.rowid";
-if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
-	$sql .= " DESC ";
-}
 $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
@@ -156,58 +235,96 @@ if ($result) {
 	print '<input type="hidden" name="action" value="ventil">';
 
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>' . $langs->trans("Invoice") . '</td>';
-	print '<td>' . $langs->trans("Ref") . '</td>';
-	print '<td>' . $langs->trans("Label") . '</td>';
-	print '<td>' . $langs->trans("Description") . '</td>';
-	print '<td align="right">' . $langs->trans("Amount") . '</td>';
-	print '<td align="right">' . $langs->trans("AccountAccounting") . '</td>';
-	print '<td align="center">' . $langs->trans("IntoAccount") . '</td>';
-	print '<td align="center">' . $langs->trans("Ventilate") . '<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>'.'</td>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"],"f.facnumber","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Amount"),'','','','','align="right"');
+	print_liste_field_titre($langs->trans("AccountAccounting"),'','','','','align="center"');
+	print_liste_field_titre($langs->trans("IntoAccount"),'','','','','align="center"');
+	print_liste_field_titre('');
+	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>','','','','','align="center"');
 	print '</tr>';
 
+//	We add search filter
+/*	But Hit Enter will validate ventilation....
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre" >&nbsp;</td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_ref" value="' . $search_ref . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="30" name="search_desc" value="' . $search_desc . '"></td>';
+
+	print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+	print '<td align="right" colspan="2" class="liste_titre">';
+	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '&nbsp;';
+	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+	print '</tr>';
+*/
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 	$form = new Form($db);
 
-	$var = True;
+	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		$var = ! $var;
 
 		// product_type: 0 = service ? 1 = product
-		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
-		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
-		$code_sell_notset = '';
+		// C'est le contraire dans les base !!!!!!  IT IS INVERTED IN LLX_PRODUCT & LLX_FACTUREDET
+		// elarifr define account numbercode comptable si pas defini dans la fiche produit a partir des lignes de facturation
+		// product_type: 1 = service ? 0 = product
+		// because some modules like subtotal module l.product_type can be other than 0 or 1   ! and we don't put in account lines with product_type=9
+		// first we check product.fk_product_type as type and l.product_type as type_l
+		// if product does not exist we use the value of l.product_type provided in facturedet to define if this is a product or service
+		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB ! so we report both and user make choice of accounting account.
+		$objp->code_sell_l = '';
+		$objp->code_sell_p = '';
+		$objp->aarowid_suggest = '';
+		$code_sell_p_l_differ = '';
 
-		if (empty($objp->code_sell)) {
-			$code_sell_notset = 'color:red';
-
-			if (! empty($objp->type)) {
-				if ($objp->type == 1) {
-					$objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-				} else {
-					$objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-				}
-			} else {
-				$code_sell_notset = 'color:blue';
-
-				if ($objp->type == 1) {
-					$objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-				} else {
-					$objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-				}
+		//check if code_sell defined in product or set default value according p.fk_product_type do not care lines when product_type value not 0 || 1
+		//and we set suggested accounting account rowid as $objp->aarowid_s
+		$code_sell_p_notset = '';
+		$objp->aarowid_suggest = $objp->aarowid;
+		if ( ! empty($objp->code_sell)) {
+			$objp->code_sell_p = $objp->code_sell;
+		} else {
+			$code_sell_p_notset = 'color:red';
+			if ($objp->type == 1) {
+				$objp->code_sell_p = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+			}
+			elseif ($objp->type == 0) {
+				$objp->code_sell_p = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 			}
 		}
+		// check facturedet.product_type & set default value according l.type_l, do not care lines when product_type value not 0 || 1
+//		if ( ! empty($objp->type_l)) {
+//			$objp->code_sell_l = $objp->type_l;
+//		} else {
+			if ($objp->type_l == 1) {
+				$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				if ($objp->aarowid == '') $objp->aarowid_suggest = $aarowid_s;
+			}
+			elseif ($objp->type_l == 0) {
+				$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				if ($objp->aarowid == '') $objp->aarowid_suggest = $aarowid_p;
+			}
+//		}
+
+
+		//if not same code for product fk_prouct_type and facturedet.product_type, product has been change after sale and must report
+		if ($objp->code_sell_l <> $objp->code_sell_p) $code_sell_p_l_differ = 'color:red';
 
 		print "<tr $bc[$var]>";
 
-		// Ref facture
+		// Ref Invoice
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->facid;
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
-
-		// Ref produit
+		// Ref Customer Invoice
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->type;
@@ -218,27 +335,39 @@ if ($result) {
 			print '&nbsp;';
 		print '</td>';
 
-		print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
-		print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
+		print '<td style="' . $code_sell_p_l_differ . '">' . dol_trunc($objp->product_label, 24) . '</td>';
+		//TODO: we should set a user defined value to adjust user square / wide screen size
+		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($objp->description, $trunclength)) . '</td>';
 
 		print '<td align="right">';
 		print price($objp->total_ht);
 		print '</td>';
 
-		print '<td align="center" style="' . $code_sell_notset . '">';
-		print $objp->code_sell;
+		print '<td align="center" style="' . $code_sell_p_notset . '">';
+		// if not same kind of product_type stored in product & facturedet we display both account and let user choose
+		if ($objp->code_sell_l == $objp->code_sell_p) {
+			print $objp->code_sell_l;
+		} else {
+			print 'lines='.$objp->code_sell_l . '<br />product=' . $objp->code_sell_p;
+		}
 		print '</td>';
 
 		// Colonne choix du compte
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1);
+		// TODO: we should set a user defined value to adjust user square / wide screen size
+		// $trunclengthform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
+		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil[]', 1);
 		print '</td>';
 
+		print '<td align="center">' . $objp->rowid . '</td>';
 		// Colonne choix ligne a ventiler
 		print '<td align="center">';
-		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
+		//TODO checked only if account exist in product, if only suggested do not check, user must validate 
+		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid_suggest ? "checked" : "") . '/>';
 		print '</td>';
-
+//debug
+//print '</tr><tr><td colspan=6>Product: p.type='. $objp->type .' - p.code_sell='. $objp->code_sell .'  --- Check code_sell_product=' . $objp->code_sell_p .'  ---Check facturedet l.type_l='. $objp->type_l .' - code_sell_lines=' . $objp->code_sell_l . '  -- aarowid_suggest=' . $objp->aarowid_suggest.'</td>';
 		print '</tr>';
 		$i ++;
 	}
@@ -250,5 +379,5 @@ if ($result) {
 	print $db->error();
 }
 
-$db->close();
 llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 75e54b2a590..1764a127515 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
@@ -115,6 +116,7 @@ $object = new Account($db);
 $paymentstatic = new Paiement($db);
 $paymentsupplierstatic = new PaiementFourn($db);
 $societestatic = new Societe($db);
+$userstatic = new User($db);
 $chargestatic = new ChargeSociales($db);
 $paymentvatstatic = new TVA($db);
 $paymentsalstatic = new PaymentSalary($db);
@@ -127,8 +129,8 @@ if ($result) {
 	// Variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
 	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
-	$cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
 	$accountancy_account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef"));
+	$accountancy_account_pay_vat = (! empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : $langs->trans("CodeNotDef"));
 
 	$tabpay = array ();
 	$tabbq = array ();
@@ -175,7 +177,6 @@ if ($result) {
 		{
 			$tabtype[$obj->rowid] = $links[$key]['type'];
 
-
 			if ($links[$key]['type'] == 'payment')
 			{
 				$paymentstatic->id = $links[$key]['url_id'];
@@ -194,6 +195,13 @@ if ($result) {
 				$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
 				$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 			}
+			else if ($links[$key]['type'] == 'user')
+			{
+				$userstatic->id = $links[$key]['url_id'];
+				$userstatic->name = $links[$key]['label'];
+				$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
+				// $tabtp[$obj->rowid][$compta_user] += $obj->amount;
+			}
 			else if ($links[$key]['type'] == 'sc')
 			{
 				$chargestatic->id = $links[$key]['url_id'];
@@ -232,8 +240,8 @@ if ($result) {
 			{
 				$paymentvatstatic->id = $links[$key]['url_id'];
 				$paymentvatstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentVat");
+				$tabtp[$obj->rowid][$accountancy_account_pay_vat] += $obj->amount;
 			}
 			else if ($links[$key]['type'] == 'payment_salary')
 			{
@@ -427,7 +435,6 @@ if ($action == 'export_csv')
 		foreach ( $tabpay as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
 
-
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 
@@ -680,6 +687,7 @@ else
 				print "<td>" . $reflabel . "</td>";
 				print "<td>" . $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE . "</td>";
 				print "<td>" . $langs->trans('ThirdParty') . "</td>";
+				print "<td>&nbsp;</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 0a000e01833..862ff92eb4b 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -112,7 +112,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 	// les variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
-	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef");
+	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 
 	$tabfac = array ();
 	$tabht = array ();
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index db9af17388a..83191f88bf4 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -136,7 +136,7 @@ if ($result) {
 			else
 				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 		}
-		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef");
+		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
 		// Situation invoices handling
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 0edc9e1142f..80f7bc5e6ee 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>  
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  *   
@@ -40,12 +40,24 @@ $langs->load("accountancy");
 $account_parent = GETPOST('account_parent');
 $changeaccount  = GETPOST('changeaccount');
 $search_ref     = GETPOST('search_ref','alpha');
-$search_facture = GETPOST('search_facture','alpha');
+$search_invoice = GETPOST('search_invoice','alpha');
 $search_label   = GETPOST('search_label','alpha');
 $search_desc    = GETPOST('search_desc','alpha');
 $search_amount  = GETPOST('search_amount','alpha');
 $search_account = GETPOST('search_account','alpha');
 
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$limit = $conf->liste_limit;
+if (! $sortfield) $sortfield="f.ref";
+if (! $sortorder) $sortorder="DESC";
+
 // Security check
 if ($user->societe_id > 0)
 	accessforbidden();
@@ -58,7 +70,7 @@ $formventilation = new FormVentilation($db);
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
     $search_ref='';
-    $search_facture='';
+    $search_invoice='';
     $search_label='';
     $search_desc='';
     $search_amount='';
@@ -95,20 +107,30 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 
 llxHeader('', $langs->trans("SuppliersVentilation") . ' - ' . $langs->trans("Dispatched"));
 
-$page = GETPOST("page");
-if ($page < 0)
-	$page = 0;
-
-if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
-	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
-} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = $conf->liste_limit;
-} else {
-	$limit = $conf->liste_limit;
-}
-
-$offset = $limit * $page;
+print  '<script type="text/javascript">
+			$(function () {
+				$(\'#select-all\').click(function(event) {
+				    // Iterate each checkbox
+				    $(\':checkbox\').each(function() {
+				    	this.checked = true;
+				    });
+			    });
+			    $(\'#unselect-all\').click(function(event) {
+				    // Iterate each checkbox
+				    $(\':checkbox\').each(function() {
+				    	this.checked = false;
+				    });
+			    });
+			});
+			 </script>';
 
+/*
+ * Action
+ */
+ 
+/*
+ * Supplier Invoice lines
+ */
 $sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht , l.qty, l.rowid, l.tva_tx, aa.label, aa.account_number, ";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
@@ -117,8 +139,8 @@ $sql .= " , " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 $sql .= " AND aa.rowid = l.fk_code_ventilation";
-if (strlen(trim($search_facture))) {
-	$sql .= " AND f.ref like '%" . $search_facture . "%'";
+if (strlen(trim($search_invoice))) {
+	$sql .= " AND f.ref like '%" . $search_invoice . "%'";
 }
 if (strlen(trim($search_ref))) {
 	$sql .= " AND p.ref like '%" . $search_ref . "%'";
@@ -138,12 +160,8 @@ if (strlen(trim($search_account))) {
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")";
 }
-
-$sql .= " ORDER BY l.rowid";
-if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
-	$sql .= " DESC ";
-}
-$sql .= $db->plimit($limit + 1, $offset);
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit + 1,$offset);
 
 dol_syslog('accountancy/supplier/lines.php::list sql= ' . $sql1);
 $result = $db->query($sql);
@@ -152,37 +170,37 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 	
-	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
 	
 	print '<td align="left"><b>' . $langs->trans("DescVentilDoneSupplier") . '</b></td>';
 	
-	print '<form method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
 	print '<table class="noborder" width="100%">';
 	
-	print '<br><br><div class="inline-block divButAction">'. $langs->trans("ChangeAccount");
+	print '<br><div class="inline-block divButAction">'. $langs->trans("ChangeAccount") . '<br>';
 	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="butAction" value="' . $langs->trans("Validate") . '" /></div>';
 	
-	print '<tr class="liste_titre"><td>' . $langs->trans("Invoice") . '</td>';
-	print '<td>' . $langs->trans("Ref") . '</td>';
-	print '<td>' . $langs->trans("Label") . '</td>';
-	print '<td>' . $langs->trans("Description") . '</td>';
-	print '<td align="left">' . $langs->trans("Amount") . '</td>';
-	print '<td colspan="2" align="left">' . $langs->trans("Account") . '</td>';
-	print '<td align="center">&nbsp;</td>';
-	print '<td align="center">&nbsp;</td>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"],"f.ref","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"],"l.total_ht","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"],"aa.account_number","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print_liste_field_titre('');
+	print_liste_field_titre($langs->trans("Ventilate").'<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>','','','','','align="center"');
 	print "</tr>\n";
-	
-	print '<tr class="liste_titre"><td><input name="search_facture" size="8" value="' . $search_facture . '"></td>';
+
+	print '<tr class="liste_titre"><td><input type="text" class="flat" name="search_invoice" size="10" value="' . $search_invoice . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . $search_ref . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_desc" value="' . $search_desc . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_amount" value="' . $search_amount . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
-	print '<td align="center">&nbsp;</td>';
-	print '<td align="center">&nbsp;</td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="8" name="search_amount" value="' . $search_amount . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
+	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
+    print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print "</td></tr>\n";
 	
@@ -215,10 +233,10 @@ if ($result) {
 		
 		print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
 		print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
-		print '<td align="left">' . price($objp->total_ht) . '</td>';
-		print '<td align="left">' . $codeCompta . '</td>';
-		print '<td>' . $objp->rowid . '</td>';
-		print '<td><a href="./card.php?id=' . $objp->rowid . '">';
+		print '<td align="right">' . price($objp->total_ht) . '</td>';
+		print '<td align="center">' . $codeCompta . '</td>';
+		print '<td align="right">' . $objp->rowid . '</td>';
+		print '<td align="left"><a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a></td>';
 		
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index bf14ebc185e..02057b31255 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
- * Copyright (C) 2014		Ari Elbaz (elarifr)		<github@accedinfo.com>
+ * Copyright (C) 2013-2015	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
  *
@@ -31,6 +31,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 // Langs
 $langs->load("compta");
@@ -42,6 +43,42 @@ $langs->load("accountancy");
 $action = GETPOST('action');
 $codeventil = GETPOST('codeventil', 'array');
 $mesCasesCochees = GETPOST('mesCasesCochees', 'array');
+$search_ref     = GETPOST('search_ref','alpha');
+$search_label   = GETPOST('search_label','alpha');
+$search_desc    = GETPOST('search_desc','alpha');
+
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+//Should move to top with all GETPOST
+$page = GETPOST('page');
+if ($page < 0) $page = 0;
+
+
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
+	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+	$limit = $conf->liste_limit;
+} else {
+	$limit = $conf->liste_limit;
+}
+$offset = $limit * $page;
+//End Should move to top with all GETPOST
+
+
+// TODO : remove comment 
+//elarifr we can not use only
+//$sql .= " ORDER BY l.rowid";
+// f.datef will order like FA08 FA09 FA10 FA05 FA06 FA07 FA04...
+// f.ref will not order properly invoice / avoir / accompte you can have All AC then All AV and all FA
+// l.rowid when an invoice is edited rowid are added at end of table & facturedet.rowid are not ordered
+//if (! $sortfield) $sortfield="l.rowid";
+if (! $sortfield) $sortfield="f.datef, f.ref, l.rowid";
+//if (! $sortorder) $sortorder="DESC";
+if (! $sortorder) {
+	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+		$sortorder = " DESC ";
+	}
+}
 
 // Security check
 if ($user->societe_id > 0)
@@ -51,8 +88,31 @@ if (! $user->rights->accounting->ventilation->dispatch)
 
 $formventilation = new FormVentilation($db);
 
+//Defaut AccountingAccount RowId Product / Service
+//at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
+//so we need to get those default value rowid first
+$accounting = new AccountingAccount($db);
+
+//TODO: we should need to check if result is a really exist accountaccount rowid.....
+$aarowid_s = $accounting->fetch('', ACCOUNTING_SERVICE_BUY_ACCOUNT);
+$aarowid_p = $accounting->fetch('', ACCOUNTING_PRODUCT_BUY_ACCOUNT);
+
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref='';
+    $search_label='';
+    $search_desc='';
+}
+
+/*
+ * View
+ */
 llxHeader('', $langs->trans("Ventilation"));
 
+//debug
+//print_r($aarowid_s);
+//print_r($aarowid_p);
 print  '<script type="text/javascript">
 			$(function () {
 				$(\'#select-all\').click(function(event) {
@@ -91,7 +151,7 @@ if ($action == 'ventil') {
 			$sql .= " SET fk_code_ventilation = " . $monCompte;
 			$sql .= " WHERE rowid = " . $monId;
 
-			dol_syslog('accountancy/supplier/list.php:: sql=' . $sql);
+			dol_syslog('accountancy/supplier/list.php:: sql=' . $sql, LOG_DEBUG);
 			if ($db->query($sql)) {
 				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
 			} else {
@@ -126,6 +186,9 @@ $offset = $limit * $page;
 
 $sql = "SELECT f.ref, f.rowid as facid, f.ref_supplier, l.fk_product, l.description, l.total_ht as price, l.rowid, l.fk_code_ventilation, ";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy";
+$sql .= " , aa.rowid as aarowid";
+$sql .= " , f.datef";
+$sql .= " , l.product_type as type_l";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
@@ -134,14 +197,22 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.
 $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation <= 0";
 $sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_buy ='')";
 
+// Add search filter like
+if (strlen(trim($search_ref))) {
+	$sql .= " AND (p.ref like '%" . $search_ref . "%')";
+}
+if (strlen(trim($search_label))) {
+	$sql .= " AND (p.label like '%" . $search_label . "%')";
+}
+if (strlen(trim($search_desc))) {
+	$sql .= " AND (l.description like '%" . $search_desc . "%')";
+}
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")";
 }
 
-$sql .= " ORDER BY l.rowid";
-if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
-	$sql .= " DESC ";
-}
+$sql.= $db->order($sortfield,$sortorder);
+
 $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog('accountancy/supplier/list.php:: $sql=' . $sql);
@@ -153,20 +224,22 @@ if ($result) {
 	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
 
-	print '<td align="left"><br><b>' . $langs->trans("DescVentilTodoSupplier") . '</b></br></td>';
+	print '<br><b>' . $langs->trans("DescVentilTodoCustomer") . '</b></br>';
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>Facture</td>';
-	print '<td align="left">' . $langs->trans("Ref") . '</td>';
-	print '<td align="left">' . $langs->trans("Label") . '</td>';
-	print '<td>' . $langs->trans("Description") . '</td>';
-	print '<td align="right">' . $langs->trans("Amount") . '</td>';
-	print '<td align="right">' . $langs->trans("Compte") . '</td>';
-	print '<td align="center">' . $langs->trans("IntoAccount") . '</td>';
-	print '<td align="center">' . $langs->trans("Ventilate") . '<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>'.'</td>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"],"f.ref","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Amount"),'','','','','align="right"');
+	print_liste_field_titre($langs->trans("AccountAccounting"),'','','','','align="center"');
+	print_liste_field_titre($langs->trans("IntoAccount"),'','','','','align="center"');
+    print_liste_field_titre('');
+	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>','','','','','align="center"');
 	print "</tr>\n";
 
 	$facturefourn_static = new FactureFournisseur($db);
@@ -181,27 +254,48 @@ if ($result) {
 		// product_type: 0 = service ? 1 = product
 		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
 		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
-		$code_buy_notset = '';
-		
-		if (empty($objp->code_buy)) {
-			$code_buy_notset = 'color:red';
+		$objp->code_buy_l = '';
+		$objp->code_buy_p = '';
+		$objp->aarowid_suggest = '';
+		$code_buy_p_l_differ = '';
+
+		$code_buy_p_notset = '';
+
+		$objp->aarowid_suggest = $objp->aarowid;
+		if ( ! empty($objp->code_buy)) {
+			$objp->code_buy_p = $objp->code_buy;
+		} else {
+			$code_buy_p_notset = 'color:red';
 			if ($objp->type == 1) {
-				$objp->code_buy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-			} else {
-				$objp->code_buy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));					
+				$objp->code_buy_p = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+
+
+			}
+
+			elseif ($objp->type == 0) {
+				$objp->code_buy_p = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 			}
-		}else {
-			$code_buy_notset = 'color:blue';
 		}
 		
+			if ($objp->type_l == 1) {
+				$objp->code_buy_l = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+				if ($objp->aarowid == '') $objp->aarowid_suggest = $aarowid_s;
+			}
+			elseif ($objp->type_l == 0) {
+				$objp->code_buy_l = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+				if ($objp->aarowid == '') $objp->aarowid_suggest = $aarowid_p;
+			}
+		
+		if ($objp->code_buy_l <> $objp->code_buy_p) $code_buy_p_l_differ = 'color:red';
+		
 		print "<tr $bc[$var]>";
 
-		// Ref facture
+		// Ref Invoice
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		print '<td>' . $facturefourn_static->getNomUrl(1) . '</td>';
 
-		// Ref facture supplier
+		// Ref Supplier Invoice
 		$productfourn_static->ref = $objp->product_ref;
 		$productfourn_static->id = $objp->product_id;
 		$productfourn_static->type = $objp->type;
@@ -212,29 +306,33 @@ if ($result) {
 			print '&nbsp;';
 		print '</td>';
 
-		// print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref.'</a></td>';
+		print '<td style="' . $code_buy_p_l_differ . '">' . dol_trunc($objp->product_label, 24) . '</td>';
 
-		// print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref_supplier.'</a></td>';
-
-		print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
-
-		print '<td>' . stripslashes(nl2br($objp->description)) . '</td>';
+		// TODO: we should set a user defined value to adjust user square / wide screen size
+		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		print '<td style="' . $code_buy_p_l_differ . '">' . nl2br(dol_trunc($objp->description, $trunclength)) . '</td>';
 
 		print '<td align="right">';
 		print price($objp->price);
 		print '</td>';
 
-		print '<td align="center" style="' . $code_buy_notset . '">';
-		print $objp->code_buy;
+		print '<td align="center" style="' . $code_buy_p_notset . '">';
+		//if not same kind of product_type stored in product & facturedt we display both account and let user choose
+		if ($objp->code_buy_l == $objp->code_buy_p) {
+			print $objp->code_buy_l;
+		} else {
+			print 'lines='.$objp->code_buy_l . '<br />product=' . $objp->code_buy_p;
+		}
 		print '</td>';
 
 		// Colonne choix du compte
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1);
+		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil[]', 1);
 		print '</td>';
+		print '<td align="center">' . $objp->rowid . '</td>';
 		// Colonne choix ligne a ventiler
 		print '<td align="center">';
-		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
+		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid_suggest ? "checked" : "") . '/>';
 		print '</td>';
 
 		print "</tr>";
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 924d9bc4481..d87729ee0c5 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -34,9 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $langs->load("companies");
@@ -239,7 +240,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && $cancel='' && $user->rights->adherent->creer)
+	if ($action == 'update' && ! $cancel && $user->rights->adherent->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -322,8 +323,29 @@ if (empty($reshook))
 			}
 
 			$result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
+
 			if ($result >= 0 && ! count($object->errors))
 			{
+				// Categories association
+				// First we delete all categories association
+				$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'categorie_member';
+				$sql .= ' WHERE fk_member = ' . $object->id;
+				$resql = $db->query($sql);
+				if (! $resql) dol_print_error($db);
+
+				// Then we add the associated categories
+				$categories = GETPOST('memcats', 'array');
+
+				if (! empty($categories))
+				{
+					$cat = new Categorie($db);
+					foreach ($categories as $id_category)
+					{
+						$cat->fetch($id_category);
+						$cat->add_type($object, 'member');
+					}
+				}
+
 				// Logo/Photo save
 				$dir= $conf->adherent->dir_output . '/' . get_exdir($object->id,2,0,1,$object,'member').'/photos';
 				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
@@ -536,6 +558,18 @@ if (empty($reshook))
 			$result=$object->create($user);
 			if ($result > 0)
 			{
+				// Categories association
+				$memcats = GETPOST('memcats', 'array');
+				if (! empty($memcats))
+				{
+					$cat = new Categorie($db);
+					foreach ($memcats as $id_category)
+					{
+						$cat->fetch($id_category);
+						$cat->add_type($object, 'member');
+					}
+				}
+
 				$db->commit();
 				$rowid=$object->id;
 				$action='';
@@ -899,6 +933,15 @@ else
 		print $form->selectyesno("public",$object->public,1);
 		print "</td></tr>\n";
 
+		// Categories
+		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		{
+			print '<tr><td>' . fieldLabel('Categories', 'memcars') . '</td><td>';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
+			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
+			print "</td></tr>";
+		}
+
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -976,7 +1019,6 @@ else
 
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
 
 		if ($conf->use_javascript_ajax)
 		{
@@ -1020,10 +1062,12 @@ else
 		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
+		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+
 		print '<table class="border" width="100%">';
 
 		// Ref
-		print '<tr><td>'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
 
 		// Login
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
@@ -1069,7 +1113,7 @@ else
 		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?$_POST["societe"]:$object->societe).'"></td></tr>';
 
 		// Civility
-		print '<tr><td width="20%">'.$langs->trans("UserTitle").'</td><td width="35%">';
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
 		print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id)."\n";
 		print '</td>';
 		print '</tr>';
@@ -1143,12 +1187,27 @@ else
 		print $form->selectyesno("public",(isset($_POST["public"])?$_POST["public"]:$object->public),1);
 		print "</td></tr>\n";
 
+		// Categories
+		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
+		{
+			print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
+			print '<td colspan="2">';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
+			$c = new Categorie($db);
+			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
+			foreach ($cats as $cat) {
+				$arrayselected[] = $cat->id;
+			}
+			print $form->multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print "</td></tr>";
+		}
+
 		// Other attributes
-		$parameters=array();
+		$parameters=array("colspan"=>2);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
-			print $object->showOptionals($extrafields,'edit');
+			print $object->showOptionals($extrafields,'edit',$parameters);
 		}
 
 		// Third party Dolibarr
@@ -1179,7 +1238,9 @@ else
 
 		print '</table>';
 
-		print '<br><div class="center">';
+		dol_fiche_end();
+
+		print '<div class="center">';
 		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
@@ -1187,7 +1248,6 @@ else
 
 		print '</form>';
 
-		print '</div>';
 	}
 
 	if ($rowid && $action != 'edit')
@@ -1277,7 +1337,7 @@ else
 			$texttosend=$object->makeSubstitution($adht->getMailOnValid());
 
 			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.=' ('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
+			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
 			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
 			$helpcontent='';
 			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
@@ -1289,7 +1349,7 @@ else
 			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
 			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
 
-			// Cree un tableau formulaire
+			// Create form popup
 			$formquestion=array();
 			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label,  'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
 			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_MAILMAN)) {
@@ -1298,7 +1358,7 @@ else
 			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))    {
 				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>'');
 			}
-			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1);
+			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1,1);
 		}
 
 		// Confirm send card by mail
@@ -1319,7 +1379,7 @@ else
 			$texttosend=$object->makeSubstitution($adht->getMailOnResiliate());
 
 			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.=' ('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
+			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
 			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
 			$helpcontent='';
 			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
@@ -1335,7 +1395,7 @@ else
 			$formquestion=array();
 			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
 			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
+			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion,'no',1);
 		}
 
 		// Confirm remove member
@@ -1463,12 +1523,21 @@ else
 		// Status
 		print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';
 
+		// Categories
+		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		{
+			print '<tr><td>' . $langs->trans("Categories") . '</td>';
+			print '<td colspan="2">';
+			print $form->showCategories($object->id, 'member', 1);
+			print '</td></tr>';
+		}
+
 		// Other attributes
-		$parameters=array();
+		$parameters=array('colspan'=>2);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
-			print $object->showOptionals($extrafields);
+			print $object->showOptionals($extrafields, 'view', $parameters);
 		}
 
 		// Third party Dolibarr
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index dabbf142730..752a756b8cb 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -944,7 +944,7 @@ if ($rowid > 0)
 				$datefrom=$object->datevalid;
             }
         }
-        $form->select_date($datefrom,'','','','',"cotisation",1,1);
+        print $form->select_date($datefrom,'','','','',"cotisation",1,1,1);
         print "</td></tr>";
 
         // Date end subscription
@@ -957,7 +957,7 @@ if ($rowid > 0)
             $dateto=-1;		// By default, no date is suggested
         }
         print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
-        $form->select_date($dateto,'end','','','',"cotisation");
+        print $form->select_date($dateto,'end','','','',"cotisation",1,0,1);
         print "</td></tr>";
 
         if ($adht->cotisation)
@@ -1058,7 +1058,7 @@ if ($rowid > 0)
 
                 // Date of payment
                 print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-                $form->select_date(isset($paymentdate)?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1);
+                print $form->select_date(isset($paymentdate)?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1,1);
                 print "</td></tr>\n";
 
                 print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index ff6c1eb7963..1cf2a8e5e09 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -73,6 +73,10 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$sall="";
 }
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('memberlist'));
+$extrafields = new ExtraFields($db);
+
 
 /*
  * View
@@ -91,6 +95,12 @@ $sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company,
 $sql.= " d.datefin,";
 $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
 $sql.= " t.libelle as type, t.cotisation";
+// Add fields for extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
 if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member"; // We need this table joined to the select in order to filter by categ
 $sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
@@ -100,52 +110,23 @@ if ($catid == -2)  $sql.= " AND cm.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql.= " AND cm.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
 $sql.= " AND d.entity IN (".getEntity('adherent', 1).")";
-if ($sall)
-{
-        // For natural search
-        $scrit = explode(' ', $sall);
-        foreach ($scrit as $crit)
-        {
-            $sql.=" AND (";
-            if (is_numeric($sall)) $sql.= "d.rowid = ".$db->escape($sall)." OR ";
-            $sql.=" d.firstname LIKE '%".$db->escape($sall)."%' OR d.lastname LIKE '%".$db->escape($sall)."%' OR d.societe LIKE '%".$db->escape($sall)."%'";
-            $sql.=" OR d.email LIKE '%".$db->escape($sall)."%' OR d.login LIKE '%".$db->escape($sall)."%' OR d.address LIKE '%".$db->escape($sall)."%'";
-            $sql.=" OR d.town LIKE '%".$db->escape($sall)."%' OR d.note_public LIKE '%".$db->escape($sall)."%' OR d.note_private LIKE '%".$db->escape($sall)."%')";
-        }
-}
-if ($type > 0)
-{
-	$sql.=" AND t.rowid=".$db->escape($type);
-}
-if (isset($_GET["statut"]) || isset($_POST["statut"]))
-{
-	$sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
-}
+if ($sall) $sql.=natural_search(array("d.rowid", "d.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
+if ($type > 0) $sql.=" AND t.rowid=".$db->escape($type);
+if (isset($_GET["statut"]) || isset($_POST["statut"])) $sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
 if ($search_ref)
 {
 	if (is_numeric($search_ref)) $sql.= " AND (d.rowid = ".$db->escape($search_ref).")";
 	else $sql.=" AND 1 = 2";    // Always wrong
 }
-if ($search_lastname)
-{
-	$sql.= " AND (d.firstname LIKE '%".$db->escape($search_lastname)."%' OR d.lastname LIKE '%".$db->escape($search_lastname)."%' OR d.societe LIKE '%".$db->escape($search_lastname)."%')";
-}
-if ($search_login)
-{
-	$sql.= " AND d.login LIKE '%".$db->escape($search_login)."%'";
-}
-if ($search_email)
-{
-	$sql.= " AND (d.email LIKE '%".$db->escape($search_email)."%')";
-}
-if ($filter == 'uptodate')
-{
-	$sql.=" AND datefin >= '".$db->idate($now)."'";
-}
-if ($filter == 'outofdate')
-{
-	$sql.=" AND (datefin IS NULL OR datefin < '".$db->idate($now)."')";
-}
+if ($search_lastname) $sql.= natural_search(array("d.firstname", "d.lastname", "d.societe"), $search_lastname);
+if ($search_login) $sql.= natural_search("d.login", $search_login);
+if ($search_email) $sql.= natural_search("d.email", $search_email);
+if ($filter == 'uptodate') $sql.=" AND datefin >= '".$db->idate($now)."'";
+if ($filter == 'outofdate') $sql.=" AND (datefin IS NULL OR datefin < '".$db->idate($now)."')";
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = 0;
@@ -199,11 +180,12 @@ if ($resql)
 
 	if ($sall)
 	{
-		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
+		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ";
+		print '<strong>'.$sall.'</strong>';
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
-	print "<table class=\"noborder\" width=\"100%\">";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 	// Filter on categories
 	$moreforfilter='';
@@ -214,14 +196,17 @@ if ($resql)
 		$moreforfilter.=$formother->select_categories(Categorie::TYPE_MEMBER,$search_categ,'search_categ',1);
 		$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
 	}
-	if ($moreforfilter)
+	if (! empty($moreforfilter))
 	{
-		print '<tr class="liste_titre">';
-		print '<td class="liste_titre" colspan="9">';
+		print '<div class="liste_titre">';
 		print $moreforfilter;
-		print '</td></tr>';
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	    print $hookmanager->resPrint;
+	    print '</div>';
 	}
 
+	print "<table class=\"noborder\" width=\"100%\">";
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
@@ -229,7 +214,12 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
+
+	$parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+
+    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
 	print "</tr>\n";
@@ -256,7 +246,12 @@ if ($resql)
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" name="search_email" value="'.$search_email.'" size="12"></td>';
 
-	print '<td class="liste_titre">&nbsp;</td>';
+	$parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+
+    // Status
+    print '<td class="liste_titre">&nbsp;</td>';
 
 	print '<td align="right" colspan="2" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -316,7 +311,11 @@ if ($resql)
 		// EMail
 		print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
 
-		// Statut
+		$parameters=array('obj' => $obj);
+        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+
+        // Statut
 		print '<td class="nowrap">';
 		print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2);
 		print "</td>";
@@ -365,6 +364,12 @@ if ($resql)
 		$i++;
 	}
 
+	$db->free($resql);
+
+	$parameters=array('sql' => $sql);
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
 	print "</table>\n";
 	print '</form>';
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index e830254fd97..54a00f04831 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -53,6 +53,12 @@ $pagenext = $page + 1;
 if (! $sortorder) {  $sortorder="DESC"; }
 if (! $sortfield) {  $sortfield="d.lastname"; }
 
+$label=GETPOST("libelle","alpha");
+$cotisation=GETPOST("cotisation","int");
+$vote=GETPOST("vote","int");
+$comment=GETPOST("comment");
+$mail_valid=GETPOST("mail_valid");
+
 // Security check
 $result=restrictedArea($user,'adherent',$rowid,'adherent_type');
 
@@ -83,11 +89,11 @@ if ($action == 'add' && $user->rights->adherent->configurer)
 	{
 		$object = new AdherentType($db);
 
-		$object->libelle     = trim($_POST["libelle"]);
-		$object->cotisation  = trim($_POST["cotisation"]);
-		$object->note        = trim($_POST["comment"]);
-		$object->mail_valid  = trim($_POST["mail_valid"]);
-		$object->vote        = trim($_POST["vote"]);
+		$object->libelle     = trim($label);
+		$object->cotisation  = trim($cotisation);
+		$object->note        = trim($comment);
+		$object->mail_valid  = trim($mail_valid);
+		$object->vote        = trim($vote);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -120,12 +126,12 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
 		$object = new AdherentType($db);
-		$object->id          = $_POST["rowid"];
-		$object->libelle     = trim($_POST["libelle"]);
-		$object->cotisation  = trim($_POST["cotisation"]);
-		$object->note        = trim($_POST["comment"]);
-		$object->mail_valid  = trim($_POST["mail_valid"]);
-		$object->vote        = trim($_POST["vote"]);
+		$object->id          = $rowid;
+		$object->libelle     = trim($label);
+		$object->cotisation  = trim($cotisation);
+		$object->note        = trim($comment);
+		$object->mail_valid  = trim($mail_valid);
+		$object->vote        = trim($vote);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -169,6 +175,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 
 	print_fiche_titre($langs->trans("MembersTypes"));
 
+	dol_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.libelle, d.cotisation, d.vote";
 	$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
@@ -197,7 +204,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 			$var=!$var;
 			print "<tr ".$bc[$var].">";
 			print '<td><a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a></td>';
-			print '<td>'.$objp->libelle.'</td>';
+			print '<td>'.dol_escape_htmltag($objp->libelle).'</td>';
 			print '<td align="center">'.yn($objp->cotisation).'</td>';
 			print '<td align="center">'.yn($objp->vote).'</td>';
 			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
@@ -211,6 +218,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		dol_print_error($db);
 	}
 
+	dol_fiche_end();
 
 	/*
 	 * Hotbar
@@ -246,7 +254,7 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 	print '<tbody>';
-	
+
 	print '<input type="hidden" name="action" value="add">';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>';
@@ -277,7 +285,7 @@ if ($action == 'create')
 	}
 	print '<tbody>';
 	print "</table>\n";
-	
+
 	dol_fiche_end();
 
 	print '<div class="center">';
@@ -317,7 +325,7 @@ if ($rowid > 0)
 		print '</td></tr>';
 
 		// Label
-		print '<tr><td width="15%">'.$langs->trans("Label").'</td><td>'.$object->libelle.'</td></tr>';
+		print '<tr><td width="15%">'.$langs->trans("Label").'</td><td>'.dol_escape_htmltag($object->libelle).'</td></tr>';
 
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 		print yn($object->cotisation);
@@ -343,7 +351,9 @@ if ($rowid > 0)
 		}
 
 		print '</table>';
-		print '</div>';
+
+		dol_fiche_end();
+
 
 		/*
 		 * Hotbar
@@ -493,15 +503,15 @@ if ($rowid > 0)
 			print '<tr class="liste_titre">';
 
 			print '<td class="liste_titre" align="left">';
-			print '<input class="flat" type="text" name="search_lastname" value="'.$search_lastname.'" size="12"></td>';
+			print '<input class="flat" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'" size="12"></td>';
 
 			print '<td class="liste_titre" align="left">';
-			print '<input class="flat" type="text" name="search_login" value="'.$search_login.'" size="7"></td>';
+			print '<input class="flat" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'" size="7"></td>';
 
 			print '<td class="liste_titre">&nbsp;</td>';
 
 			print '<td class="liste_titre" align="left">';
-			print '<input class="flat" type="text" name="search_email" value="'.$search_email.'" size="12"></td>';
+			print '<input class="flat" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'" size="12"></td>';
 
 			print '<td class="liste_titre">&nbsp;</td>';
 
@@ -563,7 +573,7 @@ if ($rowid > 0)
 		        if ($datefin)
 		        {
 			        print '<td align="center" class="nowrap">';
-		            if ($datefin < time() && $objp->statut > 0)
+		            if ($datefin < dol_now() && $objp->statut > 0)
 		            {
 		                print dol_print_date($datefin,'day')." ".img_warning($langs->trans("SubscriptionLate"));
 		            }
@@ -634,17 +644,18 @@ if ($rowid > 0)
 
 		$head = member_type_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
-
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 		print '<input type="hidden" name="action" value="update">';
+
+		dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
+
 		print '<table class="border" width="100%">';
 
 		print '<tr><td width="15%">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';
 
-		print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40" value="'.$object->libelle.'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 		print $form->selectyesno("cotisation",$object->cotisation,1);
@@ -683,6 +694,8 @@ if ($rowid > 0)
 			print '</table><br><br>';
 		}
 
+		dol_fiche_end();
+
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -693,6 +706,7 @@ if ($rowid > 0)
 	}
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 5da5fa621c6..16608a5fae2 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2008-2014	Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2015	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2011		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012  Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015		Jean-François Ferry <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -137,6 +137,11 @@ print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "<br>\n";
 
 
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="save">';
+
+
 $head=agenda_prepare_head();
 
 dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), 0, 'action');
@@ -145,10 +150,6 @@ print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
 print "<br>\n";
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="save">';
-
 $var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -168,8 +169,9 @@ if (! empty($triggers))
 		//print 'module='.$module.'<br>';
 		if (! empty($conf->$module->enabled))
 		{
-			// Discard special case.
+			// Discard special case: If option FICHINTER_CLASSIFY_BILLED is not set, we discard both trigger FICHINTER_CLASSIFY_BILLED and FICHINTER_CLASSIFY_UNBILLED
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
+			if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 
 			$var=!$var;
 			print '<tr '.$bc[$var].'>';
@@ -185,13 +187,14 @@ if (! empty($triggers))
 }
 print '</table>';
 
-print '<br><div class="center">';
+dol_fiche_end();
+
+print '<div class="center">';
 print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
 print "</div>";
 
 print "</form>\n";
 
-dol_fiche_end();
 
 print "<br>";
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index c1a9ec3afd2..633b62f2316 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2011-2015	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  *
@@ -127,6 +127,10 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print '<br>';
 
+print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="save">';
+
 $head=agenda_prepare_head();
 
 dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), 0, 'action');
@@ -134,7 +138,6 @@ dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), 0, 'action');
 print $langs->trans("AgendaExtSitesDesc")."<br>\n";
 print "<br>\n";
 
-print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 
 $selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
 if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
@@ -219,7 +222,8 @@ while ($i <= $MAXAGENDA)
 }
 
 print '</table>';
-print '<br>';
+
+dol_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" id="save" name="save" class="button hideifnotset" value="'.$langs->trans("Save").'">';
@@ -227,7 +231,6 @@ print '</div>';
 
 print "</form>\n";
 
-dol_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index f0d9f2ca00d..f892fe7149a 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2008-2010	Laurent Destailleur             <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2015	Laurent Destailleur             <eldy@users.sourceforge.net>
  * Copyright (C) 2011		Regis Houssin                   <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013      Juanjo Menent                   <jmenent@2byte.es>
+ * Copyright (C) 2011-2013  Juanjo Menent                   <jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -93,17 +93,16 @@ print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "<br>\n";
 
 
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
+print '<input type="hidden" name="action" value="set">';
+
 $head=agenda_prepare_head();
 
 dol_fiche_head($head, 'other', $langs->trans("Agenda"), 0, 'action');
 
-//print_titre($langs->trans("OtherOptions"));
-
 $var=true;
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
-print '<input type="hidden" name="action" value="set">';
-
 print '<table class="noborder allwidth">'."\n";
 print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
@@ -158,11 +157,12 @@ print '</td></tr>'."\n";
 
 print '</table>';
 
+dol_fiche_end();
+
 print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 
 print '</form>';
 
-dol_fiche_end();
 
 print "<br>";
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index d196664bdf9..f7abde2280e 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2013 	Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2015 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012-2013	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2015		Jean-François Ferry	<jfefe@aternatik.fr>
@@ -78,6 +78,9 @@ print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print '<br>';
 
 
+print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
 $head=agenda_prepare_head();
 
 dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), 0, 'action');
@@ -85,18 +88,16 @@ dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), 0, 'action');
 print $langs->trans("AgendaSetupOtherDesc")."<br>\n";
 print "<br>\n";
 
-print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<table class=\"noborder\" width=\"100%\">";
+print '<table class="noborder" width="100%">';
 
-print "<tr class=\"liste_titre\">";
+print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Value")."</td>";
 //print "<td>".$langs->trans("Examples")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr class=\"impair\">";
+print "<tr ".$bc[false].">";
 print '<td class="fieldrequired">'.$langs->trans("PasswordTogetVCalExport")."</td>";
 print '<td><input required="required" type="text" class="flat" id="MAIN_AGENDA_XCAL_EXPORTKEY" name="MAIN_AGENDA_XCAL_EXPORTKEY" value="' . (GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha')?GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha'):$conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) . '" size="40">';
 if (! empty($conf->use_javascript_ajax))
@@ -105,13 +106,13 @@ print '</td>';
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr class=\"pair\">";
+print "<tr ".$bc[true].">";
 print "<td>".$langs->trans("PastDelayVCalExport")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_PAST_DELAY\" value=\"". (GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha')?GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha'):$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY) . "\" size=\"10\"> ".$langs->trans("days")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr class=\"impair\">";
+print "<tr ".$bc[false].">";
 print "<td>".$langs->trans("UseACacheDelay")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_CACHE\" value=\"". (GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha')?GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha'):$conf->global->MAIN_AGENDA_EXPORT_CACHE) . "\" size=\"10\"></td>";
 print "<td>&nbsp;</td>";
@@ -121,13 +122,13 @@ print '</table>';
 
 print '<br>';
 
-print "<table class=\"noborder\" width=\"100%\">";
+print '<table class="noborder" width="100%">';
 
-print "<tr class=\"liste_titre\">";
+print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Value")."</td>";
 print "</tr>";
-print "<tr ".$bc[$var].">";
+print "<tr ".$bc[false].">";
 print '<td class="fieldrequired">'.$langs->trans("FixTZ")."</td>";
 print "<td>";
 print '<input class="flat" type="text" size="4" name="AGENDA_EXPORT_FIX_TZ" value="'.$conf->global->AGENDA_EXPORT_FIX_TZ.'">';
@@ -137,13 +138,14 @@ print "</tr>";
 
 print '</table>';
 
-print '<br><div class="center">';
+dol_fiche_end();
+
+print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
 print "</div>";
 
 print "</form>\n";
 
-dol_fiche_end();
 
 clearstatcache();
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index db4c1dff209..53f5962f017 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -51,216 +51,216 @@ $error=0;
 if ( ($action == 'update' && empty($_POST["cancel"]))
 || ($action == 'updateedit') )
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    $tmparray=getCountry(GETPOST('country_id','int'),'all',$db,$langs,0);
-    if (! empty($tmparray['id']))
-    {
-        $mysoc->country_id   =$tmparray['id'];
-        $mysoc->country_code =$tmparray['code'];
-        $mysoc->country_label=$tmparray['label'];
+	$tmparray=getCountry(GETPOST('country_id','int'),'all',$db,$langs,0);
+	if (! empty($tmparray['id']))
+	{
+		$mysoc->country_id   =$tmparray['id'];
+		$mysoc->country_code =$tmparray['code'];
+		$mysoc->country_label=$tmparray['label'];
 
-        $s=$mysoc->country_id.':'.$mysoc->country_code.':'.$mysoc->country_label;
-        dolibarr_set_const($db, "MAIN_INFO_SOCIETE_COUNTRY", $s,'chaine',0,'',$conf->entity);
-    }
+		$s=$mysoc->country_id.':'.$mysoc->country_code.':'.$mysoc->country_label;
+		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_COUNTRY", $s,'chaine',0,'',$conf->entity);
+	}
 
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM",$_POST["nom"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS",$_POST["address"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN",$_POST["town"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP",$_POST["zipcode"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE",$_POST["state_id"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_MONNAIE",$_POST["currency"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL",$_POST["tel"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX",$_POST["fax"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL",$_POST["mail"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB",$_POST["web"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE",$_POST["note"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD",$_POST["barcode"],'chaine',0,'',$conf->entity);
-    if ($_FILES["logo"]["tmp_name"])
-    {
-        if (preg_match('/([^\\/:]+)$/i',$_FILES["logo"]["name"],$reg))
-        {
-            $original_file=$reg[1];
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM",$_POST["nom"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS",$_POST["address"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN",$_POST["town"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP",$_POST["zipcode"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE",$_POST["state_id"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MONNAIE",$_POST["currency"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL",$_POST["tel"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX",$_POST["fax"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL",$_POST["mail"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB",$_POST["web"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE",$_POST["note"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD",$_POST["barcode"],'chaine',0,'',$conf->entity);
+	if ($_FILES["logo"]["tmp_name"])
+	{
+		if (preg_match('/([^\\/:]+)$/i',$_FILES["logo"]["name"],$reg))
+		{
+			$original_file=$reg[1];
 
-            $isimage=image_format_supported($original_file);
-            if ($isimage >= 0)
-            {
-                dol_syslog("Move file ".$_FILES["logo"]["tmp_name"]." to ".$conf->mycompany->dir_output.'/logos/'.$original_file);
-                if (! is_dir($conf->mycompany->dir_output.'/logos/'))
-                {
-                    dol_mkdir($conf->mycompany->dir_output.'/logos/');
-                }
-                $result=dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->mycompany->dir_output.'/logos/'.$original_file,1,0,$_FILES['logo']['error']);
-                if ($result > 0)
-                {
-                    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO",$original_file,'chaine',0,'',$conf->entity);
-
-                    // Create thumbs of logo (Note that PDF use original file and not thumbs)
-                    if ($isimage > 0)
-                    {
-                        // Create small thumbs for company (Ratio is near 16/9)
-                        // Used on logon for example
-                        $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-                        if (preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
-                        {
-                            $imgThumbSmall = $reg[1];
-                            dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
-                        }
-                        else dol_syslog($imgThumbSmall);
-
-                        // Create mini thumbs for company (Ratio is near 16/9)
-                        // Used on menu or for setup page for example
-                        $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
-                        if (preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
-                        {
-                            $imgThumbMini = $reg[1];
-                            dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
-                        }
-                        else dol_syslog($imgThumbMini);
-                    }
-                    else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
-                }
-                else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
-                {
-                	$error++;
-                    $langs->load("errors");
-                    $tmparray=explode(':',$result);
-                    setEventMessage($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]),'errors');
-                }
-                else
-                {
-                	$error++;
-                    setEventMessage($langs->trans("ErrorFailedToSaveFile"),'errors');
-                }
-            }
-            else
+			$isimage=image_format_supported($original_file);
+			if ($isimage >= 0)
 			{
-            	$error++;
-				$langs->load("errors");
-            	setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
-            }
-        }
-    }
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS",$_POST["MAIN_INFO_SOCIETE_MANAGERS"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SIREN",$_POST["siren"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_APE",$_POST["ape"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_RCS",$_POST["rcs"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_PROFID5",$_POST["MAIN_INFO_PROFID5"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_INFO_PROFID6",$_POST["MAIN_INFO_PROFID6"],'chaine',0,'',$conf->entity);
+				dol_syslog("Move file ".$_FILES["logo"]["tmp_name"]." to ".$conf->mycompany->dir_output.'/logos/'.$original_file);
+				if (! is_dir($conf->mycompany->dir_output.'/logos/'))
+				{
+					dol_mkdir($conf->mycompany->dir_output.'/logos/');
+				}
+				$result=dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->mycompany->dir_output.'/logos/'.$original_file,1,0,$_FILES['logo']['error']);
+				if ($result > 0)
+				{
+					dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO",$original_file,'chaine',0,'',$conf->entity);
 
-    dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity);
+					// Create thumbs of logo (Note that PDF use original file and not thumbs)
+					if ($isimage > 0)
+					{
+						// Create small thumbs for company (Ratio is near 16/9)
+						// Used on logon for example
+						$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+						if (preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
+						{
+							$imgThumbSmall = $reg[1];
+							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
+						}
+						else dol_syslog($imgThumbSmall);
+
+						// Create mini thumbs for company (Ratio is near 16/9)
+						// Used on menu or for setup page for example
+						$imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
+						if (preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
+						{
+							$imgThumbMini = $reg[1];
+							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
+						}
+						else dol_syslog($imgThumbMini);
+					}
+					else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
+				}
+				else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
+				{
+					$error++;
+					$langs->load("errors");
+					$tmparray=explode(':',$result);
+					setEventMessage($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]),'errors');
+				}
+				else
+				{
+					$error++;
+					setEventMessage($langs->trans("ErrorFailedToSaveFile"),'errors');
+				}
+			}
+			else
+			{
+				$error++;
+				$langs->load("errors");
+				setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
+			}
+		}
+	}
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS",$_POST["MAIN_INFO_SOCIETE_MANAGERS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SIREN",$_POST["siren"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_APE",$_POST["ape"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_RCS",$_POST["rcs"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_PROFID5",$_POST["MAIN_INFO_PROFID5"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_PROFID6",$_POST["MAIN_INFO_PROFID6"],'chaine',0,'',$conf->entity);
+
+	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_OBJECT",$_POST["object"],'chaine',0,'',$conf->entity);
 
-    dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START",$_POST["fiscalmonthstart"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START",$_POST["fiscalmonthstart"],'chaine',0,'',$conf->entity);
 
-    dolibarr_set_const($db, "FACTURE_TVAOPTION",$_POST["optiontva"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "FACTURE_TVAOPTION",$_POST["optiontva"],'chaine',0,'',$conf->entity);
 
-    // Local taxes
-    dolibarr_set_const($db, "FACTURE_LOCAL_TAX1_OPTION",$_POST["optionlocaltax1"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "FACTURE_LOCAL_TAX2_OPTION",$_POST["optionlocaltax2"],'chaine',0,'',$conf->entity);
+	// Local taxes
+	dolibarr_set_const($db, "FACTURE_LOCAL_TAX1_OPTION",$_POST["optionlocaltax1"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "FACTURE_LOCAL_TAX2_OPTION",$_POST["optionlocaltax2"],'chaine',0,'',$conf->entity);
 
-    if($_POST["optionlocaltax1"]=="localtax1on")
-    {
-    	if(!isset($_REQUEST['lt1']))
-    	{
-    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0,'chaine',0,'',$conf->entity);
-    	}
-    	else
-    	{
-    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1'),'chaine',0,'',$conf->entity);
-    	}
-    	dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC1", $_POST["clt1"],'chaine',0,'',$conf->entity);
-    }
-    if($_POST["optionlocaltax2"]=="localtax2on")
-    {
-    	if(!isset($_REQUEST['lt2']))
-    	{
-    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0,'chaine',0,'',$conf->entity);
-    	}
-    	else
-    	{
-    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2'),'chaine',0,'',$conf->entity);
-    	}
-    	dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC2", $_POST["clt2"],'chaine',0,'',$conf->entity);
-    }
+	if($_POST["optionlocaltax1"]=="localtax1on")
+	{
+		if(!isset($_REQUEST['lt1']))
+		{
+			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0,'chaine',0,'',$conf->entity);
+		}
+		else
+		{
+			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1'),'chaine',0,'',$conf->entity);
+		}
+		dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC1", $_POST["clt1"],'chaine',0,'',$conf->entity);
+	}
+	if($_POST["optionlocaltax2"]=="localtax2on")
+	{
+		if(!isset($_REQUEST['lt2']))
+		{
+			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0,'chaine',0,'',$conf->entity);
+		}
+		else
+		{
+			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2'),'chaine',0,'',$conf->entity);
+		}
+		dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC2", $_POST["clt2"],'chaine',0,'',$conf->entity);
+	}
 
-    if ($action != 'updateedit' && ! $error)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
+	if ($action != 'updateedit' && ! $error)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
 }
 
 if ($action == 'addthumb')
 {
-    if (file_exists($conf->mycompany->dir_output.'/logos/'.$_GET["file"]))
-    {
-        $isimage=image_format_supported($_GET["file"]);
+	if (file_exists($conf->mycompany->dir_output.'/logos/'.$_GET["file"]))
+	{
+		$isimage=image_format_supported($_GET["file"]);
 
-        // Create thumbs of logo
-        if ($isimage > 0)
-        {
-            // Create small thumbs for company (Ratio is near 16/9)
-            // Used on logon for example
-            $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small',$quality);
-            if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
-            {
-                $imgThumbSmall = $reg[1];
-                dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
-            }
-            else dol_syslog($imgThumbSmall);
+		// Create thumbs of logo
+		if ($isimage > 0)
+		{
+			// Create small thumbs for company (Ratio is near 16/9)
+			// Used on logon for example
+			$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small',$quality);
+			if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
+			{
+				$imgThumbSmall = $reg[1];
+				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
+			}
+			else dol_syslog($imgThumbSmall);
 
-            // Create mini thumbs for company (Ratio is near 16/9)
-            // Used on menu or for setup page for example
-            $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthmini, $maxheightmini, '_mini',$quality);
-            if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
-            {
-                $imgThumbMini = $reg[1];
-                dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
-            }
-            else dol_syslog($imgThumbMini);
+			// Create mini thumbs for company (Ratio is near 16/9)
+			// Used on menu or for setup page for example
+			$imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthmini, $maxheightmini, '_mini',$quality);
+			if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
+			{
+				$imgThumbMini = $reg[1];
+				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
+			}
+			else dol_syslog($imgThumbMini);
 
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        }
-        else
-        {
-        	$error++;
-        	$langs->load("errors");
-            setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
-            dol_syslog($langs->transnoentities("ErrorBadImageFormat"),LOG_WARNING);
-        }
-    }
-    else
-    {
-    	$error++;
-    	$langs->load("errors");
-        setEventMessage($langs->trans("ErrorFileDoesNotExists",$_GET["file"]),'errors');
-        dol_syslog($langs->transnoentities("ErrorFileDoesNotExists",$_GET["file"]),LOG_WARNING);
-    }
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		}
+		else
+		{
+			$error++;
+			$langs->load("errors");
+			setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
+			dol_syslog($langs->transnoentities("ErrorBadImageFormat"),LOG_WARNING);
+		}
+	}
+	else
+	{
+		$error++;
+		$langs->load("errors");
+		setEventMessage($langs->trans("ErrorFileDoesNotExists",$_GET["file"]),'errors');
+		dol_syslog($langs->transnoentities("ErrorFileDoesNotExists",$_GET["file"]),LOG_WARNING);
+	}
 }
 
 if ($action == 'removelogo')
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    $logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-    dol_delete_file($logofile);
-    dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO",$conf->entity);
-    $mysoc->logo='';
+	$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+	dol_delete_file($logofile);
+	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO",$conf->entity);
+	$mysoc->logo='';
 
-    $logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-    dol_delete_file($logosmallfile);
-    dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$conf->entity);
-    $mysoc->logo_small='';
+	$logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+	dol_delete_file($logosmallfile);
+	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$conf->entity);
+	$mysoc->logo_small='';
 
-    $logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini;
-    dol_delete_file($logominifile);
-    dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$conf->entity);
-    $mysoc->logo_mini='';
+	$logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini;
+	dol_delete_file($logominifile);
+	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$conf->entity);
+	$mysoc->logo_mini='';
 }
 
 
@@ -284,829 +284,821 @@ print "<br>\n";
 
 if ($action == 'edit' || $action == 'updateedit')
 {
-    /**
-     * Edition des parametres
-     */
-    print "\n".'<script type="text/javascript" language="javascript">';
-    print '$(document).ready(function () {
-              $("#selectcountry_id").change(function() {
-                document.form_index.action.value="updateedit";
-                document.form_index.submit();
-              });
-          });';
-    print '</script>'."\n";
+	/**
+	 * Edition des parametres
+	 */
+	print "\n".'<script type="text/javascript" language="javascript">';
+	print '$(document).ready(function () {
+			  $("#selectcountry_id").change(function() {
+				document.form_index.action.value="updateedit";
+				document.form_index.submit();
+			  });
+		  });';
+	print '</script>'."\n";
 
-    print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="update">';
-    $var=true;
+	print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
+	$var=true;
 
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><th width="35%">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-    print '<input name="nom" id="name" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM:$_POST["nom"]) . '" autofocus="autofocus"></td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
+	print '<input name="nom" id="name" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM:$_POST["nom"]) . '" autofocus="autofocus"></td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
-    print '<textarea name="address" id="address" cols="80" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:$_POST["address"]) . '</textarea></td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
+	print '<textarea name="address" id="address" cols="80" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:$_POST["address"]) . '</textarea></td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
-    print '<input name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:$_POST["zipcode"]) . '" size="10"></td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
+	print '<input name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:$_POST["zipcode"]) . '" size="10"></td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
-    print '<input name="town" id="town" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:$_POST["town"]) . '"></td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
+	print '<input name="town" id="town" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:$_POST["town"]) . '"></td></tr>'."\n";
 
-    // Country
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
-    //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
-    print $form->select_country($mysoc->country_id,'country_id');
-    if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-    print '</td></tr>'."\n";
+	// Country
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
+	//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
+	print $form->select_country($mysoc->country_id,'country_id');
+	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	print '</td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-    $formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE,$mysoc->country_code,'state_id');
-    print '</td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
+	$formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE,$mysoc->country_code,'state_id');
+	print '</td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
-    print $form->selectCurrency($conf->currency,"currency");
-    print '</td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
+	print $form->selectCurrency($conf->currency,"currency");
+	print '</td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
-    print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_SOCIETE_TEL . '"></td></tr>';
-    print '</td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+	print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_SOCIETE_TEL . '"></td></tr>';
+	print '</td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
-    print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_SOCIETE_FAX . '"></td></tr>';
-    print '</td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+	print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_SOCIETE_FAX . '"></td></tr>';
+	print '</td></tr>'."\n";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
-    print '<input name="mail" id="email" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
-    print '</td></tr>'."\n";
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+	print '<input name="mail" id="email" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
+	print '</td></tr>'."\n";
 
-    // Web
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
-    print '<input name="web" id="web" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
-    print '</td></tr>'."\n";
+	// Web
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+	print '<input name="web" id="web" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
+	print '</td></tr>'."\n";
 
-    // Barcode
-    if (! empty($conf->barcode->enabled))
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
-        print '<input name="barcode" id="barcode" size="40" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>';
-        print '</td></tr>';
-    }
+	// Barcode
+	if (! empty($conf->barcode->enabled)) {
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
+		print '<input name="barcode" id="barcode" size="40" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>';
+		print '</td></tr>';
+	}
 
-    // Logo
-    $var=!$var;
-    print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
-    print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
-    print '<input type="file" class="flat" name="logo" id="logo" size="50">';
-    print '</td><td class="nocellnopadd" valign="middle" align="right">';
-    if (! empty($mysoc->logo_mini))
-    {
-        print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
-        if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
-        {
-            print ' &nbsp; ';
-            print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
-        }
-    }
-    else
-    {
-        print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.jpg">';
-    }
-    print '</td></tr></table>';
-    print '</td></tr>';
+	// Logo
+	$var=!$var;
+	print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
+	print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+	print '<input type="file" class="flat" name="logo" id="logo" size="50">';
+	print '</td><td class="nocellnopadd" valign="middle" align="right">';
+	if (! empty($mysoc->logo_mini)) {
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
+		if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
+			print ' &nbsp; ';
+			print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
+		}
+	} else {
+		print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.jpg">';
+	}
+	print '</td></tr></table>';
+	print '</td></tr>';
 
-    // Note
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td valign="top"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-    print '<textarea class="flat" name="note" id="note" cols="80" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '').'</textarea></td></tr>';
-    print '</td></tr>';
+	// Note
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td valign="top"><label for="note">'.$langs->trans("Note").'</label></td><td>';
+	print '<textarea class="flat" name="note" id="note" cols="80" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '').'</textarea></td></tr>';
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '<br>';
+	print '<br>';
 
-    // Identifiants de la societe (country-specific)
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
-    $var=true;
+	// Identifiants de la societe (country-specific)
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	$var=true;
 
-    $langs->load("companies");
+	$langs->load("companies");
 
-    // Managing Director(s)
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%"><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-    print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" size="80" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
+	// Managing Director(s)
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%"><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
+	print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" size="80" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
 
-    // Capital
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%"><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-    print '<input name="capital" id="capital" size="20" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
+	// Capital
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%"><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
+	print '<input name="capital" id="capital" size="20" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
 
-    // Forme juridique
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td><label for="legal_form">'.$langs->trans("JuridicalStatus").'</label></td><td>';
-    if ($mysoc->country_code)
-    {
-        print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'legal_form');
-    }
-    else
-    {
-        print $countrynotdefined;
-    }
-    print '</td></tr>';
+	// Forme juridique
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td><label for="legal_form">'.$langs->trans("JuridicalStatus").'</label></td><td>';
+	if ($mysoc->country_code) {
+		print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'legal_form');
+	} else {
+		print $countrynotdefined;
+	}
+	print '</td></tr>';
 
-    // ProfID1
-    if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%"><label for="profid1">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</label></td><td>';
-        if (! empty($mysoc->country_code))
-        {
-            print '<input name="siren" id="profid1" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
-        }
-        else
-        {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
-    }
+	// ProfID1
+	if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%"><label for="profid1">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</label></td><td>';
+		if (! empty($mysoc->country_code))
+		{
+			print '<input name="siren" id="profid1" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId2
-    if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%"><label for="profid2">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</label></td><td>';
-        if (! empty($mysoc->country_code))
-        {
-            print '<input name="siret" id="profid2" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '' ) . '">';
-        }
-        else
-        {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
-    }
+	// ProfId2
+	if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%"><label for="profid2">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</label></td><td>';
+		if (! empty($mysoc->country_code))
+		{
+			print '<input name="siret" id="profid2" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '' ) . '">';
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId3
-    if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%"><label for="profid3">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</label></td><td>';
-        if (! empty($mysoc->country_code))
-        {
-            print '<input name="ape" id="profid3" size="20" value="' . (! empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
-        }
-        else
-        {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
-    }
+	// ProfId3
+	if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%"><label for="profid3">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</label></td><td>';
+		if (! empty($mysoc->country_code))
+		{
+			print '<input name="ape" id="profid3" size="20" value="' . (! empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId4
-    if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%"><label for="profid4">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</label></td><td>';
-        if (! empty($mysoc->country_code))
-        {
-            print '<input name="rcs" id="profid4" size="20" value="' . (! empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
-        }
-        else
-        {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
-    }
+	// ProfId4
+	if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%"><label for="profid4">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</label></td><td>';
+		if (! empty($mysoc->country_code))
+		{
+			print '<input name="rcs" id="profid4" size="20" value="' . (! empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId5
-    if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%"><label for="profid5">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</label></td><td>';
-        if (! empty($mysoc->country_code))
-        {
-            print '<input name="MAIN_INFO_PROFID5" id="profid5" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
-        }
-        else
-        {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
-    }
+	// ProfId5
+	if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%"><label for="profid5">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</label></td><td>';
+		if (! empty($mysoc->country_code))
+		{
+			print '<input name="MAIN_INFO_PROFID5" id="profid5" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId6
-    if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%"><label for="profid6">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</label></td><td>';
-        if (! empty($mysoc->country_code))
-        {
-            print '<input name="MAIN_INFO_PROFID6" id="profid6" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
-        }
-        else
-        {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
-    }
+	// ProfId6
+	if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%"><label for="profid6">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</label></td><td>';
+		if (! empty($mysoc->country_code))
+		{
+			print '<input name="MAIN_INFO_PROFID6" id="profid6" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+	}
 
-    // TVA Intra
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%"><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
-    print '<input name="tva" id="intra_vat" size="20" value="' . (! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
-    print '</td></tr>';
+	// TVA Intra
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%"><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
+	print '<input name="tva" id="intra_vat" size="20" value="' . (! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
+	print '</td></tr>';
 	
 	// Object of the company
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%"><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
-    print '<textarea class="flat" name="object" id="object" cols="80" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
-    print '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%"><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
+	print '<textarea class="flat" name="object" id="object" cols="80" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
 
-    // Fiscal year start
-    print '<br>';
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
-    print "</tr>\n";
-    $var=true;
+	// Fiscal year start
+	print '<br>';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
+	print "</tr>\n";
+	$var=true;
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%"><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
-    print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START,'fiscalmonthstart',0,1) . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%"><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
+	print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START,'fiscalmonthstart',0,1) . '</td></tr>';
 
-    print "</table>";
+	print "</table>";
 
 
-    // Fiscal options
-    print '<br>';
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
-    print '<td align="right">&nbsp;</td>';
-    print "</tr>\n";
-    $var=true;
+	// Fiscal options
+	print '<br>';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
+	print '<td align="right">&nbsp;</td>';
+	print "</tr>\n";
+	$var=true;
 
-    $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
-    print '<td colspan="2">';
-    print "<table>";
-    print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
-    print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
-    print "</table>";
-    print "</td></tr>\n";
+	$var=!$var;
+	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+	print '<td colspan="2">';
+	print "<table>";
+	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
+	print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
+	print "</table>";
+	print "</td></tr>\n";
 
-    $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
-    print '<td colspan="2">';
-    print "<table>";
-    print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
-    print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
-    print "</table>";
-    print "</td></tr>\n";
+	$var=!$var;
+	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+	print '<td colspan="2">';
+	print "<table>";
+	print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
+	print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
+	print "</table>";
+	print "</td></tr>\n";
 
-    print "</table>";
+	print "</table>";
 
-    /*
-     *  Local Taxes
-     */
-    if ($mysoc->useLocalTax(1))
-    {
-        // Local Tax 1
-        print '<br>';
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-        print '<td align="right">&nbsp;</td>';
-        print "</tr>\n";
-        $var=true;
-        $var=!$var;
-        // Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        if(! isOnlyOneLocalTax(1))
-        {
-	        print '<tr><td align="left"><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
-    	    $formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
-        }
-        print '</td></tr>';
+	/*
+	 *  Local Taxes
+	 */
+	if ($mysoc->useLocalTax(1))
+	{
+		// Local Tax 1
+		print '<br>';
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
+		print '<td align="right">&nbsp;</td>';
+		print "</tr>\n";
+		$var=true;
+		$var=!$var;
+		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
+		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		if(! isOnlyOneLocalTax(1))
+		{
+			print '<tr><td align="left"><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
+			$formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
+		}
+		print '</td></tr>';
 
-        $opcions=array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"),$langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"),$langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc"));
+		$opcions=array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"),$langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"),$langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc"));
 
-        print '<tr><td align="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
-        print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
-        print '</td></tr>';
-        print "</table>";
-        print "</td></tr>\n";
+		print '<tr><td align="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
+		print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
+		print '</td></tr>';
+		print "</table>";
+		print "</td></tr>\n";
 
-        $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        print "</table>";
-        print "</td></tr>\n";
-        print "</table>";
+		$var=!$var;
+		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		print "</table>";
+		print "</td></tr>\n";
+		print "</table>";
 	}
-    if ($mysoc->useLocalTax(2))
-    {
-        // Local Tax 2
-        print '<br>';
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-        print '<td align="right">&nbsp;</td>';
-        print "</tr>\n";
-        $var=true;
+	if ($mysoc->useLocalTax(2))
+	{
+		// Local Tax 2
+		print '<br>';
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
+		print '<td align="right">&nbsp;</td>';
+		print "</tr>\n";
+		$var=true;
 
-        $var=!$var;
-        // Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        print '<tr><td align="left"><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
-        if(! isOnlyOneLocalTax(2))
-        {
-	        $formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
-	        print '</td></tr>';
-        }
-        print '<tr><td align="left"><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
-        print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
-        print '</td></tr>';
-        print "</table>";
-        print "</td></tr>\n";
+		$var=!$var;
+		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
+		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		print '<tr><td align="left"><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
+		if(! isOnlyOneLocalTax(2))
+		{
+			$formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
+			print '</td></tr>';
+		}
+		print '<tr><td align="left"><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
+		print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
+		print '</td></tr>';
+		print "</table>";
+		print "</td></tr>\n";
 
-        $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        print "</table>";
-        print "</td></tr>\n";
-        print "</table>";
-    }
+		$var=!$var;
+		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		print "</table>";
+		print "</td></tr>\n";
+		print "</table>";
+	}
 
 
-    print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-    print '<br>';
+	print '<br><div class="center">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+	print '<br>';
 
-    print '</form>';
+	print '</form>';
 }
 else
 {
-    /*
-     * Show parameters
-     */
+	/*
+	 * Show parameters
+	 */
 
-    // Actions buttons
-    //print '<div class="tabsAction">';
-    //print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-    //print '</div><br>';
+	// Actions buttons
+	//print '<div class="tabsAction">';
+	//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	//print '</div><br>';
 
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
-    $var=true;
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	$var=true;
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyName").'</td><td>';
-    if (! empty($conf->global->MAIN_INFO_SOCIETE_NOM)) print $conf->global->MAIN_INFO_SOCIETE_NOM;
-    else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyName")).'</font>';
-    print '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyName").'</td><td>';
+	if (! empty($conf->global->MAIN_INFO_SOCIETE_NOM)) print $conf->global->MAIN_INFO_SOCIETE_NOM;
+	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyName")).'</font>';
+	print '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>';
-    if ($mysoc->country_code)
-    {
-        $img=picto_from_langcode($mysoc->country_code);
-        print $img?$img.' ':'';
-        print getCountry($mysoc->country_code,1);
-    }
-    else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-    print '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>';
+	if ($mysoc->country_code)
+	{
+		$img=picto_from_langcode($mysoc->country_code);
+		print $img?$img.' ':'';
+		print getCountry($mysoc->country_code,1);
+	}
+	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+	print '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td>';
-    if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE)) print getState($conf->global->MAIN_INFO_SOCIETE_STATE);
-    else print '&nbsp;';
-    print '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td>';
+	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE)) print getState($conf->global->MAIN_INFO_SOCIETE_STATE);
+	else print '&nbsp;';
+	print '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyCurrency").'</td><td>';
-    print currency_name($conf->currency,1);
-    print ' ('.$langs->getCurrencySymbol($conf->currency).')';
-    print '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyCurrency").'</td><td>';
+	print currency_name($conf->currency,1);
+	print ' ('.$langs->getCurrencySymbol($conf->currency).')';
+	print '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . '</td></tr>';
 
-    // Web
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . '</td></tr>';
+	// Web
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . '</td></tr>';
 
-    // Barcode
-    if (! empty($conf->barcode->enabled))
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';
-    }
+	// Barcode
+	if (! empty($conf->barcode->enabled))
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';
+	}
 
-    // Logo
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Logo").'</td><td>';
+	// Logo
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Logo").'</td><td>';
 
-    print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
-    print $mysoc->logo;
-    print '</td><td class="nocellnopadd" valign="center" align="right">';
+	print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+	print $mysoc->logo;
+	print '</td><td class="nocellnopadd" valign="center" align="right">';
 
-    // On propose la generation de la vignette si elle n'existe pas
-    if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i',$mysoc->logo))
-    {
-        print '<a href="'.$_SERVER["PHP_SELF"].'?action=addthumb&amp;file='.urlencode($mysoc->logo).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
-    }
-    else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
-    {
-        print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
-    }
-    else
-    {
-        print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.jpg">';
-    }
-    print '</td></tr></table>';
+	// On propose la generation de la vignette si elle n'existe pas
+	if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i',$mysoc->logo))
+	{
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=addthumb&amp;file='.urlencode($mysoc->logo).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
+	}
+	else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
+	{
+		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
+	}
+	else
+	{
+		print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.jpg">';
+	}
+	print '</td></tr></table>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%" valign="top">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%" valign="top">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
 
-    print '<br>';
+	print '<br>';
 
 
-    // Identifiants de la societe (country-specific)
-    print '<form name="formsoc" method="post">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
-    $var=true;
+	// Identifiants de la societe (country-specific)
+	print '<form name="formsoc" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	$var=true;
 
-    // Managing Director(s)
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ManagingDirectors").'</td><td>';
-    print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
+	// Managing Director(s)
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ManagingDirectors").'</td><td>';
+	print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
 
-    // Capital
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
-    print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
+	// Capital
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
+	print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
 
-    // Forme juridique
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("JuridicalStatus").'</td><td>';
-    print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
-    print '</td></tr>';
+	// Forme juridique
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("JuridicalStatus").'</td><td>';
+	print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
+	print '</td></tr>';
 
-    // ProfId1
-    if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</td><td>';
-        if (! empty($conf->global->MAIN_INFO_SIREN))
-        {
-            print $conf->global->MAIN_INFO_SIREN;
-            if ($mysoc->country_code == 'FR') print ' &nbsp; <a href="http://avis-situation-sirene.insee.fr/avisitu/jsp/avis.jsp" target="_blank">'.$langs->trans("Check").'</a>';
-        } else {
-        	print '&nbsp;';
-        }
-        print '</td></tr>';
-    }
+	// ProfId1
+	if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</td><td>';
+		if (! empty($conf->global->MAIN_INFO_SIREN))
+		{
+			print $conf->global->MAIN_INFO_SIREN;
+			if ($mysoc->country_code == 'FR') print ' &nbsp; <a href="http://avis-situation-sirene.insee.fr/avisitu/jsp/avis.jsp" target="_blank">'.$langs->trans("Check").'</a>';
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId2
-    if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</td><td>';
-        if (! empty($conf->global->MAIN_INFO_SIRET))
-        {
-            print $conf->global->MAIN_INFO_SIRET;
-        } else {
-        	print '&nbsp;';
-        }
-        print '</td></tr>';
-    }
+	// ProfId2
+	if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</td><td>';
+		if (! empty($conf->global->MAIN_INFO_SIRET))
+		{
+			print $conf->global->MAIN_INFO_SIRET;
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId3
-    if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</td><td>';
-        if (! empty($conf->global->MAIN_INFO_APE))
-        {
-            print $conf->global->MAIN_INFO_APE;
-        } else {
-        	print '&nbsp;';
-        }
-        print '</td></tr>';
-    }
+	// ProfId3
+	if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</td><td>';
+		if (! empty($conf->global->MAIN_INFO_APE))
+		{
+			print $conf->global->MAIN_INFO_APE;
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId4
-    if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</td><td>';
-        if (! empty($conf->global->MAIN_INFO_RCS))
-        {
-            print $conf->global->MAIN_INFO_RCS;
-        } else {
-        	print '&nbsp;';
-        }
-        print '</td></tr>';
-    }
+	// ProfId4
+	if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</td><td>';
+		if (! empty($conf->global->MAIN_INFO_RCS))
+		{
+			print $conf->global->MAIN_INFO_RCS;
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId5
-    if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</td><td>';
-        if (! empty($conf->global->MAIN_INFO_PROFID5))
-        {
-            print $conf->global->MAIN_INFO_PROFID5;
-        } else {
-        	print '&nbsp;';
-        }
-        print '</td></tr>';
-    }
+	// ProfId5
+	if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</td><td>';
+		if (! empty($conf->global->MAIN_INFO_PROFID5))
+		{
+			print $conf->global->MAIN_INFO_PROFID5;
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
+	}
 
-    // ProfId6
-    if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
-    {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</td><td>';
-        if (! empty($conf->global->MAIN_INFO_PROFID6))
-        {
-            print $conf->global->MAIN_INFO_PROFID6;
-        } else {
-        	print '&nbsp;';
-        }
-        print '</td></tr>';
-    }
+	// ProfId6
+	if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</td><td>';
+		if (! empty($conf->global->MAIN_INFO_PROFID6))
+		{
+			print $conf->global->MAIN_INFO_PROFID6;
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
+	}
 
-    // TVA
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("VATIntra").'</td>';
-    print '<td>';
-    if (! empty($conf->global->MAIN_INFO_TVAINTRA))
-    {
-        $s='';
-        $s.=$conf->global->MAIN_INFO_TVAINTRA;
-        $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$conf->global->MAIN_INFO_TVAINTRA.'">';
-        if (empty($conf->global->MAIN_DISABLEVATCHECK))
-        {
-            $s.=' &nbsp; ';
-            if (! empty($conf->use_javascript_ajax))
-            {
-                print "\n";
-                print '<script language="JavaScript" type="text/javascript">';
-                print "function CheckVAT(a) {\n";
-                print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n";
-                print "}\n";
-                print '</script>';
-                print "\n";
-                $s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-            }
-            else
-            {
-                $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_country).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-            }
-        }
-        print $s;
-    }
-    else
-    {
-        print '&nbsp;';
-    }
-    print '</td>';
-    print '</tr>';
+	// TVA
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATIntra").'</td>';
+	print '<td>';
+	if (! empty($conf->global->MAIN_INFO_TVAINTRA))
+	{
+		$s='';
+		$s.=$conf->global->MAIN_INFO_TVAINTRA;
+		$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$conf->global->MAIN_INFO_TVAINTRA.'">';
+		if (empty($conf->global->MAIN_DISABLEVATCHECK))
+		{
+			$s.=' &nbsp; ';
+			if (! empty($conf->use_javascript_ajax))
+			{
+				print "\n";
+				print '<script language="JavaScript" type="text/javascript">';
+				print "function CheckVAT(a) {\n";
+				print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n";
+				print "}\n";
+				print '</script>';
+				print "\n";
+				$s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+				$s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+			}
+			else
+			{
+				$s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_country).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+			}
+		}
+		print $s;
+	}
+	else
+	{
+		print '&nbsp;';
+	}
+	print '</td>';
+	print '</tr>';
 	
 	$var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%" valign="top">'.$langs->trans("CompanyObject").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . '</td></tr>';
+	print '<tr '.$bc[$var].'><td width="35%" valign="top">'.$langs->trans("CompanyObject").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . '</td></tr>';
 
-    print '</table>';
-    print '</form>';
+	print '</table>';
+	print '</form>';
 
-    /*
-     *  Debut d'annee fiscale
-     */
-    print '<br>';
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
-    print "</tr>\n";
-    $var=true;
+	/*
+	 *  Debut d'annee fiscale
+	 */
+	print '<br>';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
+	print "</tr>\n";
+	$var=true;
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FiscalMonthStart").'</td><td>';
-    $monthstart=(! empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1;
-    print dol_print_date(dol_mktime(12,0,0,$monthstart,1,2000,1),'%B','gm') . '</td></tr>';
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FiscalMonthStart").'</td><td>';
+	$monthstart=(! empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1;
+	print dol_print_date(dol_mktime(12,0,0,$monthstart,1,2000,1),'%B','gm') . '</td></tr>';
 
-    print "</table>";
+	print "</table>";
 
-    /*
-     *  Options fiscale
-     */
-    print '<br>';
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
-    print '<td align="right">&nbsp;</td>';
-    print "</tr>\n";
-    $var=true;
+	/*
+	 *  Options fiscale
+	 */
+	print '<br>';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
+	print '<td align="right">&nbsp;</td>';
+	print "</tr>\n";
+	$var=true;
 
-    $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
-    print '<td colspan="2">';
-    print "<table>";
-    print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
-    print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
-    print "</table>";
-    print "</td></tr>\n";
+	$var=!$var;
+	print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
+	print '<td colspan="2">';
+	print "<table>";
+	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
+	print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
+	print "</table>";
+	print "</td></tr>\n";
 
-    $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
-    print '<td colspan="2">';
-    print "<table>";
-    print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
-    print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
-    print "</table>";
-    print "</td></tr>\n";
+	$var=!$var;
+	print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
+	print '<td colspan="2">';
+	print "<table>";
+	print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
+	print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
+	print "</table>";
+	print "</td></tr>\n";
 
-    print "</table>";
+	print "</table>";
 
 
-    /*
-     *  Local Taxes
-     */
-    if ($mysoc->useLocalTax(1))
-    {
-        // Local Tax 1
-        print '<br>';
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-        print '<td align="right">&nbsp;</td>';
-        print "</tr>\n";
-        $var=true;
+	/*
+	 *  Local Taxes
+	 */
+	if ($mysoc->useLocalTax(1))
+	{
+		// Local Tax 1
+		print '<br>';
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
+		print '<td align="right">&nbsp;</td>';
+		print "</tr>\n";
+		$var=true;
 
-        $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        if($conf->global->MAIN_INFO_VALUE_LOCALTAX1!=0)
-        {
-	        print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>';
-	    }
-        print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
-        if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0)
-        {
-        	print $langs->transcountry("CalcLocaltax1",$mysoc->country_code);
-        }
-        else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==1)
-        {
-        	print $langs->transcountry("CalcLocaltax2",$mysoc->country_code);
-        }
-        else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){
-        	print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
-        }
+		$var=!$var;
+		print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		if($conf->global->MAIN_INFO_VALUE_LOCALTAX1!=0)
+		{
+			print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>';
+		}
+		print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
+		if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0)
+		{
+			print $langs->transcountry("CalcLocaltax1",$mysoc->country_code);
+		}
+		else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==1)
+		{
+			print $langs->transcountry("CalcLocaltax2",$mysoc->country_code);
+		}
+		else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){
+			print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
+		}
 
-        print '</td></tr>';
-        print "</table>";
-        print "</td></tr>\n";
+		print '</td></tr>';
+		print "</table>";
+		print "</td></tr>\n";
 
-        $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        print "</table>";
-        print "</td></tr>\n";
+		$var=!$var;
+		print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		print "</table>";
+		print "</td></tr>\n";
 
-        print "</table>";
+		print "</table>";
 	}
-    if ($mysoc->useLocalTax(2))
-    {
-        // Local Tax 2
-        print '<br>';
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
-        print '<td align="right">&nbsp;</td>';
-        print "</tr>\n";
-        $var=true;
+	if ($mysoc->useLocalTax(2))
+	{
+		// Local Tax 2
+		print '<br>';
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
+		print '<td align="right">&nbsp;</td>';
+		print "</tr>\n";
+		$var=true;
 
-        $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        if($conf->global->MAIN_INFO_VALUE_LOCALTAX2!=0)
-        {
-	        print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>';
-	    }
-        print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
-        if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0)
-        {
-        	print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
-        }
-        else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==1)
-        {
-        	print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
-        }
-        else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==2)
-        {
-        	print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
-        }
+		$var=!$var;
+		print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		if($conf->global->MAIN_INFO_VALUE_LOCALTAX2!=0)
+		{
+			print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>';
+		}
+		print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
+		if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0)
+		{
+			print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
+		}
+		else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==1)
+		{
+			print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
+		}
+		else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==2)
+		{
+			print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
+		}
 
-        print '</td></tr>';
-        print "</table>";
-        print "</td></tr>\n";
+		print '</td></tr>';
+		print "</table>";
+		print "</td></tr>\n";
 
-        $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
-        print '<td colspan="2">';
-        print "<table>";
-        print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
-        $example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
-        print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
-        print "</table>";
-        print "</td></tr>\n";
+		$var=!$var;
+		print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print '<td colspan="2">';
+		print "<table>";
+		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
+		$example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
+		print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+		print "</table>";
+		print "</td></tr>\n";
 
-        print "</table>";
-    }
+		print "</table>";
+	}
 
 
-    // Actions buttons
-    print '<div class="tabsAction">';
-    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a></div>';
-    print '</div>';
+	// Actions buttons
+	print '<div class="tabsAction">';
+	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a></div>';
+	print '</div>';
 
-    print '<br>';
+	print '<br>';
 }
 
 
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 48cad667a51..6020cb7947e 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -44,7 +44,7 @@ $list = array(
     'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
     'ACCOUNTING_SERVICE_BUY_ACCOUNT',
     'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
-    'ACCOUNTING_VAT_ACCOUNT',
+    'ACCOUNTING_VAT_SOLD_ACCOUNT',
     'ACCOUNTING_VAT_BUY_ACCOUNT',
     'ACCOUNTING_ACCOUNT_CUSTOMER',
     'ACCOUNTING_ACCOUNT_SUPPLIER'
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 55434d4de2e..0f9213fc252 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -229,8 +229,9 @@ $sql.= ", note";
 $sql.= ", entity";
 $sql.= " FROM ".MAIN_DB_PREFIX."const";
 $sql.= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
-if ((empty($user->entity) || $user->admin) && $debug) {} // to force for superadmin
-else $sql.= " AND visible = 1";			// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
+if ((empty($user->entity) || $user->admin) && $debug) {} 										// to force for superadmin to debug
+else if (! GETPOST('visible') || GETPOST('visible') != 'all') $sql.= " AND visible = 1";		// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
+if (GETPOST('name')) $sql.=natural_search("name", GETPOST('name'));
 $sql.= " ORDER BY entity, name ASC";
 
 dol_syslog("Const::listConstant", LOG_DEBUG);
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d13f43a6ed5..ff99ce5e4bf 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -34,10 +34,12 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
 $langs->load("companies");
+$langs->load("resource");
 
 $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
@@ -70,7 +72,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,0,25,0,26);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,0,25,0,26);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -102,6 +104,7 @@ $tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 $tabname[26]= MAIN_DB_PREFIX."c_units";
 $tabname[27]= MAIN_DB_PREFIX."c_stcomm";
 $tabname[28]= MAIN_DB_PREFIX."c_holiday_types";
+$tabname[29]= MAIN_DB_PREFIX."c_lead_status";
 
 // Dictionary labels
 $tablib=array();
@@ -133,6 +136,7 @@ $tablib[25]= "DictionaryEMailTemplates";
 $tablib[26]= "DictionaryUnits";
 $tablib[27]= "DictionaryProspectStatus";
 $tablib[28]= "DictionaryHolidayTypes";
+$tablib[29]= "DictionaryOpportunityStatus";
 
 // Requests to extract data
 $tabsql=array();
@@ -164,6 +168,7 @@ $tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position,
 $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.delay, h.newByMonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
+$tabsql[29]= "SELECT rowid   as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
@@ -195,6 +200,7 @@ $tabsqlsort[25]="label ASC";
 $tabsqlsort[26]="code ASC";
 $tabsqlsort[27]="code ASC";
 $tabsqlsort[28]="country ASC, code ASC";
+$tabsqlsort[29]="position ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
@@ -222,10 +228,11 @@ $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
 $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24]= "code,label";
-$tabfield[25]= "label,type_template,private,position,topic,content";
+$tabfield[25]= "label,type_template,position,topic,content";
 $tabfield[26]= "code,label,short_label";
 $tabfield[27]= "code,libelle";
 $tabfield[28]= "code,label,delay,newByMonth,country_id,country";
+$tabfield[29]= "code,label,percent,position";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
@@ -253,10 +260,11 @@ $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
 $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24]= "code,label";
-$tabfieldvalue[25]= "label,type_template,private,position,topic,content";
+$tabfieldvalue[25]= "label,type_template,position,topic,content";
 $tabfieldvalue[26]= "code,label,short_label";
 $tabfieldvalue[27]= "code,libelle";
 $tabfieldvalue[28]= "code,label,delay,newByMonth,country";
+$tabfieldvalue[29]= "code,label,percent,position";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
@@ -284,10 +292,11 @@ $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
 $tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24]= "code,label";
-$tabfieldinsert[25]= "label,type_template,private,position,topic,content";
+$tabfieldinsert[25]= "label,type_template,position,topic,content";
 $tabfieldinsert[26]= "code,label,short_label";
 $tabfieldinsert[27]= "code,libelle";
 $tabfieldinsert[28]= "code,label,delay,newByMonth,fk_country";
+$tabfieldinsert[29]= "code,label,percent,position";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -321,6 +330,7 @@ $tabrowid[25]= "";
 $tabrowid[26]= "";
 $tabrowid[27]= "id";
 $tabrowid[28]= "";
+$tabrowid[29]= "";
 
 // Condition to show dictionary in setup page
 $tabcond=array();
@@ -352,37 +362,39 @@ $tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_D
 $tabcond[26]= ! empty($conf->product->enabled);
 $tabcond[27]= ! empty($conf->societe->enabled);
 $tabcond[28]= ! empty($conf->holiday->enabled);
+$tabcond[29]= ! empty($conf->projet->enabled);
 
 // List of help for fields
 $tabhelp=array();
-$tabhelp[1]  = array();
-$tabhelp[2]  = array();
-$tabhelp[3]  = array();
-$tabhelp[4]  = array();
-$tabhelp[5]  = array();
-$tabhelp[6]  = array();
-$tabhelp[7]  = array();
-$tabhelp[8]  = array();
-$tabhelp[9]  = array();
-$tabhelp[10] = array();
+$tabhelp[1]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[2]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[3]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[4]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[5]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[6]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[7]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[8]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[9]  = array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"));
+$tabhelp[10] = array('taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc"));
 $tabhelp[11] = array();
-$tabhelp[12] = array();
-$tabhelp[13] = array();
-$tabhelp[14] = array();
-$tabhelp[15] = array();
-$tabhelp[16] = array();
-$tabhelp[17] = array();
-$tabhelp[18] = array();
-$tabhelp[19] = array();
-$tabhelp[20] = array();
-$tabhelp[21] = array();
-$tabhelp[22] = array();
+$tabhelp[12] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[13] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[14] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[15] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[16] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[17] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[18] = array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"));
+$tabhelp[19] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[20] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array();
-$tabhelp[24] = array();
-$tabhelp[25] = array();
-$tabhelp[26] = array();
-$tabhelp[27] = array();
-$tabhelp[28] = array();
+$tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[25] = array('type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[28] = array('delay'=>$langs->trans("MinimumNoticePeriod"), 'newByMonth'=>$langs->trans("NbAddedAutomatically"));
+$tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck=array();
@@ -414,6 +426,7 @@ $tabfieldcheck[25] = array();
 $tabfieldcheck[26] = array();
 $tabfieldcheck[27] = array();
 $tabfieldcheck[28] = array();
+$tabfieldcheck[29] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
@@ -457,6 +470,24 @@ if ($id == 11)
 			'external' => $langs->trans('External')
 	);
 }
+if ($id == 25)
+{
+	// We save list of template type Dolibarr can manage. This list can found by a grep into code on "->param['models']"
+	$elementList = array(
+			'propal_send'    => $langs->trans('MailToSendProposal'),
+			'order_send'     => $langs->trans('MailToSendOrder'),
+			'facture_send'   => $langs->trans('MailToSendInvoice'),
+
+			'shipping_send'  => $langs->trans('MailToSendShipment'),
+			'fichinter_send' => $langs->trans('MailToSendIntervention'),
+
+			'askpricesupplier_send'  => $langs->trans('MailToSendSupplierRequestForQuotation'),
+			'order_supplier_send'    => $langs->trans('MailToSendSupplierOrder'),
+			'invoice_supplier_send'  => $langs->trans('MailToSendSupplierInvoice'),
+
+			'thirdparty'    => $langs->trans('MailToThirdparty')
+	);
+}
 
 // Define localtax_typeList (used for dictionary "llx_c_tva")
 $localtax_typeList = array();
@@ -803,7 +834,6 @@ if ($action == 'delete')
  */
 if ($id)
 {
-
     // Complete requete recherche valeurs avec critere de tri
     $sql=$tabsql[$id];
 
@@ -858,9 +888,9 @@ if ($id)
 				else $valuetoshow=$langs->trans("Amount");
 				$align='right';
             }
-            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 2",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
             if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2";}
-            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 3",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
             if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3";}
             if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
             if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
@@ -892,6 +922,7 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
             if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
 	        if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
+            if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 
             if ($id == 2)	// Special cas for state page
             {
@@ -913,7 +944,7 @@ if ($id)
         if ($id == 4) print '<td></td>';
         print '<td colspan="4">';
         print '<input type="hidden" name="id" value="'.$id.'">';
-        print '&nbsp;</td>';
+        print '</td>';
         print '</tr>';
 
         // Line to enter new values
@@ -935,29 +966,43 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-        if ($id == 3)
+        if ($id == 3) unset($fieldlist[2]);
+
+        if (empty($reshook))
         {
-        	unset($fieldlist[2]);
+        	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
+        	{
+				fieldList($fieldlist,$obj,$tabname[$id],'hide');
+        	}
+        	else
+        	{
+        		fieldList($fieldlist,$obj,$tabname[$id],'add');
+        	}
         }
 
-        if (empty($reshook)) fieldList($fieldlist,$obj);
-
         if ($id == 4) print '<td></td>';
-        print '<td colspan="3" align="right"><input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'"></td>';
+        print '<td colspan="3" align="right">';
+        if ($tabname[$id] != MAIN_DB_PREFIX.'c_email_templates' || $action != 'edit')
+        {
+        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+        }
+        print '</td>';
         print "</tr>";
 
         $colspan=count($fieldlist)+2;
         if ($id == 4) $colspan++;
 
-        if (! empty($alabelisused))  // Si un des champs est un libelle
+        if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
         {
         	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
         }
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
+        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
     print '</form>';
 
+
+
     // List of available values in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
     $resql=$db->query($sql);
@@ -972,7 +1017,7 @@ if ($id)
             if ($num > $listlimit)
             {
                 print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
-                print_fleche_navigation($page,$_SERVER["PHP_SELF"],'&id='.$id,($num > $listlimit),$langs->trans("Page").' '.($page+1));
+                print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$id, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
                 print '</td></tr>';
             }
 
@@ -1002,9 +1047,9 @@ if ($id)
 					else $valuetoshow=$langs->trans("Amount");
 					$align='right';
 	            }
-                if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 2",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
+                if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
                 if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $sortable=0; }
-                if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 3",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
+                if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
                 if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $sortable=0; }
                 if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
                 if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
@@ -1030,6 +1075,7 @@ if ($id)
                 if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
                 if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
 	            if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
+            	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 
                 // Affiche nom du champ
                 if ($showfield)
@@ -1065,7 +1111,7 @@ if ($id)
                     $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id]);
+                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
 
                     print '<td colspan="3" align="right"><a name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
@@ -1085,6 +1131,10 @@ if ($id)
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->$fieldlist[$field];
+                            if ($value == 'type_template')
+                            {
+                                $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                            }
                             if ($value == 'element')
                             {
                                 $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
@@ -1381,21 +1431,24 @@ $db->close();
  * 	@param		array	$fieldlist		Array of fields
  * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
  *  @param		string	$tabname		Name of SQL table
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist,$obj='',$tabname='')
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
 {
 	global $conf,$langs,$db;
 	global $form;
 	global $region_id;
 	global $elementList,$sourceList,$localtax_typeList;
+	global $bc;
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
-		if ($fieldlist[$field] == 'country') {
+		if ($fieldlist[$field] == 'country')
+		{
 			if (in_array('region_id',$fieldlist))
 			{
 				print '<td>';
@@ -1408,7 +1461,8 @@ function fieldList($fieldlist,$obj='',$tabname='')
 			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28);
 			print '</td>';
 		}
-		elseif ($fieldlist[$field] == 'country_id') {
+		elseif ($fieldlist[$field] == 'country_id')
+		{
 			if (! in_array('country',$fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
 				$country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
@@ -1417,22 +1471,32 @@ function fieldList($fieldlist,$obj='',$tabname='')
 				print '</td>';
 			}
 		}
-		elseif ($fieldlist[$field] == 'region') {
+		elseif ($fieldlist[$field] == 'region')
+		{
 			print '<td>';
 			$formcompany->select_region($region_id,'region');
 			print '</td>';
 		}
-		elseif ($fieldlist[$field] == 'region_id') {
+		elseif ($fieldlist[$field] == 'region_id')
+		{
 			$region_id = (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:0);
 			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
 			print '</td>';
 		}
-		elseif ($fieldlist[$field] == 'lang') {
+		elseif ($fieldlist[$field] == 'lang')
+		{
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
 			print '</td>';
 		}
+		// Le type de template
+		elseif ($fieldlist[$field] == 'type_template')
+		{
+			print '<td>';
+			print $form->selectarray('type_template', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+			print '</td>';
+		}
 		// Le type de l'element (pour les type de contact)
 		elseif ($fieldlist[$field] == 'element')
 		{
@@ -1465,9 +1529,25 @@ function fieldList($fieldlist,$obj='',$tabname='')
 			print '<input type="text" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
-		elseif (in_array($fieldlist[$field], array('libelle_facture','content'))) {
+		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
 			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea></td>';
 		}
+		elseif (in_array($fieldlist[$field], array('content')))
+		{
+			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
+			{
+				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
+			}
+			else print '<td>';
+			if ($context != 'hide')
+			{
+				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea>';
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%');
+				print $doleditor->Create(1);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
 		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
 			print '<td><input type="text" class="flat" value="'.price((! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'')).'" size="8" name="'.$fieldlist[$field].'"></td>';
 		}
@@ -1496,6 +1576,8 @@ function fieldList($fieldlist,$obj='',$tabname='')
 		{
 			print '<td>';
 			$size='';
+			if ($fieldlist[$field]=='code') $size='size="8" ';
+			if ($fieldlist[$field]=='position') $size='size="4" ';
 			if ($fieldlist[$field]=='libelle') $size='size="32" ';
 			if ($fieldlist[$field]=='tracking') $size='size="92" ';
 			if ($fieldlist[$field]=='accountancy_code') $size='size="10" ';
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index eb21636126a..15c810f46c5 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -146,6 +146,10 @@ if ($action == 'setModuleOptions')
 else if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
+	if ($ret > 0 && empty($conf->global->EXPENSEREPORT_ADDON_PDF))
+	{
+		dolibarr_set_const($db, 'EXPENSEREPORT_ADDON_PDF', $value,'chaine',0,'',$conf->entity);
+	}
 }
 
 else if ($action == 'del')
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 398999d6dd9..c1baf0bc979 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -45,10 +45,10 @@ $action = GETPOST('action');
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
 
 // List of supported permanent search area
-$searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT");
-$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT);
-$searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$langs->trans("ProductsAndServices"),$langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')',$langs->trans("Members"));
-$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name');
+$searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT");
+$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT);
+$searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"));
+$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module400Name');
 
 
 if ($action == 'update')
@@ -68,11 +68,20 @@ if ($action == 'update')
 
 	dolibarr_set_const($db, "MAIN_THEME",						$_POST["main_theme"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT",			$_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity);
+	$val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
+	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', join(',',colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())),'chaine',0,'',$conf->entity);
+
+	$val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
+	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity);
+
+    dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT",			$_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE",			$_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",	$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",			$_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_PROJECT",			$_POST["MAIN_SEARCHFORM_PROJECT"],'chaine',0,'',$conf->entity);
 
 	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK",		$_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
 	dolibarr_set_const($db, "MAIN_MOTD",						dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
@@ -147,7 +156,7 @@ if ($action == 'edit')	// Edit
 
 	print '</table><br>'."\n";
 
-    // Themes
+    // Themes and themes options
     show_theme(null,1);
     print '<br>';
 
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 53937687b57..148fcf76268 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -230,7 +230,6 @@ $linuxlike=1;
 if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
 if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
 
-
 if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail';
 $port=! empty($conf->global->MAIN_MAIL_SMTP_PORT)?$conf->global->MAIN_MAIL_SMTP_PORT:ini_get('smtp_port');
 if (! $port) $port=25;
@@ -275,8 +274,21 @@ if ($action == 'edit')
                             ';
 		if ($linuxlike)
 		{
-			print '         jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);';
-			print '         jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);';
+			print '
+			               jQuery("#MAIN_MAIL_SMTP_SERVER").hide();
+			               jQuery("#MAIN_MAIL_SMTP_PORT").hide();
+			               jQuery("#smtp_server_mess").show();
+			               jQuery("#smtp_port_mess").show();
+			               ';
+		}
+		else
+		{
+			print '
+			               jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);
+			               jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);
+			               jQuery("#smtp_server_mess").hide();
+			               jQuery("#smtp_port_mess").hide();
+			               ';
 		}
 		print '
                         }
@@ -287,7 +299,11 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr("disabled");
-                        }
+                            jQuery("#MAIN_MAIL_SMTP_SERVER").show();
+                            jQuery("#MAIN_MAIL_SMTP_PORT").show();
+                            jQuery("#smtp_server_mess").hide();
+			                jQuery("#smtp_port_mess").hide();
+						}
                     }
                     initfields();
                     jQuery("#MAIN_MAIL_SENDMODE").change(function() {
@@ -336,7 +352,7 @@ if ($action == 'edit')
 	}
 	print '</td></tr>';
 
-	// Server
+	// Host server
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
@@ -357,6 +373,7 @@ if ($action == 'edit')
 		{
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $mainserver . '">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="' . $mainserver . '">';
+			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		}
 		else
 		{
@@ -389,6 +406,7 @@ if ($action == 'edit')
 		{
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" size="3" value="' . $mainport . '">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="' . $mainport . '">';
+			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		}
 		else
 		{
@@ -509,7 +527,7 @@ else
 	print $text;
 	print '</td></tr>';
 
-	// Server
+	// Host server
 	$var=!$var;
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index afa33e6b38f..ffa97b5b87b 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -172,7 +172,7 @@ jQuery(document).ready(function() {
   var compcssstring;
   getcssurl = $.ajax({
     type: "GET",
-    url: \''.DOL_URL_ROOT.'/includes/jquery/css/smoothness/jquery-ui-latest.custom.css\',
+    url: \''.DOL_URL_ROOT.'/includes/jquery/css/smoothness/jquery-ui.custom.css\',
     cache: false,
     /* async: false, */
     /*crossDomain: true, */
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index bcbf11cfdb2..3f8ecca00d9 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -2,7 +2,8 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +34,11 @@ if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 
+// Other parameters ACCOUNTING_*
+$list = array (
+		'ACCOUNTING_VAT_PAY_ACCOUNT'
+);
+
 /*
  * Actions
  */
@@ -51,9 +57,11 @@ $action = GETPOST('action','alpha');
 
 $tax_mode = empty($conf->global->TAX_MODE)?0:$conf->global->TAX_MODE;
 
-if ($action == 'settaxmode')
-{
-    $tax_mode = GETPOST('tax_mode','alpha');
+if ($action == 'update') {
+    $error = 0;
+
+	// Tax mode
+	$tax_mode = GETPOST('tax_mode','alpha');
 
     $db->begin();
 
@@ -79,38 +87,24 @@ if ($action == 'settaxmode')
     $res = dolibarr_set_const($db, 'TAX_MODE_BUY_SERVICE', $value,'chaine',0,'',$conf->entity);
     if (! $res > 0) $error++;
 
-    if (! $error)
-    {
+	// Others options
+    foreach ($list as $constname) {
+        $constvalue = GETPOST($constname, 'alpha');
+
+        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+            $error++;
+        }
+    }
+
+    if (! $error) {
         $db->commit();
         setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
+    } else {
         $db->rollback();
         setEventMessage($langs->trans("Error"),'errors');
     }
-
-
 }
 
-/*
- if ($_POST['action'] == 'update' || $_POST['action'] == 'add')
- {
- if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : '',$conf->entity));
- {
- print $db->error();
- }
- }
-
- if ($_GET['action'] == 'delete')
- {
- if (! dolibarr_del_const($db, $_GET['constname'],$conf->entity));
- {
- print $db->error();
- }
- }
- */
-
 
 /*
  * View
@@ -122,7 +116,8 @@ $form=new Form($db);
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
 
-print '<br>';
+dol_fiche_head();
+
 if (empty($mysoc->tva_assuj))
 {
     print $langs->trans("YourCompanyDoesNotUseVAT").'<br>';
@@ -134,29 +129,28 @@ else
     // Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="settaxmode">';
+    print '<input type="hidden" name="action" value="update">';
+
     print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans('OptionVatMode').'</td><td>'.$langs->trans('Description').'</td>';
-    print '<td align="right"><input class="button" type="submit" value="'.$langs->trans('Modify').'"></td>';
+    print '<td colspan="2">'.$langs->trans('OptionVatMode').'</td><td>'.$langs->trans('Description').'</td>';
     print "</tr>\n";
     print '<tr '.$bc[false].'><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
     print '<td colspan="2">'.nl2br($langs->trans('OptionVatDefaultDesc'));
     print "</td></tr>\n";
     print '<tr '.$bc[true].'><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
     print '<td colspan="2">'.nl2br($langs->trans('OptionVatDebitOptionDesc'))."</td></tr>\n";
-    print '</form>';
 
     print "</table>\n";
 
-    print '<br><br>';
+    print '<br>';
     print_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'','');
     //print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')';
 
-    print '<table class="border" width="100%">';
-    print '<tr><td>&nbsp;</td><td>'.$langs->trans("Buy").'</td><td>'.$langs->trans("Sell").'</td></tr>';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td>&nbsp;</td><td>'.$langs->trans("Buy").'</td><td>'.$langs->trans("Sell").'</td></tr>';
 
     // Products
-    print '<tr><td>'.$langs->trans("Product").'</td>';
+    print '<tr '.$bc[false].'><td>'.$langs->trans("Product").'</td>';
     print '<td>';
     print $langs->trans("OnDelivery");
     print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
@@ -167,7 +161,7 @@ else
     print '</td></tr>';
 
     // Services
-    print '<tr><td>'.$langs->trans("Services").'</td>';
+    print '<tr '.$bc[true].'><td>'.$langs->trans("Services").'</td>';
     print '<td>';
     if ($tax_mode == 0)
     {
@@ -196,6 +190,42 @@ else
     print '</table>';
 }
 
+print "<br>\n";
+
+/*
+ *  Others params
+ */
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
+print "</tr>\n";
+
+foreach ($list as $key)
+{
+	$var=!$var;
+
+	print '<tr '.$bc[$var].' class="value">';
+
+	// Param
+	$label = $langs->trans($key); 
+	print '<td><label for="'.$key.'">'.$label.'</label></td>';
+
+	// Value
+	print '<td>';
+	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td></tr>';
+}
+
+print '</table>';
+
+dol_fiche_end();
+
+print '<div class="center">';
+print '<input type="submit" class="button" value="' . $langs->trans("Modify") . '" name="button">';
+print '</div>';
+
+print '</form>';
+
 $db->close();
 
 llxFooter();
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 72280ec7220..0ff5e5f1373 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -190,7 +190,7 @@ if ($result)
 	print_liste_field_titre($langs->trans("IP"),$_SERVER["PHP_SELF"],"e.ip","","",'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"u.login","","",'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"e.description","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre('','','');
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index efa3ffb91c0..c313c91a7bd 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -134,7 +134,7 @@ if ($savehandler == 'files')
 	print_liste_field_titre($langs->trans("DateModification"),$_SERVER["PHP_SELF"],"datem","","",'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Age"),$_SERVER["PHP_SELF"],"age","","",'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Raw"),$_SERVER["PHP_SELF"],"raw","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre('','','');
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 	$var=True;
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 12b61d80419..bd8f2194fe4 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2014-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -211,7 +211,7 @@ if ($conf->societe->enabled)
 {
 	$nbno=$nbtotal=0;
 
-	print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','');
+	print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','object_company');
 	print '<br>'."\n";
 	$sql="SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''";
 	$resql=$db->query($sql);
@@ -236,7 +236,7 @@ if ($conf->societe->enabled)
 	print '<br><input class="button" type="submit" id="submitformbarcodethirdpartygen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode"))?'':'disabled ').'value="'.$langs->trans("InitEmptyBarCode",$nbno).'"';
 	print ' title="'.dol_escape_htmltag($langs->trans("FeatureNotYetAvailable")).'" disabled';
 	print '>';
-	print '<br><br><br>';
+	print '<br><br><br><br>';
 }
 
 
@@ -252,7 +252,7 @@ if ($conf->product->enabled || $conf->product->service)
 
 	$nbno=$nbtotal=0;
 
-	print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','');
+	print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','object_product');
 	print '<br>'."\n";
 
 	$sql ="SELECT count(rowid) as nb, fk_product_type, datec";
@@ -312,7 +312,7 @@ if ($conf->product->enabled || $conf->product->service)
 	$moretags2=(($nbno == $nbtotal)?' disabled':'');
 	print ' &nbsp; ';
 	print '<input class="button" type="submit" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">';
-	print '<br><br><br>';
+	print '<br><br><br><br>';
 }
 
 
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index be821f72af9..7512785d78b 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -103,7 +103,7 @@ if ($resql)
     print_liste_field_titre($langs->trans("Owner"),$_SERVER["PHP_SELF"],"u.lastname","","",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"b.dateb","","",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Position"),$_SERVER["PHP_SELF"],"b.position","","",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('','','');
+    print_liste_field_titre('');
     print "</tr>\n";
 
     $var=True;
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index b9335e80446..02465625478 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -206,8 +206,8 @@ $langs->load("cashdesk");
 				<td>
 				<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
 				<?php
-				echo $langs->trans("DateEcheance").' :';
-				print $form->select_date(-1,'txtDatePaiement');
+				print $langs->trans("DateEcheance").' :';
+				print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1);
 				?>
  				</td>
 			</tr>
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 2a41d318ff5..fcfa8f9b910 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -160,7 +160,7 @@ foreach($fulltree as $key => $val)
 }
 
 
-print '<table class="liste" width="100%">';
+print '<table class="liste nohover" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td></td><td align="right">';
 if (! empty($conf->use_javascript_ajax))
 {
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 98fe5299a5e..75d18dd8cd5 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -924,9 +924,66 @@ if ($id > 0)
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
 		if (GETPOST("afaire") == 1) $form->select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
 		else if (GETPOST("afaire") == 2) $form->select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+		//else $form->select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend','ap');
 		else $form->select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
 		print '</td></tr>';
 
+		$userepeatevent=0;	// Dev in progress
+		if ($userepeatevent)
+		{
+			// Repeat
+			print '<tr><td>'.$langs->trans("RepeatEvent").'</td><td colspan="3">';
+			print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
+			$arrayrecurrulefreq=array(
+					'no'=>$langs->trans("No"),
+					'MONTHLY'=>$langs->trans("EveryMonth"),
+					'WEEKLY'=>$langs->trans("EveryWeek"),
+					//'DAYLY'=>$langs->trans("EveryDay")
+					);
+			$selectedrecurrulefreq='no';
+			$selectedrecurrulebymonthday='';
+			$selectedrecurrulebyday='';
+			if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i',$object->recurrule,$reg)) $selectedrecurrulefreq=$reg[1];
+			if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i',$object->recurrule,$reg)) $selectedrecurrulebymonthday=$reg[1];
+			if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i',$object->recurrule,$reg)) $selectedrecurrulebyday=$reg[1];
+			print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq);
+			// If recurrulefreq is MONTHLY
+			print '<div class="repeateventBYMONTHDAY">';
+			print $langs->trans("DayOfMonth").': <input type="input" size="2" name="BYMONTHDAY" value="'.$selectedrecurrulebymonthday.'">';
+			print '</div>';
+			// If recurrulefreq is WEEKLY
+			print '<div class="repeateventBYDAY">';
+			print $langs->trans("DayOfWeek").': <input type="input" size="4" name="BYDAY" value="'.$selectedrecurrulebyday.'">';
+			print '</div>';
+			print '<script type="text/javascript" language="javascript">
+				jQuery(document).ready(function() {
+					function init_repeat()
+					{
+						if (jQuery("#recurrulefreq").val() == \'MONTHLY\')
+						{
+							jQuery(".repeateventBYMONTHDAY").show();
+							jQuery(".repeateventBYDAY").hide();
+						}
+						else if (jQuery("#recurrulefreq").val() == \'WEEKLY\')
+						{
+							jQuery(".repeateventBYMONTHDAY").hide();
+							jQuery(".repeateventBYDAY").show();	
+						}
+						else
+						{
+							jQuery(".repeateventBYMONTHDAY").hide();
+							jQuery(".repeateventBYDAY").hide();
+						}
+					}
+					init_repeat();
+					jQuery("#recurrulefreq").change(function() {
+						init_repeat();
+					});
+				});
+				</script>';	
+			print '</td></tr>';
+		}
+
 		// Status
 		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
 		$percent=GETPOST("percentage")?GETPOST("percentage"):$object->percentage;
@@ -992,7 +1049,7 @@ if ($id > 0)
 			print '</td>';
 
 			// Contact
-			print '<td>'.$langs->trans("Contact").'</td><td width="30%">';
+			print '<td>'.$langs->trans("Contact").'</td><td>';
 			$form->select_contacts($object->socid, $object->contactid, 'contactid', 1, '', '', 0, 'minwidth200');
 			print '</td></tr>';
 		}
@@ -1000,17 +1057,15 @@ if ($id > 0)
 		// Project
 		if (! empty($conf->projet->enabled))
 		{
-
 			$formproject=new FormProjets($db);
 
-			// Projet associe
 			$langs->load("project");
 
 			print '<tr><td width="30%">'.$langs->trans("Project").'</td><td colspan="3">';
 			$numprojet=$formproject->select_projects($object->socid,$object->fk_project,'projectid');
 			if ($numprojet==0)
 			{
-				print ' &nbsp; <a href="../../projet/card.php?socid='.$object->socid.'&action=create">'.$langs->trans("AddProject").'</a>';
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->socid.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit').'">'.$langs->trans("AddProject").'</a>';
 			}
 			print '</td></tr>';
 		}
@@ -1065,7 +1120,7 @@ if ($id > 0)
 		if($action == 'clone')
 		{
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . GETPOST('id'), $langs->trans('CloneAction'), $langs->trans('ConfirmCloneAction', $object->label), 'confirm_clone', $formquestion, 'yes', 1);
-			
+
 			print $formconfirm;
 		}
 
@@ -1275,7 +1330,7 @@ if ($id > 0)
 			{
 				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
-			
+
 			if ($user->rights->agenda->allactions->create ||
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
@@ -1285,7 +1340,7 @@ if ($id > 0)
 			{
 				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("ToClone").'</a></div>';
 			}
-			
+
 			if ($user->rights->agenda->allactions->delete ||
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete))
 			{
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index e5472727aa2..c414d3409d6 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -341,11 +341,14 @@ dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
 print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,0,$filtert,0,$pid,$socid,$action,$listofextcals,$actioncode,$usergroup);
 dol_fiche_end();
 
+
+// Define the legend/list of calendard to show
+$s=''; $link='';
+
 $showextcals=$listofextcals;
-// Legend
-if (! empty($conf->use_javascript_ajax))
+
+if (! empty($conf->use_javascript_ajax))	// If javascript on
 {
-	$s='';
 	$s.='<script type="text/javascript">' . "\n";
 	$s.='jQuery(document).ready(function () {' . "\n";
 	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
@@ -358,7 +361,10 @@ if (! empty($conf->use_javascript_ajax))
   	$s.='});' . "\n";
 	$s.='</script>' . "\n";
 
+	// Local calendar
 	$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+
+	// External calendars
 	if (is_array($showextcals) && count($showextcals) > 0)
 	{
 		$s.='<script type="text/javascript">' . "\n";
@@ -377,13 +383,23 @@ if (! empty($conf->use_javascript_ajax))
 			$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val['name'] . ' &nbsp; </div>';
 		}
 	}
+
+	// Birthdays
 	$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+
+	// Calendars from hooks
+    $parameters=array(); $object=null;
+	$reshook=$hookmanager->executeHooks('addCalendarChoice',$parameters,$object,$action);
+    if (empty($reshook))
+    {
+		$s.= $hookmanager->resPrint;
+    }
+    elseif ($reshook > 1)
+	{
+    	$s = $hookmanager->resPrint;
+    }
 }
-
-
-$link='';
-// Add link to show birthdays
-if (empty($conf->use_javascript_ajax))
+else 									// If javascript off
 {
 	$newparam=$param;   // newparam is for birthday links
     $newparam=preg_replace('/showbirthday=[0-1]/i','showbirthday='.(empty($showbirthday)?1:0),$newparam);
@@ -396,10 +412,10 @@ if (empty($conf->use_javascript_ajax))
     $link.='</a>';
 }
 
-print_fiche_titre($s,$link.' &nbsp; &nbsp; '.$nav, '');
+print_fiche_titre($s, $link.' &nbsp; &nbsp; '.$nav, '');
 
 
-// Get event in an array
+// Load events from database into $eventarray
 $eventarray=array();
 
 $sql = 'SELECT ';
@@ -470,6 +486,7 @@ if ($filtert > 0 || $usergroup > 0)
 $sql.= ' ORDER BY datep';
 //print $sql;
 
+
 dol_syslog("comm/action/index.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
@@ -571,6 +588,7 @@ else
     dol_print_error($db);
 }
 
+// Complete $eventarray with birthdates
 if ($showbirthday)
 {
     // Add events in array
@@ -638,6 +656,7 @@ if ($showbirthday)
     }
 }
 
+// Complete $eventarray with external import Ical
 if (count($listofextcals))
 {
     require_once DOL_DOCUMENT_ROOT.'/comm/action/class/ical.class.php';
@@ -878,6 +897,15 @@ if (count($listofextcals))
     }
 }
 
+
+
+// Complete $eventarray with events coming from external module
+$parameters=array(); $object=null;
+$reshook=$hookmanager->executeHooks('getCalendarEvents',$parameters,$object,$action);
+if (! empty($hookmanager->resArray['eventarray'])) $eventarray=array_merge($eventarray, $hookmanager->resArray['eventarray']);
+
+
+
 $maxnbofchar=18;
 $cachethirdparties=array();
 $cachecontacts=array();
diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php
index bfbcc9d4273..3fe244c7396 100644
--- a/htdocs/comm/askpricesupplier/card.php
+++ b/htdocs/comm/askpricesupplier/card.php
@@ -1768,8 +1768,11 @@ if ($action == 'create')
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div class="clearboth"></div>';
 		print '<br>';
-		print_titre($langs->trans('SendAskByMail'));
+		print_fiche_titre($langs->trans('SendAskByMail'));
+
+		dol_fiche_head('');
 
 		// Create form object
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
@@ -1816,7 +1819,7 @@ if ($action == 'create')
 
 		print $formmail->get_form();
 
-		print '<br>';
+		dol_fiche_end();
 	}
 }
 
diff --git a/htdocs/comm/askpricesupplier/index.php b/htdocs/comm/askpricesupplier/index.php
index 2f943cef083..4eddadf3803 100644
--- a/htdocs/comm/askpricesupplier/index.php
+++ b/htdocs/comm/askpricesupplier/index.php
@@ -131,7 +131,7 @@ if ($resql)
     }
     if ($conf->use_javascript_ajax)
     {
-        print '<tr><td align="center" colspan="2">';
+        print '<tr '.$bc[false].'><td align="center" colspan="2">';
         $data=array('series'=>$dataseries);
         dol_print_graph('stats',300,180,$data,1,'pie',1);
         print '</td></tr>';
diff --git a/htdocs/comm/askpricesupplier/list.php b/htdocs/comm/askpricesupplier/list.php
index bce521489e0..2e78045b308 100644
--- a/htdocs/comm/askpricesupplier/list.php
+++ b/htdocs/comm/askpricesupplier/list.php
@@ -270,22 +270,22 @@ if ($result)
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);	
+	print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('AskPriceSupplierDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
-	print '</td>';	
+	print '</td>';
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
 	print '</td>';
-	
+
 	// Date
 	print '<td class="liste_titre" colspan="1" align="center">';
 	//print $langs->trans('Month').': ';
@@ -294,7 +294,7 @@ if ($result)
 	$syear = $year;
 	$formother->select_year($syear,'year',1, 20, 5);
 	print '</td>';
-		
+
 	// Amount
 	print '<td class="liste_titre" align="right">';
 	print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$search_montant_ht.'">';
@@ -353,7 +353,7 @@ if ($result)
 		print '</td></tr></table>';
 
 		print "</td>\n";
-		
+
 		$url = DOL_URL_ROOT.'/comm/card.php?socid='.$objp->rowid;
 
 		// Company
@@ -364,12 +364,12 @@ if ($result)
 		print '<td>';
 		print $companystatic->getNomUrl(1,'customer');
 		print '</td>';
-		
+
 		// Date askprice
 		print '<td align="center">';
 		print dol_print_date($db->jdate($objp->dp), 'day');
 		print "</td>\n";
-		
+
 		print '<td align="right">'.price($objp->total_ht)."</td>\n";
 
 		$userstatic->id=$objp->fk_user_author;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 6bf5c5a5dca..aa0a2f8b61a 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -410,17 +410,19 @@ if ($id > 0)
 		print '</td><td colspan="3">';
 		$limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
 		print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
+		if (empty($object->outstanding_limit)) print $langs->trans("NoLimit");
 		// display amount and link to unpaid bill
 		$outstandingBills = $object->get_OutstandingBill();
-		if ($outstandingBills != 0)
+		print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
+		print price($outstandingBills, '', $langs, 0, 0, - 1, $conf->currency);
+		if ($object->outstanding_limit != '') 
 		{
-			print ' ('.$langs->trans("CurrentOutstandingBill");
-			print ' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'&search_status=1">';
-			print price($outstandingBills, '', $langs, 0, -1, -1, $conf->currency);
-			print '</a>';
-			if ($outstandingBills > $object->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
-			print ')';
+			if ($outstandingBills > $object->outstanding_limit)
+				print img_warning($langs->trans("OutstandingBillReached"));
+			//print ' / ' . price($soc->outstanding_limit);
 		}
+		print ')';
+		
 		print '</td>';
 		print '</tr>';
 	}
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index a80796fe574..7bdbaf99b80 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -131,8 +131,8 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin, $param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param,"",$sortfield,$sortorder);
-	print '<td class="liste_titre">'.$langs->trans("Email").'</td>';
-	print '<td class="liste_titre">'.$langs->trans("Phone").'</td>';
+	print_liste_field_titre($langs->trans("Email"));
+	print_liste_field_titre($langs->trans("Phone"));
 	print "</tr>\n";
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'?type='.$_GET["type"].'" method="GET">';
diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php
index cf5bacc5e25..126ffc5f470 100644
--- a/htdocs/comm/list.php
+++ b/htdocs/comm/list.php
@@ -55,7 +55,7 @@ $search_zipcode=GETPOST("search_zipcode");
 $search_town=GETPOST("search_town");
 $search_code=GETPOST("search_code");
 $search_compta=GETPOST("search_compta");
-$search_status		= GETPOST("search_status",'int');
+$search_status= GETPOST("search_status",'int');
 
 // Load sale and categ filters
 $search_sale  = GETPOST("search_sale",'int');
@@ -66,6 +66,7 @@ if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id;
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('customerlist'));
+$extrafields = new ExtraFields($db);
 
 
 /*
@@ -107,6 +108,12 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url);
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.zip, s.town, st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta, s.status as status,";
 $sql.= " s.datec, s.canvas";
 if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+// Add fields for extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
 if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
@@ -116,33 +123,22 @@ $sql.= " AND s.client IN (1, 3)";
 $sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
 if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";
 if ($socid) $sql.= " AND s.rowid = ".$socid;
-if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+if ($search_sale > 0)    $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
 if ($catid > 0)          $sql.= " AND cs.fk_categorie = ".$catid;
 if ($catid == -2)        $sql.= " AND cs.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql.= " AND cs.fk_categorie = ".$search_categ;
 if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_company) {
-	$sql .= natural_search(
-		array(
-			's.nom',
-			's.name_alias'
-		),
-		$search_company
-	);
-}
-if ($search_zipcode) $sql.= " AND s.zip LIKE '".$db->escape($search_zipcode)."%'";
-if ($search_town) {
-	$sql .= natural_search('s.town', $search_town);
-}
-if ($search_code)  $sql.= " AND s.code_client LIKE '%".$db->escape($search_code)."%'";
-if ($search_compta) $sql.= " AND s.code_compta LIKE '%".$db->escape($search_compta)."%'";
-
-if ($search_status!='') $sql .= " AND s.status = ".$db->escape($search_status);
-// Insert sale filter
-if ($search_sale > 0)
-{
-	$sql .= " AND sc.fk_user = ".$search_sale;
-}
+if ($search_company)     $sql.= natural_search(array('s.nom', 's.name_alias'), $search_company);
+if ($search_zipcode)     $sql.= natural_search("s.zip", $search_zipcode);
+if ($search_town)        $sql.= natural_search('s.town', $search_town);
+if ($search_code)        $sql.= natural_search("s.code_client", $search_code);
+if ($search_compta)      $sql.= natural_search("s.code_compta", $search_compta);
+if ($search_status!='')  $sql.= " AND s.status = ".$db->escape($search_status);
+if ($search_sale > 0)    $sql.= " AND sc.fk_user = ".$search_sale;
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 
 // Count total nb of records
 $nbtotalofrecords = 0;
@@ -190,6 +186,9 @@ if ($result)
 	{
 		print '<div class="liste_titre">';
 	    print $moreforfilter;
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	print $hookmanager->resPrint;
 	    print '</div>';
 	}
 
@@ -202,11 +201,12 @@ if ($result)
 	print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","",$param,'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre('');
     $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print "</tr>\n";
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
 
@@ -234,6 +234,10 @@ if ($result)
     print '&nbsp;';
     print '</td>';
 
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
     print '<td class="liste_titre" align="center">';
     print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
@@ -242,9 +246,6 @@ if ($result)
     print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print '</td>';
 
-    $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-
     print '</tr>'."\n";
 
 
@@ -272,12 +273,15 @@ if ($result)
         print '<td>'.$obj->code_client.'</td>';
         print '<td>'.$obj->code_compta.'</td>';
         print '<td align="right">'.dol_print_date($db->jdate($obj->datec),'day').'</td>';
-        print '<td align="center">'.$thirdpartystatic->getLibStatut(3);
-        print '</td>';
-        print '<td></td>';
 
         $parameters=array('obj' => $obj);
-        $formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+	    print $hookmanager->resPrint;
+
+        print '<td align="center">'.$thirdpartystatic->getLibStatut(3);
+        print '</td>';
+
+        print '<td></td>';
 
         print "</tr>\n";
 		$i++;
@@ -285,7 +289,8 @@ if ($result)
 	$db->free($result);
 
 	$parameters=array('sql' => $sql);
-	$formconfirm=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print "</table>\n";
 	print "</form>\n";
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 91082646913..b7d4f909fa7 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -992,6 +992,9 @@ else
 
 			// Print mail content
 			print_fiche_titre($langs->trans("EMail"),'','');
+
+			dol_fiche_head('');
+
 			print '<table class="border" width="100%">';
 
 			// Subject
@@ -1042,7 +1045,8 @@ else
 			print '</tr>';
 
 			print '</table>';
-			print "<br>";
+
+			dol_fiche_end();
 		}
 		else
 		{
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index ff129a557e8..99c73dc4837 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2013 Laurent Destailleur  <eldy@uers.sourceforge.net>
+ * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@uers.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
  *
@@ -408,25 +408,17 @@ if ($object->fetch($id) >= 0)
 		print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
-
 		// Date sending
 		if ($object->statut < 2)
 		{
-			print '<td class="liste_titre">&nbsp;</td>';
+			print_liste_field_titre('');
 		}
 		else
 		{
 			print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
 		}
-
-		// Statut
 		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
-
-		//Search Icon
-		print '<td class="liste_titre">';
-		print '&nbsp';
-		print '</td>';
-
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 		print '</tr>';
 
 		// Ligne des champs de filtres
@@ -463,8 +455,7 @@ if ($object->fetch($id) >= 0)
 		//Search Icon
 		print '<td class="liste_titre" align="right">';
 		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-		print '&nbsp; ';
-		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Reset"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 		print '</td>';
 		print '</tr>';
 
@@ -523,9 +514,6 @@ if ($object->fetch($id) >= 0)
 				{
 					print '<td align="center">&nbsp;</td>';
 					print '<td align="right" class="nowrap">'.$langs->trans("MailingStatusNotSent");
-					if ($user->rights->mailing->creer && $allowaddtarget) {
-						print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient"));
-					}
 					print '</td>';
 				}
 				else
@@ -537,7 +525,14 @@ if ($object->fetch($id) >= 0)
 				}
 
 				//Sreach Icon
-				print '<td></td>';
+				print '<td align="right">';
+				if ($obj->statut == 0)
+				{
+					if ($user->rights->mailing->creer && $allowaddtarget) {
+						print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient"));
+					}
+				}
+				print '</td>';
 				print '</tr>';
 
 				$i++;
@@ -545,7 +540,7 @@ if ($object->fetch($id) >= 0)
 		}
 		else
 		{
-			print '<tr '.$bc[false].'><td colspan="7">'.$langs->trans("NoTargetYet").'</td></tr>';
+			print '<tr '.$bc[false].'><td colspan="8">'.$langs->trans("NoTargetYet").'</td></tr>';
 		}
 		print "</table><br>";
 
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 8cd48a75f40..dc0f376234e 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2288,6 +2288,9 @@ if ($action == 'create')
 	}
 	print "<br>\n";
 
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) $action = 'presend';
+
 	if ($action != 'presend')
 	{
 		print '<div class="fichecenter"><div class="fichehalfleft">';
@@ -2330,10 +2333,6 @@ if ($action == 'create')
 	/*
 	 * Action presend
  	 */
-	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
 	if ($action == 'presend')
 	{
 		$object->fetch_projet();
@@ -2369,8 +2368,11 @@ if ($action == 'create')
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div class="clearboth"></div>';
 		print '<br>';
-		print_titre($langs->trans('SendPropalByMail'));
+		print_fiche_titre($langs->trans('SendPropalByMail'));
+
+		dol_fiche_head('');
 
 		// Create form object
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
@@ -2439,7 +2441,7 @@ if ($action == 'create')
 
 		print $formmail->get_form();
 
-		print '<br>';
+		dol_fiche_end();
 	}
 }
 
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 05ec9c19629..8dd693624ac 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -66,7 +66,7 @@ class PropaleStats extends Stats
 
 		$this->field='total_ht';
 		$this->field_line='total_ht';
-		
+
 		$this->where.= " p.fk_statut > 0";
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
 		$this->where.= " AND p.entity IN (".getEntity('propal', 1).")";
@@ -183,7 +183,7 @@ class PropaleStats extends Stats
 		return $this->_getAllByYear($sql);
 	}
 
-	
+
 
 	/**
 	 *	Return nb, amount of predefined product for year
@@ -193,9 +193,11 @@ class PropaleStats extends Stats
 	 */
 	function getAllByProduct($year)
 	{
+		global $user;
+
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql.= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		//if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE ".$this->where;
 		$sql.= " AND p.rowid = tl.fk_propal AND tl.fk_product = product.rowid";
     	$sql.= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,1,false))."' AND '".$this->db->idate(dol_get_last_day($year,12,false))."'";
@@ -204,5 +206,5 @@ class PropaleStats extends Stats
         //$sql.= $this->db->plimit(20);
 
 		return $this->_getAllByProduct($sql);
-	}	
+	}
 }
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index c8e96919f84..1004986ffe5 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@capnetworks.com>
@@ -9,8 +9,8 @@
  * Copyright (C) 2010-2011 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
-*
+ * Copyright (C) 2015      Jean-François Ferry     <jfefe@aternatik.fr>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -58,8 +58,8 @@ $search_montant_ht=GETPOST('search_montant_ht','alpha');
 $search_author=GETPOST('search_author','alpha');
 $search_product_category=GETPOST('search_product_category','int');
 $search_town=GETPOST('search_town','alpha');
-$viewstatut=$db->escape(GETPOST('viewstatut'));
-$object_statut=$db->escape(GETPOST('propal_statut'));
+$viewstatut=GETPOST('viewstatut');
+$object_statut=GETPOST('propal_statut');
 
 $sall=GETPOST("sall");
 $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
@@ -255,6 +255,7 @@ if ($result)
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_author)  	 $param.='&search_author='.$search_author;
 	if ($search_town)		 $param.='&search_town='.$search_town;
+
 	print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png');
 
 	// Lignes des champs de filtre
@@ -271,7 +272,7 @@ if ($result)
  		$langs->load("commercial");
 	 	$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
 	 	$moreforfilter.='</div>';
  	}
 	// If the user can view prospects other than his'
@@ -279,7 +280,7 @@ if ($result)
 	{
 	 	$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	    $moreforfilter.='</div>';
 	}
 	// If the user can view prospects other than his'
@@ -310,7 +311,7 @@ if ($result)
 	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 291d4b4557f..898f228fdb2 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,10 +28,13 @@
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
 
 $WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
 
+$object_statut=GETPOST('propal_statut');
+
 $userid=GETPOST('userid','int');
 $socid=GETPOST('socid','int');
 // Security check
@@ -55,11 +58,12 @@ $mode=GETPOST('mode');
  */
 
 $form=new Form($db);
+$formpropal=new FormPropal($db);
 
 $langs->load('propal');
 $langs->load('other');
 
-llxHeader();
+llxHeader('', $langs->trans("ProposalsStatistics"));
 
 print_fiche_titre($langs->trans("ProposalsStatistics"),'','title_commercial.png');
 
@@ -67,7 +71,9 @@ $dir=$conf->propal->dir_temp;
 
 dol_mkdir($dir);
 
+
 $stats = new PropaleStats($db, $socid, ($userid>0?$userid:0));
+if ($object_statut != '' && $object_statut >= 0) $stats->where .= ' AND p.fk_statut IN ('.$object_statut.')';
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
@@ -113,7 +119,7 @@ if (! $mesg)
 }
 
 // Build graphic amount of object
-$data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
+$data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,0);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 if (!$user->rights->societe->client->voir || $user->societe_id)
@@ -154,7 +160,7 @@ if (! $mesg)
     $px2->draw($filenameamount,$fileurlamount);
 }
 
-$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
+$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear, $filter);
 
 $fileurl_avg='';
 if (!$user->rights->societe->client->voir || $user->societe_id)
@@ -239,6 +245,10 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
 	print $form->select_dolusers($userid,'userid',1);
 	print '</td></tr>';
+	// Status
+	print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">';
+	$formpropal->selectProposalStatus($object_statut,0,1);
+	print '</td></tr>';
 	// Year
 	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
 	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 68299c9a781..70847f479c3 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -156,6 +156,7 @@ $sts = array(-1,0,1,2,3);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('prospectlist'));
+$extrafields = new ExtraFields($db);
 
 // Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
@@ -214,6 +215,12 @@ $sql.= " s.prefix_comm, s.fk_prospectlevel, s.fk_stcomm as stcomm_id,";
 $sql.= " st.libelle as stcomm_label,";
 $sql.= " d.nom as departement";
 if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+// Add fields for extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)";
@@ -229,15 +236,7 @@ if ($catid > 0)           $sql.= " AND cs.fk_categorie = ".$catid;
 if ($catid == -2)         $sql.= " AND cs.fk_categorie IS NULL";
 if ($search_categ > 0)    $sql.= " AND cs.fk_categorie = ".$search_categ;
 if ($search_categ == -2)  $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_nom) {
-	$sql .= natural_search(
-		array(
-			's.nom',
-			's.name_alias'
-		),
-		$search_nom
-	);
-}
+if ($search_nom) $sql .= natural_search(array('s.nom','s.name_alias'), $search_nom);
 if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape(strtolower($search_zipcode))."%'";
 if ($search_town)    $sql .= natural_search('s.town', $search_town);
 if ($search_state)   $sql .= natural_search('d.nom', $search_state);
@@ -253,6 +252,10 @@ if ($socname)
 	$sortfield = "s.nom";
 	$sortorder = "ASC";
 }
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 // Count total nb of records
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -326,6 +329,9 @@ if ($resql)
 	{
 		print '<div class="liste_titre">';
 	    print $moreforfilter;
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	print $hookmanager->resPrint;
 	    print '</div>';
 	}
 
@@ -340,12 +346,13 @@ if ($resql)
 	print_liste_field_titre($langs->trans("ProspectLevelShort"),$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("StatusProsp"),$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre('');
-    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre('');
 
-    $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -404,7 +411,11 @@ if ($resql)
     print '&nbsp;';
     print '</td>';
 
-    print '<td class="liste_titre" align="center">';
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+    print '<td class="liste_titre" align="right">';
     print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
 
@@ -413,10 +424,6 @@ if ($resql)
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print "</td></tr>\n";
 
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
 	print "</tr>\n";
 
 	$i = 0;
@@ -462,13 +469,15 @@ if ($resql)
 		}
 		print '</td>';
 
-        print '<td align="center">';
-		print $prospectstatic->LibStatut($prospectstatic->status,3);
-        print '</td>';
-        print '<td></td>';
-
         $parameters=array('obj' => $obj);
-        $formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+	    print $hookmanager->resPrint;
+
+		print '<td align="right">';
+		print $prospectstatic->LibStatut($prospectstatic->status,5);
+        print '</td>';
+
+        print '<td></td>';
 
         print "</tr>\n";
 		$i++;
@@ -483,7 +492,8 @@ if ($resql)
 	$db->free($resql);
 
 	$parameters=array('sql' => $sql);
-	$formconfirm=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 }
 else
 {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 79f752f8355..82cf9bf168d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -32,6 +32,7 @@
  * \ingroup commande
  * \brief Page to show customer order
  */
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formorder.class.php';
@@ -1371,7 +1372,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 	}
 	// Date
 	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
-	//$form->select_date($dateorder, 're', '', '', '', "crea_commande", 1, 1);
 	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);			// Always autofill date with current date
 	print '</td></tr>';
 
@@ -1430,7 +1430,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '<tr>';
 		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
 		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
-		print ' &nbsp; <a href="../projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
 		print '</td>';
 		print '</tr>';
 	}
@@ -2362,8 +2362,11 @@ if ($action == 'create' && $user->rights->commande->creer)
 				$file = $fileparams['fullname'];
 			}
 
+			print '<div class="clearboth"></div>';
 			print '<br>';
-			print_titre($langs->trans('SendOrderByMail'));
+			print_fiche_titre($langs->trans('SendOrderByMail'));
+
+			dol_fiche_head('');
 
 			// Cree l'objet formulaire mail
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
@@ -2402,8 +2405,10 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$contactarr = array();
 			$contactarr = $object->liste_contact(- 1, 'external');
 
-			if (is_array($contactarr) && count($contactarr) > 0) {
-				foreach ($contactarr as $contact) {
+			if (is_array($contactarr) && count($contactarr) > 0)
+			{
+				foreach ($contactarr as $contact)
+				{
 					if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
 						$contactstatic = new Contact($db);
 						$contactstatic->fetch($contact ['id']);
@@ -2432,7 +2437,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			// Show form
 			print $formmail->get_form();
 
-			print '<br>';
+			dol_fiche_end();
 		}
 	}
 }
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 351a4171dd6..6af44d4a7d6 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -46,6 +46,7 @@ $orderyear=GETPOST("orderyear","int");
 $ordermonth=GETPOST("ordermonth","int");
 $deliveryyear=GETPOST("deliveryyear","int");
 $deliverymonth=GETPOST("deliverymonth","int");
+$search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('search_ref','alpha')!=''?GETPOST('search_ref','alpha'):GETPOST('sref','alpha');
 $search_ref_customer=GETPOST('search_ref_customer','alpha');
 $search_company=GETPOST('search_company','alpha');
@@ -79,6 +80,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $search_categ='';
     $search_user='';
     $search_sale='';
+    $search_product_category='';
     $search_ref='';
     $search_ref_customer='';
     $search_company='';
@@ -115,10 +117,14 @@ $companystatic = new Societe($db);
 $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
 llxHeader('',$langs->trans("Orders"),$help_url);
 
-$sql = 'SELECT s.nom as name, s.rowid as socid, s.client, s.code_client, c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client,';
+$sql = 'SELECT';
+if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
+$sql.= ' s.nom as name, s.rowid as socid, s.client, s.code_client, c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client,';
 $sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as facturee';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= ', '.MAIN_DB_PREFIX.'commande as c';
+if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
+if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
@@ -128,15 +134,11 @@ if ($search_user > 0)
 }
 $sql.= ' WHERE c.fk_soc = s.rowid';
 $sql.= ' AND c.entity IN ('.getEntity('commande', 1).')';
-if ($socid)	$sql.= ' AND s.rowid = '.$socid;
+if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
+if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($search_ref) {
-	$sql .= natural_search('c.ref', $search_ref);
-}
-if ($sall)
-{
-	$sql .= natural_search(array('c.ref', 'c.note_private'), $sall);
-}
+if ($search_ref) $sql .= natural_search('c.ref', $search_ref);
+if ($sall) $sql .= natural_search(array('c.ref', 'c.note_private'), $sall);
 if ($viewstatut <> '')
 {
 	if ($viewstatut < 4 && $viewstatut > -3)
@@ -190,24 +192,12 @@ else if ($deliveryyear > 0)
 {
     $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,12,false))."'";
 }
-if (!empty($search_company))
-{
-	$sql .= natural_search('s.nom', $search_company);
-}
-if (!empty($search_ref_customer))
-{
-	$sql.= ' AND c.ref_client LIKE \'%'.$db->escape($search_ref_customer).'%\'';
-}
+if (!empty($search_company)) $sql .= natural_search('s.nom', $search_company);
+if (!empty($search_ref_customer)) $sql.= natural_search('c.ref_client', $search_ref_customer);
 if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
-if ($search_user > 0)
-{
-    $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
-}
-if ($search_total_ht != '')
-{
-	$sql.= natural_search('c.total_ht', $search_total_ht, 1);
-}
-$sql.= ' ORDER BY '.$sortfield.' '.$sortorder;
+if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
+if ($search_total_ht != '') $sql.= natural_search('c.total_ht', $search_total_ht, 1);
+$sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -216,7 +206,6 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-
 $sql.= $db->plimit($limit + 1,$offset);
 
 //print $sql;
@@ -278,22 +267,37 @@ if ($resql)
  	if ($user->rights->societe->client->voir || $socid)
  	{
  		$langs->load("commercial");
+		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
-	 	$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+	 	$moreforfilter.='</div>';
  	}
 	// If the user can view prospects other than his'
 	if ($user->rights->societe->client->voir || $socid)
 	{
-	    $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+		$moreforfilter.='<div class="divsearchfield">';
+		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	 	$moreforfilter.='</div>';
+	}
+	// If the user can view prospects other than his'
+	if ($conf->categorie->enabled && $user->rights->produit->lire)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$moreforfilter.='<div class="divsearchfield">';
+		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.='</div>';
 	}
 	if (! empty($moreforfilter))
 	{
-	    print '<tr class="liste_titre">';
-	    print '<td class="liste_titre" colspan="9">';
-	    print $moreforfilter;
-	    print '</td></tr>';
+		print '<div class="liste_titre">';
+		print $moreforfilter;
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	print $hookmanager->resPrint;
+    	print '</div>';
 	}
 
 	print '<tr class="liste_titre">';
@@ -303,7 +307,11 @@ if ($resql)
 	print_liste_field_titre($langs->trans('OrderDate'),$_SERVER["PHP_SELF"],'c.date_commande','',$param, 'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('DeliveryDate'),$_SERVER["PHP_SELF"],'c.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'c.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
+	$parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'c.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
@@ -328,6 +336,10 @@ if ($resql)
 	print '<td class="liste_titre" align="right">';
 	print '<input class="flat" type="text" size="6" name="search_total_ht" value="'.$search_total_ht.'">';
 	print '</td>';
+	print '<td align="right">';
+	$liststatus=array('0'=>$langs->trans("StatusOrderDraftShort"), '1'=>$langs->trans("StatusOrderValidated"), '2'=>$langs->trans("StatusOrderSentShort"), '3'=>$langs->trans("StatusOrderToBill"), '4'=>$langs->trans("StatusOrderProcessed"), '-1'=>$langs->trans("StatusOrderCanceledShort"));
+	print $form->selectarray('viewstatut', $liststatus, $viewstatut, 1);
+	print '</td>';
 	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print "</td></tr>\n";
@@ -493,6 +505,8 @@ if ($resql)
 		// Statut
 		print '<td align="right" class="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>';
 
+		print '<td></td>';
+
 		print '</tr>';
 
 		$total+=$objp->total_ht;
@@ -507,7 +521,8 @@ if ($resql)
 		print '<td class="nowrap" colspan="5">'.$langs->trans('TotalHT').'</td>';
 		// Total HT
 		print '<td align="right" class="nowrap">'.price($total).'</td>';
-		print '<td class="nowrap">&nbsp;</td>';
+		print '<td></td>';
+		print '<td></td>';
 		print '</tr>';
 	}
 
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index f2a7649166a..680a12c211c 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -374,43 +374,34 @@ if ($id > 0 || ! empty($ref))
 	 * Boutons actions
 	 */
 
-	if ($action != 'delete')
-	{
+	if ($action != 'delete') {
 		print '<div class="tabsAction">';
 
-		if ($object->type != 2 && $object->rappro)  // If not cash account and can be reconciliate
-		{
-			if ($user->rights->banque->consolidate)
-			{
+		if ($object->type != 2 && $object->rappro) { // If not cash account and can be reconciliate
+			if ($user->rights->banque->consolidate) {
 				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
 			}
 		}
 
-		if ($action != 'addline')
-		{
-			if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
-			{
-				if ($user->rights->banque->modifier)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("AddBankRecord").'</a>';
-				}
-				else
-				{
-					print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
-				}
-			}
-			else
-			{
-				print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
-			}
-		}
-
-		print '</div>';
-	}
+		if ($action != 'addline') {
+			if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
+                if (empty($conf->accounting->enabled)) {
+                    if ($user->rights->banque->modifier) {
+                        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("AddBankRecord").'</a>';
+                    } else {
+                        print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+                    }
+                } else {
+                    print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+                }
+			} else {
+                print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+            }
+        }
+        print '</div>';
+    }
 	
 	print '<br>';
 		
@@ -466,15 +457,12 @@ if ($id > 0 || ! empty($ref))
 		print '<div class="floatright">'.$navig.'</div>';
 	}
 	
-	print '<table class="noborder" width="100%">';
-
 	// Form to add a transaction with no invoice
 	if ($user->rights->banque->modifier && $action == 'addline')
 	{
-		print '<tr>';
-		print '<td align="left" colspan="10"><b>'.$langs->trans("AddBankRecordLong").'</b></td>';
-		print '</tr>';
+        print_fiche_titre($langs->trans("AddBankRecordLong"),'','');
 
+		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Date").'</td>';
 		print '<td>&nbsp;</td>';
@@ -507,11 +495,13 @@ if ($id > 0 || ! empty($ref))
 		print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'"><br>';
 		print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
 		print '</td></tr>';
-		print "</form>";
-
-		print '<tr class="noborder"><td colspan="10">&nbsp;</td></tr>'."\n";
+		print '</table>';
+		print '</form>';
+		print '<br>';
 	}
 
+	print '<table class="noborder" width="100%">';
+
 	/*
 	 * Affiche tableau des transactions bancaires
 	 */
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 183220d2004..08bd304aa2d 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -113,12 +113,12 @@ if ($conf->salaries->enabled)
 		    $total = 0 ;
 		    print '<table class="noborder" width="100%">';
 		    print '<tr class="liste_titre">';
-			  print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.dateep","",$param,'width="140px"',$sortfield,$sortorder);
-			  print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'',$sortfield,$sortorder);
-			  print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
-			  print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"s.rowid","",$param,'',$sortfield,$sortorder);
-			  print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
-			  print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.dateep","",$param,'width="140px"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"s.rowid","",$param,'',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
 		    print "</tr>\n";
 		    $var=1;
 		    while ($i < $num)
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 02a3bc82e19..083aeb48986 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -262,7 +262,7 @@ if ($action == 'create')
 
     print "<tr>";
     print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-    print $form->select_date($datec?$datec:-1,'','','','','add',1,1);
+    print $form->select_date($datec?$datec:-1,'','','','','add',1,1,1);
     print '</td></tr>';
 
     // Km
@@ -358,7 +358,7 @@ else if ($id)
 
             // Date
             print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-            print $form->select_date($object->date,'','','','','update');
+            print $form->select_date($object->date,'',0,0,0,'update',1,0,1);
             print '</td></tr>';
 
             // Km
@@ -433,7 +433,7 @@ else if ($id)
             print '</td></tr>';
 
 	        $form->load_cache_types_fees();
-            
+
 	        // Type
             print '<tr><td>';
             print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 37a0f944bb3..b8920bb45a4 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003		Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004		Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2011	Regis Houssin        <regis.houssin@capnetworks.com>
  *
@@ -98,7 +98,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // Statistics
-print '<table class="noborder" width="100%">';
+print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="4">'.$langs->trans("Statistics").'</td>';
 print "</tr>\n";
@@ -111,7 +111,7 @@ foreach ($listoftype as $code => $label)
 
 if ($conf->use_javascript_ajax)
 {
-    print '<tr><td align="center" colspan="4">';
+    print '<tr '.$bc[false].'><td align="center" colspan="4">';
     $data=array('series'=>$dataseries);
     dol_print_graph('stats',300,180,$data,1,'pie',1);
     print '</td></tr>';
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index e34e7c2b3a6..c3c5f7dd80b 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -139,7 +139,7 @@ if ($resql)
     print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.lastname","","&socid=$socid",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socid=$socid",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("FeesKilometersOrAmout"),$_SERVER["PHP_SELF"],"d.km","","&socid=$socid",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('',$_SERVER["PHP_SELF"], '');
+    print_liste_field_titre('');
     print "</tr>\n";
 
     // Filters lines
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index a461d1b9c82..087780fdaad 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2273,7 +2273,7 @@ if ($action == 'create')
 	// Date invoice
 	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
 	$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-	$form->select_date($datefacture?$datefacture:$dateinvoice, '', '', '', '', "add", 1, 1);
+	print $form->select_date($datefacture?$datefacture:$dateinvoice, '', '', '', '', "add", 1, 1, 1);
 	print '</td></tr>';
 
 	// Payment term
@@ -2300,7 +2300,7 @@ if ($action == 'create')
 		$langs->load('projects');
 		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
 		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
-		print ' &nbsp; <a href="../projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
 		print '</td></tr>';
 	}
 
@@ -2457,12 +2457,12 @@ if ($action == 'create')
 					print '<td class="nobordernopadding nowrap">';
 					print $langs->trans('From') . ' ';
 					print '</td><td class="nobordernopadding nowrap">';
-					print $form->select_date('', 'date_start' . $i, $usehm, $usehm, 1, "add");
+					print $form->select_date('', 'date_start' . $i, $usehm, $usehm, 1, "add", 1, 0, 1);
 					print '</td></tr>';
 					print '<td class="nobordernopadding nowrap">';
 					print $langs->trans('to') . ' ';
 					print '</td><td class="nobordernopadding nowrap">';
-					print $form->select_date('', 'date_end' . $i, $usehm, $usehm, 1, "add");
+					print $form->select_date('', 'date_end' . $i, $usehm, $usehm, 1, "add", 1, 0, 1);
 					print '</td></tr></table>';
 					print '</td>';
 				}
@@ -2502,7 +2502,9 @@ if ($action == 'create')
 	}
 
 	print '<br>';
-} else if ($id > 0 || ! empty($ref)) {
+}
+else if ($id > 0 || ! empty($ref))
+{
 	/*
 	 * Show object in view mode
 	 */
@@ -2522,7 +2524,8 @@ if ($action == 'create')
 	$result = $object->fetch_thirdparty();
 
 	$soc = new Societe($db);
-	$soc->fetch($object->socid);
+	$result=$soc->fetch($object->socid);
+	if ($result < 0) dol_print_error($db);
 	$selleruserevenustamp = $mysoc->useRevenueStamp();
 
 	$totalpaye = $object->getSommePaiement();
@@ -2857,7 +2860,8 @@ if ($action == 'create')
 		$outstandingBills = $soc->get_OutstandingBill();
 		print ' - ' . $langs->trans('CurrentOutstandingBill') . ': ';
 		print price($outstandingBills, '', $langs, 0, 0, - 1, $conf->currency);
-		if ($soc->outstanding_limit != '') {
+		if ($soc->outstanding_limit != '')
+		{
 			if ($outstandingBills > $soc->outstanding_limit)
 				print img_warning($langs->trans("OutstandingBillReached"));
 			print ' / ' . price($soc->outstanding_limit);
@@ -2946,7 +2950,8 @@ if ($action == 'create')
 		} else
 			print '. ';
 	}
-	if ($absolute_creditnote > 0) {
+	if ($absolute_creditnote > 0)
+	{
 		// If validated, we show link "add credit note to payment"
 		if ($object->statut != 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
 			if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT) {
@@ -3850,8 +3855,9 @@ if ($action == 'create')
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div class="clearboth"></div>';
 		print '<br>';
-		print_titre($langs->trans($titreform));
+		print_fiche_titre($langs->trans($titreform));
 
 		// Cree l'objet formulaire mail
 		dol_fiche_head();
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index fc3d8936edf..dbbc1d88212 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2721,7 +2721,10 @@ class Facture extends CommonInvoice
 				$dir = dol_buildpath($reldir."core/modules/facture/");
 
 				// Load file with numbering class (if found)
-				$mybool|=@include_once $dir.$file;
+				if (is_file($dir.$file) && is_readable($dir.$file))
+				{
+                    $mybool |= include_once $dir . $file;
+                }
 			}
 
 			// For compatibility
@@ -2734,8 +2737,11 @@ class Facture extends CommonInvoice
 				foreach ($conf->file->dol_document_root as $dirroot)
 				{
 					$dir = $dirroot."/core/modules/facture/";
+
 					// Load file with numbering class (if found)
-					$mybool|=@include_once $dir.$file;
+					if (is_file($dir.$file) && is_readable($dir.$file)) {
+                        $mybool |= include_once $dir . $file;
+                    }
 				}
 			}
 
@@ -3061,11 +3067,14 @@ class Facture extends CommonInvoice
 	/**
 	 *	Create a withdrawal request for a standing order
 	 *
-	 *	@param      User	$user       User asking standing order
+	 *	@param      User	$fuser       User asking standing order
+	 *  @param		float	$amount		Amount we request withdraw for
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
-	function demande_prelevement($user)
+	function demande_prelevement($fuser, $amount=0)
 	{
+		global $langs;
+
 		$error=0;
 
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
@@ -3099,27 +3108,36 @@ class Facture extends CommonInvoice
                     // For example print 239.2 - 229.3 - 9.9; does not return 0.
                     //$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
                     //$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-                    $resteapayer = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
+					if (empty($amount)) $amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
 
-                    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande';
-                    $sql .= ' (fk_facture, amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib)';
-                    $sql .= ' VALUES ('.$this->id;
-                    $sql .= ",'".price2num($resteapayer)."'";
-                    $sql .= ",'".$this->db->idate($now)."'";
-                    $sql .= ",".$user->id;
-                    $sql .= ",'".$bac->code_banque."'";
-                    $sql .= ",'".$bac->code_guichet."'";
-                    $sql .= ",'".$bac->number."'";
-                    $sql .= ",'".$bac->cle_rib."')";
+					if (is_numeric($amount) && $amount != 0)
+					{
+						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande';
+						$sql .= ' (fk_facture, amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib)';
+						$sql .= ' VALUES ('.$this->id;
+						$sql .= ",'".price2num($amount)."'";
+						$sql .= ",'".$this->db->idate($now)."'";
+						$sql .= ",".$fuser->id;
+						$sql .= ",'".$bac->code_banque."'";
+						$sql .= ",'".$bac->code_guichet."'";
+						$sql .= ",'".$bac->number."'";
+						$sql .= ",'".$bac->cle_rib."')";
 
-                    dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
-                    $resql=$this->db->query($sql);
-                    if (! $resql)
-                    {
-                        $this->error=$this->db->lasterror();
-                        dol_syslog(get_class($this).'::demandeprelevement Erreur');
-                        $error++;
-                    }
+						dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
+						$resql=$this->db->query($sql);
+						if (! $resql)
+						{
+						    $this->error=$this->db->lasterror();
+						    dol_syslog(get_class($this).'::demandeprelevement Erreur');
+						    $error++;
+						}
+					}
+					else
+					{
+						$this->error='WithdrawRequestErrorNilAmount';
+	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
+	                    $error++;
+					}
 
         			if (! $error)
         			{
@@ -3159,11 +3177,11 @@ class Facture extends CommonInvoice
 	/**
 	 *  Supprime une demande de prelevement
 	 *
-	 *  @param  User		$user       utilisateur creant la demande
+	 *  @param  User	$fuser      User making delete
 	 *  @param  int		$did        id de la demande a supprimer
 	 *  @return	int					<0 if OK, >0 if KO
 	 */
-	function demande_prelevement_delete($user, $did)
+	function demande_prelevement_delete($fuser, $did)
 	{
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
 		$sql .= ' WHERE rowid = '.$did;
@@ -3184,8 +3202,8 @@ class Facture extends CommonInvoice
 	/**
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *	@param      User	$user    	Object user
-	 *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *	@param  User		$user    	Object user
+	 *	@return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
 	 */
 	function load_board($user)
 	{
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 2668f0f1af6..aab2e0b18d5 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Juanjo Menent	    <jmenent@2byte.es>
@@ -129,7 +129,7 @@ if ($action == 'create')
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="add">';
 		print '<input type="hidden" name="facid" value="'.$object->id.'">';
-		
+
 		dol_fiche_head();
 
 		$rowspan=4;
@@ -202,7 +202,7 @@ if ($action == 'create')
 		$sql = 'SELECT l.fk_product, l.product_type, l.label as custom_label, l.description, l.qty, l.rowid, l.tva_tx,';
 		$sql.= ' l.fk_remise_except,';
 		$sql.= ' l.remise_percent, l.subprice, l.info_bits,';
-		$sql.= ' l.total_ht, l.total_tva, l.total_ttc,';
+		$sql.= ' l.total_ht, l.total_tva as total_vat, l.total_ttc,';
 		$sql.= ' l.date_start,';
 		$sql.= ' l.date_end,';
 		$sql.= ' l.product_type,';
@@ -220,7 +220,7 @@ if ($action == 'create')
 			$num = $db->num_rows($result);
 			$i = 0; $total = 0;
 
-			echo '<table class="notopnoleftnoright" width="100%">';
+			echo '<table class="noborder" width="100%">';
 			if ($num)
 			{
 				print '<tr class="liste_titre">';
@@ -572,7 +572,7 @@ else
 		/*
 		 *  List mode
 		 */
-		$sql = "SELECT s.nom as name, s.rowid as socid, f.titre, f.total, f.rowid as facid";
+		$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 		$sql.= " WHERE f.fk_soc = s.rowid";
 		$sql.= " AND f.entity = ".$conf->entity;
@@ -592,11 +592,13 @@ else
 			$i = 0;
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("Ref").'</td>';
+			print_liste_field_titre($langs->trans("Ref"));
 			print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"s.nom","","&socid=$socid","",$sortfiled,$sortorder);
-			print '</td><td align="right">'.$langs->trans("Amount").'</td>';
-			print '<td>&nbsp;</td>';
-			print "</td>\n";
+			print_liste_field_titre($langs->trans("AmountHT"),'','','','','align="right"');
+			print_liste_field_titre($langs->trans("AmountVAT"),'','','','','align="right"');
+			print_liste_field_titre($langs->trans("AmountTTC"),'','','','','align="right"');
+			print_liste_field_titre('');		// Field may contains ling text
+			print "</tr>\n";
 
 			if ($num > 0)
 			{
@@ -616,19 +618,21 @@ else
 					print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
 
 					print '<td align="right">'.price($objp->total).'</td>'."\n";
+					print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
+					print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
 
-					echo '<td align="center">';
-
+					print '<td align="center">';
 					if ($user->rights->facture->creer)
 					{
-                        echo '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
-                        echo  $langs->trans("CreateBill"),'</a>';
+                        print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
+                        print $langs->trans("CreateBill").'</a>';
 					}
 					else
 					{
-					    echo "&nbsp;";
+					    print "&nbsp;";
 					}
-					echo "</td></tr>\n";
+					print "</td>";
+					print "</tr>\n";
 					$i++;
 				}
 			}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a68ed8ef903..faefe63d9af 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -63,6 +63,7 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $lineid=GETPOST('lineid','int');
 $userid=GETPOST('userid','int');
+$search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha');
 $search_refcustomer=GETPOST('search_refcustomer','alpha');
 $search_societe=GETPOST('search_societe','alpha');
@@ -121,6 +122,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $search_categ='';
     $search_user='';
     $search_sale='';
+    $search_product_category='';
     $search_ref='';
     $search_refcustomer='';
     $search_societe='';
@@ -144,8 +146,8 @@ $formfile = new FormFile($db);
 $bankaccountstatic=new Account($db);
 $facturestatic=new Facture($db);
 
-if (! $sall) $sql = 'SELECT';
-else $sql = 'SELECT DISTINCT';
+$sql = 'SELECT';
+if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc,';
 $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
 $sql.= ' f.paye as paye, f.fk_statut,';
@@ -155,6 +157,8 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= ', '.MAIN_DB_PREFIX.'facture as f';
 if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
 else $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as fd ON fd.fk_facture = f.rowid';
+if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid=pd.fk_facture';
+if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
@@ -165,7 +169,8 @@ if ($search_user > 0)
 $sql.= ' WHERE f.fk_soc = s.rowid';
 $sql.= " AND f.entity = ".$conf->entity;
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= ' AND s.rowid = '.$socid;
+if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
+if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
 if ($userid)
 {
     if ($userid == -1) $sql.=' AND f.fk_user_author IS NULL';
@@ -180,30 +185,12 @@ if ($filtre)
         $sql .= ' AND ' . trim($filt[0]) . ' = ' . trim($filt[1]);
     }
 }
-if ($search_ref)
-{
-    $sql .= natural_search('f.facnumber', $search_ref);
-}
-if ($search_refcustomer)
-{
-	$sql .= natural_search('f.ref_client', $search_refcustomer);
-}
-if ($search_societe)
-{
-    $sql .= natural_search('s.nom', $search_societe);
-}
-if ($search_montant_ht != '')
-{
-    $sql.= natural_search('f.total', $search_montant_ht, 1);
-}
-if ($search_montant_ttc != '')
-{
-    $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
-}
-if ($search_status != '')
-{
-	$sql.= " AND f.fk_statut = '".$db->escape($search_status)."'";
-}
+if ($search_ref) $sql .= natural_search('f.facnumber', $search_ref);
+if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcustomer);
+if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
+if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
+if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
+if ($search_status != '') $sql.= " AND f.fk_statut = '".$db->escape($search_status)."'";
 if ($month > 0)
 {
     if ($year > 0 && empty($day))
@@ -258,7 +245,6 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-
 $sql.= $db->plimit($limit+1,$offset);
 //print $sql;
 
@@ -294,20 +280,34 @@ if ($resql)
  	if ($user->rights->societe->client->voir || $socid)
  	{
  		$langs->load("commercial");
+ 		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
-	 	$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+	 	$moreforfilter.='</div>';
  	}
     // If the user can view prospects other than his'
     if ($user->rights->societe->client->voir || $socid)
     {
-        $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+		$moreforfilter.='<div class="divsearchfield">';
+    	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
+        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	 	$moreforfilter.='</div>';
     }
+	// If the user can view prospects other than his'
+	if ($conf->categorie->enabled && $user->rights->produit->lire)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$moreforfilter.='<div class="divsearchfield">';
+		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.='</div>';
+	}
+
     if ($moreforfilter)
     {
         print '<tr class="liste_titre">';
-        print '<td class="liste_titre" colspan="10">';
+        print '<td class="liste_titre" colspan="11">';
         print $moreforfilter;
         print '</td></tr>';
     }
@@ -323,8 +323,8 @@ if ($resql)
     print_liste_field_titre($langs->trans('AmountTTC'),$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans('Received'),$_SERVER['PHP_SELF'],'am','',$param,'align="right"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_statut,paye,am','',$param,'align="right"',$sortfield,$sortorder);
-    //print '<td class="liste_titre">&nbsp;</td>';
-    print '</tr>';
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
 
     // Filters lines
     print '<tr class="liste_titre">';
@@ -346,9 +346,13 @@ if ($resql)
     print '</td>';
     print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.$search_societe.'"></td>';
     print '<td class="liste_titre" align="right"><input class="flat" type="text" size="6" name="search_montant_ht" value="'.$search_montant_ht.'"></td>';
-    print '<td class="liste_titre" align="right">&nbsp;</td>';
+    print '<td class="liste_titre"></td>';
     print '<td class="liste_titre" align="right"><input class="flat" type="text" size="6" name="search_montant_ttc" value="'.$search_montant_ttc.'"></td>';
-    print '<td class="liste_titre" align="right">&nbsp;</td>';
+    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre" align="right">';
+	$liststatus=array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"), '3'=>$langs->trans("Cancel"));
+	print $form->selectarray('search_status', $liststatus, $search_status, 1);
+    print '</td>';
     print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print "</td></tr>\n";
@@ -440,7 +444,9 @@ if ($resql)
             print '<td align="right" class="nowrap">';
             print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$paiement,$objp->type);
             print "</td>";
-            //print "<td>&nbsp;</td>";
+
+            print "<td></td>";
+
             print "</tr>\n";
             $total_ht+=$objp->total_ht;
             $total_tva+=$objp->total_tva;
@@ -458,7 +464,8 @@ if ($resql)
             print '<td class="liste_total" align="right">'.price($total_tva,0,$langs).'</td>';
             print '<td class="liste_total" align="right">'.price($total_ttc,0,$langs).'</td>';
             print '<td class="liste_total" align="right">'.price($totalrecu,0,$langs).'</td>';
-            print '<td class="liste_total" align="center">&nbsp;</td>';
+            print '<td class="liste_total"></td>';
+            print '<td class="liste_total"></td>';
             print '</tr>';
         }
     }
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index e8010229a8e..d29f237c331 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -654,13 +654,16 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Rest"),$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","",$param,'align="right"',$sortfield,$sortorder);
+
+	$searchpitco='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	$searchpitco.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Reset"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	if (empty($mode))
 	{
-		print_liste_field_titre($langs->trans("PDFMerge"),$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($searchpitco,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
 	}
 	else
 	{
-		print_liste_field_titre($langs->trans("Remind"),$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($searchpitco,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
 	}
 	print "</tr>\n";
 
@@ -695,9 +698,6 @@ if ($resql)
 	print $form->selectarray('filtre', $liststatus, $filter, 1);
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '<br>';
 	if (empty($mode))
 	{
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 0e1763d4b86..be78b422fe6 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  *
@@ -68,14 +68,19 @@ if ($action == "new")
 {
     if ($object->id > 0)
     {
-        $result = $object->demande_prelevement($user);
+    	$db->begin();
+
+        $result = $object->demande_prelevement($user, GETPOST('withdraw_request_amount'));
         if ($result > 0)
         {
+        	$db->commit();
+
             setEventMessage($langs->trans("RecordSaved"));
         }
         else
-        {
-        	setEventMessage($object->error, 'errors');
+		{
+        	$db->rollback();
+        	setEventMessage($object->error, $object->errors, 'errors');
         }
     }
     $action='';
@@ -309,7 +314,7 @@ if ($object->id > 0)
 	print '</td>';
 	print '</tr>';
 
-	// Conditions de reglement
+	// Payment condition
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
@@ -370,11 +375,11 @@ if ($object->id > 0)
 	print '</td><td colspan="3">';
 	if ($action == 'editmode')
 	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
 	}
 	else
 	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
 
@@ -478,7 +483,13 @@ if ($object->id > 0)
 	{
 		if ($user->rights->prelevement->bons->creer)
 		{
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=new">'.$langs->trans("MakeWithdrawRequest").'</a>';
+			print '<form method="POST" action="">';
+			print '<input type="hidden" name="id" value="' . $object->id . '" />';
+			print '<input type="hidden" name="action" value="new" />';
+			print '<label for="withdraw_request_amount">' . $langs->trans('WithdrawRequestAmount') . ' </label>';
+			print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="' . $resteapayer . '" size="10" />';
+			print '<input type="submit" class="butAction" value="'.$langs->trans("MakeWithdrawRequest").'" />';
+			print '</form>';
 		}
 		else
 		{
@@ -508,10 +519,12 @@ if ($object->id > 0)
 
 	print '<tr class="liste_titre">';
 	print '<td align="left">'.$langs->trans("DateRequest").'</td>';
-	print '<td align="center">'.$langs->trans("DateProcess").'</td>';
+	print '<td align="center">'.$langs->trans("User").'</td>';
 	print '<td align="center">'.$langs->trans("Amount").'</td>';
 	print '<td align="center">'.$langs->trans("WithdrawalReceipt").'</td>';
-	print '<td align="center">'.$langs->trans("User").'</td><td>&nbsp;</td><td>&nbsp;</td>';
+	print '<td>&nbsp;</td>';
+	print '<td align="center">'.$langs->trans("DateProcess").'</td>';
+	print '<td>&nbsp;</td>';
 	print '</tr>';
 	$var=true;
 
@@ -526,15 +539,18 @@ if ($object->id > 0)
 
 			print "<tr ".$bc[$var].">";
 			print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
-			print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
+			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 			print '<td align="center">'.price($obj->amount).'</td>';
 			print '<td align="center">-</td>';
-			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 			print '<td>&nbsp;</td>';
-			print '<td>';
+
+			print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
+
+			print '<td align="right">';
 			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;did='.$obj->rowid.'">';
 			print img_delete();
 			print '</a></td>';
+
 			print "</tr>\n";
 			$i++;
 		}
@@ -574,7 +590,7 @@ if ($object->id > 0)
 
 			print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
 
-			print '<td align="center">'.dol_print_date($db->jdate($obj->date_traite),'day')."</td>\n";
+			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 
 			print '<td align="center">'.price($obj->amount).'</td>';
 
@@ -585,9 +601,10 @@ if ($object->id > 0)
 			print $withdrawreceipt->getNomUrl(1);
 			print "</td>\n";
 
-			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
-
 			print '<td>&nbsp;</td>';
+
+			print '<td align="center">'.dol_print_date($db->jdate($obj->date_traite),'day')."</td>\n";
+
 			print '<td>&nbsp;</td>';
 
 			print "</tr>\n";
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index 4df30c023fc..584077509b3 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2013-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2014	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2015		Alexandre Spangaro	<alexandre.spangaro@gmail.com>
  *
@@ -109,15 +109,22 @@ if (! empty($conf->holiday->enabled))
 {
 	$user_id = $user->id;
 
-	$nbaquis=$holiday->getCPforUser($user_id);
-	$nbdeduced=$holiday->getConfCP('nbHolidayDeducted');
-	$nb_holiday = $nbaquis / $nbdeduced;
-
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Holidays").'</td></tr>';
     print "<tr ".$bc[0].">";
     print '<td colspan="3">';
-    print $langs->trans('SoldeCPUser',round($nb_holiday,2)).($nbdeduced != 1 ? ' ('.$nbaquis.' / '.$nbdeduced.')' : '');
+
+    $out='';
+    $typeleaves=$holiday->getTypes(1,1);
+    foreach($typeleaves as $key => $val)
+    {
+    	$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
+    	$nb_holiday += $nb_type;
+    	$out .= ' - '.$val['label'].': <strong>'.($nb_type?price2num($nb_type):0).'</strong><br>';
+    }
+    print $langs->trans('SoldeCPUser', round($nb_holiday,5)).'<br>';
+    print $out;
+
     print '</td>';
     print '</tr>';
     print '</table><br>';
@@ -196,7 +203,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 {
-	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
 	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE u.rowid = x.fk_user_author";
@@ -231,8 +238,8 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 			while ($i < $num && $i < $max)
 			{
 				$obj = $db->fetch_object($result);
-				$expensereportstatic->ref=$obj->rowid;
 				$expensereportstatic->id=$obj->rowid;
+				$expensereportstatic->ref=$obj->ref;
 				$userstatic->id=$obj->uid;
 				$userstatic->lastname=$obj->lastname;
 				$userstatic->firstname=$obj->firstname;
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 9fd0d411d8e..e2842f6dd1e 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -151,7 +151,7 @@ if ($result)
 			if($obj->product_type == 0) $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT:$langs->trans("CodeNotDef"));
 			else $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT:$langs->trans("CodeNotDef"));
 		}
-		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)?$conf->global->ACCOUNTING_VAT_ACCOUNT:$langs->trans("CodeNotDef"));
+		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT:$langs->trans("CodeNotDef"));
 		$compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva);
 
 		$account_localtax1=getLocalTaxesFromRate($obj->tva_tx, 1, $obj->thirdparty, $mysoc);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 98fe402266c..aaebcf697f3 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -705,7 +705,7 @@ if (! GETPOST('action'))
         print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','','','',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'libelle','','','',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'fa_amount','','','align="right"',$sortfield,$sortorder);
-        print '<td>&nbsp;</td>';
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
         print "</tr>\n";
 
         while ($i < min($num,$limit))
@@ -728,6 +728,6 @@ if (! GETPOST('action'))
     }
 }
 
-$db->close();
-
 llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index 1afdf0e2c80..489997011b0 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -88,7 +88,7 @@ if ($resql)
     print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","","",'width="80" align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle","","","",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"c.libelle","","",'align="right"',$sortfield,$sortorder);
-    print "<td>&nbsp;</td>";
+    print_liste_field_titre('');
     print "</tr>\n";
 
     while ($i < min($num,$limit))
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index e2422bffa70..aea7579007a 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -221,7 +221,26 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
 	}
 	else
 	{
-		setEventMessage($paiement->error, 'errors');
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->banque->cheque)
+{
+	$reject_date = dol_mktime(0, 0, 0, GETPOST('rejectdate_month'), GETPOST('rejectdate_day'), GETPOST('rejectdate_year'));
+	$rejected_check = GETPOST('bankid');
+
+	$object->fetch($id);
+	$paiement_id = $object->reject_check($rejected_check, $reject_date);
+	if ($paiement_id > 0)
+	{
+		setEventMessage($langs->trans("CheckRejectedAndInvoicesReopened"));
+		header("Location: ".DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -334,6 +353,18 @@ else
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide','','',1);
 
 	}
+
+	/*
+	 * Confirm check rejection
+	 */
+	if ($action == 'reject_check')
+	{
+		$formquestion = array(
+			array('type' => 'hidden','name' => 'bankid','value' => GETPOST('lineid')),
+			array('type' => 'date','name' => 'rejectdate_','label' => $langs->trans("RejectCheckDate"),'value' => dol_now())
+		);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("RejectCheck"), $langs->trans("ConfirmRejectCheck"), 'confirm_reject_check',$formquestion,'',1);
+	}
 }
 
 $accounts = array();
@@ -350,20 +381,20 @@ if ($action == 'new')
 	print '<input type="hidden" name="action" value="new">';
 
 	dol_fiche_head();
-	
+
 	print '<table class="border" width="100%">';
 	//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
 	// Filter
 	print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>';
-	print $form->select_date($filterdate,'fd',0,0,1,'',1,1);
+	print $form->select_date($filterdate,'fd',0,0,1,'',1,1,1);
 	print '</td></tr>';
     print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
     $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
     print '</td></tr>';
 	print '</table>';
-	
+
 	dol_fiche_end();
-	
+
     print '<div class="center">';
 	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
     if ($filterdate || $filteraccountid > 0)
@@ -377,10 +408,9 @@ if ($action == 'new')
 
 	$sql = "SELECT ba.rowid as bid, b.datec as datec, b.dateo as date, b.rowid as chqid, ";
 	$sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque";
-	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
-	$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
+	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON (b.fk_account = ba.rowid)";
 	$sql.= " WHERE b.fk_type = 'CHQ'";
-	$sql.= " AND b.fk_account = ba.rowid";
 	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
 	$sql.= " AND b.fk_bordereau = 0";
 	$sql.= " AND b.amount > 0";
@@ -599,12 +629,11 @@ else
 	// Liste des cheques
 	$sql = "SELECT b.rowid, b.amount, b.num_chq, b.emetteur,";
 	$sql.= " b.dateo as date, b.datec as datec, b.banque,";
-	$sql.= " p.rowid as pid, ba.rowid as bid";
+	$sql.= " p.rowid as pid, ba.rowid as bid, p.statut";
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
-	$sql.= ", ".MAIN_DB_PREFIX."bank as b";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON (b.fk_account = ba.rowid)";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
-	$sql.= " WHERE ba.rowid = b.fk_account";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " WHERE ba.entity IN (".getEntity('bank_account', 1).")";
 	$sql.= " AND b.fk_type= 'CHQ'";
 	$sql.= " AND b.fk_bordereau = ".$object->id;
 	$sql.= " ORDER BY $sortfield $sortorder";
@@ -625,7 +654,8 @@ else
 		print_liste_field_titre($langs->trans("Bank"),$_SERVER["PHP_SELF"],"b.banque", "",$param,"",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"b.amount", "",$param,'align="right"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("LineRecord"),$_SERVER["PHP_SELF"],"b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre('','','');
+		print_liste_field_titre($langs->trans("Payment"),$_SERVER["PHP_SELF"],"p.rowid", "",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 		print "</tr>\n";
 		$i=1;
 		$var=false;
@@ -654,13 +684,25 @@ else
 				print '&nbsp;';
 			}
 			print '</td>';
-			if ($object->statut == 0)
+			print '<td align="center">';
+			$paymentstatic->id=$objp->pid;
+			$paymentstatic->ref=$objp->pid;
+			if ($paymentstatic->id)
 			{
-				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a></td>';
+				print $paymentstatic->getNomUrl(1);
 			}
 			else
 			{
-				print '<td>&nbsp;</td>';
+				print '&nbsp;';
+			}
+			print '</td>';
+			if ($object->statut == 0)
+			{
+				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"),'disable').'</a></td>';
+			}
+			else if($objp->statut == 2) {
+				print '<td align="right">'.img_picto($langs->trans('CheckRejected'),'statut8').'</a></td>';
 			}
 			print '</tr>';
 			$var=!$var;
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 2dc1efe04b4..20923222741 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -25,6 +25,7 @@
  *	\brief      File with class to manage cheque delivery receipts
  */
 require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 
 /**
@@ -647,17 +648,83 @@ class RemiseCheque extends CommonObject
 
 			$resql = $this->db->query($sql);
 			if ($resql)
-	  {
-	  	$this->updateAmount();
-	  }
-	  else
-	  {
-	  	$this->errno = -1032;
-	  	dol_syslog("RemiseCheque::removeCheck ERREUR UPDATE ($this->errno)");
-	  }
+			{
+				$this->updateAmount();
+			}
+			else
+			{
+				$this->errno = -1032;
+				dol_syslog("RemiseCheque::removeCheck ERREUR UPDATE ($this->errno)");
+			}
 		}
 		return 0;
 	}
+
+	/**
+	 *	Check rejection management
+	 *	Reopen linked invoices and saves a new negative payment
+	 *
+	 *	@param	int		$bank_id 		Id of bank line concerned
+	 *	@param	date	$rejection_date	Date to use on the negative payment
+	 * 	@return	int
+	 */
+	function reject_check($bank_id, $rejection_date)
+	{
+		global $db, $user;
+
+		$payment = new Paiement($db);
+		$payment->fetch(0,0,$bank_id);
+
+		$bankaccount = $payment->fk_account;
+
+		// Get invoice list to reopen them
+		$sql = 'SELECT pf.fk_facture, pf.amount';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+		$sql.= ' WHERE pf.fk_paiement = '.$payment->id;
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$rejectedPayment = new Paiement($db);
+			$rejectedPayment->amounts = array();
+			$rejectedPayment->datepaye = $rejection_date;
+			$rejectedPayment->paiementid = dol_getIdFromCode($this->db, 'CHQ', 'c_paiement');
+			$rejectedPayment->num_paiement = $payment->numero;
+
+			while($obj = $db->fetch_object($resql))
+			{
+				$invoice = new Facture($db);
+				$invoice->fetch($obj->fk_facture);
+				$invoice->set_unpaid($user);
+
+				$rejectedPayment->amounts[$obj->fk_facture] = price2num($obj->amount) * -1;
+			}
+
+			if ($rejectedPayment->create($user) > 0)
+			{
+				$result=$rejectedPayment->addPaymentToBank($user,'payment','(CheckRejected)',$bankaccount,'','');
+				if ($result > 0)
+				{
+					$payment->reject();
+					return $rejectedPayment->id;
+				}
+				else
+				{
+					return -1;
+				}
+			}
+			else
+			{
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
 	/**
 	 *	Charge les proprietes ref_previous et ref_next
 	 *
@@ -747,7 +814,7 @@ class RemiseCheque extends CommonObject
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
 			$sql.= " SET number = '".$number."'" ;
 			$sql.= " WHERE rowid = ".$this->id;
-			
+
 			dol_syslog("RemiseCheque::set_number", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 60d669fcacf..e45d0936bcc 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -78,11 +78,12 @@ class Paiement extends CommonObject
 	/**
 	 *    Load payment from database
 	 *
-	 *    @param	int		$id     Id of payment to get
-	 *    @param	int		$ref    Ref of payment to get (same as $id)
-	 *    @return   int     		<0 if KO, 0 if not found, >0 if OK
+	 *    @param	int		$id			Id of payment to get
+	 *    @param	string	$ref		Ref of payment to get (currently ref = id but this may change in future)
+	 *    @param	int		$fk_bank	Id of bank line associated to payment
+	 *    @return   int		<0 if KO, 0 if not found, >0 if OK
 	 */
-	function fetch($id, $ref='')
+	function fetch($id, $ref='', $fk_bank='')
 	{
 		$sql = 'SELECT p.rowid, p.datep as dp, p.amount, p.statut, p.fk_bank,';
 		$sql.= ' c.code as type_code, c.libelle as type_libelle,';
@@ -91,10 +92,12 @@ class Paiement extends CommonObject
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement as p';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid ';
 		$sql.= ' WHERE p.fk_paiement = c.id';
-		if ($ref)
-			$sql.= ' AND p.rowid = '.$ref;
-		else
+		if ($id > 0)
 			$sql.= ' AND p.rowid = '.$id;
+		else if ($ref)
+			$sql.= ' AND p.rowid = '.$ref;
+		else if ($fk_bank)
+			$sql.= ' AND p.fk_bank = '.$fk_bank;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -116,7 +119,8 @@ class Paiement extends CommonObject
 				$this->type_code      = $obj->type_code;
 				$this->statut         = $obj->statut;
 
-				$this->bank_account   = $obj->fk_account;
+				$this->bank_account   = $obj->fk_account; // deprecated
+				$this->fk_account     = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
 
 				$this->db->free($result);
@@ -670,6 +674,29 @@ class Paiement extends CommonObject
 		}
 	}
 
+	/**
+	 *    Reject payment
+	 *
+	 *    @return     int     <0 if KO, >0 if OK
+	 */
+	function reject()
+	{
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 2 WHERE rowid = '.$this->id;
+
+		dol_syslog(get_class($this).'::reject', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			dol_syslog(get_class($this).'::reject '.$this->error);
+			return -1;
+		}
+	}
+
 	/*
 	 *    \brief      Information sur l'objet
 	 *    \param      id      id du paiement dont il faut afficher les infos
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 34cf3b94460..d284a128631 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -68,6 +68,12 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_company="";
 }
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('paymentlist'));
+$extrafields = new ExtraFields($db);
+
+
+
 /*
  * 	View
  */
@@ -81,24 +87,37 @@ if (GETPOST("orphelins"))
     // Paiements lies a aucune facture (pour aide au diagnostic)
     $sql = "SELECT p.rowid, p.datep as dp, p.amount,";
     $sql.= " p.statut, p.num_paiement,";
-    //$sql.= " c.libelle as paiement_type";
     $sql.= " c.code as paiement_code";
+	// Add fields for extrafields
+	foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
     $sql.= " FROM (".MAIN_DB_PREFIX."paiement as p,";
     $sql.= " ".MAIN_DB_PREFIX."c_paiement as c)";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
     $sql.= " WHERE p.fk_paiement = c.id";
     $sql.= " AND p.entity = ".$conf->entity;
     $sql.= " AND pf.fk_facture IS NULL";
+	// Add where from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
 }
 else
 {
     $sql = "SELECT DISTINCT p.rowid, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
     $sql.= " p.statut, p.num_paiement,";
-    //$sql.= " c.libelle as paiement_type,";
     $sql.= " c.code as paiement_code,";
     $sql.= " ba.rowid as bid, ba.label,";
     $sql.= " s.rowid as socid, s.nom as name";
-    //$sql.= " f.facnumber";
+	// Add fields for extrafields
+	foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
     $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement as p)";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
@@ -127,6 +146,10 @@ else
     if ($search_paymenttype != "")  $sql .=" AND c.code='".$db->escape($search_paymenttype)."'";
     if ($search_amount)      		$sql .=" AND p.amount='".$db->escape(price2num($search_amount))."'";
     if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+	// Add where from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
 }
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
@@ -157,11 +180,13 @@ if ($resql)
     print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$paramlist,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"p.amount","",$paramlist,'align="right"',$sortfield,$sortorder);
     //print_liste_field_titre($langs->trans("Invoices"),"","","",$paramlist,'align="left"',$sortfield,$sortorder);
-    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-    {
-        print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$paramlist,'align="right"',$sortfield,$sortorder);
-    }
-    print '<td class="liste_titre">&nbsp;</td>';
+
+	$parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$paramlist,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
     // Lines for filters fields
@@ -199,7 +224,7 @@ if ($resql)
         $var=!$var;
         print "<tr ".$bc[$var].">";
 
-        print '<td width="40">';
+        print '<td>';
         $paymentstatic->id=$objp->rowid;
         $paymentstatic->ref=$objp->rowid;
         print $paymentstatic->getNomUrl(1);
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 420fbd7af69..173226f6ab5 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -176,6 +176,8 @@ if ($_GET["action"] == 'create')
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
+	dol_fiche_head('', '');
+
 	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
 
 	print "<tr class=\"liste_titre\"><td colspan=\"3\">".$langs->trans("SocialContribution")."</td>";
@@ -235,7 +237,7 @@ if ($_GET["action"] == 'create')
 
 	print '</table>';
 
-	print '<br>';
+	dol_fiche_end();
 
 	/*
  	 * Autres charges impayees
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index c2d67b4551b..695afb7562f 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -55,7 +55,7 @@ $pagenext = $page + 1;
 
 
 /*
- * Mode Liste
+ * Mode List
  *
  */
 $sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
@@ -75,17 +75,16 @@ if ($result)
 
   print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
 
-  print"\n<!-- debut table -->\n";
   print '<table class="liste" width="100%">';
 
   print '<tr class="liste_titre">';
   print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref",'','','class="liste_titre"');
   print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'class="liste_titre" align="center"');
-  print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>';
-  print '</tr>';
+  print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"","","",'align="center"');
+  print "</tr>\n";
 
   print '<tr class="liste_titre">';
-  print '<form action="bons.php" method="GET">';
+  print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
   print '<td class="liste_titre"><input type="text" class="flat" name="search_ligne" value="'. $search_line.'" size="10"></td>';
   print '<td class="liste_titre">&nbsp;</td>';
   print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
@@ -121,7 +120,7 @@ else
   dol_print_error($db);
 }
 
-$db->close();
 
 llxFooter();
 
+$db->close();
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 16e95402ec5..9dd841e0add 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -25,6 +25,7 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
@@ -45,6 +46,11 @@ if ($user->societe_id > 0) accessforbidden();
 $action = GETPOST('action','alpha');
 $id = GETPOST('id','int');
 
+$socid = GETPOST('socid','int');
+$page = GETPOST('page','int');
+$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
+$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "pl.fk_soc" : GETPOST('sortfield','alpha');
+
 
 /*
  * Actions
@@ -207,10 +213,10 @@ if ($id > 0)
 		print '<table class="border" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+		print '<tr '.$bc[false].'><td width="20%">'.$langs->trans("TransData").'</td><td>';
 		print $form->select_date('','','','','',"userfile",1,1);
 		print '</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+		print '<tr '.$bc[false].'><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
 		print $form->selectarray("methode",$bon->methodes_trans);
 		print '</td></tr>';
 /*			print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
@@ -230,7 +236,7 @@ if ($id > 0)
 		print '<table class="border" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+		print '<tr '.$bc[false].'><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
 		print $form->select_date('','','','','',"infocredit",1,1);
 		print '</td></tr>';
 		print '</table>';
@@ -259,6 +265,122 @@ if ($id > 0)
 
 		print "</div>";
 	}
+
+
+	$ligne=new LignePrelevement($db,$user);
+
+	if ($page == -1) { $page = 0 ; }
+
+	$offset = $conf->liste_limit * $page ;
+	$pageprev = $page - 1;
+	$pagenext = $page + 1;
+
+	/*
+	 * Lines into withdraw request
+	 */
+	$sql = "SELECT pl.rowid, pl.statut, pl.amount";
+	$sql.= ", s.rowid as socid, s.nom as name";
+	$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+	$sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql.= " WHERE pl.fk_prelevement_bons = ".$id;
+	$sql.= " AND pl.fk_prelevement_bons = pb.rowid";
+	$sql.= " AND pb.entity = ".$conf->entity;
+	$sql.= " AND pl.fk_soc = s.rowid";
+	if ($socid)	$sql.= " AND s.rowid = ".$socid;
+	$sql.= $db->order($sortfield, $sortorder);
+	$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+	$result = $db->query($sql);
+
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+
+		$urladd = "&amp;id=".$prev_id;
+
+		print_barre_liste("", $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
+		print"\n<!-- debut table -->\n";
+		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans("Lines"),$_SERVER["PHP_SELF"],"pl.rowid",'',$urladd);
+		print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd);
+		print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","",$urladd,'align="center"');
+		print_liste_field_titre('');
+		print "</tr>\n";
+
+		$var=false;
+
+		$total = 0;
+
+		while ($i < min($num,$conf->liste_limit))
+		{
+			$obj = $db->fetch_object($result);
+
+			print "<tr ".$bc[$var].">";
+
+			print "<td>";
+
+			print $ligne->LibStatut($obj->statut,2);
+			print "&nbsp;";
+
+			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
+			print substr('000000'.$obj->rowid, -6);
+			print '</a></td>';
+
+			$thirdparty=new Societe($db);
+			$thirdparty->fetch($obj->socid);
+			print '<td>';
+			print $thirdparty->getNomUrl(1);
+			print "</td>\n";
+
+			print '<td align="center">'.price($obj->amount)."</td>\n";
+
+			print '<td>';
+
+			if ($obj->statut == 3)
+			{
+		  		print '<b>'.$langs->trans("StatusRefused").'</b>';
+			}
+			else
+			{
+		  		print "&nbsp;";
+			}
+
+			print '</td></tr>';
+
+			$total += $obj->total_ttc;
+			$var=!$var;
+			$i++;
+		}
+
+		if($socid)
+		{
+			print "<tr ".$bc[$var].">";
+
+			print '<td>'.$langs->trans("Total").'</td>';
+
+			print '<td align="center">'.price($total)."</td>\n";
+
+			print '<td>&nbsp;</td>';
+
+			print '<td>&nbsp;</td>';
+
+			print "</tr>\n";
+		}
+
+		print "</table>";
+		$db->free($result);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+
+
+
+
 }
 
 
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index c1ba81073bd..3f813e00938 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -446,8 +446,17 @@ class BonPrelevement extends CommonObject
                             $fac = new Facture($this->db);
                             $fac->fetch($facs[$i][0]);
                             $amounts[$fac->id] = $facs[$i][1];
-                            $result = $fac->set_paid($user);
+
+							$totalpaye  = $fac->getSommePaiement();
+							$totalcreditnotes = $fac->getSumCreditNotesUsed();
+							$totaldeposits = $fac->getSumDepositsUsed();
+							$alreadypayed = $totalpaye + $totalcreditnotes + $totaldeposits;
+
+							if ($alreadypayed + $facs[$i][1] >= $fac->total_ttc) {
+								$result = $fac->set_paid($user);
+							}
                         }
+
                         $paiement = new Paiement($this->db);
                         $paiement->datepaye     = $date ;
                         $paiement->amounts      = $amounts;
@@ -651,7 +660,7 @@ class BonPrelevement extends CommonObject
     {
         global $conf;
 
-        $sql = "SELECT sum(f.total_ttc) as nb";
+        $sql = "SELECT sum(pfd.amount) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
         $sql.= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
         //$sql.= " ,".MAIN_DB_PREFIX."c_paiement as cp";
@@ -837,7 +846,7 @@ class BonPrelevement extends CommonObject
                             else
 							{
 								dol_syslog(__METHOD__."::Check RIB Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
-                                $this->invoice_in_error[$fac[0]]="Error on default bank number RIB/IBAN for invoice ".$fact->getNomUrl(0)." for thirdparty (reported by function verif) ".$soc->name;
+                                $this->invoice_in_error[$fac[0]]="Error on default bank number RIB/IBAN for invoice ".$fact->getNomUrl(0)." for thirdparty (reported by function verif) ".$soc->getNomUrl(0);
                             }
                         }
                         else
@@ -924,6 +933,7 @@ class BonPrelevement extends CommonObject
 	                if ($resql)
 	                {
 	                    $prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
+						$this->id = $prev_id;
 
 	                    $dir=$conf->prelevement->dir_output.'/receipts';
 	                    $file=$filebonprev;
@@ -981,6 +991,7 @@ class BonPrelevement extends CommonObject
 
                         dol_syslog(__METHOD__."::Update Orders::Sql=".$sql, LOG_DEBUG);
                         $resql=$this->db->query($sql);
+
                         if (! $resql)
                         {
                             $error++;
@@ -1210,7 +1221,7 @@ class BonPrelevement extends CommonObject
     /**
      * Generate a withdrawal file.
      * Generation Formats:
-     * - Europe: SEPA (France: CFONB no more supported, Spain:  AEB19 if external module EsAEB is enabled)
+     * - Europe: SEPA (France: CFONB no more supported, Spain: AEB19 if external module EsAEB is enabled)
      * - Others countries: Warning message
      * File is generated with name this->filename
      *
@@ -1226,6 +1237,11 @@ class BonPrelevement extends CommonObject
         dol_syslog(get_class($this)."::generate build file ".$this->filename);
 
         $this->file = fopen($this->filename,"w");
+		if (empty($this->file))
+		{
+			$this->error=$langs->trans('ErrorFailedToOpenFile', $this->filename);
+			return -1;
+		}
 
         $found=0;
 
@@ -1287,7 +1303,8 @@ class BonPrelevement extends CommonObject
 			//echo $sql;
 			$resql=$this->db->query($sql);
 			if ($resql)
-			{	$num = $this->db->num_rows($resql);
+			{
+				$num = $this->db->num_rows($resql);
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
@@ -1297,7 +1314,8 @@ class BonPrelevement extends CommonObject
 				}
 			}
 			else
-			{	fputs($this->file, 'ERREUR DEBITEUR '.$sql.$CrLf);
+			{
+				fputs($this->file, 'ERREUR DEBITEUR '.$sql.$CrLf);
 				$result = -2;
 			}
 
@@ -1305,10 +1323,12 @@ class BonPrelevement extends CommonObject
 			 * section Emetteur(sepa Emetteur bloc lines)
 			 */
 			if ($result != -2)
-			{	$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $i, $this->total, $CrLf);
+			{
+				$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $i, $this->total, $CrLf);
 			}
 			else
-			{	fputs($this->file, 'ERREUR EMETTEUR'.$CrLf);
+			{
+				fputs($this->file, 'ERREUR EMETTEUR'.$CrLf);
 			}
 
 			/**
@@ -1503,7 +1523,7 @@ class BonPrelevement extends CommonObject
      */
     static function buildRumNumber($row_code_client, $row_datec, $row_drum)
     {
-		$pre = ($row_datec > 1359673200) ? 'Rum' : '++R';
+		$pre = ($row_datec > 1359673200) ? 'RUM-' : '++R';
 		return $pre.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
     }
 
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index e4cb4b65c30..64ec4ad1895 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2010      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -96,13 +96,19 @@ if (prelevement_check_config() < 0)
 	print '</div>';
 }
 
-$h=0;
+/*$h=0;
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/create.php';
 $head[$h][1] = $langs->trans("NewStandingOrder");
+$head[$h][2] = 'payment';
+$hselected = 'payment';
 $h++;
 
 dol_fiche_head($head, $hselected, $langs->trans("StandingOrders"), 0, 'payment');
+*/
 
+print_fiche_titre($langs->trans("NewStandingOrder"));
+
+dol_fiche_head();
 
 $nb=$bprev->NbFactureAPrelever();
 $nb1=$bprev->NbFactureAPrelever(1);
@@ -161,7 +167,7 @@ print '<br>';
  */
 
 $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,";
-$sql.= " pfd.date_demande";
+$sql.= " pfd.date_demande, pfd.amount";
 $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s,";
 $sql.= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
@@ -184,6 +190,7 @@ if ($resql)
     print '<td>'.$langs->trans("Invoice").'</td>';
     print '<td>'.$langs->trans("ThirdParty").'</td>';
     print '<td>'.$langs->trans("RIB").'</td>';
+    print '<td>'.$langs->trans("RUM").'</td>';
     print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
     print '<td align="right">'.$langs->trans("DateRequest").'</td>';
     print '</tr>';
@@ -210,9 +217,13 @@ if ($resql)
             print '<td>';
             print $thirdpartystatic->display_rib();
             print '</td>';
+            // RUM
+            print '<td>';
+            print $thirdpartystatic->display_rib('rum');
+            print '</td>';
             // Amount
             print '<td align="right">';
-            print price($obj->total_ttc,0,$langs,0,0,-1,$conf->currency);
+            print price($obj->amount,0,$langs,0,0,-1,$conf->currency);
             print '</td>';
             // Date
             print '<td align="right">';
@@ -265,11 +276,14 @@ if ($result)
         $obj = $db->fetch_object($result);
         $var=!$var;
 
-        print "<tr ".$bc[$var]."><td>";
+        print "<tr ".$bc[$var].">";
+
+        print "<td>";
         $bprev->id=$obj->rowid;
         $bprev->ref=$obj->ref;
         print $bprev->getNomUrl(1);
         print "</td>\n";
+
         print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
 
         print '<td align="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index d11fefbb6cb..a7df114ae6f 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -147,7 +147,9 @@ if ($result)
   	print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"p.ref",'',$urladd,'class="liste_titre"',$sortfield,$sortorder);
   	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd,'class="liste_titre"',$sortfield,$sortorder);
   	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"f.total_ttc","",$urladd,'class="liste_titre" align="center"',$sortfield,$sortorder);
-  	print '<td class="liste_titre" colspan="2">&nbsp;</td></tr>';
+  	print_liste_field_titre('');
+	print_liste_field_titre('');
+	print "</tr>\n";
 
   	$var=false;
 
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index ee11532a46f..36e4ed71341 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -96,7 +96,7 @@ print '</td></tr></table><br>';
  * Invoices waiting for withdraw
  */
 $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
-$sql.= " pfd.date_demande,";
+$sql.= " pfd.date_demande, pfd.amount,";
 $sql.= " s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
@@ -143,7 +143,7 @@ if ($resql)
             print '</td>';
 
             print '<td align="right">';
-            print price($obj->total_ttc);
+            print price($obj->amount);
             print '</td>';
 
             print '<td align="right">';
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
deleted file mode 100644
index c4724824f36..00000000000
--- a/htdocs/compta/prelevement/lignes.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/compta/prelevement/lignes.php
- *  \ingroup    prelevement
- *	\brief      Prelevement lines
- */
-
-require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-
-// Security check
-if ($user->societe_id > 0) accessforbidden();
-
-$langs->load('withdrawals');
-$langs->load('bills');
-
-// Get supervariables
-$prev_id = GETPOST('id','int');
-$socid = GETPOST('socid','int');
-$page = GETPOST('page','int');
-$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
-$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "pl.fk_soc" : GETPOST('sortfield','alpha');
-
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("WithdrawalsReceipts"));
-
-if ($prev_id)
-{
-	$bon = new BonPrelevement($db,"");
-
-	if ($bon->fetch($prev_id) == 0)
-	{
-		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'lines', $langs->trans("WithdrawalsReceipts"), '', 'payment');
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-
-		// Status
-		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
-		print '<td>'.$bon->getLibStatut(1).'</td>';
-		print '</tr>';
-
-		if($bon->date_trans <> 0)
-		{
-			$muser = new User($db);
-			$muser->fetch($bon->user_trans);
-
-			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
-			print dol_print_date($bon->date_trans,'day');
-			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
-			print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
-			print $bon->methodes_trans[$bon->method_trans];
-			print '</td></tr>';
-		}
-		if($bon->date_credit <> 0)
-		{
-			print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
-			print dol_print_date($bon->date_credit,'day');
-			print '</td></tr>';
-		}
-
-		print '</table>';
-
-		print '<br>';
-
-		print '<table class="border" width="100%"><tr><td width="20%">';
-		print $langs->trans("WithdrawalFile").'</td><td>';
-		$relativepath = 'receipts/'.$bon->ref;
-		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
-		print '</td></tr></table>';
-
-		dol_fiche_end();
-
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-$ligne=new LignePrelevement($db,$user);
-
-if ($page == -1) { $page = 0 ; }
-
-$offset = $conf->liste_limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
-/*
- * Liste des lignes de prelevement
- */
-$sql = "SELECT pl.rowid, pl.statut, pl.amount";
-$sql.= ", s.rowid as socid, s.nom as name";
-$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
-$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-$sql.= " WHERE pl.fk_prelevement_bons = ".$prev_id;
-$sql.= " AND pl.fk_prelevement_bons = pb.rowid";
-$sql.= " AND pb.entity = ".$conf->entity;
-$sql.= " AND pl.fk_soc = s.rowid";
-if ($socid)	$sql.= " AND s.rowid = ".$socid;
-$sql.= " ORDER BY $sortfield $sortorder ";
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
-
-$result = $db->query($sql);
-
-if ($result)
-{
-	$num = $db->num_rows($result);
-	$i = 0;
-
-	$urladd = "&amp;id=".$prev_id;
-
-	print_barre_liste("", $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
-	print"\n<!-- debut table -->\n";
-	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Lines"),$_SERVER["PHP_SELF"],"pl.rowid",'',$urladd);
-	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd);
-	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","",$urladd,'align="center"');
-	print '<td colspan="2">&nbsp;</td></tr>';
-
-	$var=false;
-
-	$total = 0;
-
-	while ($i < min($num,$conf->liste_limit))
-	{
-		$obj = $db->fetch_object($result);
-
-		print "<tr ".$bc[$var]."><td>";
-
-		print $ligne->LibStatut($obj->statut,2);
-		print "&nbsp;";
-
-		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
-		print substr('000000'.$obj->rowid, -6);
-		print '</a></td>';
-
-		$thirdparty=new Societe($db);
-		$thirdparty->fetch($obj->socid);
-		print '<td>';
-		print $thirdparty->getNomUrl(1);
-		print "</td>\n";
-
-		print '<td align="center">'.price($obj->amount)."</td>\n";
-
-		print '<td>';
-
-		if ($obj->statut == 3)
-		{
-	  		print '<b>'.$langs->trans("StatusRefused").'</b>';
-		}
-		else
-		{
-	  		print "&nbsp;";
-		}
-
-		print '</td></tr>';
-
-		$total += $obj->total_ttc;
-		$var=!$var;
-		$i++;
-	}
-
-	if($socid)
-	{
-		print "<tr ".$bc[$var]."><td>";
-
-		print '<td>Total</td>';
-
-		print '<td align="center">'.price($total)."</td>\n";
-
-		print '<td>&nbsp;</td>';
-
-		print "</tr>\n";
-	}
-
-	print "</table>";
-	$db->free($result);
-}
-else
-{
-	dol_print_error($db);
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 5c5a6c8ffce..9274a885105 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -124,8 +124,8 @@ if ($result)
     print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"');
     print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'align="center"');
     print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","","",'align="right"');
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '</tr>';
+    print_liste_field_titre('');
+	print "</tr>\n";
 
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
     print '<tr class="liste_titre">';
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 0582e4f4091..30eafa40efa 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -92,7 +92,7 @@ if ($result)
 	print_liste_field_titre($langs->trans("Line"),$_SERVER["PHP_SELF"],"p.ref",'',$urladd);
 	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd);
 	print_liste_field_titre($langs->trans("Reason"),$_SERVER["PHP_SELF"],"pr.motif","",$urladd);
-	print '</tr>';
+	print "</tr>\n";
 
 	$var=True;
 
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 078b4acb057..0e08b70f87e 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -127,14 +127,14 @@ if ($result)
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.salary","",$param,"",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre("");
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.salary","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
 	print '<tr class="liste_titre">';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 31e98370003..3afbba0df79 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -164,6 +164,7 @@ if ($resql)
 		print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'align="center"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cs.paye","",$param,'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 		print "</tr>\n";
 
 		print '<tr class="liste_titre">';
@@ -184,6 +185,8 @@ if ($resql)
 		print '<input class="flat" type="text" size="6" name="search_amount" value="'.$search_amount.'">';
 		print '</td>';
 		print '<td class="liste_titre">&nbsp;</td>';
+		// Status
+		print '<td class="liste_titre">&nbsp;</td>';
 		print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 		print "</td></tr>\n";
@@ -228,6 +231,8 @@ if ($resql)
 
 			print '<td align="right" class="nowrap">'.$chargesociale_static->LibStatut($obj->paye,5,$obj->alreadypayed).'</a></td>';
 
+			print '<td></td>';
+
 			print '</tr>';
 			$i++;
 		}
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 4b92ce7eebc..e995b06aa6b 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013   Antoine Iauch       <aiauch@gpcsolutions.fr>
+/* Copyright (C) 2013   Antoine Iauch	   <aiauch@gpcsolutions.fr>
  * Copyright (C) 2013   Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2015   Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
@@ -18,8 +18,8 @@
  */
 
 /**
- *       \file        htdocs/compta/stats/cabyprodserv.php
- *       \brief       Page reporting TO by Products & Services
+ *	   \file		htdocs/compta/stats/cabyprodserv.php
+ *	   \brief	   Page reporting TO by Products & Services
  */
 
 require '../../main.inc.php';
@@ -47,13 +47,13 @@ if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
 $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
 $sortfield=isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
 if (! $sortorder) $sortorder="asc";
-if (! $sortfield) $sortfield="name";
+if (! $sortfield) $sortfield="ref";
 
 // Category
 $selected_cat = (int) GETPOST('search_categ', 'int');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
-    $subcat = true;
+	$subcat = true;
 }
 
 // Date range
@@ -132,7 +132,7 @@ $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
 foreach($allparams as $key => $value) {
-    $paramslink .= '&' . $key . '=' . $value;
+	$paramslink .= '&' . $key . '=' . $value;
 }
 
 
@@ -148,28 +148,28 @@ $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByProductsAndServices");
 
 if ($modecompta=="CREANCES-DETTES") {
 	$calcmode=$langs->trans("CalcModeDebt");
-    $calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=RECETTES-DEPENSES">','</a>').')';
+	$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 
-    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
 
-    $description=$langs->trans("RulesCADue");
+	$description=$langs->trans("RulesCADue");
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    $description.= $langs->trans("DepositsAreNotIncluded");
+		$description.= $langs->trans("DepositsAreNotIncluded");
 	} else {
-	    $description.= $langs->trans("DepositsAreIncluded");
+		$description.= $langs->trans("DepositsAreIncluded");
 	}
 
-    $builddate=time();
+	$builddate=time();
 } else {
 	$calcmode=$langs->trans("CalcModeEngagement");
 	$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=CREANCES-DETTES">','</a>').')';
 
-    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
 
-    $description=$langs->trans("RulesCAIn");
-    $description.= $langs->trans("DepositsAreIncluded");
+	$description=$langs->trans("RulesCAIn");
+	$description.= $langs->trans("DepositsAreIncluded");
 
-    $builddate=time();
+	$builddate=time();
 }
 
 report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,$tableparams,$calcmode);
@@ -180,221 +180,226 @@ $catotal=0;
 
 if ($modecompta == 'CREANCES-DETTES')
 {
-    $sql = "SELECT DISTINCT p.rowid as rowid, p.ref as ref, p.label as label,";
-    $sql.= " sum(l.total_ht) as amount, sum(l.total_ttc) as amount_ttc";
-    $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as l, ".MAIN_DB_PREFIX."product as p";
+	$sql = "SELECT DISTINCT p.rowid as rowid, p.ref as ref, p.label as label,";
+	$sql.= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
+	$sql.= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
+	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as l, ".MAIN_DB_PREFIX."product as p";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
+		$sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
 	}
 	else if ($selected_cat) 	// Into a specific category
 	{
-	    $sql.= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
+		$sql.= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
-    $sql.= " WHERE l.fk_product = p.rowid";
+	$sql.= " WHERE l.fk_product = p.rowid";
 	$sql.= " AND l.fk_facture = f.rowid";
-    $sql.= " AND f.fk_statut in (1,2)";
-    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql.= " AND f.type IN (0,1,2,5)";
-    } else {
+	$sql.= " AND f.fk_statut in (1,2)";
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$sql.= " AND f.type IN (0,1,2,5)";
+	} else {
 	$sql.= " AND f.type IN (0,1,2,3,5)";
-    }
-    if ($date_start && $date_end) {
-	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    }
+	}
+	if ($date_start && $date_end) {
+		$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql.=" AND cp.fk_product is null";
+		$sql.=" AND cp.fk_product is null";
 	}
 	else if ($selected_cat) {	// Into a specific category
-	    $sql.= " AND (c.rowid = ".$selected_cat;
-	    if ($subcat) $sql.=" OR c.fk_parent = " . $selected_cat;
-	    $sql.= ")";
+		$sql.= " AND (c.rowid = ".$selected_cat;
+		if ($subcat) $sql.=" OR c.fk_parent = " . $selected_cat;
+		$sql.= ")";
 		$sql.= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
 	}
-    $sql.= " AND f.entity = ".$conf->entity;
-    $sql.= " GROUP BY p.rowid, p.ref, p.label";
-    $sql.= " ORDER BY p.ref";
+	$sql.= " AND f.entity = ".$conf->entity;
+	$sql.= " GROUP BY p.rowid, p.ref, p.label";
+	$sql.= $db->order($sortfield,$sortorder);
 
-    dol_syslog("cabyprodserv", LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result) {
-	$num = $db->num_rows($result);
-	$i=0;
-	while ($i < $num) {
-		$obj = $db->fetch_object($result);
-		$amount_ht[$obj->rowid] = $obj->amount;
-		$amount[$obj->rowid] = $obj->amount_ttc;
-		$name[$obj->rowid] = $obj->ref . '&nbsp;-&nbsp;' . $obj->label;
-		$catotal_ht+=$obj->amount;
-		$catotal+=$obj->amount_ttc;
-		$i++;
+	dol_syslog("cabyprodserv", LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i=0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$amount_ht[$obj->rowid] = $obj->amount;
+			$amount[$obj->rowid] = $obj->amount_ttc;
+			$qty[$obj->rowid] = $obj->qty;
+			$name[$obj->rowid] = $obj->ref . '&nbsp;-&nbsp;' . $obj->label;
+			$catotal_ht+=$obj->amount;
+			$catotal+=$obj->amount_ttc;
+			$qtytotal+=$obj->qty;
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
 	}
-    } else {
-	dol_print_error($db);
-    }
 
-    // Show Array
-    $i=0;
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    // Extra parameters management
-    foreach($headerparams as $key => $value)
-    {
-	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
-    }
+	// Show Array
+	$i=0;
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	// Extra parameters management
+	foreach($headerparams as $key => $value)
+	{
+		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	}
 
-    print '<table class="noborder" width="100%">';
-    // Category filter
-    print '<tr class="liste_titre">';
-    print '<td>';
-    print $langs->trans("Category") . ': ' . $formother->select_categories(Categorie::TYPE_PRODUCT, $selected_cat, 'search_categ', true);
-    print ' ';
-    print $langs->trans("SubCats") . '? ';
-    print '<input type="checkbox" name="subcat" value="yes"';
-    if ($subcat) {
-	print ' checked';
-    }
-    print '></td>';
-    print '<td colspan="3" align="right">';
-    print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print '</td></tr>';
-	    // Array header
-    print "<tr class=\"liste_titre\">";
-    print_liste_field_titre(
-	    $langs->trans("Product"),
-	    $_SERVER["PHP_SELF"],
-	    "name",
-	    "",
-	    $paramslink,
-	    "",
-	    $sortfield,
-	    $sortorder
-	    );
-    print_liste_field_titre(
-	    $langs->trans('AmountHT'),
-	    $_SERVER["PHP_SELF"],
-	    "amount_ht",
-	    "",
-	    $paramslink,
-	    'align="right"',
-	    $sortfield,
-	    $sortorder
-	    );
-    print_liste_field_titre(
-	    $langs->trans("AmountTTC"),
-	    $_SERVER["PHP_SELF"],
-	    "amount_ttc",
-	    "",
-	    $paramslink,
-	    'align="right"',
-	    $sortfield,
-	    $sortorder
-	    );
-    print_liste_field_titre(
-	    $langs->trans("Percentage"),
-	    $_SERVER["PHP_SELF"],
-	    "amount_ttc",
-	    "",
-	    $paramslink,
-	    'align="right"',
-	    $sortfield,
-	    $sortorder
-	    );
-    // TODO: statistics?
-    print "</tr>\n";
+	print '<table class="noborder" width="100%">';
+	// Category filter
+	print '<tr class="liste_titre">';
+	print '<td>';
+	print $langs->trans("Category") . ': ' . $formother->select_categories(Categorie::TYPE_PRODUCT, $selected_cat, 'search_categ', true);
+	print ' ';
+	print $langs->trans("SubCats") . '? ';
+	print '<input type="checkbox" name="subcat" value="yes"';
+	if ($subcat) {
+		print ' checked';
+	}
+	print '></td>';
+	print '<td colspan="5" align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '</td></tr>';
+	
+	// Array header
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre(
+		$langs->trans("Product"),
+		$_SERVER["PHP_SELF"],
+		"ref",
+		"",
+		$paramslink,
+		"",
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		$langs->trans('Quantity'),
+		$_SERVER["PHP_SELF"],
+		"qty",
+		"",
+		$paramslink,
+		'align="right"',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		$langs->trans("Percentage"),
+		$_SERVER["PHP_SELF"],
+		"qty",
+		"",
+		$paramslink,
+		'align="right"',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		$langs->trans('AmountHT'),
+		$_SERVER["PHP_SELF"],
+		"amount",
+		"",
+		$paramslink,
+		'align="right"',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		$langs->trans("AmountTTC"),
+		$_SERVER["PHP_SELF"],
+		"amount_ttc",
+		"",
+		$paramslink,
+		'align="right"',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		$langs->trans("Percentage"),
+		$_SERVER["PHP_SELF"],
+		"amount_ttc",
+		"",
+		$paramslink,
+		'align="right"',
+		$sortfield,
+		$sortorder
+	);
+	print "</tr>\n";
 
-    // Array Data
-    $var=true;
+	// Array Data
+	$var=true;
 
-    if (count($amount)) {
-	    $arrayforsort=$name;
-	    // defining arrayforsort
-	    if ($sortfield == 'nom' && $sortorder == 'asc') {
-		    asort($name);
-		    $arrayforsort=$name;
-	    }
-	    if ($sortfield == 'nom' && $sortorder == 'desc') {
-		    arsort($name);
-		    $arrayforsort=$name;
-	    }
-	    if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
-		asort($amount_ht);
-		$arrayforsort=$amount_ht;
-	    }
-	    if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
-		arsort($amount_ht);
-		$arrayforsort=$amount_ht;
-	    }
-	    if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
-		    asort($amount);
-		    $arrayforsort=$amount;
-	    }
-	    if ($sortfield == 'amount_ttc' && $sortorder == 'desc') {
-		    arsort($amount);
-		    $arrayforsort=$amount;
-	    }
-	    foreach($arrayforsort as $key=>$value) {
-		    $var=!$var;
-		    print "<tr ".$bc[$var].">";
+	if (count($name)) {
+		foreach($name as $key=>$value) {
+			$var=!$var;
+			print "<tr ".$bc[$var].">";
 
-		    // Product
-		     $fullname=$name[$key];
-		    if ($key >= 0) {
-			$linkname='<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$key.'">'.img_object($langs->trans("ShowProduct"),'product').' '.$fullname.'</a>';
-		    } else {
-			$linkname=$langs->trans("PaymentsNotLinkedToProduct");
-		    }
+			// Product
+			$fullname=$name[$key];
+			if ($key >= 0) {
+				$linkname='<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$key.'">'.img_object($langs->trans("ShowProduct"),'product').' '.$fullname.'</a>';
+			} else {
+				$linkname=$langs->trans("PaymentsNotLinkedToProduct");
+			}
 
-		print "<td>".$linkname."</td>\n";
+			print "<td>".$linkname."</td>\n";
+			
+			// Quantity
+			print '<td align="right">';
+			print $qty[$key];
+			print '</td>';
+			
+			// Percent;
+			print '<td align="right">'.($qtytotal > 0 ? round(100 * $qty[$key] / $qtytotal, 2).'%' : '&nbsp;').'</td>';
+	
+			// Amount w/o VAT
+			print '<td align="right">';
+			/*if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?productid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}*/
+			print price($amount_ht[$key]);
+			//print '</a>';
+			print '</td>';
+	
+			// Amount with VAT
+			print '<td align="right">';
+			/*if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?productid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}*/
+			print price($amount[$key]);
+			//print '</a>';
+			print '</td>';
+	
+			// Percent;
+			print '<td align="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
+	
+			// TODO: statistics?
+	
+			print "</tr>\n";
+			$i++;
+		}
 
-		// Amount w/o VAT
-		print '<td align="right">';
-		/*if ($key > 0) {
-		    print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?productid='.$key.'">';
-		} else {
-		    print '<a href="#">';
-		}*/
-		print price($amount_ht[$key]);
-		//print '</a>';
-		print '</td>';
+		// Total
+		print '<tr class="liste_total">';
+		print '<td>'.$langs->trans("Total").'</td>';
+		print '<td align="right">'.price($catotal_ht).'</td>';
+		print '<td align="right">'.price($catotal).'</td>';
+		print '<td>&nbsp;</td>';
+		print '</tr>';
 
-		// Amount with VAT
-		print '<td align="right">';
-		/*if ($key > 0) {
-		    print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?productid='.$key.'">';
-		} else {
-		    print '<a href="#">';
-		}*/
-		print price($amount[$key]);
-		//print '</a>';
-		print '</td>';
-
-		// Percent;
-		print '<td align="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
-
-		// TODO: statistics?
-
-		print "</tr>\n";
-		$i++;
-	    }
-
-	    // Total
-	    print '<tr class="liste_total">';
-	    print '<td>'.$langs->trans("Total").'</td>';
-	    print '<td align="right">'.price($catotal_ht).'</td>';
-	    print '<td align="right">'.price($catotal).'</td>';
-	    print '<td>&nbsp;</td>';
-	    print '</tr>';
-
-	    $db->free($result);
-    }
-    print "</table>";
-    print '</form>';
+		$db->free($result);
+	}
+	print "</table>";
+	print '</form>';
 } else {
-    // $modecompta != 'CREANCES-DETTES'
-    // "Calculation of part of each product for accountancy in this mode is not possible. When a partial payment (for example 5 euros) is done on an
-    // invoice with 2 product (product A for 10 euros and product B for 20 euros), what is part of paiment for product A and part of paiment for product B ?
-    // Because there is no way to know this, this report is not relevant.
+	// $modecompta != 'CREANCES-DETTES'
+	// "Calculation of part of each product for accountancy in this mode is not possible. When a partial payment (for example 5 euros) is done on an
+	// invoice with 2 product (product A for 10 euros and product B for 20 euros), what is part of paiment for product A and part of paiment for product B ?
+	// Because there is no way to know this, this report is not relevant.
 	print '<br>'.$langs->trans("TurnoverPerProductInCommitmentAccountingNotRelevant") . '<br>';
 }
 
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 5d8dce0fd73..85752367334 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -21,7 +21,7 @@
 
 /**
  *	    \file       htdocs/compta/tva/clients.php
- *      \ingroup    tax
+ *	  \ingroup    tax
  *		\brief      Page des societes
  */
 
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
 
 $langs->load("bills");
 $langs->load("compta");
@@ -39,8 +40,7 @@ $langs->load("other");
 
 // Date range
 $year=GETPOST("year");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y",dol_now());
 	$year_start = $year_current;
 } else {
@@ -50,38 +50,55 @@ if (empty($year))
 $date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
 $date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
-    $q=GETPOST("q");
-    if (empty($q))
-	{
-		if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
-		else
-		{
-		    $month_current = strftime("%m",dol_now());
-		    if ($month_current >= 10) $q=4;
-            elseif ($month_current >= 7) $q=3;
-            elseif ($month_current >= 4) $q=2;
-            else $q=1;
+if (empty($date_start) || empty($date_end)) {// We define date_start and date_end
+	$q=GETPOST("q");
+	if (empty($q)) {
+		if (isset($_REQUEST["month"])) {
+			$date_start=dol_get_first_day($year_start,$_REQUEST["month"],false);
+			$date_end=dol_get_last_day($year_start,$_REQUEST["month"],false);
+		} else {
+			$month_current = strftime("%m",dol_now());
+			if ($month_current >= 10) $q=4;
+			elseif ($month_current >= 7) $q=3;
+			elseif ($month_current >= 4) $q=2;
+			else $q=1;
 		}
 	}
-	if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
-	if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
-	if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
-	if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+	if ($q==1) {
+		$date_start=dol_get_first_day($year_start,1,false);
+		$date_end=dol_get_last_day($year_start,3,false);
+	}
+	if ($q==2) {
+		$date_start=dol_get_first_day($year_start,4,false);
+		$date_end=dol_get_last_day($year_start,6,false);
+	}
+	if ($q==3) {
+		$date_start=dol_get_first_day($year_start,7,false);
+		$date_end=dol_get_last_day($year_start,9,false);
+	}
+	if ($q==4) {
+		$date_start=dol_get_first_day($year_start,10,false);
+		$date_end=dol_get_last_day($year_start,12,false);
+	}
 }
 
 $min = GETPOST("min");
-if (empty($min)) $min = 0;
+if (empty($min)) {
+	$min = 0;
+}
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit
 $modetax = $conf->global->TAX_MODE;
-if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
+if (isset($_REQUEST["modetax"])) {
+	$modetax=$_REQUEST["modetax"];
+}
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+	$socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -95,9 +112,15 @@ $company_static=new Societe($db);
 
 $morequerystring='';
 $listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
-foreach($listofparams as $param)
-{
-	if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
+foreach($listofparams as $param) {
+	if (GETPOST($param)!='') {
+		$morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
+	}
+}
+
+$special_report = false;
+if (isset($_REQUEST['extra_report']) && $_REQUEST['extra_report'] == 1) {
+	$special_report = true;
 }
 
 llxHeader('','','','',0,0,'','',$morequerystring);
@@ -109,62 +132,92 @@ $fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
 $fsearch.='  <input type="text" name="min" id="min" value="'.$min.'" size="6">';
 
 // Affiche en-tete du rapport
-if ($modetax==1)	// Calculate on invoice for goods and services
-{
-    $name=$langs->trans("VATReportByCustomersInDueDebtMode");
+if ($modetax==1) {	// Calculate on invoice for goods and services
+	$name=$langs->trans("VATReportByCustomersInDueDebtMode");
 	$calcmode=$langs->trans("CalcModeVATDebt");
-    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
-    //$name.='<br>('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
-    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
-    $description=$langs->trans("RulesVATDueServices");
-    $description.='<br>';
-    $description.=$langs->trans("RulesVATDueProducts");
-    //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
-    //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
-    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.='<br>'.$langs->trans("DepositsAreNotIncluded");
-	else  $description.='<br>'.$langs->trans("DepositsAreIncluded");
+	$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+	//$name.='<br>('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
+	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
+	$description=$langs->trans("RulesVATDueServices");
+	$description.='<br>';
+	$description.=$langs->trans("RulesVATDueProducts");
+	//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
+	//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description.='<br>'.$langs->trans("DepositsAreIncluded");
+	}
 	$description.=$fsearch;
+	$description.='<br>'
+		. '<input type="radio" name="extra_report" value="0" '.($special_report?'':'checked="checked"').'> '
+		. $langs->trans('SimpleReport')
+		. '</input>'
+		. '<br>'
+		. '<input type="radio" name="extra_report" value="1" '.($special_report?'checked="checked"':'').'> '
+		. $langs->trans('AddExtraReport')
+		. '</input>'
+		. '<br>';
 	$builddate=time();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	//$exportlink=$langs->trans("NotYetAvailable");
 
 	$elementcust=$langs->trans("CustomersInvoices");
 	$productcust=$langs->trans("Description");
 	$amountcust=$langs->trans("AmountHT");
-	if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
+	if ($mysoc->tva_assuj) {
+		$vatcust.=' ('.$langs->trans("ToPay").')';
+	}
 	$elementsup=$langs->trans("SuppliersInvoices");
 	$productsup=$langs->trans("Description");
 	$amountsup=$langs->trans("AmountHT");
-	if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+	if ($mysoc->tva_assuj) {
+		$vatsup.=' ('.$langs->trans("ToGetBack").')';
+	}
 }
-if ($modetax==0) 	// Invoice for goods, payment for services
-{
-    $name=$langs->trans("VATReportByCustomersInInputOutputMode");
-    $calcmode=$langs->trans("CalcModeVATEngagement");
-    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
-    //$name.='<br>('.$langs->trans("SeeVATReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=1">','</a>').')';
-    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
-    $description=$langs->trans("RulesVATInServices");
-    $description.=' '.$langs->trans("DepositsAreIncluded");
-    $description.='<br>';
-    $description.=$langs->trans("RulesVATInProducts");
-    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.=' '.$langs->trans("DepositsAreNotIncluded");
-	else  $description.=' '.$langs->trans("DepositsAreIncluded");
-    //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
-    //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description.=$fsearch;
-    $builddate=time();
-    //$exportlink=$langs->trans("NotYetAvailable");
+if ($modetax==0) {	// Invoice for goods, payment for services
+	$name=$langs->trans("VATReportByCustomersInInputOutputMode");
+	$calcmode=$langs->trans("CalcModeVATEngagement");
+	$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+	//$name.='<br>('.$langs->trans("SeeVATReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=1">','</a>').')';
+	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
+	$description=$langs->trans("RulesVATInServices");
+	$description.=' '.$langs->trans("DepositsAreIncluded");
+	$description.='<br>';
+	$description.=$langs->trans("RulesVATInProducts");
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= ' ' . $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= ' ' . $langs->trans("DepositsAreIncluded");
+	}
+	//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
+	//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
+	$description.=$fsearch;
+	$description.='<br>'
+		. '<input type="radio" name="extra_report" value="0" '.($special_report?'':'checked="checked"').'> '
+		. $langs->trans('SimpleReport')
+		. '</input>'
+		. '<br>'
+		. '<input type="radio" name="extra_report" value="1" '.($special_report?'checked="checked"':'').'> '
+		. $langs->trans('AddExtraReport')
+		. '</input>'
+		. '<br>';
+	$builddate=time();
+	//$exportlink=$langs->trans("NotYetAvailable");
 
 	$elementcust=$langs->trans("CustomersInvoices");
 	$productcust=$langs->trans("Description");
 	$amountcust=$langs->trans("AmountHT");
-	if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
+	if ($mysoc->tva_assuj) {
+		$vatcust.=' ('.$langs->trans("ToPay").')';
+	}
 	$elementsup=$langs->trans("SuppliersInvoices");
 	$productsup=$langs->trans("Description");
 	$amountsup=$langs->trans("AmountHT");
-	if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+	if ($mysoc->tva_assuj) {
+		$vatsup.=' ('.$langs->trans("ToGetBack").')';
+	}
 }
 report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
 
@@ -198,25 +251,18 @@ $parameters["direction"] = 'sell';
 $hookmanager->initHooks(array('externalbalance'));
 $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-if (is_array($coll_list))
-{
+if (is_array($coll_list)) {
 	$var=true;
 	$total = 0;  $totalamount = 0;
 	$i = 1;
-	foreach($coll_list as $coll)
-	{
-		if($min == 0 or ($min > 0 && $coll->amount > $min))
-		{
+	foreach ($coll_list as $coll) {
+		if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
 			$var=!$var;
 			$intra = str_replace($find,$replace,$coll->tva_intra);
-			if(empty($intra))
-			{
-				if($coll->assuj == '1')
-				{
+			if(empty($intra)) {
+				if($coll->assuj == '1') {
 					$intra = $langs->trans('Unknown');
-				}
-				else
-				{
+				} else {
 					//$intra = $langs->trans('NotRegistered');
 					$intra = '';
 				}
@@ -232,28 +278,27 @@ if (is_array($coll_list))
 			print '<td class="nowrap">'.$intra."</td>";
 			print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
 			print "<td class=\"nowrap\" align=\"right\">".price($coll->tva)."</td>";
-            $totalamount = $totalamount + $coll->amount;
+			$totalamount = $totalamount + $coll->amount;
 			$total = $total + $coll->tva;
 			print "</tr>\n";
 			$i++;
 		}
 	}
-    $x_coll_sum = $total;
+	$x_coll_sum = $total;
 
 	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
+	print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
 	print '<td class="nowrap" align="right">'.price($total).'</td>';
 	print '</tr>';
-}
-else
-{
+} else {
 	$langs->load("errors");
-	if ($coll_list == -1)
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-	else if ($coll_list == -2)
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-	else
-		print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+	if ($coll_list == -1) {
+		print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+	} else if ($coll_list == -2) {
+		print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+	} else {
+		print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
+	}
 }
 
 //print '</table>';
@@ -279,25 +324,18 @@ $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
 
 $parameters["direction"] = 'buy';
 $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if (is_array($coll_list))
-{
+if (is_array($coll_list)) {
 	$var=true;
 	$total = 0;  $totalamount = 0;
 	$i = 1;
-	foreach($coll_list as $coll)
-	{
-		if($min == 0 or ($min > 0 && $coll->amount > $min))
-		{
+	foreach ($coll_list as $coll) {
+		if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
 			$var=!$var;
 			$intra = str_replace($find,$replace,$coll->tva_intra);
-			if(empty($intra))
-			{
-				if($coll->assuj == '1')
-				{
+			if (empty($intra)) {
+				if ($coll->assuj == '1') {
 					$intra = $langs->trans('Unknown');
-				}
-				else
-				{
+				} else {
 					//$intra = $langs->trans('NotRegistered');
 					$intra = '';
 				}
@@ -313,44 +351,197 @@ if (is_array($coll_list))
 			print '<td class="nowrap">'.$intra."</td>";
 			print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
 			print "<td class=\"nowrap\" align=\"right\">".price($coll->tva)."</td>";
-            $totalamount = $totalamount + $coll->amount;
+			$totalamount = $totalamount + $coll->amount;
 			$total = $total + $coll->tva;
 			print "</tr>\n";
 			$i++;
 		}
 	}
-    $x_paye_sum = $total;
+	$x_paye_sum = $total;
 
 	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
+	print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
 	print '<td class="nowrap" align="right">'.price($total).'</td>';
 	print '</tr>';
 
 	print '</table>';
 
-    // Total to pay
-    print '<br><br>';
-    print '<table class="noborder" width="100%">';
-    $diff = $x_coll_sum - $x_paye_sum;
-    print '<tr class="liste_total">';
-    print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
-    print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
-    print "</tr>\n";
+	// Total to pay
+	print '<br><br>';
+	print '<table class="noborder" width="100%">';
+	$diff = $x_coll_sum - $x_paye_sum;
+	print '<tr class="liste_total">';
+	print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
+	print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
+	print "</tr>\n";
 
-}
-else
-{
+} else {
 	$langs->load("errors");
-	if ($coll_list == -1)
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-	else if ($coll_list == -2)
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-	else
-		print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+	if ($coll_list == -1) {
+		print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+	} else if ($coll_list == -2) {
+		print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+	} else {
+		print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
+	}
 }
 
 print '</table>';
 
+if ($special_report) {
+	// Get country 2-letters code
+	global $mysoc;
+	$country_id = $mysoc->country_id;
+	$country = new Ccountry($db);
+	$country->fetch($country_id);
+
+	// Print listing of other-country customers as additional report
+	// This matches tax requirements to list all same-country customers (only)
+	print '<h3>'.$langs->trans('OtherCountriesCustomersReport').'</h3>';
+	print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry');
+	$coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
+
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	print '<td align="left">' . $langs->trans("Num") . "</td>";
+	print '<td align="left">' . $langs->trans("Customer") . "</td>";
+	print "<td>" . $langs->trans("VATIntra") . "</td>";
+	print "<td align=\"right\">" . $langs->trans("AmountHTVATRealReceived") . "</td>";
+	print "<td align=\"right\">" . $vatcust . "</td>";
+	print "</tr>\n";
+
+	if (is_array($coll_list)) {
+		$var = true;
+		$total = 0;
+		$totalamount = 0;
+		$i = 1;
+		foreach ($coll_list as $coll) {
+			if (substr($coll->tva_intra, 0, 2) == $country->code) {
+				// Only use different-country VAT codes
+				continue;
+			}
+			if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
+				$var = !$var;
+				$intra = str_replace($find, $replace, $coll->tva_intra);
+				if (empty($intra)) {
+					if ($coll->assuj == '1') {
+						$intra = $langs->trans('Unknown');
+					} else {
+						//$intra = $langs->trans('NotRegistered');
+						$intra = '';
+					}
+				}
+				print "<tr " . $bc[$var] . ">";
+				print '<td class="nowrap">' . $i . "</td>";
+				$company_static->id = $coll->socid;
+				$company_static->name = $coll->name;
+				$company_static->client = 1;
+				print '<td class="nowrap">' . $company_static->getNomUrl(1,
+						'customer') . '</td>';
+				$find = array(' ', '.');
+				$replace = array('', '');
+				print '<td class="nowrap">' . $intra . "</td>";
+				print "<td class=\"nowrap\" align=\"right\">" . price($coll->amount) . "</td>";
+				print "<td class=\"nowrap\" align=\"right\">" . price($coll->tva) . "</td>";
+				$totalamount = $totalamount + $coll->amount;
+				$total = $total + $coll->tva;
+				print "</tr>\n";
+				$i++;
+			}
+		}
+		$x_coll_sum = $total;
+
+		print '<tr class="liste_total"><td align="right" colspan="3">' . $langs->trans("Total") . ':</td>';
+		print '<td class="nowrap" align="right">' . price($totalamount) . '</td>';
+		print '<td class="nowrap" align="right">' . price($total) . '</td>';
+		print '</tr>';
+	} else {
+		$langs->load("errors");
+		if ($coll_list == -1) {
+			print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+		} else {
+			if ($coll_list == -2) {
+				print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+			} else {
+				print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
+			}
+		}
+	}
+	print '</table>';
+
+	// Print listing of same-country customers as additional report
+	// This matches tax requirements to list all same-country customers (only)
+	print '<h3>'.$langs->trans('SameCountryCustomersWithVAT').'</h3>';
+	print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry');
+	$coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
+
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	print '<td align="left">' . $langs->trans("Num") . "</td>";
+	print '<td align="left">' . $langs->trans("Customer") . "</td>";
+	print "<td>" . $langs->trans("VATIntra") . "</td>";
+	print "<td align=\"right\">" . $langs->trans("AmountHTVATRealReceived") . "</td>";
+	print "<td align=\"right\">" . $vatcust . "</td>";
+	print "</tr>\n";
+
+	if (is_array($coll_list)) {
+		$var = true;
+		$total = 0;
+		$totalamount = 0;
+		$i = 1;
+		foreach ($coll_list as $coll) {
+			if (substr($coll->tva_intra, 0, 2) != $country->code) {
+				// Only use same-country VAT codes
+				continue;
+			}
+			if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
+				$var = !$var;
+				$intra = str_replace($find, $replace, $coll->tva_intra);
+				if (empty($intra)) {
+					if ($coll->assuj == '1') {
+						$intra = $langs->trans('Unknown');
+					} else {
+						//$intra = $langs->trans('NotRegistered');
+						$intra = '';
+					}
+				}
+				print "<tr " . $bc[$var] . ">";
+				print '<td class="nowrap">' . $i . "</td>";
+				$company_static->id = $coll->socid;
+				$company_static->name = $coll->name;
+				$company_static->client = 1;
+				print '<td class="nowrap">' . $company_static->getNomUrl(1, 'customer') . '</td>';
+				$find = array(' ', '.');
+				$replace = array('', '');
+				print '<td class="nowrap">' . $intra . "</td>";
+				print "<td class=\"nowrap\" align=\"right\">" . price($coll->amount) . "</td>";
+				print "<td class=\"nowrap\" align=\"right\">" . price($coll->tva) . "</td>";
+				$totalamount = $totalamount + $coll->amount;
+				$total = $total + $coll->tva;
+				print "</tr>\n";
+				$i++;
+			}
+		}
+		$x_coll_sum = $total;
+
+		print '<tr class="liste_total"><td align="right" colspan="3">' . $langs->trans("Total") . ':</td>';
+		print '<td class="nowrap" align="right">' . price($totalamount) . '</td>';
+		print '<td class="nowrap" align="right">' . price($total) . '</td>';
+		print '</tr>';
+	} else {
+		$langs->load("errors");
+		if ($coll_list == -1) {
+			print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+		} else {
+			if ($coll_list == -2) {
+				print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+			} else {
+				print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
+			}
+		}
+	}
+	print '</table>';
+}
 
 llxFooter();
 
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
index 4b399d65248..3918b56c3bf 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -72,8 +72,8 @@ function tva_coll($db,$y,$q)
         $sql.= " AND f.fk_statut in (1,2)";
         $sql.= " AND f.rowid = d.fk_facture ";
         $sql.= " AND date_format(f.datef,'%Y') = '".$y."'";
-        $sql.= " AND (round(date_format(f.datef,'%m') > ".(($q-1)*3);
-        $sql.= " AND round(date_format(f.datef,'%m')) <= ".($q*3).")";
+        $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3);
+        $sql.= " AND date_format(f.datef,'%m') <= ".($q*3).")";
         $sql.= " ORDER BY rate, facid";
 
     }
@@ -131,7 +131,7 @@ function tva_paye($db, $y,$q)
     if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
     {
         // Si on paye la tva sur les factures dues (non brouillon)
-        $sql = "SELECT d.fk_facture_fourn as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.tva as amount";
+        $sql = "SELECT d.fk_facture_fourn as facid, f.ref_supplier as facnum, d.tva_tx as rate, d.total_ht as totalht, d.tva as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
         $sql.= ", ".MAIN_DB_PREFIX."facture_fourn_det as d" ;
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -222,8 +222,7 @@ if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
 	$subtot_coll_vat = 0;
 	$subtot_paye_total = 0;
 	$subtot_paye_vat = 0;
-	for ($q = 1 ; $q <= 4 ; $q++)
-	{
+	for ($q = 1 ; $q <= 4 ; $q++) {
 		print "<tr class=\"liste_titre\"><td colspan=\"8\">".$langs->trans("Quadri")." $q (".dol_print_date(dol_mktime(0,0,0,(($q-1)*3)+1,1,$y),"%b %Y").' - '.dol_print_date(dol_mktime(0,0,0,($q*3),1,$y),"%b %Y").")</td></tr>";
 		$var=true;
 
diff --git a/htdocs/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php
new file mode 100644
index 00000000000..5861dcdaff4
--- /dev/null
+++ b/htdocs/compta/tva/quarter_report.php
@@ -0,0 +1,713 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2007, 2015 Yannick Warnier      <ywarnier@beeznest.org>
+ * Copyright (C) 2014	   Ferran Marcet        <fmarcet@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/compta/tva/quadri_detail.php
+ *		\ingroup    tax
+ *		\brief      Trimestrial page - detailed version
+ *		TODO 		Deal with recurrent invoices as well
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+
+$langs->load("main");
+$langs->load("bills");
+$langs->load("compta");
+$langs->load("companies");
+$langs->load("products");
+$langs->load("other");
+
+// Date range
+$year=GETPOST('year', 'int');
+if (empty($year)) {
+	$year_current = strftime("%Y",dol_now());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
+}
+$date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
+$date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
+// Quarter
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
+	$q=GETPOST('q', 'int');
+	if (empty($q)) {
+		if (isset($_REQUEST["month"])) {
+			$date_start=dol_get_first_day($year_start,$_REQUEST["month"],false);
+			$date_end=dol_get_last_day($year_start,$_REQUEST["month"],false);
+		} else {
+			$month_current = strftime("%m",dol_now());
+			if ($month_current >= 10) $q=4;
+			elseif ($month_current >= 7) $q=3;
+			elseif ($month_current >= 4) $q=2;
+			else $q=1;
+		}
+	}
+	if ($q==1) {
+		$date_start=dol_get_first_day($year_start,1,false);
+		$date_end=dol_get_last_day($year_start,3,false);
+	}
+	if ($q==2) {
+		$date_start=dol_get_first_day($year_start,4,false);
+		$date_end=dol_get_last_day($year_start,6,false);
+	}
+	if ($q==3) {
+		$date_start=dol_get_first_day($year_start,7,false);
+		$date_end=dol_get_last_day($year_start,9,false);
+	}
+	if ($q==4) {
+		$date_start=dol_get_first_day($year_start,10,false);
+		$date_end=dol_get_last_day($year_start,12,false);
+	}
+}
+
+$min = GETPOST("min");
+if (empty($min)) {
+	$min = 0;
+}
+
+// Define modetax (0 or 1)
+// 0=normal, 1=option vat for services is on debit
+$modetax = $conf->global->TAX_MODE;
+if (isset($_REQUEST["modetax"])) {
+	$modetax=$_REQUEST["modetax"];
+}
+if (empty($modetax)) {
+	$modetax=0;
+}
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) {
+	$socid=$user->societe_id;
+}
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
+
+
+/*
+ * View
+ */
+
+$morequerystring='';
+$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
+foreach ($listofparams as $param) {
+	if (GETPOST($param)!='') {
+		$morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
+	}
+}
+
+llxHeader('','','','',0,0,'','',$morequerystring);
+
+$form=new Form($db);
+
+$company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+
+//print_fiche_titre($langs->trans("VAT"),"");
+
+//$fsearch.='<br>';
+$fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
+$fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
+//$fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
+//$fsearch.='  <input type="text" name="min" value="'.$min.'">';
+
+
+// Affiche en-tete du rapport
+if ($modetax==1) { // Calculate on invoice for goods and services
+	$nom=$langs->trans("VATReportByQuartersInDueDebtMode");
+	$calcmode=$langs->trans("CalcModeVATDebt");
+	$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	$prevyear=$year_start; $prevquarter=$q;
+	if ($prevquarter > 1) {
+		$prevquarter--;
+	} else {
+		$prevquarter=4; $prevyear--;
+	}
+	$nextyear=$year_start; $nextquarter=$q;
+	if ($nextquarter < 4) {
+		$nextquarter++;
+	} else {
+		$nextquarter=1; $nextyear++;
+	}
+	//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
+	$description=$langs->trans("RulesVATDueServices");
+	$description.='<br>';
+	$description.=$langs->trans("RulesVATDueProducts");
+	//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
+	//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description.='<br>'.$langs->trans("DepositsAreIncluded");
+	}
+	$description.=$fsearch;
+	$builddate=time();
+	//$exportlink=$langs->trans("NotYetAvailable");
+
+	$elementcust=$langs->trans("CustomersInvoices");
+	$productcust=$langs->trans("ProductOrService");
+	$amountcust=$langs->trans("AmountHT");
+	$vatcust=$langs->trans("VATReceived");
+	$namecust=$langs->trans("Name");
+	if ($mysoc->tva_assuj) {
+		$vatcust.=' ('.$langs->trans("ToPay").')';
+	}
+	$elementsup=$langs->trans("SuppliersInvoices");
+	$productsup=$langs->trans("ProductOrService");
+	$amountsup=$langs->trans("AmountHT");
+	$vatsup=$langs->trans("VATPaid");
+	$namesup=$namecust;
+	if ($mysoc->tva_assuj) {
+		$vatsup.=' ('.$langs->trans("ToGetBack").')';
+	}
+}
+if ($modetax==0) {	// Invoice for goods, payment for services
+	$nom=$langs->trans("VATReportByQuartersInInputOutputMode");
+	$calcmode=$langs->trans("CalcModeVATEngagement");
+	$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+	$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+	$prevyear=$year_start; $prevquarter=$q;
+	if ($prevquarter > 1) {
+		$prevquarter--;
+	} else {
+		$prevquarter=4; $prevyear--;
+	}
+	$nextyear=$year_start; $nextquarter=$q;
+	if ($nextquarter < 4) {
+		$nextquarter++;
+	} else {
+		$nextquarter=1; $nextyear++;
+	}
+	//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
+	$description=$langs->trans("RulesVATInServices");
+	$description.=' '.$langs->trans("DepositsAreIncluded");
+	$description.='<br>';
+	$description.=$langs->trans("RulesVATInProducts");
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description.=' '.$langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description.=' '.$langs->trans("DepositsAreIncluded");
+	}
+	//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
+	//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
+	$description.=$fsearch;
+	$builddate=time();
+	//$exportlink=$langs->trans("NotYetAvailable");
+
+	$elementcust=$langs->trans("CustomersInvoices");
+	$productcust=$langs->trans("ProductOrService");
+	$amountcust=$langs->trans("AmountHT");
+	$vatcust=$langs->trans("VATReceived");
+	$namecust=$langs->trans("Name");
+	if ($mysoc->tva_assuj) {
+		$vatcust.=' ('.$langs->trans("ToPay").')';
+	}
+	$elementsup=$langs->trans("SuppliersInvoices");
+	$productsup=$productcust;
+	$amountsup=$amountcust;
+	$vatsup=$langs->trans("VATPaid");
+	$namesup=$namecust;
+	if ($mysoc->tva_assuj) {
+		$vatsup.=' ('.$langs->trans("ToGetBack").')';
+	}
+}
+report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
+
+$vatcust=$langs->trans("VATReceived");
+$vatsup=$langs->trans("VATPaid");
+
+
+// VAT Received and paid
+
+echo '<table class="noborder" width="100%">';
+
+$y = $year_current;
+$total = 0;
+$i=0;
+$columns = 6;
+
+// Load arrays of datas
+$x_coll = vat_by_date($db, 0, 0, $date_start, $date_end, $modetax, 'sell');
+$x_paye = vat_by_date($db, 0, 0, $date_start, $date_end, $modetax, 'buy');
+
+if (!is_array($x_coll) || !is_array($x_paye)) {
+	$langs->load("errors");
+	if ($x_coll == -1) {
+		print '<tr><td colspan="' . $columns . '">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+	} else if ($x_coll == -2) {
+		print '<tr><td colspan="' . $columns . '">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+	} else {
+		print '<tr><td colspan="' . $columns . '">' . $langs->trans("Error") . '</td></tr>';
+	}
+} else {
+	$x_both = array();
+	//now, from these two arrays, get another array with one rate per line
+	foreach(array_keys($x_coll) as $my_coll_rate) {
+		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
+		$x_both[$my_coll_rate]['coll']['vat']	 = $x_coll[$my_coll_rate]['vat'];
+		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
+		$x_both[$my_coll_rate]['paye']['vat'] = 0;
+		$x_both[$my_coll_rate]['coll']['links'] = '';
+		$x_both[$my_coll_rate]['coll']['detail'] = array();
+		foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+			$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
+			$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
+			$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+			$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+			$x_both[$my_coll_rate]['coll']['detail'][] = array(
+				'id'        =>$x_coll[$my_coll_rate]['facid'][$id],
+				'descr'     =>$x_coll[$my_coll_rate]['descr'][$id],
+				'pid'       =>$x_coll[$my_coll_rate]['pid'][$id],
+				'pref'      =>$x_coll[$my_coll_rate]['pref'][$id],
+				'ptype'     =>$x_coll[$my_coll_rate]['ptype'][$id],
+				'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
+				'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
+				'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
+				'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
+				'dtype'     =>$x_coll[$my_coll_rate]['dtype'][$id],
+				'datef'     =>$x_coll[$my_coll_rate]['datef'][$id],
+				'company_link'=>$company_static->getNomUrl(1,'',20),
+				'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
+				'ddate_end'  =>$x_coll[$my_coll_rate]['ddate_end'][$id],
+				'totalht'   =>$x_coll[$my_coll_rate]['totalht_list'][$id],
+				'vat'       =>$x_coll[$my_coll_rate]['vat_list'][$id],
+				'link'      =>$invoice_customer->getNomUrl(1,'',12)
+			);
+		}
+	}
+	// tva paid
+	foreach (array_keys($x_paye) as $my_paye_rate) {
+		$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
+		$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
+		if (!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
+			$x_both[$my_paye_rate]['coll']['totalht'] = 0;
+			$x_both[$my_paye_rate]['coll']['vat'] = 0;
+		}
+		$x_both[$my_paye_rate]['paye']['links'] = '';
+		$x_both[$my_paye_rate]['paye']['detail'] = array();
+
+		foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy) {
+			$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
+			$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+			$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
+			$company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
+			$x_both[$my_paye_rate]['paye']['detail'][] = array(
+				'id'        =>$x_paye[$my_paye_rate]['facid'][$id],
+				'descr'     =>$x_paye[$my_paye_rate]['descr'][$id],
+				'pid'       =>$x_paye[$my_paye_rate]['pid'][$id],
+				'pref'      =>$x_paye[$my_paye_rate]['pref'][$id],
+				'ptype'     =>$x_paye[$my_paye_rate]['ptype'][$id],
+				'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
+				'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+				'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+				'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+				'dtype'     =>$x_paye[$my_paye_rate]['dtype'][$id],
+				'datef'     =>$x_paye[$my_paye_rate]['datef'][$id],
+				'company_link'=>$company_static->getNomUrl(1,'',20),
+				'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+				'ddate_end'  =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+				'totalht'   =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+				'vat'       =>$x_paye[$my_paye_rate]['vat_list'][$id],
+				'link'      =>$invoice_supplier->getNomUrl(1,'',12)
+			);
+		}
+	}
+	//now we have an array (x_both) indexed by rates for coll and paye
+
+
+	//print table headers for this quadri - incomes first
+
+	$x_coll_sum = 0;
+	$x_coll_ht = 0;
+	$x_paye_sum = 0;
+	$x_paye_ht = 0;
+
+	$span=$columns-3;
+	if ($modetax == 0) $span+=2;
+
+	//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
+
+	// Customers invoices
+	print '<tr class="liste_titre">';
+	print '<td align="left">'.$elementcust.'</td>';
+	print '<td align="left">'.$langs->trans("Date").'</td>';
+	print '<td align="left">'.$namecust.'</td>';
+	print '<td align="left">'.$productcust.'</td>';
+	if ($modetax == 0) {
+		print '<td align="right">'.$amountcust.'</td>';
+		print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td align="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
+	print '<td align="right">'.$vatcust.'</td>';
+	print '</tr>';
+	
+	$action = "tvadetail";
+	$parameters["mode"] = $modetax;
+	$parameters["start"] = $date_start;
+	$parameters["end"] = $date_end;
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	
+	foreach (array_keys($x_coll) as $rate) {
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
+
+		if (is_array($x_both[$rate]['coll']['detail'])) {
+			// VAT Rate
+			$var=true;
+			print "<tr>";
+			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
+			print '</tr>'."\n";
+
+			foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
+				// Define type
+				$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type=1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type=1;
+				}
+
+				$var=!$var;
+				print '<tr '.$bc[$var].'>';
+
+				// Ref
+				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+
+				// Invoice date
+				print '<td align="left">' . $fields['datef'] . '</td>';
+				// Company name
+				print '<td align="left">' . $fields['company_link'] . '</td>';
+
+				// Description
+				print '<td align="left">';
+				if ($fields['pid']) {
+					$product_static->id=$fields['pid'];
+					$product_static->ref=$fields['pref'];
+					$product_static->type=$fields['ptype'];
+					print $product_static->getNomUrl(1);
+					if (dol_string_nohtmltag($fields['descr'])) {
+						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+					}
+				} else {
+					if ($type) {
+						$text = img_object($langs->trans('Service'),'service');
+					} else {
+						$text = img_object($langs->trans('Product'),'product');
+					}
+					if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
+						if ($reg[1]=='DEPOSIT') {
+							$fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+						} elseif ($reg[1]=='CREDIT_NOTE') {
+							$fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+						} else {
+							$fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+						}
+					}
+					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+					// Show range
+					print_date_range($fields['ddate_start'],$fields['ddate_end']);
+				}
+				print '</td>';
+
+				// Total HT
+				if ($modetax == 0) {
+					print '<td class="nowrap" align="right">';
+					print price($fields['totalht']);
+					if (price2num($fields['ftotal_ttc'])) {
+						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+						$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+						//print ' ('.round($ratiolineinvoice*100,2).'%)';
+					}
+					print '</td>';
+				}
+
+				// Payment
+				$ratiopaymentinvoice=1;
+				if ($modetax == 0) {
+					if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+						$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+					}
+					print '<td class="nowrap" align="right">';
+					//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+					if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+						$payment_static->id=$fields['payment_id'];
+						print $payment_static->getNomUrl(2);
+					}
+					if ($type == 0) {
+						print $langs->trans("NotUsedForGoods");
+					} else {
+						print $fields['payment_amount'];
+						if (isset($fields['payment_amount'])) {
+							print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+						}
+					}
+					print '</td>';
+				}
+
+				// Total collected
+				print '<td class="nowrap" align="right">';
+				$temp_ht=$fields['totalht'];
+				if ($type == 1) {
+					$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+				}
+				print price(price2num($temp_ht,'MT'),1);
+				print '</td>';
+
+				// VAT
+				print '<td class="nowrap" align="right">';
+				$temp_vat=$fields['vat'];
+				if ($type == 1) {
+					$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+				}
+				print price(price2num($temp_vat,'MT'),1);
+				//print price($fields['vat']);
+				print '</td>';
+				print '</tr>';
+
+				$subtot_coll_total_ht += $temp_ht;
+				$subtot_coll_vat      += $temp_vat;
+				$x_coll_sum           += $temp_vat;
+			}
+		}
+		// Total customers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td colspan="'.$span.'"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
+		print '</tr>';
+	}
+
+	if (count($x_coll) == 0) {  // Show a total ine if nothing shown
+		print '<tr class="liste_total">';
+		print '<td colspan="'.$span.'"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num(0,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
+		print '</tr>';
+	}
+
+	// Blank line
+	print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
+
+	//print table headers for this quadri - expenses now
+	//imprime les en-tete de tables pour ce quadri - maintenant les d�penses
+	print '<tr class="liste_titre">';
+	print '<td align="left">'.$elementsup.'</td>';
+	print '<td align="left">'.$langs->trans("Date").'</td>';
+	print '<td align="left">'.$namesup.'</td>';
+	print '<td align="left">'.$productsup.'</td>';
+	if ($modetax == 0) {
+		print '<td align="right">'.$amountsup.'</td>';
+		print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td align="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
+	print '<td align="right">'.$vatsup.'</td>';
+	print '</tr>'."\n";
+
+	foreach (array_keys($x_paye) as $rate) {
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
+
+		if (is_array($x_both[$rate]['paye']['detail'])) {
+			$var=true;
+			print "<tr>";
+			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
+			print '</tr>'."\n";
+
+			foreach ($x_both[$rate]['paye']['detail'] as $index=>$fields) {
+				// Define type
+				$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type=1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type=1;
+				}
+
+				$var=!$var;
+				print '<tr '.$bc[$var].'>';
+
+				// Ref
+				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+				// Invoice date
+				print '<td align="left">' . $fields['datef'] . '</td>';
+				// Company name
+				print '<td align="left">' . $fields['company_link'] . '</td>';
+
+				// Description
+				print '<td align="left">';
+				if ($fields['pid']) {
+					$product_static->id=$fields['pid'];
+					$product_static->ref=$fields['pref'];
+					$product_static->type=$fields['ptype'];
+					print $product_static->getNomUrl(1);
+					if (dol_string_nohtmltag($fields['descr'])) {
+						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+					}
+				} else {
+					if ($type) {
+						$text = img_object($langs->trans('Service'),'service');
+					} else {
+						$text = img_object($langs->trans('Product'),'product');
+					}
+					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+					// Show range
+					print_date_range($fields['ddate_start'],$fields['ddate_end']);
+				}
+				print '</td>';
+
+				// Total HT
+				if ($modetax == 0) {
+					print '<td class="nowrap" align="right">';
+					print price($fields['totalht']);
+					if (price2num($fields['ftotal_ttc'])) {
+						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+						$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+						//print ' ('.round($ratiolineinvoice*100,2).'%)';
+					}
+					print '</td>';
+				}
+
+				// Payment
+				$ratiopaymentinvoice=1;
+				if ($modetax == 0) {
+					if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+						$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+					}
+					print '<td class="nowrap" align="right">';
+					if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+						$paymentfourn_static->id=$fields['payment_id'];
+						print $paymentfourn_static->getNomUrl(2);
+					}
+					if ($type == 0) {
+						print $langs->trans("NotUsedForGoods");
+					} else {
+						print $fields['payment_amount'];
+						if (isset($fields['payment_amount'])) {
+							print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+						}
+					}
+					print '</td>';
+				}
+
+				// VAT paid
+				print '<td class="nowrap" align="right">';
+				$temp_ht=$fields['totalht'];
+				if ($type == 1) {
+					$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+				}
+				print price(price2num($temp_ht,'MT'),1);
+				print '</td>';
+
+				// VAT
+				print '<td class="nowrap" align="right">';
+				$temp_vat=$fields['vat'];
+				if ($type == 1) {
+					$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+				}
+				print price(price2num($temp_vat,'MT'),1);
+				//print price($fields['vat']);
+				print '</td>';
+				print '</tr>';
+
+				$subtot_paye_total_ht += $temp_ht;
+				$subtot_paye_vat	  += $temp_vat;
+				$x_paye_sum		   += $temp_vat;
+			}
+		}
+		// Total suppliers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td colspan="'.$span.'"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
+		print '</tr>';
+	}
+
+	if (count($x_paye) == 0) {  // Show a total ine if nothing shown
+		print '<tr class="liste_total">';
+		print '<td colspan="'.$span.'"></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0) {
+			print '<td class="nowrap" align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num(0,'MT')).'</td>';
+		print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
+		print '</tr>';
+	}
+
+	print '</table>';
+
+	// Total to pay
+	print '<br><br>';
+	print '<table class="noborder" width="100%">';
+	$diff = $x_coll_sum - $x_paye_sum;
+	print '<tr class="liste_total">';
+	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
+	print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
+	print "</tr>\n";
+
+	$i++;
+}
+echo '</table>';
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 14cdedc821c..3f9c0d1bb59 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
@@ -140,7 +140,7 @@ if ($result)
 	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("");
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index e39c5502b4d..0278a864c2f 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
@@ -635,11 +635,11 @@ else
             $form=new Form($db);
             if ($object->birthday)
             {
-                print $form->select_date($object->birthday,'birthday',0,0,0,"perso");
+                print $form->select_date($object->birthday,'birthday',0,0,0,"perso", 1, 0, 1);
             }
             else
             {
-                print $form->select_date('','birthday',0,0,1,"perso");
+                print $form->select_date('','birthday',0,0,1,"perso", 1, 0, 1);
             }
             print '</td>';
 
@@ -1149,6 +1149,14 @@ else
         else print $langs->trans("NoDolibarrAccess");
         print '</td></tr>';
 
+        print '<tr><td>';
+        print $langs->trans("ExportCardToFormat").'</td><td colspan="3">';
+		print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$contact->id.'">';
+		print img_picto($langs->trans("VCard"),'vcard.png').' ';
+		print $langs->trans("VCard");
+		print '</a>';
+        print '</td></tr>';
+
         print "</table>";
 
         print dol_fiche_end();
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 9bbb684e831..e1a5468cfb9 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -921,7 +921,11 @@ class Contact extends CommonObject
         //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
         $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
         $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
-        $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',array($this->phone_pro,$this->phone_mobile,$this->phone_perso));
+        $phonelist=array();
+        if ($this->phone_pro) $phonelist[]=$this->phone_pro;
+        if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
+        if ($this->phone_pesro) $phonelist[]=$this->phone_perso;
+        $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',$phonelist);
         $label.= '<br><b>' . $langs->trans("Address") . ':</b> '.dol_format_address($this, 1, ' ', $langs);
 
         $link = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
deleted file mode 100644
index e9e9c70966c..00000000000
--- a/htdocs/contact/exportimport.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/* Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/contact/exportimport.php
- *	\ingroup    societe
- *	\brief      Onglet exports-imports d'un contact
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
-
-$langs->load("companies");
-
-// Security check
-$id = GETPOST('id', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
-
-
-/*
- *	View
- */
-
-$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-
-llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
-
-$form = new Form($db);
-
-$contact = new Contact($db);
-$contact->fetch($id, $user);
-
-
-$head = contact_prepare_head($contact);
-
-dol_fiche_head($head, 'exportimport', $title, 0, 'contact');
-
-
-/*
- * Fiche en mode visu
- */
-print '<table class="border" width="100%">';
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
-
-// Ref
-print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="3">';
-print $form->showrefnav($contact, 'id', $linkback);
-print '</td></tr>';
-
-// Name
-print '<tr><td width="20%">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td>'.$contact->lastname.'</td>';
-print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>';
-
-// Company
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-{
-    if ($contact->socid > 0)
-    {
-    	$objsoc = new Societe($db);
-    	$objsoc->fetch($contact->socid);
-
-    	print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
-    }
-    else
-    {
-    	print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-    	print $langs->trans("ContactNotLinkedToCompany");
-    	print '</td></tr>';
-    }
-}
-
-// Civility
-print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
-print $contact->getCivilityLabel();
-print '</td></tr>';
-
-print '</table>';
-
-print '</div>';
-
-print '<br>';
-
-print $langs->trans("ExportCardToFormat").': ';
-print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$contact->id.'">';
-print img_picto($langs->trans("VCard"),'vcard.png').' ';
-print $langs->trans("VCard");
-print '</a>';
-
-
-
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 11d46ad3fc4..c6ac982e348 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -131,7 +131,7 @@ $formother=new FormOther($db);
 
 $sql = "SELECT s.rowid as socid, s.nom as name,";
 $sql.= " p.rowid as cidp, p.lastname as lastname, p.statut, p.firstname, p.poste, p.email, p.skype,";
-$sql.= " p.phone, p.phone_mobile, p.fax, p.fk_pays, p.priv, p.tms,";
+$sql.= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.tms,";
 $sql.= " co.code as country_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
@@ -311,10 +311,10 @@ if ($result)
     print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"p.tms", $begin, $param, 'align="center"', $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("ContactVisibility"),$_SERVER["PHP_SELF"],"p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut", $begin, $param, 'align="center"', $sortfield,$sortorder);
-    print '<td class="liste_titre">&nbsp;</td>';
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
-    // Ligne des champs de filtres
+    // Lines for filter fields
     print '<tr class="liste_titre">';
     print '<td class="liste_titre">';
     print '<input class="flat" type="text" name="search_lastname" size="9" value="'.dol_escape_htmltag($search_lastname).'">';
@@ -377,6 +377,10 @@ if ($result)
 		$contactstatic->firstname='';
 		$contactstatic->id=$obj->cidp;
 		$contactstatic->statut=$obj->statut;
+		$contactstatic->poste=$obj->poste;
+		$contactstatic->phone_pro=$obj->phone_pro;
+		$contactstatic->phone_perso=$obj->phone_perso;
+		$contactstatic->phone_mobile=$obj->phone_mobile;
 		print $contactstatic->getNomUrl(1,'',20);
 		print '</td>';
 
@@ -403,7 +407,7 @@ if ($result)
         }
 
         // Phone
-        print '<td>'.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
         // Phone mobile
         print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
         // Fax
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 19213ca049f..8f4e97e690d 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -129,7 +129,7 @@ if ($action == 'edit')
     // Date To Birth
     print '<tr><td>'.$langs->trans("DateToBirth").'</td><td>';
     $form=new Form($db);
-    print $form->select_date($object->birthday,'birthday',0,0,1,"perso");
+    print $form->select_date($object->birthday,'birthday',0,0,1,"perso", 1,0,1);
     print '</td>';
 
     print '<td colspan="2">'.$langs->trans("Alert").': ';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 6bf7dcaeacc..4005cb9abdf 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1687,11 +1687,11 @@ else
                 }
 
                 print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>';
-                print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active");
+                print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active",1,0,1);
                 print '</td>';
 
                 print '<td>'.$langs->trans("DateEndPlanned").'</td><td>';
-                print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active");
+                print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active",1,0,1);
                 print '</td>';
 
                 print '<td align="center" rowspan="2" valign="middle">';
@@ -1744,7 +1744,7 @@ else
                     if ($objp->statut == 4)
                     {
                         print $langs->trans("DateEndReal").' ';
-                        $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1);
+                        print $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1,1);
                     }
                 }
                 print '</td>';
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index fe89907279c..eedb0183759 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -191,14 +191,14 @@ if ($resql)
 	print $form->selectarray('filter_op1',$arrayofoperators,$filter_op1,1);
 	print ' ';
 	$filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
-	print $form->select_date($filter_date1,'op1',0,0,1);
+	print $form->select_date($filter_date1,'op1',0,0,1,'',1,0,1);
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
 	$arrayofoperators=array('<'=>'<','>'=>'>');
 	print $form->selectarray('filter_op2',$arrayofoperators,$filter_op2,1);
 	print ' ';
 	$filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
-	print $form->select_date($filter_date2,'op2',0,0,1);
+	print $form->select_date($filter_date2,'op2',0,0,1,'',1,0,1);
 	print '</td>';
     print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index b81bd2f9578..ca851961857 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -180,6 +180,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					//$px1->mode='depth';
 					$px1->SetType(array('pie'));
 					$px1->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Invoices")));
+					$px1->combine = 0.05;
 
 					$px1->draw($filenamenb,$fileurlnb);
 				}
@@ -238,6 +239,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					//$px2->mode='depth';
 					$px2->SetType(array('pie'));
 					$px2->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Proposals")));
+					$px2->combine = 0.05;
 
 					$px2->draw($filenamenb,$fileurlnb);
 				}
@@ -297,6 +299,8 @@ class box_graph_product_distribution extends ModeleBoxes
 					//$px3->mode='depth';
 					$px3->SetType(array('pie'));
 					$px3->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Orders")));
+					$px3->combine = 0.05;
+
 					$px3->draw($filenamenb,$fileurlnb);
 				}
 			}
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index eb9c26b416a..c2425b54b71 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -20,7 +20,6 @@
  *  \file       htdocs/core/boxes/box_task.php
  *  \ingroup    Projet
  *  \brief      Module to Task activity of the current year
- *  \version    $Id: box_task.php,v 1.1 2012/09/11 Charles-François BENKE
  */
 
 include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
@@ -123,8 +122,7 @@ class box_task extends ModeleBoxes
 
 
 		// Add the sum à the bottom of the boxes
-		$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
-		$this->info_box_contents[$i][1] = array('td' => '', 'text' => "");
+		$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" colspan="2" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
 		$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
 		$this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
 		$this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index dfe83012acf..d1d05ec28a8 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -273,7 +273,6 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                             $tdparam='';
                             if (isset($contents[$i][$j]['td'])) $tdparam.=' '.$contents[$i][$j]['td'];
 
-                            if (empty($contents[$i][$j]['text'])) $contents[$i][$j]['text']="";
                             $text=isset($contents[$i][$j]['text'])?$contents[$i][$j]['text']:'';
                             $textwithnotags=preg_replace('/<([^>]+)>/i','',$text);
                             $text2=isset($contents[$i][$j]['text2'])?$contents[$i][$j]['text2']:'';
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 1aadc47b79e..2c58848fe4f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -39,7 +39,7 @@ class CMailFile
 	var $subject;      	// Topic:       Subject of email
 	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>')
 	                   	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
-	                   	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, use for Sender an email of the protected domain.
+	                   	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
 	                   	// Return-Path: Email where to send bounds.
 	var $errors_to;		// Errors-To:	Email where to send errors.
 	var $addr_to;
@@ -366,7 +366,7 @@ class CMailFile
 	 */
 	function sendfile()
 	{
-		global $conf;
+		global $conf,$db;
 
 		$errorlevel=error_reporting();
 		error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
@@ -375,6 +375,20 @@ class CMailFile
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
 		{
+			
+			dol_include_once('/core/class/hookmanager.class.php');
+        		$hookmanager=new HookManager($db);
+        		$hookmanager->initHooks(array('maildao'));
+        		$reshook=$hookmanager->executeHooks('doactions',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        		if (!empty($reshook))
+        		{
+                
+            			$this->error="Error in hook maildao doactions ".$reshook;
+            			dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+        
+			        return $reshook;
+        		}
+			
 			// Action according to choosed sending method
 			if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
 			{
@@ -408,8 +422,8 @@ class CMailFile
 					$bounce = '';	// By default
 					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
 					{
-						// le return-path dans les header ne fonctionne pas avec tous les MTA
-						// Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
+						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
+						// Le forcage de la valeure grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
 						// La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse)
 						$bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
 					}
@@ -427,7 +441,15 @@ class CMailFile
 
 					if (! $res)
 					{
-						$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Check your server logs and your firewalls setup";
+						$this->error="Failed to send mail with php mail";
+						$linuxlike=1;
+						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
+						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+						if (! $linuxlike)
+						{
+							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
+						}
+						$this->error.=".<br>Check your server logs and your firewalls setup";
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					}
 					else
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8ae7332fc6e..d9f8daa9882 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -41,6 +41,11 @@ abstract class CommonObject
      */
 	public $db;
 
+	/**
+	 * @var int The object identifier
+	 */
+	public $id;
+
     /**
      * @var string 		Error string
      * @deprecated		Use instead the array of error strings
@@ -92,33 +97,245 @@ abstract class CommonObject
      */
     public $canvas;
 
-
-    public $name;
-    public $lastname;
-    public $firstname;
-    public $civility_id;
 	/**
-	 * @deprecated
-	 * @see thirdparty
+	 * @var Project The related project
+	 * @see fetch_projet()
 	 */
-	public $client;
+	public $project;
 	/**
-	 * @var Societe
+	 * @var int The related project ID
+	 * @see setProject(), project
 	 */
-    public $thirdparty;
+	public $fk_project;
 	/**
 	 * @deprecated
 	 * @see project
 	 */
 	public $projet;
+
 	/**
-	 * @var Project
+	 * @var Contact a related contact
+	 * @see fetch_contact()
 	 */
-	public $project;
+	public $contact;
+	/**
+	 * @var int The related contact ID
+	 * @see fetch_contact()
+	 */
+	public $contact_id;
+
+	/**
+	 * @var Societe A related thirdparty
+	 * @see fetch_thirdparty()
+	 */
+	public $thirdparty;
+	/**
+	 * @deprecated
+	 * @see thirdparty
+	 */
+	public $client;
+
+	/**
+	 * @var User A related user
+	 * @see fetch_user()
+	 */
+	public $user;
+
+	/**
+	 * @var CommonObject An originating object?
+	 * @see fetch_origin()
+	 */
+	public $origin;
+	/**
+	 * @var int The originating object?
+	 * @see fetch_origin(), origin
+	 */
+	public $origin_id;
+
+	/**
+	 * @var string The object's reference
+	 */
+	public $ref;
+	/**
+	 * @var string The object's previous reference
+	 */
+	public $ref_previous;
+	/**
+	 * @var string The object's next reference
+	 */
+	public $ref_next;
+	/**
+	 * @var string An external reference for the object
+	 */
+	public $ref_ext;
+
+	/**
+	 * @var string
+	 */
+	public $element;
+	/**
+	 * @var string
+	 */
+	public $table_element;
+	/**
+	 * @var
+	 */
+	public $table_element_line;
+
+	/**
+	 * @var int The object's status
+	 * @see setStatut()
+	 */
+	public $statut;
+
+	/**
+	 * @var string
+	 * @see getFullAddress()
+	 */
+	public $country;
+	/**
+	 * @var int
+	 * @see getFullAddress(), country
+	 */
+	public $country_id;
+	/**
+	 * @var string
+	 * @see getFullAddress(), isInEEC(), country
+	 */
+	public $country_code;
+
+	/**
+	 * @var int
+	 * @see fetch_barcode()
+	 */
+	public $barcode_type;
+	/**
+	 * @var string
+	 * @see fetch_barcode(), barcode_type
+	 */
+	public $barcode_type_code;
+	/**
+	 * @var string
+	 * @see fetch_barcode(), barcode_type
+	 */
+	public $barcode_type_label;
+	/**
+	 * @var string
+	 * @see fetch_barcode(), barcode_type
+	 */
+	public $barcode_type_coder;
+
+	/**
+	 * @var int Payment method ID?
+	 * @see setPaymentMethods()
+	 */
+	public $mode_reglement_id;
+
+	/**
+	 * @var string Payment terms ID
+	 * @see setPaymentTerms()
+	 */
+	public $cond_reglement_id;
+	/**
+	 * @deprecated
+	 * @see cond_reglement_id;
+	 */
+	public $cond_reglement;
+
+	/**
+	 * @var int Delivery address ID
+	 * @see setDeliveryAddress()
+	 */
+	public $fk_delivery_address;
+
+	/**
+	 * @var int Shipping method ID
+	 * @see setShippingMethod()
+	 */
+	public $shipping_method_id;
+
+	/**
+	 * @var string
+	 * @see SetDocModel()
+	 */
+	public $modelpdf;
+
+	/**
+	 * @var int Bank account ID
+	 * @see SetBankAccount()
+	 */
+	public $fk_account;
+
+	/**
+	 * @var string Public note
+	 * @see update_note()
+	 */
+	public $note_public;
+	/**
+	 * @var string Private note
+	 * @see update_note()
+	 */
+	public $note_private;
+	/**
+	 * @deprecated
+	 * @see note_public
+	 */
+	public $note;
+
+	/**
+	 * @var float
+	 * @see update_price()
+	 */
+	public $total_ht;
+	/**
+	 * @var float
+	 * @see update_price()
+	 */
+	public $total_tva;
+	/**
+	 * @var float
+	 * @see update_price()
+	 */
+	public $total_localtax1;
+	/**
+	 * @var float
+	 * @see update_price()
+	 */
+	public $total_localtax2;
+	/**
+	 * @var float
+	 * @see update_price()
+	 */
+	public $total_ttc;
+
+	/**
+	 * @var CommonObjectLine[]
+	 */
+	public $lines;
+
+	/**
+	 * @var int
+	 * @see setIncoterms()
+	 */
+	public $fk_incoterms;
+	/**
+	 * @var string
+	 * @see SetIncoterms()
+	 */
+	public $libelle_incoterms;
+	/**
+	 * @var string
+	 * @see display_incoterms()
+	 */
+	public $location_incoterms;
+
+    public $name;
+    public $lastname;
+    public $firstname;
+    public $civility_id;
 
     // No constructor as it is an abstract class
 
-
     /**
      * Check an object id/ref exists
      * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
@@ -135,7 +352,7 @@ abstract class CommonObject
 
 		$sql = "SELECT rowid, ref, ref_ext";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
-		$sql.= " WHERE entity IN (".getEntity($element).")" ;
+		$sql.= " WHERE entity IN (".getEntity($element,1).")" ;
 
 		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
 		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
@@ -178,8 +395,6 @@ abstract class CommonObject
      */
     function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)
     {
-        global $conf;
-
         //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
         $lastname=$this->lastname;
         $firstname=$this->firstname;
@@ -223,13 +438,13 @@ abstract class CommonObject
      *
      *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
      *  @param 	int		$type_contact 		Type of contact (code or id). Must be if or code found into table llx_c_type_contact. For example: SALESREPFOLL
-     *  @param  int		$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+     *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
      *  @param  int		$notrigger			Disable all triggers
      *  @return int                 		<0 if KO, >0 if OK
      */
     function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)
     {
-        global $user,$conf,$langs;
+        global $user,$langs;
 
 
         dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source");
@@ -321,8 +536,6 @@ abstract class CommonObject
      */
     function copy_linked_contact($objFrom, $source='internal')
     {
-        global $user,$langs,$conf;
-
         $contacts = $objFrom->liste_contact(-1, $source);
         foreach($contacts as $contact)
         {
@@ -373,7 +586,7 @@ abstract class CommonObject
      */
     function delete_contact($rowid, $notrigger=0)
     {
-        global $user,$langs,$conf;
+        global $user;
 
 
         $this->db->begin();
@@ -545,7 +758,7 @@ abstract class CommonObject
      *      Return array with list of possible values for type of contacts
      *
      *      @param	string	$source     'internal', 'external' or 'all'
-     *      @param	string	$order		Sort order by 'code' or 'rowid'
+     *      @param	string	$order		Sort order by : 'code' or 'rowid'
      *      @param  int		$option     0=Return array id->label, 1=Return array code->label
      *      @param  int		$activeonly 0=all status of contact, 1=only the active
      *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')
@@ -769,7 +982,7 @@ abstract class CommonObject
                 }
             }
         }
-        else return 0;
+        return 0;
     }
 
     /**
@@ -891,10 +1104,8 @@ abstract class CommonObject
      *	@param	User|string	$user		Update last update fields also if user object provided
      *	@return	int						<0 if KO, >0 if OK
      */
-    function setValueFrom($field, $value, $table='', $id='', $format='', $id_field='', $user='')
+    function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $user='')
     {
-        global $conf;
-
         if (empty($table)) 	$table=$this->table_element;
         if (empty($id))    	$id=$this->id;
 		if (empty($format)) 	$format='text';
@@ -933,7 +1144,7 @@ abstract class CommonObject
      */
     function load_previous_next_ref($filter,$fieldid,$nodbprefix=0)
     {
-        global $conf, $user;
+        global $user;
 
         if (! $this->table_element)
         {
@@ -1253,6 +1464,8 @@ abstract class CommonObject
         }
     }
 
+	// TODO: Move line related operations to CommonObjectLine?
+
     /**
      *  Save a new position (field rang) for details lines.
      *  You can choose to set position for lines with already a position or lines without any position defined.
@@ -1918,7 +2131,7 @@ abstract class CommonObject
      *	@return	void
      *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
      */
-	function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype='',$clause='OR',$alsosametype=1)
+	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1)
     {
         global $conf;
 
@@ -1948,7 +2161,7 @@ abstract class CommonObject
 
         if (empty($sourceid) && empty($targetid))
         {
-        	dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERROR);
+        	dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERR);
         	return -1;
         }
 
@@ -2082,7 +2295,7 @@ abstract class CommonObject
      *	@return							int	>0 if OK, <0 if KO
      *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked
      */
-    function updateObjectLinked($sourceid='', $sourcetype='', $targetid='', $targettype='')
+    function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')
     {
     	$updatesource=false;
     	$updatetarget=false;
@@ -2128,7 +2341,7 @@ abstract class CommonObject
 	 *	@return     int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked
 	 */
-	function deleteObjectLinked($sourceid='', $sourcetype='', $targetid='', $targettype='')
+	function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')
 	{
 		$deletesource=false;
 		$deletetarget=false;
@@ -2180,7 +2393,7 @@ abstract class CommonObject
      *      @param	string	$elementType	Type of element to force (use this->table_element by default)
      *      @return int						<0 if KO, >0 if OK
      */
-    function setStatut($status,$elementId='',$elementType='')
+    function setStatut($status,$elementId=null,$elementType='')
     {
     	global $user,$langs,$conf;
 
@@ -2324,7 +2537,6 @@ abstract class CommonObject
         foreach($this->childtables as $table)
         {
             // Check if third party can be deleted
-            $nb=0;
             $sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
             $sql.= " WHERE ".$this->fk_element." = ".$id;
             $resql=$this->db->query($sql);
@@ -2398,10 +2610,9 @@ abstract class CommonObject
 
             	$pu_ht = $obj->pu_ht;
             	$qty= $obj->qty;
-            	$discount_percent_line = $obj->remise_percent;
             	$total_ht = $obj->total_ht;
 
-        		$total_discount_line = price2num(($pu_ht * $qty) - $total_ht, 'MT');
+        		$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
         		$total_discount += $total_discount_line;
 
         		$i++;
@@ -2451,7 +2662,7 @@ abstract class CommonObject
     function display_incoterms()
     {
         $out = '';
-		$this->incoterms_libelle = '';
+		$this->libelle_incoterms = '';
 		if (!empty($this->fk_incoterms))
 		{
 			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
@@ -2640,8 +2851,8 @@ abstract class CommonObject
 	 *	But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
 	 *
 	 *	@param	string		$action				Action code
-	 *	@param  Societe		$seller            	Object of seller third party
-	 *	@param  Societe  	$buyer             	Object of buyer third party
+	 *	@param  string		$seller            	Object of seller third party
+	 *	@param  string  	$buyer             	Object of buyer third party
 	 *	@param	int			$selected		   	Object line selected
 	 *	@param  int	    	$dateSelector      	1=Show also date range input fields
 	 *	@return	void
@@ -2734,12 +2945,12 @@ abstract class CommonObject
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
-					$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
 				else
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
-					$reshook=$hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
 			}
 			else
@@ -2755,16 +2966,16 @@ abstract class CommonObject
 	 *	Return HTML content of a detail line
 	 *	TODO Move this into an output class file (htmlline.class.php)
 	 *
-	 *	@param	string				$action				GET/POST action
-	 *	@param 	CommonObjectLine 	$line		       	Selected object line to output
-	 *	@param  string	    		$var               	Is it a an odd line (true)
-	 *	@param  int		    		$num               	Number of line (0)
-	 *	@param  int		    		$i					I
-	 *	@param  int		    		$dateSelector      	1=Show also date range input fields
-	 *	@param  Societe	    		$seller            	Object of seller third party
-	 *	@param  Societe	    		$buyer             	Object of buyer third party
-	 *	@param	int					$selected		   	Object line selected
-	 *  @param  object				$extrafieldsline	Object of extrafield line attribute
+	 *	@param	string		$action				GET/POST action
+	 *	@param CommonObjectLine $line		       	Selected object line to output
+	 *	@param  string	    $var               	Is it a an odd line (true)
+	 *	@param  int		    $num               	Number of line (0)
+	 *	@param  int		    $i					I
+	 *	@param  int		    $dateSelector      	1=Show also date range input fields
+	 *	@param  string	    $seller            	Object of seller third party
+	 *	@param  string	    $buyer             	Object of buyer third party
+	 *	@param	int			$selected		   	Object line selected
+	 *  @param  int			$extrafieldsline	Object of extrafield line attribute
 	 *	@return	void
 	 */
 	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)
@@ -2895,7 +3106,6 @@ abstract class CommonObject
 	    }
         print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';
 
-        $num = count($this->lines);
         $var = true;
         $i	 = 0;
 
@@ -2909,7 +3119,7 @@ abstract class CommonObject
                 {
                     $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
                     $action='';
-                    $reshook=$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                    $hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 }
             }
             else
@@ -2927,13 +3137,13 @@ abstract class CommonObject
      *  If lines are into a template, title must also be into a template
      *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
      *
-     * 	@param	array	$line		Line
-     * 	@param	string	$var		Var
+     * 	@param	CommonObjectLine	$line		Line
+     * 	@param	string				$var		Var
      * 	@return	void
      */
     function printOriginLine($line,$var)
     {
-        global $conf,$langs,$bc, $conf;
+        global $langs, $conf;
 
         //var_dump($line);
 		if (!empty($line->date_start))
@@ -3042,7 +3252,7 @@ abstract class CommonObject
 	/**
 	 * Show the array with all margin infos
 	 *
-	 * @param 		boolean	$force_price	Force price
+	 * @param 		bool	$force_price	Force price
 	 * @return		void
 	 * @deprecated	3.8 Load FormMargin class and make a direct call to displayMarginInfos
 	 */
@@ -3108,7 +3318,7 @@ abstract class CommonObject
 	 */
 	function delete_resource($rowid, $element, $notrigger=0)
 	{
-	    global $user,$langs,$conf;
+	    global $user;
 
 
 	    $this->db->begin();
@@ -3150,7 +3360,7 @@ abstract class CommonObject
         	$nboflines=count($this->lines);
         	for($i=0; $i < $nboflines; $i++)
         	{
-            	$this->lines[$i] = dol_clone($this->lines[$i]);
+            	$this->lines[$i] = clone $this->lines[$i];
         	}
         }
     }
@@ -3306,11 +3516,11 @@ abstract class CommonObject
 		{
 			// Create small thumbs for company (Ratio is near 16/9)
 	        // Used on logon for example
-	        $imgThumbSmall = vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+	        vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
 
 	        // Create mini thumbs for company (Ratio is near 16/9)
 	        // Used on menu or for setup page for example
-	        $imgThumbMini = vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);
+	        vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);
 		}
 	}
 
@@ -3365,7 +3575,7 @@ abstract class CommonObject
      *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label()
      *  @return	int						<0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded
      */
-    function fetch_optionals($rowid='',$optionsArray='')
+    function fetch_optionals($rowid=null,$optionsArray=null)
     {
     	if (empty($rowid)) $rowid=$this->id;
 
@@ -3429,10 +3639,6 @@ abstract class CommonObject
      */
 	function deleteExtraFields()
 	{
-		global $langs;
-
-		$error=0;
-
 		$this->db->begin();
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
@@ -3472,13 +3678,12 @@ abstract class CommonObject
             $langs->load('admin');
             require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
-            $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
+            $extrafields->fetch_name_optionals_label($this->table_element);
 
             foreach($this->array_options as $key => $value)
             {
                	$attributeKey = substr($key,8);   // Remove 'options_' prefix
                	$attributeType  = $extrafields->attribute_type[$attributeKey];
-               	//$attributeSize  = $extrafields->attribute_size[$attributeKey];	Not required to insert an extrafield value. Only used for definition.
                	$attributeLabel = $extrafields->attribute_label[$attributeKey];
                	$attributeParam = $extrafields->attribute_param[$attributeKey];
                	switch ($attributeType)
@@ -3486,7 +3691,7 @@ abstract class CommonObject
                		case 'int':
               			if (!is_numeric($value) && $value!='')
                			{
-               				$error++; $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
+               				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
                				return -1;
               			}
                			elseif ($value=='')
@@ -3572,8 +3777,8 @@ abstract class CommonObject
      * Function to show lines of extrafields with output datas
      *
      * @param	object	$extrafields	Extrafield Object
-     * @param	string	$mode			Show output (view) or input (edit) for extrafield
-	 * @param	array	$params			Optionnal parameters
+     * @param	string	$mode			Show output ('view') or input ('edit') for extrafield
+	 * @param	array	$params			Optionnal parameters. Example: array('colspan'=>2)
 	 * @param	string	$keyprefix		Prefix string to add into name and id of field (can be used to avoid duplicate names)
      *
      * @return string
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index 150d52fae62..ba519fab365 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2009  Regis Houssin  <regis.houssin@capnetworks.com>
+/* Copyright (C) 2009-2015  Regis Houssin  <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,19 +23,23 @@
 
 
 /**
- *	\class      DolCookie
- *	\brief      Class to manage cookies
+ *	Class to manage cookies.
+ *  This class is used by external module multicompany but will be removed soon only and must not be used by
+ *
+ *  @deprecated PHP already provide function to read/store a cookie. No need to use a dedicated class. Also storing sensitive information into cookie is forbidden, so encryption is useless.
+ *  If a data is sensitive, it must be stored into database (if we need a long term retention) or into session.
  */
 class DolCookie
 {
-	var $myKey;
+	private $_myKey;
+	private $_iv;
+
 	var $myCookie;
 	var $myValue;
 	var $myExpire;
 	var $myPath;
 	var $myDomain;
 	var	$mySecure;
-	var $cookiearray;
 	var $cookie;
 
 	/**
@@ -45,8 +49,8 @@ class DolCookie
 	 */
 	function __construct($key = '')
 	{
-		$this->myKey = $key;
-		$this->cookiearray = array();
+		$this->_myKey = hash('sha256', $key, TRUE);
+		$this->_iv = md5(md5($this->_myKey));
 		$this->cookie = "";
 		$this->myCookie = "";
 		$this->myValue = "";
@@ -58,16 +62,12 @@ class DolCookie
 	 *
 	 * @return	void
 	 */
-	function cryptCookie()
+	private function _cryptCookie()
 	{
-		if (!empty($this->myKey))
+		if (!empty($this->_myKey) && !empty($this->_iv))
 		{
 			$valuecrypt = base64_encode($this->myValue);
-			$max=dol_strlen($valuecrypt)-1;
-			for ($f=0 ; $f <= $max; $f++)
-			{
-				$this->cookie .= intval(ord($valuecrypt[$f]))*$this->myKey."|";
-			}
+			$this->cookie = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->_myKey, $valuecrypt, MCRYPT_MODE_CBC, $this->_iv));
 		}
 		else
 		{
@@ -82,19 +82,12 @@ class DolCookie
 	 *
 	 * @return	string
 	 */
-	function decryptCookie()
+	private function _decryptCookie()
 	{
-		if (!empty($this->myKey))
+		if (!empty($this->_myKey) && !empty($this->_iv))
 		{
-			$this->cookiearray = explode("|",$_COOKIE[$this->myCookie]);
-			$this->myValue = "" ;
-			$num = (count($this->cookiearray) - 2);
-			for ($f = 0; $f <= $num; $f++)
-			{
-				if (!empty($this->myKey)) {
-					$this->myValue .= strval(chr($this->cookiearray[$f]/$this->myKey));
-				}
-			}
+			$this->cookie = $_COOKIE[$this->myCookie];
+			$this->myValue = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->_myKey, base64_decode($this->cookie), MCRYPT_MODE_CBC, $this->_iv));
 
 			return(base64_decode($this->myValue));
 		}
@@ -115,7 +108,7 @@ class DolCookie
 	 * @param	int			$secure		0 or 1
 	 * @return	void
 	 */
-	function _setCookie($cookie, $value, $expire=0, $path="/", $domain="", $secure=0)
+	public function setCookie($cookie, $value, $expire=0, $path="/", $domain="", $secure=0)
 	{
 		$this->myCookie = $cookie;
 		$this->myValue = $value;
@@ -126,7 +119,7 @@ class DolCookie
 
 		//print 'key='.$this->myKey.' name='.$this->myCookie.' value='.$this->myValue.' expire='.$this->myExpire;
 
-		$this->cryptCookie();
+		$this->_cryptCookie();
 	}
 
 	/**
@@ -135,11 +128,11 @@ class DolCookie
 	 *  @param   	string		$cookie         Cookie name
 	 *  @return  	string						Decrypted value
 	 */
-	function _getCookie($cookie)
+	public function getCookie($cookie)
 	{
 		$this->myCookie = $cookie;
 
-		$decryptValue = $this->decryptCookie();
+		$decryptValue = $this->_decryptCookie();
 
 		return $decryptValue;
 	}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index b65c5c8ede4..0b713de80ff 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (c) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (c) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (c) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@ class DolGraph
 	var $showlegend=1;
 	var $showpointvalue=1;
 	var $showpercent=0;
-
+	var $combine=0;				// 0.05 if you want to combine records < 5% into "other"
 	var $graph;     			// Objet Graph (Artichow, Phplot...)
 	var $error;
 
@@ -875,39 +875,43 @@ class DolGraph
 			function plotWithOptions_'.$tag.'() {
 			$.plot($("#placeholder_'.$tag.'"), d0,
 			{
-			series: {
-			pie: {
-			show: true,
-			radius: 3/4,
-			label: {
-			show: true,
-			radius: 3/4,
-			formatter: function(label, series) {
-			var percent=Math.round(series.percent);
-			var number=series.data[0][1];
-			return \'';
-			$this->stringtoshow.='<div style="font-size:8pt;text-align:center;padding:2px;color:white;">';
-			if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-			$this->stringtoshow.='\'+';
-			$this->stringtoshow.=($showlegend?'':'label+\'<br/>\'+');	// Hide label if already shown in legend
-			$this->stringtoshow.=($showpointvalue?'number+':'');
-			$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
-			$this->stringtoshow.='\'';
-			if ($urltemp) $this->stringtoshow.='</a>';
-			$this->stringtoshow.='</div>\';
-			},
-			background: {
-			opacity: 0.5,
-			color: \'#000000\'
-			}
-			}
-			}
+				series: {
+					pie: {
+						show: true,
+						radius: 0.8,
+						'.($this->combine ? '
+						combine: {
+						 	threshold: '.$this->combine.'
+						},' : '') . '
+						label: {
+							show: true,
+							radius: 0.9,
+							formatter: function(label, series) {
+								var percent=Math.round(series.percent);
+								var number=series.data[0][1];
+								return \'';
+								$this->stringtoshow.='<div style="font-size:8pt;text-align:center;padding:2px;color:black;">';
+								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								$this->stringtoshow.='\'+';
+								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
+								$this->stringtoshow.=($showpointvalue?'number+':'');
+								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
+								$this->stringtoshow.='\'';
+								if ($urltemp) $this->stringtoshow.='</a>';
+								$this->stringtoshow.='</div>\';
+							},
+							background: {
+							opacity: 0.0,
+							color: \'#000000\'
+						}
+					}
+				}
 			},
 			zoom: {
-			interactive: true
+				interactive: true
 			},
 			pan: {
-			interactive: true
+				interactive: true
 			},';
 			if (count($datacolor))
 			{
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index ee7742660c1..d1c5547cccc 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -116,8 +116,8 @@ class HookManager
      * 	    @param		array	$parameters		Array of parameters
      * 		@param		Object	$object			Object to use hooks on
      * 	    @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     * 		@return		mixed					For 'addreplace hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 if KO.
-     * 											For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint.
+     * 		@return		mixed					For 'addreplace hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results and set into ->resArray.
+     * 											For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results and set into ->resArray.
      *                                          All types can also return some values into an array ->results.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
@@ -128,26 +128,28 @@ class HookManager
         $parameters['context']=join(':',$this->contextarray);
         dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
-        // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated).
+        // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
         $hooktype='output';
-        if (in_array(
-        	$method,
-        	array(
-        		'addMoreActionsButtons',
-		        'addStatisticLine',
-        	    'deleteFile',
-        		'doActions',
-        		'formCreateThirdpartyOptions',
-		        'formObjectOptions',
-		        'formattachOptions',
-		        'formBuilddocLineOptions',
-		        'moveUploadedFile',
-		        'pdf_writelinedesc',
-		        'paymentsupplierinvoices',
-		        'printSearchForm',
-        		'formatEvent'
-        		)
-        	)) $hooktype='addreplace';
+		if (in_array(
+			$method,
+			array(
+				'addMoreActionsButtons',
+				'addStatisticLine',
+				'deleteFile',
+				'doActions',
+				'formCreateThirdpartyOptions',
+				'formObjectOptions',
+				'formattachOptions',
+				'formBuilddocLineOptions',
+				'moveUploadedFile',
+				'pdf_writelinedesc',
+				'paymentsupplierinvoices',
+				'printAddress',
+				'printSearchForm',
+				'formatEvent',
+				'addCalendarChoice'
+				)
+			)) $hooktype='addreplace';
         // Deprecated hook types ('returnvalue')
         if (preg_match('/^pdf_/',$method) && $method != 'pdf_writelinedesc') $hooktype='returnvalue';		// pdf_xxx except pdf_writelinedesc are 'returnvalue' hooks. When there is 2 hooks of this type, only last one win. TODO Move them into 'output' or 'addreplace' hooks.
         if ($method == 'insertExtraFields')
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0adf708b392..19e313607ea 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -398,13 +398,13 @@ class Form
         if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
 
         $htmltext=str_replace('"',"&quot;",$htmltext);
-        if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
+        if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
         else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
         if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
         $s="";
         if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr style="height: auto;">';
-        elseif ($notabs == 2) $s.='<div class="inline-block nowrap">';
+        elseif ($notabs == 2) $s.='<div class="inline-block">';
         // Define value if value is before
         if ($direction < 0) {
             $s.='<'.$tag.$paramfortooltipimg;
@@ -1254,10 +1254,11 @@ class Form
      *  @param	string	$morefilter		Add more filters into sql request
      *  @param	string	$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
      *  @param	string	$enableonlytext	If option $enableonly is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
+     *  @param	string	$morecss		More css
      * 	@return	string					HTML select string
      *  @see select_dolgroups
      */
-    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='')
+    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='')
     {
         global $conf,$user,$langs;
 
@@ -1339,7 +1340,7 @@ class Form
 		            $nodatarole=($comboenhancement?' data-role="none"':'');
 		        }
 
-                $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$nodatarole.'>';
+                $out.= '<select class="flat minwidth200'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$nodatarole.'>';
                 if ($show_empty) $out.= '<option value="-1"'.((empty($selected) || $selected==-1)?' selected':'').'>&nbsp;</option>'."\n";
 				if ($show_every) $out.= '<option value="-2"'.(($selected==-2)?' selected':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
 
@@ -2324,7 +2325,7 @@ class Form
 
 
     /**
-     *      Charge dans cache la liste des conditions de paiements possibles
+     *      Load into cache list of payment terms
      *
      *      @return     int             Nb of lines loaded, <0 if KO
      */
@@ -2358,7 +2359,7 @@ class Form
                 $i++;
             }
 
-			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label');		// We use the sortorder
+			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
 
             return $num;
         }
@@ -2403,7 +2404,7 @@ class Form
                 $i++;
             }
 
-            $this->cache_availability = dol_sort_array($this->cache_availability, 'label');
+            $this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
 
             return $num;
         }
@@ -2484,7 +2485,7 @@ class Form
                 $i++;
             }
 
-            $this->cache_demand_reason=dol_sort_array($tmparray, 'label', 'asc');
+            $this->cache_demand_reason=dol_sort_array($tmparray, 'label', 'asc', 0, 0, 1);
 
             unset($tmparray);
             return $num;
@@ -2547,7 +2548,9 @@ class Form
 
         dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $sql = "SELECT id, code, libelle, type";
+        $this->cache_types_paiements = array();
+
+        $sql = "SELECT id, code, libelle as label, type";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
         $sql.= " WHERE active > 0";
 
@@ -2561,14 +2564,15 @@ class Form
                 $obj = $this->db->fetch_object($resql);
 
                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-                $label=($langs->trans("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->trans("PaymentTypeShort".$obj->code):($obj->libelle!='-'?$obj->libelle:''));
+                $label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
+                $this->cache_types_paiements[$obj->id]['id'] =$obj->id;
                 $this->cache_types_paiements[$obj->id]['code'] =$obj->code;
                 $this->cache_types_paiements[$obj->id]['label']=$label;
                 $this->cache_types_paiements[$obj->id]['type'] =$obj->type;
                 $i++;
             }
 
-            $this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label');
+            $this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
 
             return $num;
         }
@@ -3164,6 +3168,18 @@ class Form
                             $i++;
                         }
                     }
+					else if ($input['type'] == 'date')
+					{
+						$more.='<tr><td>'.$input['label'].'</td>';
+						$more.='<td colspan="2" align="left">';
+						$more.=$this->select_date($input['value'],$input['name'],0,0,0,'',1,0,1);
+						$more.='</td></tr>'."\n";
+						$formquestion[] = array('name'=>$input['name'].'day');
+						$formquestion[] = array('name'=>$input['name'].'month');
+						$formquestion[] = array('name'=>$input['name'].'year');
+						$formquestion[] = array('name'=>$input['name'].'hour');
+						$formquestion[] = array('name'=>$input['name'].'min');
+					}
                     else if ($input['type'] == 'other')
                     {
                         $more.='<tr><td>';
@@ -3209,9 +3225,9 @@ class Form
 			// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
             $formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
             if (! empty($more)) {
-            	$formconfirm.= '<div>'.$more.'</div>';
+            	$formconfirm.= '<div class="confirmquestions">'.$more.'</div>';
             }
-            $formconfirm.= ($question ? img_help('','').' '.$question : '');
+            $formconfirm.= ($question ? '<div class="confirmmessage"'.img_help('','').' '.$question . '</div>': '');
             $formconfirm.= '</div>'."\n";
 
             $formconfirm.= "\n<!-- begin ajax form_confirm page=".$page." -->\n";
@@ -3521,7 +3537,7 @@ class Form
             $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             $ret.='<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
             $ret.='<tr><td>';
-            $ret.=$this->select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname);
+            $ret.=$this->select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname,1,0,1);
             $ret.='</td>';
             $ret.='<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
             $ret.='</tr></table></form>';
@@ -3579,7 +3595,7 @@ class Form
 
 
     /**
-     *    Affiche formulaire de selection des modes de reglement
+     *    Show form with payment mode
      *
      *    @param	string	$page        	Page
      *    @param    int		$selected    	Id mode pre-selectionne
@@ -3607,6 +3623,7 @@ class Form
             if ($selected)
             {
                 $this->load_cache_types_paiements();
+
                 print $this->cache_types_paiements[$selected]['label'];
             } else {
                 print "&nbsp;";
@@ -4027,14 +4044,15 @@ class Form
      *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
      *	@param	string		$form_name 		Not used
      *	@param	int			$d				1=Show days, month, years
-     * 	@param	int			$addnowbutton	Add a button "Now"
+     * 	@param	int			$addnowlink		Add a link "Now"
      * 	@param	int			$nooutput		Do not output html string but return it
      * 	@param 	int			$disabled		Disable input fields
      *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
+     *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.
      * 	@return	mixed						Nothing or string if nooutput is 1
      *  @see	form_date
      */
-    function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowbutton=0, $nooutput=0, $disabled=0, $fullday='')
+    function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='')
     {
         global $conf,$langs;
 
@@ -4187,7 +4205,7 @@ class Form
         if ($h)
         {
             // Show hour
-            $retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'hour':'').'" name="'.$prefix.'hour">';
+            $retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'hour':'').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
             if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
             for ($hour = 0; $hour < 24; $hour++)
             {
@@ -4201,7 +4219,7 @@ class Form
         if ($m)
         {
             // Show minutes
-            $retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'min':'').'" name="'.$prefix.'min">';
+            $retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'min':'').'" id="'.$prefix.'min" name="'.$prefix.'min">';
             if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
             for ($min = 0; $min < 60 ; $min++)
             {
@@ -4211,14 +4229,18 @@ class Form
             $retstring.='</select>';
         }
 
-        // Add a "Now" button
-        if ($conf->use_javascript_ajax && $addnowbutton)
+        // Add a "Now" link
+        if ($conf->use_javascript_ajax && $addnowlink)
         {
-            // Script which will be inserted in the OnClick of the "Now" button
+            // Script which will be inserted in the onClick of the "Now" link
             $reset_scripts = "";
 
             // Generate the date part, depending on the use or not of the javascript calendar
-            if ($usecalendar == "eldy")
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(),'day').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(),'%d').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(),'%m').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(),'%Y').'\');';
+            /*if ($usecalendar == "eldy")
             {
                 $base=DOL_URL_ROOT.'/core/';
                 $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';
@@ -4228,30 +4250,66 @@ class Form
                 $reset_scripts .= 'this.form.elements[\''.$prefix.'day\'].value=formatDate(new Date(), \'d\'); ';
                 $reset_scripts .= 'this.form.elements[\''.$prefix.'month\'].value=formatDate(new Date(), \'M\'); ';
                 $reset_scripts .= 'this.form.elements[\''.$prefix.'year\'].value=formatDate(new Date(), \'yyyy\'); ';
-            }
-            // Generate the hour part
+            }*/
+            // Update the hour part
             if ($h)
             {
                 if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
+                //$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(),'%H').'\');';
                 if ($fullday) $reset_scripts .= ' } ';
             }
-            // Generate the minute part
+            // Update the minute part
             if ($m)
             {
                 if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
+                //$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(),'%M').'\');';
                 if ($fullday) $reset_scripts .= ' } ';
             }
-            // If reset_scripts is not empty, print the button with the reset_scripts in OnClick
+            // If reset_scripts is not empty, print the link with the reset_scripts in the onClick
             if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
             {
-                $retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="Now" onClick="'.$reset_scripts.'">';
+                $retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';
                 $retstring.=$langs->trans("Now");
                 $retstring.='</button> ';
             }
         }
 
+        // Add a "Plus one hour" link
+        if ($conf->use_javascript_ajax && $addplusone)
+        {
+            // Script which will be inserted in the onClick of the "Add plusone" link
+            $reset_scripts = "";
+
+            // Generate the date part, depending on the use or not of the javascript calendar
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(),'day').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(),'%d').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(),'%m').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(),'%Y').'\');';
+            // Update the hour part
+            if ($h)
+            {
+                if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(),'%H').'\');';
+                if ($fullday) $reset_scripts .= ' } ';
+            }
+            // Update the minute part
+            if ($m)
+            {
+                if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(),'%M').'\');';
+                if ($fullday) $reset_scripts .= ' } ';
+            }
+            // If reset_scripts is not empty, print the link with the reset_scripts in the onClick
+            if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
+            {
+                $retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="'.$reset_scripts.'">';
+                $retstring.=$langs->trans("DateStartPlusOne");
+                $retstring.='</button> ';
+            }
+        }
+
         if (! empty($nooutput)) return $retstring;
 
         print $retstring;
@@ -4604,7 +4662,7 @@ class Form
 	 *
 	 * 	@param		int		$id				Id of object
  	 * 	@param		string	$type			Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
- 	 *  @param		int		$rendermode		0=Default, use multiselect. 1=Use text with link
+ 	 *  @param		int		$rendermode		0=Default, use multiselect. 1=Emulate multiselect
 	 * 	@return		mixed					Array of category objects or < 0 if KO
 	 */
 	function showCategories($id, $type, $rendermode=0)
@@ -4622,10 +4680,10 @@ class Form
 				$ways = $c->print_all_ways();
 				foreach($ways as $way)
 				{
-					$toprint[] = img_object('','category').' '.$way;
+					$toprint[] = '<li class="select2-search-choice-dolibarr">'.img_object('','category').' '.$way.'</li>';
 				}
 			}
-			return implode('<br>', $toprint);
+			return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 
 		if ($rendermode == 0)
@@ -5142,11 +5200,11 @@ class Form
 	                 */
                     global $dolibarr_main_url_root;
                     $ret.='<!-- Put link to gravatar -->';
-                    $ret.='<img class="photo'.$modulepart.'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)),3).'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,2)).'">';	// gravatar need md5 hash
+                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)),3).'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,2)).'">';	// gravatar need md5 hash
                 }
                 else
 				{
-                    $ret.='<img class="photo'.$modulepart.'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
+                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
                 }
             }
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index d273eef1462..f20acde69b7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -795,8 +795,8 @@ class FormFile
 			print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Date"),$url,"date","",$param,'align="center"',$sortfield,$sortorder);
 			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');
-			print_liste_field_titre('','','');
-			print '</tr>';
+			print_liste_field_titre('');
+			print "</tr>\n";
 
 			$nboffiles=count($filearray);
 
@@ -866,14 +866,26 @@ class FormFile
 						if (image_format_supported($file['name']) > 0)
 						{
 							$permtoedit=0;
-							if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoedit=1;
-							if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoedit=1;
+							$newmodulepart=$modulepart;
+							if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service')
+							{
+								if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoedit=1;
+								if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoedit=1;
+								$newmodulepart='produit|service';
+							}
+							/* TODO Not yet working
+							if ($modulepart == 'holiday')
+							{
+								if ($user->rights->holiday->write_all) $permtoedit=1;
+							}
+							*/
+
 							if (empty($conf->global->MAIN_UPLOAD_DOC)) $permtoedit=0;
 
 							if ($permtoedit)
 							{
    								// Link to resize
-   			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
+   			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
 							}
 						}
 					}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 4e1a8ffc0c5..8310db730ab 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -276,7 +276,8 @@ class FormMail extends Form
 
         	// Get message template
 			$model_id=0;
-        	if (array_key_exists('models_id',$this->param)) {
+        	if (array_key_exists('models_id',$this->param))
+        	{
         		$model_id=$this->param["models_id"];
         	}
         	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
@@ -295,23 +296,26 @@ class FormMail extends Form
         	}
 
         	$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-        	if ($result<0) {
+        	if ($result<0)
+        	{
         		setEventMessage($this->error,'errors');
         	}
         	$modelmail_array=array();
-        	foreach($this->lines_model as $line) {
+        	foreach($this->lines_model as $line)
+        	{
         		$modelmail_array[$line->id]=$line->label;
         	}
 
-        	if (count($modelmail_array)>0) {
-	        	$out.= '<table class="nobordernopadding" width="100%"><tr><td width="20%">'."\n";
+        	// Zone to select its email template
+        	if (count($modelmail_array)>0)
+        	{
+	        	$out.= '<div style="padding: 3px 0 3px 0">'."\n";
 	        	$out.= $langs->trans('SelectMailModel').':'.$this->selectarray('modelmailselected', $modelmail_array,$model_id);
-	        	$out.= '</td>';
-	        	$out.= '<td width="5px">';
 	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	        	$out.= '</td>';
-	        	$out.= '<td><input class="flat" type="submit" value="'.$langs->trans('Valid').'" name="modelselected" id="modelselected"></td>';
-	        	$out.= '</tr></table>';
+	        	$out.= ' &nbsp; ';
+	        	$out.= '<input class="button" type="submit" value="'.$langs->trans('Valid').'" name="modelselected" id="modelselected">';
+	        	$out.= ' &nbsp; ';
+	        	$out.= '</div>';
         	}
 
 
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index ea5ca1c0048..c08568ad8b6 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -82,7 +82,7 @@ class FormOrder
 		print '<select class="flat" name="'.$htmlname.'">';
 		if ($addempty) print '<option value="-1" selected>&nbsp;</option>';
 
-		// TODO Use a table called llx_c_input_reason
+		// TODO Use the table called llx_c_input_reason
 		print '<option value="0"'.($selected=='0'?' selected':'').'>'.$langs->trans('OrderSource0').'</option>';
 		print '<option value="1"'.($selected=='1'?' selected':'').'>'.$langs->trans('OrderSource1').'</option>';
 		print '<option value="2"'.($selected=='2'?' selected':'').'>'.$langs->trans('OrderSource2').'</option>';
@@ -109,9 +109,9 @@ class FormOrder
 		global $conf,$langs,$form;
 
         if (! is_object($form)) $form=new Form($this->db);
-		
+
         $listofmethods=array();
-		
+
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
 		$sql.= " WHERE active = 1";
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 4f286d26eb7..8e9ca33b2a0 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -361,9 +361,10 @@ class FormOther
      *  @param  User	$user           Object user
      *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
      *  @param	int		$showempty		1=show also an empty value
+     *  @param	string	$morecss		More CSS
      *  @return string					Html combo list code
      */
-    function select_salesrepresentatives($selected,$htmlname,$user,$showstatus=0,$showempty=1)
+    function select_salesrepresentatives($selected,$htmlname,$user,$showstatus=0,$showempty=1,$morecss='')
     {
         global $conf,$langs;
         $langs->load('users');
@@ -383,7 +384,7 @@ class FormOther
             }
         }
         // Select each sales and print them in a select input
-        $out.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
         if ($showempty) $out.='<option value="0">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
@@ -582,6 +583,24 @@ class FormOther
         }
     }
 
+
+    /**
+     *		Output a HTML thumb of color or a text if not defined.
+     *
+     *		@param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')
+     *		@param	string		$textifnotdefined	Text to show if color not defined
+     * 		@return	string							HTML code for color thumb
+     *		@see selectColor
+     */
+    static function showColor($color, $textifnotdefined='')
+    {
+    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+    	$color = colorArrayToHex(colorStringToArray($color,array()),'');
+		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$color.'" value="'.$color.'">';
+		else print $textifnotdefined;
+    }
+
     /**
      *		Output a HTML code to select a color
      *
@@ -591,7 +610,7 @@ class FormOther
      * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@return	void
-     * 		@deprecated
+     * 		@deprecated Use instead selectColor
      *      @see selectColor()
      */
     function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
@@ -609,8 +628,9 @@ class FormOther
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@param	string		$morecss		Add css style into input field
      * 		@return	string
+     *		@see showColor
      */
-    function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
+    static function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
     {
 	    // Deprecation warning
 	    if ($form_name) {
@@ -857,7 +877,7 @@ class FormOther
         $min_year = $currentyear-$min_year;
         if(empty($selected) && empty($useempty)) $selected = $currentyear;
 
-        $out.= '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
+        $out.= '<select class="flat" placeholder="aa" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
         if($useempty)
         {
         	$selected_html='';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index cbc5452f3ba..d51516359ad 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -261,7 +261,7 @@ class FormProjets
 	 *
 	 *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
 	 *	@param  int		$selected   	Id task preselected
-	 *	@param  string	$htmlname   	Nom de la zone html
+	 *	@param  string	$htmlname   	Name of HTML select
 	 *	@param	int		$maxlength		Maximum length of label
 	 *	@param	int		$option_only	Return only html options lines without the select tag
 	 *	@param	int		$show_empty		Add an empty line
@@ -270,7 +270,7 @@ class FormProjets
      *  @param	int		$disabled		Disabled
 	 *	@return int         			Nber of project if OK, <0 if KO
 	 */
-	function select_task($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0)
+	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0)
 	{
 		global $user,$conf,$langs;
 
@@ -289,8 +289,11 @@ class FormProjets
 		}
 
 		// Search all projects
-		$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.ref, p.title, p.fk_soc, p.fk_statut, p.public';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p, '.MAIN_DB_PREFIX.'projet_task as t';
+		$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
+		$sql.= ' s.nom as name';
+		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$sql.= ', '.MAIN_DB_PREFIX.'projet_task as t';
 		$sql.= " WHERE p.entity = ".$conf->entity;
 		$sql.= " AND t.fk_projet = p.rowid";
 		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
@@ -312,7 +315,7 @@ class FormProjets
 	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
             	$out.=$comboenhancement;
             	$nodatarole=($comboenhancement?' data-role="none"':'');
-            	$minmax='minwidth100';
+            	$minmax='minwidth200';
 			}
 
 			if (empty($option_only)) {
@@ -346,6 +349,8 @@ class FormProjets
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
 
+						if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+
 						$disabled=0;
 						if ($obj->fk_statut == 0)
 						{
@@ -364,7 +369,7 @@ class FormProjets
 						}
 						// Label for task
 						$labeltoshow.=' - '.$obj->tref.' '.dol_trunc($obj->tlabel,$maxlength);
-						
+
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
 							$out.= '<option value="'.$obj->rowid.'" selected';
@@ -408,38 +413,42 @@ class FormProjets
 			return -1;
 		}
 	}
-	
-	
+
+
 	/**
 	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
 	 *    @param	string		$table_element		Table of the element to update
-	 *    @param	int			$socid				socid to filter
+	 *    @param	int			$socid				If of thirdparty to use as filter
+	 *    @param	string		$morecss			More CSS
 	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	function select_element($table_element,$socid=0)
+	function select_element($table_element,$socid=0,$morecss='')
 	{
 		global $conf, $langs;
 
 		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
 
+		$linkedtothirdparty=false;
+		if (! in_array($table_element, array('don','expensereport_det','expensereport'))) $linkedtothirdparty=true;
+
 		$projectkey="fk_projet";
 		switch ($table_element)
 		{
 			case "facture":
-				$sql = "SELECT rowid, facnumber as ref";
+				$sql = "SELECT t.rowid, t.facnumber as ref";
 				break;
 			case "facture_fourn":
-				$sql = "SELECT rowid, ref, ref_supplier";
+				$sql = "SELECT t.rowid, t.ref, t.ref_supplier";
 				break;
 			case "commande_fourn":
-				$sql = "SELECT rowid, ref, ref_supplier";
+				$sql = "SELECT t.rowid, t.ref, t.ref_supplier";
 				break;
 			case "facture_rec":
-				$sql = "SELECT rowid, titre as ref";
+				$sql = "SELECT t.rowid, t.titre as ref";
 				break;
 			case "actioncomm":
-				$sql = "SELECT id as rowid, label as ref";
+				$sql = "SELECT t.id as rowid, t.label as ref";
 				$projectkey="fk_project";
 				break;
 			case "expensereport_det":
@@ -448,14 +457,16 @@ class FormProjets
 				$projectkey="fk_projet";
 				break;*/
 			default:
-				$sql = "SELECT rowid, ref";
+				$sql = "SELECT t.rowid, t.ref";
 				break;
 		}
-
-		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element;
+		if ($linkedtothirdparty) $sql.=", s.nom as name";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
+		if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
 		$sql.= " WHERE ".$projectkey." is null";
-		if (! empty($socid) && ! in_array($table_element, array('don'))) $sql.= " AND fk_soc=".$socid;
-		if (! in_array($table_element, array('expensereport_det'))) $sql.= ' AND entity='.getEntity('project');
+		if (! empty($socid) && $linkedtothirdparty) $sql.= " AND t.fk_soc=".$socid;
+		if (! in_array($table_element, array('expensereport_det'))) $sql.= ' AND t.entity='.getEntity('project');
+		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
 		$sql.= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
@@ -467,12 +478,14 @@ class FormProjets
 			$i = 0;
 			if ($num > 0)
 			{
-				$sellist = '<select class="flat" name="elementselect">';
+				$sellist = '<select class="flat elementselect css'.$table_element.($morecss?' '.$morecss:'').'" name="elementselect">';
+				$sellist .='<option value="-1"></option>';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 					$ref=$obj->ref?$obj->ref:$obj->rowid;
 					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
+					if (! empty($obj->name)) $ref.=' - '.$obj->name;
 					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
@@ -489,13 +502,84 @@ class FormProjets
 			return $sellist;
 		}
 		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->lasterror();
+			$this->errors[]=$this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+
+	/**
+	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
+	 *
+	 *    @param	string		$htmlname			HTML name
+	 *    @param	int			$preselected		Preselected
+	 *    @param	int			$showempty			Add an empty line
+	 *    @param	int			$useshortlabel		Use short label
+	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO
+	 */
+	function selectOpportunityStatus($htmlname,$preselected=0,$showempty=1,$useshortlabel=0)
+	{
+		global $conf, $langs;
+
+		$sql = "SELECT rowid, code, label, percent";
+		$sql.= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
+		$sql.= " WHERE active = 1";
+		$sql.= " ORDER BY position";
+
+		dol_syslog(get_class($this).'::selectOpportunityStatus', LOG_DEBUG);
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num > 0)
+			{
+				$sellist = '<select class="flat oppstatus" name="'.$htmlname.'">';
+				if ($showempty) $sellist.= '<option value="-1"></option>';
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+
+					$sellist .='<option value="'.$obj->rowid.'"';
+					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
+					$sellist .= '>';
+					if ($useshortlabel)
+					{
+						$finallabel = ($langs->transnoentitiesnoconv("OppStatusShort".$obj->code) != "OppStatusShort".$obj->code ? $langs->transnoentitiesnoconv("OppStatusShort".$obj->code) : $obj->label);
+					}
+					else
+					{
+						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
+						$finallabel.= ' ('.$obj->percent.'%)';
+					}
+					$sellist .= $finallabel;
+					$sellist .='</option>';
+					$i++;
+				}
+				$sellist .='</select>';
+			}
+			/*else
+			{
+				$sellist = '<select class="flat" name="elementselect">';
+				$sellist.= '<option value="0" disabled>'.$langs->trans("None").'</option>';
+				$sellist.= '</select>';
+			}*/
+			$this->db->free($resql);
+
+			return $sellist;
+		}
+		else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errors[]=$this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::selectOpportunityStatus " . $this->error, LOG_ERR);
 			return -1;
 		}
 	}
 
-
 }
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 987d5d76682..e3f21212e8b 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -45,11 +45,13 @@ class FormPropal
      *    Return combo list of differents status of a proposal
      *    Values are id of table c_propalst
      *
-     *    @param	string	$selected   Preselected value
-     *    @param	int		$short		Use short labels
+     *    @param	string	$selected   	Preselected value
+     *    @param	int		$short			Use short labels
+     *    @param	int		$excludedraft	0=All status, 1=Exclude draft status
+     *    @param	int 	$showempty		1=Add empty line
      *    @return	void
      */
-    function selectProposalStatus($selected='',$short=0)
+    function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1)
     {
         global $langs;
 
@@ -61,7 +63,7 @@ class FormPropal
         if ($resql)
         {
             print '<select class="flat" name="propal_statut">';
-            print '<option value="">&nbsp;</option>';
+            if ($showempty) print '<option value="">&nbsp;</option>';
             $num = $this->db->num_rows($resql);
             $i = 0;
             if ($num)
@@ -69,6 +71,14 @@ class FormPropal
                 while ($i < $num)
                 {
                     $obj = $this->db->fetch_object($resql);
+                    if ($excludedraft)
+                    {
+						if ($obj->code == 'Draft' || $obj->code == 'PR_DRAFT')
+						{
+							$i++;
+							continue;
+						}
+                    }
                     if ($selected == $obj->id)
                     {
                         print '<option value="'.$obj->id.'" selected>';
@@ -83,7 +93,7 @@ class FormPropal
                         print $langs->trans("PropalStatus".$key.($short?'Short':''));
                     }
                     else
-                    {
+					{
                         $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Opened','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
                         if (! empty($conv_to_new_code[$obj->code])) $key=$conv_to_new_code[$obj->code];
                         print ($langs->trans("PropalStatus".$key.($short?'Short':''))!="PropalStatus".$key.($short?'Short':''))?$langs->trans("PropalStatus".$key.($short?'Short':'')):$obj->label;
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index dff357d8f91..737e682bba3 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -58,11 +58,12 @@ class Menu
      * @param   string	$target		Target lien
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+     * @param	int		$position	Position (not used yet)
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='')
+    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0)
     {
-        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu);
+        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position);
     }
 
     /**
@@ -76,12 +77,13 @@ class Menu
      * @param   string	$target		Target lien
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+     * @param	int		$position	Position (not used yet)
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='')
+    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0)
     {
         $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu));
+        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position));
         $array_end   = array_slice($this->liste,($idafter+1));
         $this->liste=array_merge($array_start,$array_new,$array_end);
     }
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 0f0f715922e..2c21cb3c512 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -95,6 +95,7 @@ class Menubase
         $this->perms=trim($this->perms);
         $this->enabled=trim($this->enabled);
         $this->user=trim($this->user);
+        $this->position=trim($this->position);
         if (! $this->level) $this->level=0;
 
         // Check parameters
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 349b32d5104..56e338b7eb8 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -400,7 +400,7 @@ class RssParser
                     {
                         if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
-                            $itemLink = (string) $item['link']['href'];
+                            $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
@@ -409,7 +409,7 @@ class RssParser
                         }
                         else
                         {
-                            $itemLink = (string) $item['link']['href'];
+                            $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index ff9f29f55ff..9a459f33e41 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -125,7 +125,10 @@ abstract class Stats
 	}
 
 	/**
-	 * Return amount of elements by month for several years
+	 * Return amount of elements by month for several years.
+	 * Criterias used to build request are defined into the constructor of parent class into xxx/class/xxxstats.class.php
+	 * The caller of class can add more filters into sql request by adding criteris into the $stats->where property just after
+	 * calling constructor.
 	 *
 	 * @param	int		$endyear		Start year
 	 * @param	int		$startyear		End year
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 9b4987ddb56..37846bf2421 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -337,8 +337,8 @@ class Translate
 	}
 
 	/**
-	 * Return translated value of key. Search in lang file, then into database.
-	 * Key must be any complete entry into lang file: CurrencyEUR, ...
+	 * Return translated value of key for special keys ("Currency...", "Civility...", ...).
+	 * Search in lang file, then into database. Key must be any complete entry into lang file: CurrencyEUR, ...
 	 * If not found, return key.
 	 * The string return is not formated (translated with transnoentitiesnoconv)
 	 * NOTE: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey), if you modify this function,
@@ -354,25 +354,33 @@ class Translate
 		if (! is_string($key)) return 'ErrorBadValueForParamNotAString';	// Avoid multiple errors with code not using function correctly.
 
 		$newstr=$key;
-		if (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i',$key,$reg))
-		{
-			$newstr=$this->getLabelFromKey($db,$reg[1],'c_currencies','code_iso','label');
-		}
-		else if (preg_match('/^SendingMethod([0-9A-Z]+)$/i',$key,$reg))
-		{
-			$newstr=$this->getLabelFromKey($db,$reg[1],'c_shipment_mode','code','libelle');
-		}
-        else if (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i',$key,$reg))
-        {
-            $newstr=$this->getLabelFromKey($db,$reg[1],'c_paiement','code','libelle');
-        }
-        else if (preg_match('/^Civility([0-9A-Z]+)$/i',$key,$reg))
+	    if (preg_match('/^Civility([0-9A-Z]+)$/i',$key,$reg))
         {
             $newstr=$this->getLabelFromKey($db,$reg[1],'c_civility','code','label');
         }
-        else if (preg_match('/^OrderSource([0-9A-Z]+)$/i',$key,$reg))
+		elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i',$key,$reg))
+		{
+			$newstr=$this->getLabelFromKey($db,$reg[1],'c_currencies','code_iso','label');
+		}
+		elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i',$key,$reg))
+		{
+			$newstr=$this->getLabelFromKey($db,$reg[1],'c_shipment_mode','code','libelle');
+		}
+        elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i',$key,$reg))
         {
-        	// TODO Add a table for OrderSourceX
+            $newstr=$this->getLabelFromKey($db,$reg[1],'c_paiement','code','libelle');
+        }
+		elseif (preg_match('/^OppStatusShort([0-9A-Z]+)$/i',$key,$reg))
+        {
+            $newstr=$this->getLabelFromKey($db,$reg[1],'c_lead_status','code','label');
+        }
+        elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i',$key,$reg))
+        {
+            $newstr=$this->getLabelFromKey($db,$reg[1],'c_lead_status','code','label');
+        }
+        elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i',$key,$reg))
+        {
+        	// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
             //$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
         }
         return $newstr;
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index c4908595493..fa9db9ea4b4 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -220,7 +220,7 @@ abstract class DoliDB implements Database
 	/**
 	 * Define sort criteria of request
 	 *
-	 * @param	string	$sortfield  List of sort fields
+	 * @param	string	$sortfield  List of sort fields, separated by comma. Example: 't1.fielda, t2.fieldb'
 	 * @param	string	$sortorder  Sort order
 	 * @return	string      		String to provide syntax of a sort sql string
 	 */
@@ -236,7 +236,8 @@ abstract class DoliDB implements Database
 				else $return.=',';
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
-				if (isset($sortorder)) {
+				if (isset($sortorder))
+				{
 					$return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder);
 				}
 			}
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 591789fcd89..d714a277ae0 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -34,7 +34,7 @@ class DoliDBMysqli extends DoliDB
     //! Database type
     public $type='mysqli';
     //! Database label
-    const LABEL='MySQL';
+    const LABEL='MySQL or MariaDB';
     //! Version min database
     const VERSIONMIN='4.1.3';
 	/** @var mysqli_result Resultset of last query */
diff --git a/htdocs/core/js/lib_batch.js b/htdocs/core/js/lib_batch.js
index e833cef4321..fd76085a36d 100644
--- a/htdocs/core/js/lib_batch.js
+++ b/htdocs/core/js/lib_batch.js
@@ -20,6 +20,8 @@
 //
 
 /**
+ * addLineBatch
+ * 
  * @param	index	int		number of produt. 0 = first product line
  */
 function addLineBatch(index) 
diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index ba3dc38da9e..6ddfa529bee 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -57,7 +57,8 @@ function showDP(base,dateFieldID,format,codelang)
 
 	showDP.box=document.createElement("div");
 	showDP.box.className="bodyline";
-	showDP.box.style.siplay="block";
+	showDP.box.style.display="block";
+	showDP.box.style.zIndex="1000";
 	showDP.box.style.position="absolute";
 	showDP.box.style.top=thetop + "px";
 	showDP.box.style.left=theleft + "px";
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 05204885c9c..2eb0fbb77ba 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -837,13 +837,13 @@ function unActivateModule($value, $requiredby=1)
     }
     else
     {
-        // TODO Cannot instantiate abstract class
-    	//$genericMod = new DolibarrModul($db);
-        //$genericMod->name=preg_replace('/^mod/i','',$modName);
-        //$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
-        //$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
+        // TODO Replace this afte DolibarrModules is moved as abstract class with a try catch to show module is bugged
+        $genericMod = new DolibarrModules($db);
+        $genericMod->name=preg_replace('/^mod/i','',$modName);
+        $genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
+        $genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
         dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName);
-        //$genericMod->_remove();
+        $genericMod->_remove();
     }
 
     // Desactivation des modules qui dependent de lui
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 0cdde284e28..a1d2ac3cf02 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -340,7 +340,7 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * Use ajax_combobox() only for small combo list! If not, use instead ajax_autocompleter().
  * TODO: It is used when COMPANY_USE_SEARCH_TO_SELECT and CONTACT_USE_SEARCH_TO_SELECT are set by html.formcompany.class.php. Should use ajax_autocompleter instead like done by html.form.class.php for select_produits.
  *
- * @param	string	$htmlname					Name of html select field
+ * @param	string	$htmlname					Name of html select field ('myid' or '.myclass')
  * @param	array	$events						More events option. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
  * @param  	int		$minLengthToAutocomplete	Minimum length of input string to start autocomplete
  * @param	int		$forcefocus					Force focus on field
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c4385b6324e..5ba2ea89009 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -504,7 +504,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
                 $projecttmp = new Project($db);
 
                 $i=0;
-                $var=false;
+                $var=true;
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($result);
@@ -629,7 +629,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     }
     // Edit
     print_liste_field_titre('');
-    print "</tr>";
+	print "</tr>\n";
 
 
     print '<tr class="liste_titre">';
@@ -971,6 +971,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
 
                     $out.="<tr ".$bc[$var].">";
 
+                    // Date
                     $out.='<td width="120" align="left" class="nowrap">';
                     $out.=dol_print_date($datep,'dayhour');
                     if ($datep2 && $datep2 != $datep)
@@ -998,7 +999,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
 
                     // Title of event
                     //$out.='<td colspan="2">'.dol_trunc($obj->label,40).'</td>';
-                    $out.='<td colspan="2">'.$actionstatic->getNomUrl(1,40).'</td>';
+                    $out.='<td colspan="2">'.$actionstatic->getNomUrl(1,120).'</td>';
 
                     // Contact pour cette action
                     if (empty($objcon->id) && $obj->fk_contact > 0)
@@ -1240,14 +1241,14 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
                 //$actionstatic->libelle=$libelle;
                 $actionstatic->libelle=$histo[$key]['note'];
                 $actionstatic->id=$histo[$key]['id'];
-                $out.=$actionstatic->getNomUrl(1,40);
+                $out.=$actionstatic->getNomUrl(1,120);
             }
             if (isset($histo[$key]['type']) && $histo[$key]['type']=='mailing')
             {
                 $out.='<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"),"email").' ';
                 $transcode=$langs->trans("Action".$histo[$key]['acode']);
                 $libelle=($transcode!="Action".$histo[$key]['acode']?$transcode:'Send mass mailing');
-                $out.=dol_trunc($libelle,40);
+                $out.=dol_trunc($libelle,120);
             }
             $out.='</td>';
 
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 40dab648de1..bd995cf63d0 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,11 +57,6 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
-	$head[$tab][0] = DOL_URL_ROOT.'/contact/exportimport.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans("ExportImport");
-	$head[$tab][2] = 'exportimport';
-	$tab++;
-
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index cbd7d308f07..8b9ca77f6a9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -226,7 +226,7 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable
  *
  *  @param	string	$paramname   Name of parameter to found
- *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'= Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'custom'= custom filter specify $filter and $options)
+ *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
  *  @param  int     $filter      Filter to apply when $check is set to custom. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to custom
@@ -545,7 +545,7 @@ function dol_escape_js($stringtoescape, $mode=0, $noescapebackslashn=0)
 
 
 /**
- *  Returns text escaped for inclusion in HTML alt or title tags, or into values of HTMPL input fields
+ *  Returns text escaped for inclusion in HTML alt or title tags, or into values of HTML input fields.
  *
  *  @param      string		$stringtoescape		String to escape
  *  @param		int			$keepb				Do not clean b tags
@@ -1777,26 +1777,29 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 						series: {
 							pie: {
 								show: true,
-								radius: 3/4,
+								radius: 0.8,
+								combine: {
+								 	threshold: 0.05
+								},
 								label: {
 									show: true,
-									radius: 3/4,
+									radius: 0.9,
 									formatter: function(label, series) {
 										var percent=Math.round(series.percent);
 										var number=series.data[0][1];
 										return \'';
-										print '<div style="font-size:8pt;text-align:center;padding:2px;color:white;">';
+										print '<div style="font-size:8pt;text-align:center;padding:2px;color:black;">';
 										if ($url) print '<a style="color: #FFFFFF;" border="0" href="'.$url.'=">';
-										print '\'+'.($showlegend?'number':'label+\'<br/>\'+number');
+										print '\'+'.($showlegend?'number':'label+\' \'+number');
 										if (! empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
 										print '+\'';
 										if ($url) print '</a>';
 										print '</div>\';
 									},
 									background: {
-										opacity: 0.5,
+										opacity: 0.0,
 										color: \'#000000\'
-									}
+									},
 								}
 							}
 						},
@@ -2639,7 +2642,7 @@ function dol_print_error_email($prefixcode)
  *	@param  string	$td          Options of attribute td ("" by defaut, example: 'align="center"')
  *	@param  string	$sortfield   Current field used to sort
  *	@param  string	$sortorder   Current sort order
- *  @param	string	$prefix		 Prefix for css
+ *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
  *	@return	void
  */
 function print_liste_field_titre($name, $file="", $field="", $begin="", $moreparam="", $td="", $sortfield="", $sortorder="", $prefix="")
@@ -2659,7 +2662,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
  *	@param  string	$moreattrib  Add more attributes on th ("" by defaut)
  *	@param  string	$sortfield   Current field used to sort
  *	@param  string	$sortorder   Current sort order
- *  @param	string	$prefix		 Prefix for css
+ *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
  *	@return	string
  */
 function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="", $prefix="")
@@ -2675,7 +2678,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 
 	// If field is used as sort criteria we use a specific class
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
-	if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="liste_titre_sel" '. $moreattrib.'>';
+	if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
 	else $out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
 
 	if (! empty($conf->dol_optimize_smallscreen) && empty($thead) && $field)    // If this is a sort field
@@ -2901,11 +2904,11 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
  *	@param	string			$file				Page URL (in most cases provided with $_SERVER["PHP_SELF"])
  *	@param	string			$options         	Other url paramaters to propagate ("" by default)
  *	@param	integer			$nextpage	    	Do we show a next page button
- *	@param	string			$betweenarrows		HTML content to show between arrows. Must contains '<li> </li>' tags.
+ *	@param	string			$betweenarrows		HTML content to show between arrows. MUST contains '<li> </li>' tags or '<li><span> </span></li>'.
  *  @param	string			$afterarrows		HTML content to show after arrows. Must NOT contains '<li> </li>' tags.
  *	@return	void
  */
-function print_fleche_navigation($page,$file,$options='',$nextpage=0,$betweenarrows='',$afterarrows='')
+function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='')
 {
 	global $conf, $langs;
 
@@ -2915,8 +2918,10 @@ function print_fleche_navigation($page,$file,$options='',$nextpage=0,$betweenarr
 		if (empty($conf->dol_use_jmobile)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
 		else print '<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
 	}
-	//if ($betweenarrows) print ($page > 0?' ':'').$betweenarrows.($nextpage>0?' ':'');
-	print $betweenarrows;
+	if ($betweenarrows)
+	{
+		print $betweenarrows;
+	}
 	if ($nextpage > 0)
 	{
 		if (empty($conf->dol_use_jmobile)) print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
@@ -3761,7 +3766,7 @@ function get_exdir($num,$level,$alpha,$withoutslash,$object,$modulepart)
 	// TODO if object is null, load it from id and modulepart.
 
 
-	if (! empty($level) && in_array($modulepart, array('cheque','user','category','shipment', 'member','don','donation','supplier_invoice','invoice_supplier')))
+	if (! empty($level) && in_array($modulepart, array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier')))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided
 		if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num);
@@ -4313,17 +4318,16 @@ function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)
 /**
  *	Set event message in dol_events session object. Will be output by calling dol_htmloutput_events.
  *  Note: Calling dol_htmloutput_events is done into pages by standard llxFooter() function.
+ *  Note: Prefer to use setEventMessages instead.
  *
  *	@param	mixed	$mesgs			Message string or array
  *  @param  string	$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')
  *  @return	void
  *  @see	dol_htmloutput_events
- *  @deprecated	Use setEventMessages instead
  */
 function setEventMessage($mesgs, $style='mesgs')
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
-
+	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
 	if (! is_array($mesgs))		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
@@ -4557,12 +4561,13 @@ function dol_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
  *
  *  @param      array		$array      		Array to sort (array of array('key','otherkey1','otherkey2'...))
  *  @param      string		$index				Key in array to use for sorting criteria
- *  @param      int			$order				Sort order
+ *  @param      int			$order				Sort order ('asc' or 'desc')
  *  @param      int			$natsort			1=use "natural" sort (natsort), 0=use "standard" sort (asort)
  *  @param      int			$case_sensitive		1=sort is case sensitive, 0=not case sensitive
+ *  @param		int			$keepindex			If 0 and index key of array to sort is a numeric, than index will be rewrote. If 1 or index key is not numeric, key for index is kept after sorting.
  *  @return     array							Sorted array
  */
-function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensitive=0)
+function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensitive=0, $keepindex=0)
 {
 	// Clean parameters
 	$order=strtolower($order);
@@ -4571,13 +4576,21 @@ function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensiti
 	if (is_array($array) && $sizearray>0)
 	{
 		foreach(array_keys($array) as $key) $temp[$key]=$array[$key][$index];
+
 		if (!$natsort) ($order=='asc') ? asort($temp) : arsort($temp);
 		else
 		{
 			($case_sensitive) ? natsort($temp) : natcasesort($temp);
 			if($order!='asc') $temp=array_reverse($temp,TRUE);
 		}
-		foreach(array_keys($temp) as $key) (is_numeric($key))? $sorted[]=$array[$key] : $sorted[$key]=$array[$key];
+
+		$sorted = array();
+
+		foreach(array_keys($temp) as $key)
+		{
+			(is_numeric($key) && empty($keepindex)) ? $sorted[]=$array[$key] : $sorted[$key]=$array[$key];
+		}
+
 		return $sorted;
 	}
 	return $array;
@@ -4634,7 +4647,8 @@ function dol_osencode($str)
 
 
 /**
- *      Return an id or code from a code or id. Store also Code-Id into a cache for next use.
+ *      Return an id or code from a code or id.
+ *      Store also Code-Id into a cache to speed up next request on same key.
  *
  * 		@param	DoliDB	$db			Database handler
  * 		@param	string	$key		Code to get Id
@@ -4642,7 +4656,7 @@ function dol_osencode($str)
  * 		@param	string	$fieldkey	Field for code
  * 		@param	string	$fieldid	Field for id
  *      @return int					<0 if KO, Id of code if OK
- *      @see getLabelFromKey
+ *      @see $langs->getLabelFromKey
  */
 function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 {
@@ -4657,7 +4671,7 @@ function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 		return $cache_codes[$tablename][$key];   // Found in cache
 	}
 
-	$sql = "SELECT ".$fieldid." as id";
+	$sql = "SELECT ".$fieldid." as valuetoget";
 	$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
 	$sql.= " WHERE ".$fieldkey." = '".$key."'";
 	dol_syslog('dol_getIdFromCode', LOG_DEBUG);
@@ -4665,7 +4679,7 @@ function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $cache_codes[$tablename][$key]=$obj->id;
+		if ($obj) $cache_codes[$tablename][$key]=$obj->valuetoget;
 		else $cache_codes[$tablename][$key]='';
 		$db->free($resql);
 		return $cache_codes[$tablename][$key];
@@ -5028,10 +5042,10 @@ function dol_getmypid()
  *                             			If param $mode is 1, can contains an operator <, > or = like "<10" or ">=100.5 < 1000"
  *                             			If param $mode is 2, can contains a list of id separated by comma like "1,3,4"
  * @param	integer			$mode		0=value is list of keywords, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of id separated with comma (Example '1,3,4')
- * @param	integer			$nofinaland	1=Do now output the final 'AND'
+ * @param	integer			$nofirstand	1=Do now output the first 'AND'
  * @return 	string 			$res 		The statement to append to the SQL query
  */
-function natural_search($fields, $value, $mode=0, $nofinaland=0)
+function natural_search($fields, $value, $mode=0, $nofirstand=0)
 {
     global $db,$langs;
 
@@ -5098,7 +5112,7 @@ function natural_search($fields, $value, $mode=0, $nofinaland=0)
         if ($newres) $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') .$newres . ($i2 > 1 ? ')' : '');
         $j++;
     }
-    $res = ($nofinaland?"":" AND ")."(" . $res . ")";
+    $res = ($nofirstand?"":" AND ")."(" . $res . ")";
     //print 'xx'.$res.'yy';
     return $res;
 }
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 09801972ce5..e7566107613 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -651,7 +651,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $masktri='00000';
         $maskcounter='00000';
     }
-    
+
     $maskraz=-1;
     $maskoffset=0;
     $resetEveryMonth=false;
@@ -670,7 +670,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
     else $maskrefclient='';
-    
+
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
     {
@@ -1915,29 +1915,30 @@ function fetchObjectByElement($element_id,$element_type) {
 
 
 /**
- *	Convert an array with RGB value into hex RGB value
+ *	Convert an array with RGB value into hex RGB value.
+ *  This is the opposite function of colorStringToArray
  *
  *  @param	array	$arraycolor			Array
  *  @param	string	$colorifnotfound	Color code to return if entry not defined or not a RGB format
- *  @return	string						RGB hex value (without # before). For example: FF00FF
- *  @see	Make the opposite of colorStringToArray
+ *  @return	string						RGB hex value (without # before). For example: 'FF00FF', '01FF02'
+ *  @see	colorStringToArray
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
 	if (! is_array($arraycolor)) return $colorifnotfound;
 	if (empty($arraycolor)) return $colorifnotfound;
-	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
+	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
-
 /**
  *	Convert a string RGB value ('FFFFFF', '255,255,255') into an array RGB array(255,255,255).
+ *  This is the opposite function of colorArrayToHex.
  *  If entry is already an array, return it.
  *
  *  @param	string	$stringcolor		String with hex (FFFFFF) or comma RGB ('255,255,255')
  *  @param	array	$colorifnotfound	Color code array to return if entry not defined
  *  @return	string						RGB hex value (without # before). For example: FF00FF
- *  @see	Make the opposite of colorArrayToHex
+ *  @see	colorArrayToHex
  */
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index bb42f2e0760..42551601524 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -34,11 +34,16 @@ function holiday_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT . '/holiday/card.php?id='.$object->id;
+    $head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'card';
     $h++;
 
+	$head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Document');
+	$head[$h][2] = 'documents';
+	$h++;
+
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 0dbdcf64a86..358209ef23e 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006-2011  Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2015  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Alexandre Spangaro  <alexandre.spangaro@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
@@ -68,17 +68,6 @@ function member_prepare_head(Adherent $object)
 	    $h++;
 	}
 
-	// Show category tab
-	if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$type = Categorie::TYPE_MEMBER;
-		$head[$h][0] = DOL_URL_ROOT."/categories/categorie.php?id=".$object->id.'&type='.$type;
-		$head[$h][1] = $langs->trans('Categories');
-		$head[$h][2] = 'category';
-		$h++;
-	}
-
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 5ca77722dd4..6be81524373 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -643,12 +643,12 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
 		$cury+=3;
-		
+
 		if ($diffsizecontent <= 2) $cury+=1;
 	}
 
 	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
-	
+
 	if (empty($onlynumber) && ! empty($account->domiciliation))
 	{
 		$pdf->SetXY($curx, $cury);
@@ -659,7 +659,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		$tmpy=$pdf->getStringHeight(100, $val);
 		$cury+=$tmpy;
 	}
-	
+
 	if (! empty($account->proprio))
 	{
 		$pdf->SetXY($curx, $cury);
@@ -668,9 +668,9 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		$tmpy=$pdf->getStringHeight(100, $val);
 		$cury+=$tmpy;
 	}
-	
+
 	else if (! $usedetailedbban) $cury+=1;
-	
+
 	// Use correct name of bank id according to country
 	$ibankey="IBANNumber";
 	if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
@@ -1735,12 +1735,22 @@ function pdf_getLinkedObjects($object,$outputlangs)
 				$objects[$i]->fetchObjectLinked();
 				$order = $objects[$i]->linkedObjects['commande'][0];
 
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
-				$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($objects[$i]->ref);
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-				$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($objects[$i]->date_delivery,'day','',$outputlangs);
+				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
+				{
+					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($objects[$i]->ref);
+					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
+					$linkedobjects[$objecttype]['date_value'].= dol_print_date($objects[$i]->date_delivery,'day','',$outputlangs);
+				}
+				else	// We show both info of order and shipment
+				{
+					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
+					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($objects[$i]->ref);
+					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending");
+					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+					$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($objects[$i]->date_delivery,'day','',$outputlangs);
+				}
 			}
 		}
 	}
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index 18608a55a04..a575ae51bcc 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -44,11 +44,6 @@ function prelevement_prepare_head(BonPrelevement $object)
 	$head[$h][2] = 'prelevement';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Lines");
-	$head[$h][2] = 'lines';
-	$h++;
-
 	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Bills");
 	$head[$h][2] = 'invoices';
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 556dbc0a1c6..5167fcd69f3 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -53,7 +53,7 @@ function project_prepare_head($object)
 	|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("ProjectReferers");
+		$head[$h][1] = $langs->trans("Overview");
 		$head[$h][2] = 'element';
 		$h++;
 	}
@@ -872,13 +872,15 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
  * Return HTML table with list of projects and number of opened tasks
  *
  * @param	DoliDB	$db					Database handler
+ * @param	Form	$form				Object form
  * @param   int		$socid				Id thirdparty
  * @param   int		$projectsListId     Id of project i have permission on
  * @param   int		$mytasks            Limited to task i am contact to
  * @param	int		$statut				-1=No filter on statut, 0 or 1 = Filter on status
+ * @param	array	$listofoppstatus	List of opportunity status
  * @return	void
  */
-function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0, $statut=-1)
+function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=0, $statut=-1, $listofoppstatus=array())
 {
 	global $langs,$conf,$user,$bc;
 
@@ -890,17 +892,22 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0, $sta
 	$sortorder='';
 	$project_year_filter=0;
 
-	$title=$langs->trans("Project");
-	if ($statut != '' && $statut >= 0) $title=$langs->trans("Project").' ('.$langs->trans($projectstatic->statuts[$statut]).')';
+	$title=$langs->trans("Projects");
+	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($title,"index.php","","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder);
+	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		print_liste_field_titre($langs->trans("OpportunityAmount"),"","","","",'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("OpportunityStatus"),"","","","",'align="right"',$sortfield,$sortorder);
+	}
+	if (empty($conf->global->PROJECT_HIDE_TASKS)) print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder);
 	print "</tr>\n";
 
-	$sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut, COUNT(t.rowid) as nb";
+	$sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount, COUNT(DISTINCT t.rowid) as nb";	// We use DISTINCT here because line can be doubled if task has 2 links to same user
 	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	if ($mytasks)
 	{
@@ -927,24 +934,31 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0, $sta
 	{
 		$sql.= " AND p.fk_statut = ".$statut;
 	}
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) {
+	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
+	{
 		$project_year_filter = GETPOST("project_year_filter");
 		//Check if empty or invalid year. Wildcard ignores the sql check
-		if ($project_year_filter != "*") {
-			if (empty($project_year_filter) || !ctype_digit($project_year_filter)) { //
+		if ($project_year_filter != "*")
+		{
+			if (empty($project_year_filter) || !ctype_digit($project_year_filter))
+			{
 				$project_year_filter = date("Y");
 			}
 			$sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
 			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
 		}
 	}
-	$sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut";
+	$sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount";
 	$sql.= " ORDER BY p.title, p.ref";
 
 	$var=true;
 	$resql = $db->query($sql);
 	if ( $resql )
 	{
+		$total_task = 0;
+		$total_opp_amount = 0;
+		$ponderated_opp_amount = 0;
+
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -966,15 +980,37 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0, $sta
 				$projectstatic->ref=$objp->ref;
 				print $projectstatic->getNomUrl(1);
 				print ' - '.dol_trunc($objp->title,24).'</td>';
-				print '<td align="right">'.$objp->nb.'</td>';
-				$projectstatic->statut = $objp->fk_statut;
+				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+				{
+					print '<td align="right">';
+        			if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					print '</td>';
+					print '<td align="right">';
+					$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
+        			if ($code) print $langs->trans("OppStatus".$code);
+					print '</td>';
+				}
+				$projectstatic->statut = $objp->status;
+				if (empty($conf->global->PROJECT_HIDE_TASKS)) print '<td align="right">'.$objp->nb.'</td>';
 				print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
 				print "</tr>\n";
+
+				$total_task = $total_task + $objp->nb;
+				$total_opp_amount = $total_opp_amount + $objp->opp_amount;
+				$ponderated_opp_amount = $ponderated_opp_amount + price2num($listofoppstatus[$objp->opp_status] * $objp->opp_amount / 100);
 			}
 
 			$i++;
 		}
 
+		print '<tr><td>'.$langs->trans("Total")."</td>";
+		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		{
+			print '<td align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
+			print '<td align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmount"), 1).'</td>';
+		}
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) print '<td align="right">'.$total_task.'</td>';
+
 		$db->free($resql);
 	}
 	else
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 681f6e7a913..79ab5fe0ead 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -24,18 +24,18 @@
 
 
 /**
-*    Show header of a VAT report
+*	Show header of a VAT report
 *
-*    @param		string				$nom            Name of report
-*    @param 	string				$variante       Link for alternate report
-*    @param 	string				$period         Period of report
-*    @param 	string				$periodlink     Link to switch period
-*    @param 	string				$description    Description
-*    @param 	timestamp|integer	$builddate      Date generation
-*    @param 	string				$exportlink     Link for export or ''
-*    @param		array				$moreparam		Array with list of params to add into form
-*    @param		string				$calcmode		Calculation mode
-*    @return	void
+*	@param		string				$nom            Name of report
+*	@param 	string				$variante       Link for alternate report
+*	@param 	string				$period         Period of report
+*	@param 	string				$periodlink     Link to switch period
+*	@param 	string				$description    Description
+*	@param 	timestamp|integer	$builddate      Date generation
+*	@param 	string				$exportlink     Link for export or ''
+*	@param		array				$moreparam		Array with list of params to add into form
+*	@param		string				$calcmode		Calculation mode
+*	@return	void
 */
 function report_header($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='')
 {
@@ -55,7 +55,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	foreach($moreparam as $key => $value)
 	{
-	     print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 	print '<table width="100%" class="border">';
 
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index fe0c9809296..04e0fb133f6 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -212,7 +212,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	// Execute hook getLoginPageOptions
 	// Should be an array with differents options in $hookmanager->resArray
 	$parameters=array('entity' => GETPOST('entity','int'));
-	$hookmanager->executeHooks('getLoginPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks
+	$reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks. resArray is filled by hook.
 
 	// Login
 	$login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
@@ -238,7 +238,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
 	{
 		$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
-
 	}
 
 	// Security graphical code
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index a163047e61b..7d9ee545dea 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -280,10 +280,11 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
             $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
             $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc,";
+            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
             $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
             $sql.= " 0 as payment_id, 0 as payment_amount";
             $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+            $sql.= " ".MAIN_DB_PREFIX."societe as s,";
             $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
@@ -291,6 +292,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
 			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;
+            $sql.= " AND s.rowid = f.fk_soc";
             if ($y && $m)
             {
                 $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
@@ -325,10 +327,11 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
             $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
             $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc,";
+            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef as date_f, s.nom as company_name, s.rowid as company_id,";
             $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
             $sql.= " 0 as payment_id, 0 as payment_amount";
             $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+            $sql.= " ".MAIN_DB_PREFIX."societe as s,";
             $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
@@ -336,6 +339,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
         	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
 			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;
+            $sql.= " AND s.rowid = f.fk_soc";
             if ($y && $m)
             {
                 $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
@@ -384,6 +388,9 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
                 }
                 $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
                 $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
+                $list[$assoc['rate']]['datef'][] = $assoc['datef'];
+                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
+                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
                 $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
                 $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
@@ -438,10 +445,11 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
             $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
             $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc,";
+            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
             $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
             $sql.= " 0 as payment_id, 0 as payment_amount";
             $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+            $sql.= " ".MAIN_DB_PREFIX."societe as s,";
             $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
@@ -449,6 +457,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
         	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
 			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;
+            $sql.= " AND s.rowid = f.fk_soc";
             if ($y && $m)
             {
                 $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
@@ -484,12 +493,13 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
             $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
             $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc,";
+            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
             $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
             $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount";
             $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
             $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
             $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+            $sql.= " ".MAIN_DB_PREFIX."societe as s,";
             $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
@@ -497,6 +507,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
         	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
 			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;
+            $sql.= " AND s.rowid = f.fk_soc";
             $sql.= " AND pf.".$fk_facture2." = f.rowid";
             $sql.= " AND pa.rowid = pf.".$fk_payment;
             if ($y && $m)
@@ -548,6 +559,9 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
                 }
                 $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
                 $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
+                $list[$assoc['rate']]['datef'][] = $assoc['datef'];
+                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
+                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
                 $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
                 $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 08fa63c52c6..5b1682c5494 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -144,7 +144,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree')
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
 			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; }
-			print "\n".'<li>';
+			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
 			print $tab[$x]['entry'];
 			// And now we search all its sons of lower level
 			tree_recur($tab,$tab[$x],$rang+1);
@@ -153,7 +153,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree')
 		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; }
-			print "\n".'<li>';
+			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
 			print $tab[$x]['entry'];
 			// And now we search all its sons of lower level
 			tree_recur($tab,$tab[$x],$rang+1);
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index e3895bacf54..5dc17962e14 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -254,7 +254,12 @@ function entity_prepare_head($object, $aEntities)
  */
 function show_theme($fuser,$edit=0,$foruserprofile=false)
 {
-    global $conf,$langs,$bc;
+    global $conf,$langs,$db;
+    global $bc;
+
+	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+
+    $formother = new FormOther($db);
 
     //$dirthemes=array(empty($conf->global->MAIN_FORCETHEMEDIR)?'/theme':$conf->global->MAIN_FORCETHEMEDIR.'/theme');
     $dirthemes=array('/theme');
@@ -380,9 +385,48 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
 	    $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
 	    print '<td colspan="'.($colspan-1).'"><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-	    print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+	    print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';
 	    print '</tr>';
+
+	    //if ($conf->theme == 'eldy')
+	    //{
+		    // TopMenuBackgroundColor
+		    $var=!$var;
+		    print '<tr '.$bc[$var].'>';
+		    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		    print '<td colspan="'.($colspan-1).'">';
+		    if ($edit)
+		    {
+				print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+		    }
+		   	else
+		   	{
+		   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+				if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$color.'" value="'.$color.'">';
+				else print $langs->trans("Default");
+		   	}
+	    	print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		    print '</td>';
+
+		    // BackgroundTableTitleColor
+		    $var=!$var;
+		    print '<tr '.$bc[$var].'>';
+		    print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
+		    print '<td colspan="'.($colspan-1).'">';
+		    if ($edit)
+		    {
+				print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
+		    }
+		   	else
+		   	{
+		   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
+		   	}
+	    	print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		    print '</td>';
+	    //}
+
+	    print '</tr>';
 	}
 
     print '</table>';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index ef83701518c..5a6eee1184a 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  * @param 	DoliDB	$db				Database handler
  * @param 	string	$atarget		Target (Example: '' or '_top')
  * @param 	int		$type_user     	0=Menu for backoffice, 1=Menu for front office
- * @param  	array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param  	array	$tabMenu        If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	array	$menu			Object Menu to return back list of menu entries
  * @param	int		$noout			Disable output (Initialise &$menu only).
  * @return	int						0
@@ -732,9 +732,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->ficheinter->enabled))
 			{
 				$langs->load("interventions");
-				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter');
-				$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer);
-				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire);
+				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 200);
+				$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);
+				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
 			}
 
 		}
@@ -1133,6 +1133,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		/*
 		 * Menu SUPPLIERS
 		 */
+		/*
 		if ($mainmenu == 'suppliers')
 		{
 			$langs->load("suppliers");
@@ -1173,6 +1174,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 		}
+		*/
 
 		/*
 		 * Menu PROJECTS
@@ -1192,6 +1194,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer);
 				$newmenu->add("/projet/list.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
+				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
 
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
@@ -1215,19 +1218,21 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		*/
 		if ($mainmenu == 'hrm')
 		{
-			// Holiday module
+			// Leave/Holiday/Vacation module
 			if (! empty($conf->holiday->enabled))
 			{
 				$langs->load("holiday");
 
-				$newmenu->add("/holiday/index.php?&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->write, '', $mainmenu, 'hrm');
-				$newmenu->add("/holiday/card.php?&action=request", $langs->trans("MenuAddCP"), 1,$user->rights->holiday->write);
+				$newmenu->add("/holiday/list.php?&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');
+				$newmenu->add("/holiday/card.php?&action=request", $langs->trans("New"), 1,$user->rights->holiday->write);
+				$newmenu->add("/holiday/list.php?&leftmenu=hrm", $langs->trans("List"), 1,$user->rights->holiday->read);
+				$newmenu->add("/holiday/list.php?select_statut=2&leftmenu=hrm", $langs->trans("ListToApprove"), 2, $user->rights->holiday->read);
 				$newmenu->add("/holiday/define_holiday.php?&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->define_holiday);
-				$newmenu->add("/holiday/view_log.php?&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->view_log);
-				$newmenu->add("/holiday/month_report.php?&action=request", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->month_report);
+				$newmenu->add("/holiday/view_log.php?&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);
+				$newmenu->add("/holiday/month_report.php?&action=request", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->define_holiday);
 			}
 
-			// Trips and expenses
+			// Trips and expenses (old module)
 			if (! empty($conf->deplacement->enabled))
 			{
 				$langs->load("trips");
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 472e260cfa6..e759bf9454a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -194,6 +194,16 @@ abstract class DolibarrModules
      */
     public $core_enabled;
 
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB		$db      Database handler
+	 */
+	//public function __construct($db);
+	// We should but can't set this as abstract because this will make dolibarr hang
+	// after migration due to old module not implementing. We must wait PHP is able to make
+	// a try catch on Fatal error to manage this correctly.
+	
     /**
      * Enables a module.
      * Inserts all informations into database
@@ -1000,7 +1010,18 @@ print $sql;
             $i=0;
             foreach ($this->tabs as $key => $value)
             {
-                if ($value)
+            	if (is_array($value) && count($value) == 0) continue;	// Discard empty arrays
+
+            	$entity=$conf->entity;
+            	$newvalue = $value;
+
+            	if (is_array($value))
+            	{
+            		$newvalue = $value['data'];
+            		if (isset($value['entity'])) $entity = $value['entity'];
+            	}
+
+                if ($newvalue)
                 {
                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
                     $sql.= "name";
@@ -1370,10 +1391,11 @@ print $sql;
             $menu->target=$this->menu[$key]['target'];
             $menu->user=$this->menu[$key]['user'];
             $menu->enabled=isset($this->menu[$key]['enabled'])?$this->menu[$key]['enabled']:0;
-
+            $menu->position=$this->menu[$key]['position'];
+            
             if (! $err)
             {
-                $result=$menu->create($user);
+                $result=$menu->create($user);	// Save menu entry into table llx_menu
                 if ($result > 0)
                 {
                     $this->menu[$key]['rowid']=$result;
@@ -1660,4 +1682,30 @@ print $sql;
         return $err;
     }
 
+	/**
+	 * Function called when module is enabled.
+	 * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 * It also creates data directories
+	 *
+	 * @param string $options    Options when enabling module ('', 'noboxes')
+	 * @return int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		return $this->_init(array(), $options);
+	}
+
+	/**
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             	1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		return $this->_remove(array(), $options);
+	}
+
 }
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 641ceb43e8f..d2ade2e4fc6 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -341,10 +341,13 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->MultiCell($this->posxtva-$this->posxprojet-1, 3,$object->lines[$i]->projet_ref, 0, 'C');
 
 					// VAT Rate
-					$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->SetXY($this->posxtva, $curY);
-					$pdf->MultiCell($this->posxup-$this->posxtva-1, 3,$vat_rate, 0, 'R');
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+					{
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+						$pdf->SetFont('','', $default_font_size - 1);
+						$pdf->SetXY($this->posxtva, $curY);
+						$pdf->MultiCell($this->posxup-$this->posxtva-1, 3,$vat_rate, 0, 'R');
+					}
 
 					// Unit price
 					$pdf->SetFont('','', $default_font_size - 1);
@@ -358,7 +361,7 @@ class pdf_standard extends ModeleExpenseReport
 
 					// Total with all taxes
 					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->SetXY($this->postotalttc-2, $curY);
+					$pdf->SetXY($this->postotalttc-1, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R');
 
 					$nexY+=5;
@@ -441,12 +444,15 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 160, 5, price($object->total_ht), 1, 'R');
 				$pdf->SetFillColor(248,248,248);
 
-				$posy+=5;
-				$pdf->SetXY(100, $posy);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->MultiCell(60, 5, $outputlangs->transnoentities("TotalVAT"), 1,'L');
-				$pdf->SetXY(160, $posy);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 160, 5, price($object->total_tva),1, 'R');
+				if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+				{
+					$posy+=5;
+					$pdf->SetXY(100, $posy);
+					$pdf->SetTextColor(0,0,60);
+					$pdf->MultiCell(60, 5, $outputlangs->transnoentities("TotalVAT"), 1,'L');
+					$pdf->SetXY(160, $posy);
+					$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 160, 5, price($object->total_tva),1, 'R');
+				}
 
 				$posy+=5;
 				$pdf->SetXY(100, $posy);
@@ -768,9 +774,12 @@ class pdf_standard extends ModeleExpenseReport
 		$pdf->MultiCell($this->posxtva-$this->posxprojet-1,2, $outputlangs->transnoentities("Project"),'','C');
 
 		// VAT
-		$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
-		$pdf->SetXY($this->posxtva-1, $tab_top+1);
-		$pdf->MultiCell($this->posxup-$this->posxtva-1,2, $outputlangs->transnoentities("VAT"),'','C');
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+		{
+			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+			$pdf->SetXY($this->posxtva-1, $tab_top+1);
+			$pdf->MultiCell($this->posxup-$this->posxtva-1,2, $outputlangs->transnoentities("VAT"),'','C');
+		}
 
 		// Unit price
 		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index aa9fbf65ed2..a38d64ba826 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1423,8 +1423,10 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetTextColor(0,0,60);
 		$pdf->SetFont('','B', $default_font_size + 3);
 
+		$w = 110;
+
 		$posy=$this->marge_haute;
-        $posx=$this->page_largeur-$this->marge_droite-100;
+        $posx=$this->page_largeur-$this->marge_droite-$w;
 
 		$pdf->SetXY($this->marge_gauche,$posy);
 
@@ -1441,14 +1443,14 @@ class pdf_crabe extends ModelePDFFactures
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B',$default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
 		else
 		{
 			$text=$this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
 		$pdf->SetFont('','B', $default_font_size + 3);
@@ -1459,14 +1461,14 @@ class pdf_crabe extends ModelePDFFactures
 		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
 		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
 		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat");
-		$pdf->MultiCell(100, 3, $title, '', 'R');
+		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('','B',$default_font_size);
 
 		$posy+=5;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
 
 		$posy+=1;
 		$pdf->SetFont('','', $default_font_size - 2);
@@ -1476,7 +1478,7 @@ class pdf_crabe extends ModelePDFFactures
 			$posy+=4;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
 		$objectidnext=$object->getIdReplacingInvoice('validated');
@@ -1488,7 +1490,7 @@ class pdf_crabe extends ModelePDFFactures
 			$posy+=3;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
 		}
 		if ($object->type == 1)
 		{
@@ -1498,7 +1500,7 @@ class pdf_crabe extends ModelePDFFactures
 			$posy+=4;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
 		if ($object->type == 2)
 		{
@@ -1508,20 +1510,20 @@ class pdf_crabe extends ModelePDFFactures
 			$posy+=3;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
 
 		$posy+=4;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
 
 		if ($object->type != 2)
 		{
 			$posy+=3;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
 		}
 
 		if ($object->thirdparty->code_client)
@@ -1529,13 +1531,13 @@ class pdf_crabe extends ModelePDFFactures
 			$posy+=3;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		$posy+=1;
 
 		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
 
 		if ($showaddress)
 		{
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 84e18048e84..7b7a9dd4517 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -272,35 +272,4 @@ class modAccounting extends DolibarrModules
 		$this->menus = array();
 		$r = 0;
 	}
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-
-        $sql = array();
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
 }
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index c897be729ec..1090e8b6939 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -230,37 +230,4 @@ class modAdherent extends DolibarrModules
 		$this->import_regex_array[$r]=array('a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)','a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
         $this->import_examplevalues_array[$r]=array('a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1','a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note_public'=>"This is a public comment on member",'a.note_private'=>"This is private comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d'));
     }
-
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-
-        $sql = array();
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index c6492ab5161..3119553f677 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -399,39 +399,4 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
 
 	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		// Prevent pb of modules not correctly disabled
-		//$this->remove($options);
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-	}
-
 }
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 2bdcbe03c54..5e0e825d1e0 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -232,21 +232,5 @@ class modApi extends DolibarrModules
 
 		return $this->_init($sql, $options);
 	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
 }
 
diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modAskPriceSupplier.class.php
index 451caccf649..23d4fb20f42 100644
--- a/htdocs/core/modules/modAskPriceSupplier.class.php
+++ b/htdocs/core/modules/modAskPriceSupplier.class.php
@@ -148,7 +148,8 @@ class modAskPriceSupplier extends DolibarrModules
 			'langs'=>'askpricesupplier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'enabled'=>'$conf->askpricesupplier->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'perms'=>'$user->rights->askpricesupplier->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-			'user'=>2 // 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+            'position'=>30
 		);
 		$r++;
 
@@ -160,7 +161,8 @@ class modAskPriceSupplier extends DolibarrModules
 			'langs'=>'askpricesupplier',
 			'enabled'=>'$conf->askpricesupplier->enabled',
 			'perms'=>'$user->rights->askpricesupplier->creer',
-			'user'=>2
+			'user'=>2,
+            'position'=>31
 		);
 		$r++;
 
@@ -172,7 +174,8 @@ class modAskPriceSupplier extends DolibarrModules
 			'langs'=>'askpricesupplier',
 			'enabled'=>'$conf->askpricesupplier->enabled',
 			'perms'=>'$user->rights->askpricesupplier->lire',
-			'user'=>2
+			'user'=>2,
+            'position'=>32
 		);
 		$r++;
 	}
@@ -218,20 +221,4 @@ class modAskPriceSupplier extends DolibarrModules
 
 		return $this->_init($sql, $options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
\ No newline at end of file
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index df698b26a90..9222a38ff26 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -209,20 +209,4 @@ class modBanque extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 0d06c1657c2..4ee6084aaf6 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -146,20 +146,4 @@ class modBarcode extends DolibarrModules
 
 		return $this->_init($sql, $options);
 	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *		Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-	 *		@param		string	$options	Options when enabling module ('', 'noboxes')
-	 *		@return		int					1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
 }
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 587429aa830..a6585e14d54 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -99,35 +99,4 @@ class modBookmark extends DolibarrModules
 		$this->rights[$r][4] = 'supprimer';
 
 	}
-
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index d6deb4ab51f..9b256162597 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -139,20 +139,4 @@ class modCashDesk extends DolibarrModules
 
     	return $this->_init($sql,$options);
   	}
-
-    /**
-     *  Function called when module is disabled.
-     *  Remove from database constants, boxes and permissions from Dolibarr database.
-     *  Data directories are not deleted.
-     *
-     *  @param	string	$options	Options
-     *  @return int             	1 if OK, 0 if KO
-     */
-  	function remove($options='')
-	{
-    	$sql = array();
-
-    	return $this->_remove($sql,$options);
-  	}
-
 }
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index b64c9671a99..e9efbcbe732 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -363,20 +363,4 @@ class modCategorie extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index 872700c1817..518cafa35a4 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -74,37 +74,4 @@ class modClickToDial extends DolibarrModules
 		$this->rights = array();
 		$this->rights_class = 'clicktodial';
 	}
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-	function init($options='')
-	{
-		global $conf;
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 03b1a6d964b..4289bd54932 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -237,21 +237,4 @@ class modCommande extends DolibarrModules
 
 		 return $this->_init($sql,$options);
 	}
-
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 74002f0065f..e23a04ce548 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -115,20 +115,4 @@ class modComptabilite extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index dedfc4efff0..c1bcc9fd914 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -199,20 +199,4 @@ class modContrat extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index fafec485b60..90d17882672 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -137,39 +137,4 @@ class modCron extends DolibarrModules
 						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;
     }
-
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-	    $sql = array();
-
-	    // Prevent pb of modules not correctly disabled
-        //$this->remove($options);
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 47642e5195d..08f21ae6c63 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -145,20 +145,4 @@ class modDeplacement extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
index ea40750a161..c312cc37b5a 100644
--- a/htdocs/core/modules/modDocumentGeneration.class.php
+++ b/htdocs/core/modules/modDocumentGeneration.class.php
@@ -114,21 +114,4 @@ class modDocumentGeneration extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index c546292c2b4..1d279b85148 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -158,20 +158,4 @@ class modDon  extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
\ No newline at end of file
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index 1b2fb712a8b..78f56a76ab4 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -84,39 +84,4 @@ class modDynamicPrices extends DolibarrModules
         $this->rights_class = 'dynamicprices';
         $r=0;
     }
-
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-        // Prevent pb of modules not correctly disabled
-        //$this->remove($options);
-
-        $sql = array();
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 60d76f2e995..2bf3542186a 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -179,36 +179,5 @@ class modECM extends DolibarrModules
 							  'user'=>2);			// 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-	function init($options='')
-  	{
-    	$sql = array();
-
-    	return $this->_init($sql,$options);
-  	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
 
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 2f4b7a88be8..6e019849ae2 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -277,20 +277,4 @@ class modExpedition extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index dfe8180e0c1..690ca7ba87e 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -203,8 +203,8 @@ class modExpenseReport extends DolibarrModules
 		$this->export_label[$r]='ListTripsAndExpenses';
 		$this->export_icon[$r]='trip';
 		$this->export_permission[$r]=array(array("expensereport","export"));
-        $this->export_fields_array[$r]=array('d.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove','d.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.fk_c_tva'=>'VATRate','ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref');
-        $this->export_entities_array[$r]=array('u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line','ed.fk_c_tva'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line','ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project');
+        $this->export_fields_array[$r]=array('d.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove','d.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate','ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref');
+        $this->export_entities_array[$r]=array('u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line','ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line','ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project');
         $this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
 		$this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
@@ -345,19 +345,4 @@ class modExpenseReport extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-	/**
-	 *  Function called when module is disabled.
-	 *  Remove from database constants, boxes and permissions from Dolibarr database.
-	 *	Data directories are not deleted.
-	 *
-	 *  @param		string		$options		Options
-	 *  @return     int             			1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-	}
 }
\ No newline at end of file
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index ad2da537436..634306ea4db 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -89,35 +89,4 @@ class modExport extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'creer';
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index 61eebe77f80..620fc53b53f 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -117,36 +117,5 @@ class modExternalSite extends DolibarrModules
 		$r++;
 
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-	function init($options='')
-  	{
-    	$sql = array();
-
-    	return $this->_init($sql,$options);
-  	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
 
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 38b16127c90..e7388faaedf 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -126,36 +126,5 @@ class modFTP extends DolibarrModules
 							  'user'=>2);			// 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-	function init($options='')
-  	{
-    	$sql = array();
-
-    	return $this->_init($sql,$options);
-  	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
 
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 6a4ec011747..54363bc9d80 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -241,10 +241,10 @@ class modFacture extends DolibarrModules
 		$this->export_label[$r]='CustomersInvoicesAndPayments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='bill';
 		$this->export_permission[$r]=array(array("facture","facture","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber','p.fk_bank'=>'IdTransaction');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber','pt.code'=>'PaymentMode','p.fk_bank'=>'IdTransaction');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number','p.fk_bank'=>'Number');
 		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number','p.fk_bank'=>'Number');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment','p.fk_bank'=>'payment','f.fk_user_author'=>'user','uc.login'=>'user','f.fk_user_valid'=>'user','uv.login'=>'user');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment','pt.code'=>'payment','p.fk_bank'=>'payment','f.fk_user_author'=>'user','uc.login'=>'user','f.fk_user_valid'=>'user','uv.login'=>'user');
 		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture'";
@@ -295,6 +295,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pt ON pt.id = p.fk_paiement';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture',1).')';
 		$r++;
@@ -341,20 +342,4 @@ class modFacture extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 8f81bf74f7b..6a5932cca5a 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -82,37 +82,4 @@ class modFckeditor extends DolibarrModules
 		$this->rights = array();
 		$this->rights_class = 'fckeditor';
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf;
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index b41b291711a..91a672fb669 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -175,20 +175,4 @@ class modFicheinter extends DolibarrModules
 
         return $this->_init($sql,$options);
     }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index d43535dd4e1..0db347f0df2 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -564,20 +564,4 @@ class modFournisseur extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index cfe7acbdfa6..164d89243b8 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -85,35 +85,4 @@ class modGeoIPMaxmind extends DolibarrModules
 		$this->rights_class = 'geoipmaxmind';
 		$r=0;
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index aae38ae391b..241cca18dbb 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -183,38 +183,5 @@ class modGravatar extends DolibarrModules
 		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		// $r++;
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		//$result=$this->_load_tables('');
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
 
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index e45b40a3f57..be075f2d57a 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -134,16 +134,16 @@ class modHoliday extends DolibarrModules
 		$r=0;
 
 		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify your own holidays';	// Permission label
+		$this->rights[$r][1] = 'Read your own holidays';	// Permission label
 		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify hollidays for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][1] = 'Create/modify your own holidays';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
@@ -155,23 +155,23 @@ class modHoliday extends DolibarrModules
 		$r++;
 
 		$this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Setup holidays of users';	// Permission label
+		$this->rights[$r][1] = 'Read hollidays for everybody';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'See logs for holidays requests';	// Permission label
+		$this->rights[$r][1] = 'Create/modify hollidays for everybody';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'view_log';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read holidays monthly report';	// Permission label
+		$this->rights[$r][1] = 'Setup holidays of users (setup and update balance)';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'month_report';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
@@ -278,36 +278,5 @@ class modHoliday extends DolibarrModules
 		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		// $r++;
 	}
-
-	/**
-	 *	Function called when module is enabled.
-	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *	It also creates data directories.
-	 *
-	 *	@return     int             1 if OK, 0 if KO
-	 */
-	function init()
-	{
-		$sql = array();
-
-		//$result=$this->_load_tables('');
-
-		return $this->_init($sql);
-	}
-
-	/**
-	 *	Function called when module is disabled.
-	 *  Remove from database constants, boxes and permissions from Dolibarr database.
-	 *	Data directories are not deleted.
-	 *
-	 *  @return     int             1 if OK, 0 if KO
-	 */
-	function remove()
-	{
-		$sql = array();
-
-		return $this->_remove($sql);
-	}
-
 }
 
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index 3a371ecf2e7..5ac3b8928db 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -85,35 +85,4 @@ class modImport extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'run';
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index 2ae30951c8c..cae4f9ec28f 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -109,34 +109,4 @@ class modIncoterm extends DolibarrModules
 		$this->menus = array();			// List of menus to add
 		$r=0;
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
 }
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 9519c63fb95..3292e2269fb 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -89,7 +89,6 @@ class modLabel extends DolibarrModules
 
 	}
 
-
 	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
@@ -107,20 +106,4 @@ class modLabel extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index f7362ceefdd..cb2ad24fef4 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -90,35 +90,4 @@ class modLdap extends DolibarrModules
 		$this->rights = array();
 		$this->rights_class = 'ldap';
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index 21ae96eba26..ab2ca7f33c2 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -162,20 +162,4 @@ class modLoan extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 045f857b574..9930168a218 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -147,20 +147,4 @@ class modMailing extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 1b5bbab61c6..4d96b4e8cd1 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -77,37 +77,4 @@ class modMailmanSpip extends DolibarrModules
 		$this->rights = array();
 		$this->rights_class = 'clicktodial';
 	}
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-	function init($options='')
-	{
-		global $conf;
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 1f0a95ea001..65396126585 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -139,36 +139,5 @@ class modMargin extends DolibarrModules
 		$this->rights[$r][4] = 'read';
 		$this->rights[$r][5] = 'all';
 	}
-
-	/**
-     *	Function called when module is enabled.
-     *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *	It also creates data directories.
-     *
-     *	@return     int             1 if OK, 0 if KO
-     */
-	function init()
-  	{
-    	$sql = array();
-
-		//$result=$this->_load_tables();
-
-    	return $this->_init($sql);
-  	}
-
-	/**
-	 *	Function called when module is disabled.
-	 *	Remove from database constants, boxes and permissions from Dolibarr database.
-	 *	Data directories are not deleted.
-	 *
-	 *	@return     int             1 if OK, 0 if KO
- 	 */
-	function remove()
-	{
-    	$sql = array();
-
-    	return $this->_remove($sql);
-  	}
-
 }
 
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index 78e939f4048..74d7e6dfbcc 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -90,20 +90,4 @@ class modNotification extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 44b9f928694..db93cae5220 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -195,20 +195,5 @@ class modOpenSurvey extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-	/**
-	 *	Function called when module is disabled.
-	 *  Remove from database constants, boxes and permissions from Dolibarr database.
-	 *	Data directories are not deleted
-	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *  @return     int             	1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-	}
 }
 
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 820bc1d19c1..d77d2dfc3f4 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -172,38 +172,5 @@ class modPayBox extends DolibarrModules
         // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
         // $r++;
     }
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-        $sql = array();
-
-        //$result=$this->_load_tables('');
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
 
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 8c1e0fe4797..227540e825e 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -164,38 +164,5 @@ class modPaypal extends DolibarrModules
         // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
         // $r++;
     }
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-        $sql = array();
-
-        //$result=$this->_load_tables('');
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
 
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 7bb5e748037..84bd19712df 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -141,20 +141,4 @@ class modPrelevement extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index bb18d7d022c..e14a2efd63e 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -120,35 +120,4 @@ class modPrinting extends DolibarrModules
 
 
     }
-
-    /**
-     *   Function called when module is enabled.
-     *   The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *   It also creates data directories
-     *
-     *   @param      string	$options    Options when enabling module ('', 'noboxes')
-     *   @return     int                1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-        $sql = array();
-
-        return $this->_init($sql, $options);
-    }
-
-    /**
-     *   Function called when module is disabled.
-     *   Remove from database constants, boxes and permissions from Dolibarr database.
-     *   Data directories are not deleted
-     *
-     *   @param      string $options    Options when enabling module ('', 'noboxes')
-     *   @return     int                 1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-        $sql = array();
-
-        return $this->_remove($sql, $options);
-    }
-
 }
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index dbdc56be3b2..f5e366bc3ad 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -166,7 +166,7 @@ class modProduct extends DolibarrModules
 		if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'product'));
 		if (! empty($conf->fournisseur->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('s.nom'=>'product','pf.ref_fourn'=>'product','pf.unitprice'=>'product'));
 		// Add extra fields
-		$sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
+		$sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity IN (0, ".$conf->entity.')';
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -251,7 +251,8 @@ class modProduct extends DolibarrModules
 		$this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
 		if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
 		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity = ".$conf->entity;
+		$import_extrafield_sample=array();
+		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' entity IN (0, ".$conf->entity.')';
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -260,13 +261,14 @@ class modProduct extends DolibarrModules
 		        $fieldname='extra.'.$obj->name;
 		        $fieldlabel=ucfirst($obj->label);
 		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+		        $import_extrafield_sample[$fieldname]=$fieldlabel;
 		    }
 		}
 		// End add extra fields
 		$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r]=array('p.ref'=>'[^ ]','p.tosell'=>'^[0|1]$','p.tobuy'=>'^[0|1]$','p.fk_product_type'=>'^[0|1]$','p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-		$this->import_examplevalues_array[$r]=array('p.ref'=>"PREF123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31');
-
+		$import_sample=array('p.ref'=>"PREF123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31');
+		$this->import_examplevalues_array[$r]=array_merge($import_sample,$import_extrafield_sample);
 
 		if (! empty($conf->fournisseur->enabled))
 		{
@@ -341,20 +343,4 @@ class modProduct extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index bf77943ea6c..b55dba2945a 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -124,21 +124,5 @@ class modProductBatch extends DolibarrModules
 
 		return $this->_init($sql, $options);
 	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
 }
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 1174c47d831..ca66e861862 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -361,20 +361,4 @@ class modProjet extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 6a8dc7254d4..cb297f87a61 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -231,20 +231,4 @@ class modPropale extends DolibarrModules
 		return $this->_init($sql,$options);
 
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 1f7a92f47b7..94a4b56427a 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -360,21 +360,6 @@ class modResource extends DolibarrModules
 		return $this->_init($sql, $options);
 	}
 
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * 	@param		string	$options	Options when enabling module ('', 'noboxes')
-	 * 	@return		int					1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
 	/**
 	 * Create tables, keys and data required by module
 	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index fa8a0ebd811..1708c7a8ed0 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -168,20 +168,4 @@ class modSalaries extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index b8040e41c7c..85ab2b03e7d 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -327,20 +327,4 @@ class modService extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php
index f010f3b769e..a55f979db8c 100644
--- a/htdocs/core/modules/modSkype.class.php
+++ b/htdocs/core/modules/modSkype.class.php
@@ -87,39 +87,4 @@ class modSkype extends DolibarrModules
         //------------------
         $this->menu = array();
     }
-
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-		$sql = array();
-
-        // Prevent pb of modules not correctly disabled
-        //$this->remove($options);
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 6de689e792c..1d7848f5f46 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -505,20 +505,4 @@ class modSociete extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 63613862550..2b8e983372e 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -198,35 +198,4 @@ class modStock extends DolibarrModules
 		);
 
 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php
index 37366270a57..b87d7d9ecd5 100644
--- a/htdocs/core/modules/modSyncSupplierWebServices.class.php
+++ b/htdocs/core/modules/modSyncSupplierWebServices.class.php
@@ -83,39 +83,4 @@ class modSyncSupplierWebServices extends DolibarrModules
         $this->rights_class = 'syncsupplierwebservices';
         $r=0;
     }
-
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-        // Prevent pb of modules not correctly disabled
-        //$this->remove($options);
-
-        $sql = array();
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index f2b5f80ff32..a635e8f2fdc 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -80,37 +80,4 @@ class modSyslog extends DolibarrModules
 		$this->rights = array();
 		$this->rights_class = 'syslog';
 	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		return $this->_init($sql,$options);
-
-	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 6f47d66f5a9..9e8ee7908d7 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -156,20 +156,4 @@ class modTax extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index fd7efdae5bc..41598f51106 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -211,7 +211,6 @@ class modUser extends DolibarrModules
 		$this->export_permission[$r]=array(array("user","user","export"));
 		$this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion','u.fk_socpeople'=>"IdContact",'u.fk_soc'=>"IdCompany",'u.fk_member'=>"MemberId");
 		$this->export_TypeFields_array[$r]=array('u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.office_phone'=>'Text','u.office_fax'=>'Text','u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date','u.datepreviouslogin'=>'Date','u.fk_soc'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:nom");
-
 		$this->export_entities_array[$r]=array('u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.office_phone'=>'user','u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_soc'=>"company",'u.fk_member'=>"member");
         if (empty($conf->adherent->enabled))
         {
@@ -243,20 +242,4 @@ class modUser extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index 9211d2749d0..a22e5a5be64 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -83,39 +83,4 @@ class modWebServices extends DolibarrModules
         $this->rights_class = 'webservices';
         $r=0;
     }
-
-
-    /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
-        // Prevent pb of modules not correctly disabled
-        //$this->remove($options);
-
-        $sql = array();
-
-        return $this->_init($sql,$options);
-    }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index ed0f66e6455..0eb447306b4 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -148,20 +148,4 @@ class modWorkflow extends DolibarrModules
 
         return $this->_init($sql,$options);
     }
-
-    /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function remove($options='')
-    {
-		$sql = array();
-
-		return $this->_remove($sql,$options);
-    }
-
 }
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 9a3f69ac6c1..217f431b96e 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -37,7 +37,6 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 $langs->load("products");
 $langs->load("other");
@@ -52,12 +51,19 @@ $cancel=GETPOST("cancel");
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for modulepart');
 $accessallowed=0;
-if ($modulepart=='produit|service')
+if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
 {
 	$result=restrictedArea($user,'produit|service',$id,'product&product');
 	if ($modulepart=='produit|service' && (! $user->rights->produit->lire && ! $user->rights->service->lire)) accessforbidden();
 	$accessallowed=1;
 }
+elseif ($modulepart == 'holiday')
+{
+	$result=restrictedArea($user,'holiday',$id,'holiday');
+	if ($modulepart=='holiday' && (! $user->rights->holiday->read)) accessforbidden();
+	$accessallowed=1;
+}
+
 
 // Security:
 // Limit access if permissions are wrong
@@ -66,15 +72,32 @@ if (! $accessallowed)
 	accessforbidden();
 }
 
-$object = new Product($db);
-if ($id > 0)
+// Define dir according to modulepart
+if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
 {
-	$result = $object->fetch($id);
-	if ($result <= 0) dol_print_error($db,'Failed to load object');
-	$dir=$conf->product->multidir_output[$object->entity];	// By default
-	if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
-	if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+	$object = new Product($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db,'Failed to load object');
+		$dir=$conf->product->multidir_output[$object->entity];	// By default
+		if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
+		if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
+	}
 }
+elseif ($modulepart == 'holiday')
+{
+	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+	$object = new Holiday($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db,'Failed to load object');
+		$dir=$conf->holiday->dir_output;	// By default
+	}
+}
+
 
 /*
  * Actions
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 49fefc3ebed..dc90a7c3853 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -70,7 +70,7 @@ $searchform = '';
 if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
 {
 	$langs->load("companies");
-	$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname');
+	$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname');
 	$nbofsearch++;
 }
 
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index fc13acc7072..142c0903212 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -75,6 +75,8 @@
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="add">
 
+<?php dol_fiche_head(); ?>
+
 <table summary="listofattributes" class="border centpercent">
 <!-- Label -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo GETPOST('label'); ?>"></td></tr>
@@ -121,7 +123,9 @@
 <?php } ?>
 </table>
 
-<div align="center"><br><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>"> &nbsp;
+<?php dol_fiche_end(); ?>
+
+<div align="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>
 
 </form>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 286eba8c3b7..898348d047e 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -46,6 +46,8 @@
 <input type="hidden" name="action" value="update">
 <input type="hidden" name="rowid" value="<?php echo $rowid ?>">
 
+<?php dol_fiche_head(); ?>
+
 <table summary="listofattributes" class="border centpercent">
 
 <?php
@@ -123,7 +125,9 @@ if(($type == 'select') || ($type == 'sellist') || ($type == 'checkbox') || ($typ
 <?php } ?>
 </table>
 
-<div align="center"><br><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>"> &nbsp;
+<?php dol_fiche_end(); ?>
+
+<div align="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>
 
 </form>
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index f130ac9f7ef..fc62c5b145f 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2009-2010 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2009-2015 Regis Houssin <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -245,6 +245,18 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 
 <?php if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?>
 
+<?php
+if (! empty($hookmanager->resArray['options'])) {
+	foreach ($hookmanager->resArray['options'] as $format => $option)
+	{
+		if ($format == 'js') {
+			echo "\n".'<!-- Javascript by hook -->';
+			echo $option."\n";
+		}
+	}
+}
+?>
+
 <?php
 // Google Analytics (need Google module)
 if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index db55be8754c..8b56049fe7f 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -347,9 +347,9 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
 	else
 	{
 		echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
-		echo $form->select_date($date_start,'date_start',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct");
+		echo $form->select_date($date_start,'date_start',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct",1,0,1);
 		echo ' '.$langs->trans('to').' ';
-		echo $form->select_date($date_end,'date_end',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct");
+		echo $form->select_date($date_end,'date_end',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct",1,0,1);
 	}
 	?>
 	</td>
@@ -527,7 +527,8 @@ jQuery(document).ready(function() {
 		      		}
 	      			if (this.id == 'pmpprice')
 	      			{
-		      			var defaultbuyprice = <?php echo (isset($conf->global->MARGIN_PMP_AS_DEFAULT_BUY_PRICE)?int($conf->global->MARGIN_PMP_AS_DEFAULT_BUY_PRICE):1); ?>;
+	      				// If margin is calculated on PMP, we set it by defaut (but only if value is not 0)
+		      			var defaultbuyprice = <?php echo ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')?1:0); ?>;
 		      			if (this.price > 0 && 1 == defaultbuyprice) { defaultkey = this.id; defaultprice = this.price; }
 	    	      		options += '<option value="'+this.id+'" price="'+this.price+'">'+this.label+'</option>';
 	      			}
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 51ded55f1c7..e38b8f873bd 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -222,9 +222,9 @@ $coldisplay=-1; // We remove first td
 	<td colspan="11"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
 	$hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
-	echo $form->select_date($line->date_start,'date_start',$hourmin,$hourmin,$line->date_start?0:1,"updateligne");
+	echo $form->select_date($line->date_start,'date_start',$hourmin,$hourmin,$line->date_start?0:1,"updateligne",1,0,1);
 	echo ' '.$langs->trans('to').' ';
-	echo $form->select_date($line->date_end,'date_end',$hourmin,$hourmin,$line->date_end?0:1,"updateligne");
+	echo $form->select_date($line->date_end,'date_end',$hourmin,$hourmin,$line->date_end?0:1,"updateligne",1,0,1);
 	?>
 	</td>
 </tr>
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 500506b532e..f2c4a93e030 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -594,7 +594,9 @@ else
 	print "</td></tr>";
 
 	print '<tr><td>';
-	print $langs->trans('CronDtNextLaunch')."</td><td>";
+	print $langs->trans('CronDtNextLaunch');
+	print ' ('.$langs->trans('CronFrom').')';
+	print "</td><td>";
 	if(!empty($object->datenextrun)) {print dol_print_date($object->datenextrun,'dayhourtext');} else {print $langs->trans('CronNone');}
 	print "</td></tr>";
 
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 5f2ef68b194..26ae969e493 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -842,8 +842,8 @@ class Cronjob extends CommonObject
 	/**
 	 * Run a job
 	 *
-	 * @param  string		$userlogin    User login
-	 * @return	int					 <0 if KO, >0 if OK
+	 * @param  string		$userlogin    	User login
+	 * @return	int					 		<0 if KO, >0 if OK
 	 */
 	function run_jobs($userlogin)
 	{
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 15f9234e7b2..37186686938 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -178,7 +178,7 @@ print_liste_field_titre($langs->trans("CronLastResult"),$_SERVER["PHP_SELF"],"t.
 print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVER["PHP_SELF"],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("Enabled"),$_SERVER["PHP_SELF"],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder);
 print_liste_field_titre('');
-print '</tr>';
+print "</tr>\n";
 
 print '<tr class="liste_titre">';
 print '<td>&nbsp;</td>';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 47878c7e75f..90b4589470a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -542,7 +542,7 @@ if ($action == 'create')
             print '<td colspan="3">';
             //print dol_print_date($object->date_livraison,"day");	// date_livraison come from order and will be stored into date_delivery planed.
             $date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST
-            print $form->select_date($date_delivery?$date_delivery:-1,'date_delivery',1,1);
+            print $form->select_date($date_delivery?$date_delivery:-1,'date_delivery',1,1,1);
             print "</td>\n";
             print '</tr>';
 
@@ -1059,7 +1059,7 @@ else if ($id || $ref)
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
-			$form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
+			print $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison",1,0,1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
@@ -1561,8 +1561,11 @@ else if ($id || $ref)
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div class="clearboth"></div>';
 		print '<br>';
-		print_titre($langs->trans('SendShippingByEMail'));
+		print_fiche_titre($langs->trans('SendShippingByEMail'));
+
+		dol_fiche_head('');
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -1638,7 +1641,7 @@ else if ($id || $ref)
 		// Show form
 		print $formmail->get_form();
 
-		print '<br>';
+		dol_fiche_end();
 	}
 
 	if ($action != 'presend' && ! empty($origin) && $object->$origin->id)
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index d0e10105471..aa629955f53 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 $langs->load("sendings");
+$langs->load("deliveries");
 $langs->load('companies');
 
 // Security check
@@ -132,7 +133,7 @@ if ($resql)
     	print_liste_field_titre($langs->trans("DateReceived"), $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
 	}
 	print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	// Lignes des champs de filtre
@@ -143,22 +144,24 @@ if ($resql)
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" size="10" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 	print '</td>';
-	// Date
+	// Date delivery planned
 	print '<td class="liste_titre">&nbsp;</td>';
     if ($conf->livraison_bon->enabled)
     {
+    	// Delivery order
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
 		print '</td>';
-
+		// Date received
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	// Status
+	print '<td></td>';
+	// Search
+	print '<td class="liste_titre" align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print '</td>';
-	print '<td class="liste_titre" align="center">';
-	print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
-	print '</td>';
 
 	print "</tr>\n";
 
@@ -170,8 +173,9 @@ if ($resql)
 
 		$var=!$var;
 
-		// Ref
 		print "<tr ".$bc[$var].">";
+
+		// Ref
 		print "<td>";
 		$shipment->id=$objp->rowid;
 		$shipment->ref=$objp->ref;
@@ -195,11 +199,6 @@ if ($resql)
 		}*/
 		print "</td>\n";
 
-		// Date real
-		print '<td align="center">';
-		print dol_print_date($db->jdate($objp->date_expedition),"day");
-		print '</td>'."\n";
-
         if ($conf->livraison_bon->enabled)
         {
 		    $shipment->fetchObjectLinked($shipment->id,$shipment->element);
@@ -209,13 +208,16 @@ if ($resql)
             print '<td>';
             print !empty($receiving) ? $receiving->getNomUrl($db) : '';
             print '</td>';
-
+			// Date received
         	print '<td align="center">';
 			print dol_print_date($db->jdate($objp->date_reception),"day");
 			print '</td>'."\n";
 		}
 
 		print '<td align="right">'.$expedition->LibStatut($objp->fk_statut,5).'</td>';
+
+		print '<td></td>';
+
 		print "</tr>\n";
 
 		$i++;
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1a52f0dc194..fd701cc333b 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -49,6 +49,7 @@ $date_start = dol_mktime(0, 0, 0, GETPOST('date_debutmonth'), GETPOST('date_debu
 $date_end = dol_mktime(0, 0, 0, GETPOST('date_finmonth'), GETPOST('date_finday'), GETPOST('date_finyear'));
 $date = dol_mktime(0, 0, 0, GETPOST('datemonth'), GETPOST('dateday'), GETPOST('dateyear'));
 $fk_projet=GETPOST('fk_projet');
+$vatrate=GETPOST('vatrate');
 $ref=GETPOST("ref",'alpha');
 
 // If socid provided by ajax company selector
@@ -178,7 +179,7 @@ if ($action == 'update' && $user->rights->expensereport->creer)
 	}
 }
 
-if ($action == "confirm_save" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
+if ($action == "confirm_validate" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
 {
 	$object = new ExpenseReport($db);
 	$object->fetch($id);
@@ -220,6 +221,8 @@ if ($action == "confirm_save" && GETPOST("confirm") == "yes" && $id > 0 && $user
 
 		if ($emailTo && $emailFrom)
 		{
+			$filename=array(); $filedir=array(); $mimetype=array();
+			
 			// SUBJECT
 			$subject = $langs->trans("ExpenseReportWaitingForApproval");
 
@@ -234,7 +237,6 @@ if ($action == "confirm_save" && GETPOST("confirm") == "yes" && $id > 0 && $user
 
 			if($resultPDF):
 			// ATTACHMENT
-			$filename=array(); $filedir=array(); $mimetype=array();
 			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
 			array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref).".pdf");
 			array_push($mimetype,"application/pdf");
@@ -260,7 +262,7 @@ if ($action == "confirm_save" && GETPOST("confirm") == "yes" && $id > 0 && $user
 					if ($mailfile->error)
 					{
 						$mesg='';
-						$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 						$mesg.='<br>'.$mailfile->error;
 						setEventMessage($mesg,'errors');
 					}
@@ -666,123 +668,6 @@ if ($action == "confirm_cancel" && GETPOST('confirm')=="yes" && GETPOST('detail_
 	}
 }
 
-if ($action == "confirm_paid" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->to_paid)
-{
-	$object = new ExpenseReport($db);
-	$object->fetch($id);
-
-	$result = $object->setPaid($user);
-
-	if ($result > 0)
-	{
-		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-			$model=$object->modelpdf;
-			$ret = $object->fetch($id); // Reload to get new records
-
-			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		}
-	}
-
-	if ($result > 0)
-	{
-		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))
-		{
-			// Send mail
-
-			// TO
-			$destinataire = new User($db);
-			$destinataire->fetch($object->fk_user_author);
-			$emailTo = $destinataire->email;
-
-			// FROM
-			$expediteur = new User($db);
-			$expediteur->fetch($object->fk_user_paid);
-			$emailFrom = $expediteur->email;
-
-			// SUBJECT
-			$subject = "' ERP - Note de frais payée";
-
-			// CONTENT
-			$message = "Bonjour {$destinataire->firstname},\n\n";
-			$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
-			$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
-			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-			$message.= "Bien cordialement,\n' SI";
-
-			// Génération du pdf avant attachement
-			$object->setDocModel($user,"");
-			$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-
-			// PREPARE SEND
-			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
-
-			if(!$mailfile->error):
-
-			// SEND
-			$result=$mailfile->sendfile();
-			if ($result):
-			// Insert écriture dans le compte courant
-			$idTrip 	= $id;
-			$idAccount 	= 1;
-
-			$object = new ExpenseReport($db);
-			$object->fetch($idTrip);
-
-			$datePaiement = explode("-",$object->date_paiement);
-
-			$dateop 	= dol_mktime(12,0,0,$datePaiement[1],$datePaiement[2],$datePaiement[0]);
-			$operation	= $object->code_paiement;
-			$label		= "Règlement ".$object->ref;
-			$amount 	= - price2num($object->total_ttc);
-			$num_chq	= '';
-			$cat1		= '';
-
-			$user = new User($db);
-			$user->fetch($object->fk_user_paid);
-
-			$acct=new Account($db,$idAccount);
-			$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
-
-			if ($insertid > 0):
-			$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport as d";
-			$sql.= " SET integration_compta = 1, fk_bank_account = $idAccount";
-			$sql.= " WHERE rowid = $idTrip";
-			$resql=$db->query($sql);
-			if($result):
-			Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-			exit;
-			else:
-			dol_print_error($db);
-			endif;
-			else:
-			dol_print_error($db,$acct->error);
-			endif;
-			endif;
-
-			else:
-
-			$mesg="Impossible d'envoyer l'email.";
-
-			endif;
-			// END - Send mail
-		}
-	}
-	else
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-}
-
 if ($action == "confirm_brouillonner" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->creer)
 {
 	$object = new ExpenseReport($db);
@@ -827,16 +712,96 @@ if ($action == "confirm_brouillonner" && GETPOST('confirm')=="yes" && $id > 0 &&
 	}
 }
 
-if ($action == 'set_paid')
+if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
 {
-	if ($object->set_paid($id) >= 0)
+	$object = new ExpenseReport($db);
+	$object->fetch($id);
+	
+	$result = $object->set_paid($id, $user);
+	
+	if ($result > 0)
 	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
+		// Define output language
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+		{
+			$outputlangs = $langs;
+			$newlang = '';
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+			if (! empty($newlang)) {
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
+			$model=$object->modelpdf;
+			$ret = $object->fetch($id); // Reload to get new records
+
+			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		}
+	}
+
+	if ($result > 0)
+	{
+		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))
+		{
+			// Send mail
+
+			// TO
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user_author);
+			$emailTo = $destinataire->email;
+
+			// FROM
+			$expediteur = new User($db);
+			$expediteur->fetch($user->id);
+			$emailFrom = $expediteur->email;
+
+			// SUBJECT
+			$subject = "'ERP - Note de frais payée";
+
+			// CONTENT
+			$message = "Bonjour {$destinataire->firstname},\n\n";
+			$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
+			$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
+			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
+			$message.= "Bien cordialement,\n' SI";
+
+			// Generate pdf before attachment
+			$object->setDocModel($user,"");
+			$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+
+			// PREPARE SEND
+			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
+
+			if(!$mailfile->error):
+
+			// SEND
+			$result=$mailfile->sendfile();
+			if ($result):
+			
+			// Retour
+			if($result):
+				Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			else:
+				dol_print_error($db);
+			endif;
+			
+			else:
+			dol_print_error($db,$acct->error);
+			endif;
+
+			else:
+
+			$mesg="Impossible d'envoyer l'email.";
+
+			endif;
+			// END - Send mail
+		}
+	}
+	else
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
-    else {
-	    setEventMessage($object->error, 'errors');
-    }
 }
 
 if ($action == "addline")
@@ -860,7 +825,7 @@ if ($action == "addline")
 	$object_ligne->fk_c_type_fees = GETPOST('fk_c_type_fees');
 
 	$object_ligne->fk_c_tva = GETPOST('fk_c_tva');
-	$object_ligne->vatrate = price2num(GETPOST('vatrate'));
+	$object_ligne->vatrate = price2num($vatrate);
 
 	$object_ligne->fk_projet = $fk_projet;
 
@@ -905,10 +870,10 @@ if ($action == "addline")
 	{
 		$object_ligne->fk_expensereport = $_POST['fk_expensereport'];
 
-		$type = 0;	// TODO What if service
+		$type = 0;	// TODO What if service ?
 		$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type);
 
-		$object_ligne->vatrate = price2num(GETPOST('vatrate'));
+		$object_ligne->vatrate = price2num($vatrate);
 		$object_ligne->total_ttc = $tmp[2];
 		$object_ligne->total_ht = $tmp[0];
 		$object_ligne->total_tva = $tmp[1];
@@ -980,7 +945,6 @@ if ($action == "updateligne" )
 
 	$rowid = $_POST['rowid'];
 	$type_fees_id = GETPOST('fk_c_type_fees');
-	$object_ligne->fk_c_tva = GETPOST('fk_c_tva');
 	$object_ligne->vatrate = price2num(GETPOST('vatrate'));
 	$projet_id = $fk_projet;
 	$comments = GETPOST('comments');
@@ -1310,7 +1274,7 @@ else
 					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
 					print '<td>';
 					$userfee=new User($db);
-					$userfee->fetch($object->fk_user_paid);
+					$userfee->fetch($user->id);
 					print $userfee->getNomUrl(1);
 					print '</td></tr>';
 
@@ -1352,7 +1316,7 @@ else
 				dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
 
 				if ($action == 'save'):
-				$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_save","","",1);
+				$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_validate","","",1);
 				if ($ret == 'html') print '<br>';
 				endif;
 
@@ -1401,7 +1365,7 @@ else
 					if ($ret == 'html') print '<br>';
 				}
 
-				print '<table class="border" width="100%">';
+				print '<table class="border centpercent">';
 
 				$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
@@ -1428,6 +1392,7 @@ else
 				print '<td>'.$langs->trans("Statut").'</td>';
 				print '<td colspan="2">'.$object->getLibStatut(4).'</td>';
 				print '</tr>';
+				
 				print '<tr>';
 				print '<td>'.$langs->trans("NotePublic").'</td>';
 				print '<td colspan="2">'.$object->note_public.'</td>';
@@ -1531,20 +1496,6 @@ else
 				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
 				print '<td>'.dol_print_date($object->date_create,'dayhour').'</td></tr>';
 				print '</tr>';
-				if($object->fk_statut==6)
-				{
-					print '<tr>';
-					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
-					print '<td>';
-					$userfee=new User($db);
-					$userfee->fetch($object->fk_user_paid);
-					print $userfee->getNomUrl(1);
-					print '</td></tr>';
-					print '<tr>';
-					print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';
-					print '<td>'.$object->date_paiement.'</td></tr>';
-					print '</tr>';
-				}
 
 				// User to inform
 				if($object->fk_statut<3)	// informed
@@ -1616,13 +1567,29 @@ else
 					print '</td>';
 					print '</tr>';
 				}
+
+				if($object->fk_statut==6)
+				{
+					print '<tr>';
+					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
+					print '<td>';
+					$userfee=new User($db);
+					$userfee->fetch($object->fk_user_paid);
+					print $userfee->getNomUrl(1);
+					print '</td></tr>';
+					print '<tr>';
+					print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';
+					print '<td>'.$object->date_paiement.'</td></tr>';
+					print '</tr>';
+				}
+				
 				print '</table>';
 
 				print '<br>';
 
 				// Fetch Lines of current expense report
 				$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_projet, fde.date,';
-				$sql.= ' fde.fk_c_tva as fk_c_tva, fde.tva_tx as vatrate, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
+				$sql.= ' fde.tva_tx as vatrate, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
 				$sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
 				$sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
 				$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
@@ -2001,9 +1968,9 @@ if ($action != 'create' && $action != 'edit')
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
 		}
 		
-		if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
+		if (round($remaintopay) == 0 && $object->paid == 0)
 		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
+			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
 		}
 
 		// Cancel
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 914ff34043d..04f5628a224 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011 Dimitri Mouillard   <dmouillard@teclib.com>
  * Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2015 Alexandre Spangaro  <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,361 +29,352 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  */
 class ExpenseReport extends CommonObject
 {
-	var $db;
-	var $error;
-	var $element='expensereport';
-	var $table_element='expensereport';
-	var $table_element_line = 'expensereport_det';
-	var $fk_element = 'fk_expensereport';
+    var $db;
+    var $error;
+    var $element='expensereport';
+    var $table_element='expensereport';
+    var $table_element_line = 'expensereport_det';
+    var $fk_element = 'fk_expensereport';
 
-	var $id;
-	var $ref;
-	var $lignes=array();
-	var $total_ht;
-	var $total_tva;
-	var $total_ttc;
-	var $note_public;
-	var $note_private;
-	var $date_debut;
-	var $date_fin;
+    var $id;
+    var $ref;
+    var $lignes=array();
+    var $total_ht;
+    var $total_tva;
+    var $total_ttc;
+    var $note_public;
+    var $note_private;
+    var $date_debut;
+    var $date_fin;
 
-	var $fk_user_validator;
-	var $status;
-	var $fk_statut;		// -- 1=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
-	var $fk_c_paiement;
-	var $paid;
+    var $fk_user_validator;
+    var $status;
+    var $fk_statut;     // -- 1=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+    var $fk_c_paiement;
+    var $paid;
 
-	var $user_author_infos;
-	var $user_validator_infos;
+    var $user_author_infos;
+    var $user_validator_infos;
 
     var $modepayment;
     var $modepaymentid;
-	var $code_paiement;
-	var $code_statut;
+    var $code_paiement;
+    var $code_statut;
 
-	/*
-		ACTIONS
-	*/
+    /*
+        ACTIONS
+    */
 
-	// Enregistrement
-	var $date_create;
-	var $fk_user_author;
+    // Enregistrement
+    var $date_create;
+    var $fk_user_author;
 
-	// Refus
-	var $date_refuse;
-	var $detail_refuse;
-	var $fk_user_refuse;
+    // Refus
+    var $date_refuse;
+    var $detail_refuse;
+    var $fk_user_refuse;
 
-	// Annulation
-	var $date_cancel;
-	var $detail_cancel;
-	var $fk_user_cancel;
+    // Annulation
+    var $date_cancel;
+    var $detail_cancel;
+    var $fk_user_cancel;
 
-	// Validation
-	var $date_valid;
-	var	$fk_user_valid;
-	var $user_valid_infos;
+    // Validation
+    var $date_valid;
+    var $fk_user_valid;
+    var $user_valid_infos;
 
-	// Approve
-	var $date_approve;
-	var	$fk_user_approve;
+    // Approve
+    var $date_approve;
+    var $fk_user_approve;
 
-	// Paiement
-	var $date_paiement;
-	var $fk_user_paid;
-	var $user_paid_infos;
+    // Paiement
+    var $user_paid_infos;
 
-	/*
-		END ACTIONS
-	*/
+    /*
+        END ACTIONS
+    */
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB	$db		Handler acces base de donnees
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->total_ht = 0;
-		$this->total_ttc = 0;
-		$this->total_tva = 0;
-		$this->modepaymentid = 0;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db     Handler acces base de donnees
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->total_ht = 0;
+        $this->total_ttc = 0;
+        $this->total_tva = 0;
+        $this->modepaymentid = 0;
 
-		// List of language codes for status
+        // List of language codes for status
         $this->statuts_short = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
-        $this->statuts = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
+        $this->statuts = array(0 => 'Draft', 2 => 'ValidatedWaitingApproval', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
         $this->statuts_logo = array(0 => 'statut0', 2 => 'statut1', 4 => 'statut5', 5 => 'statut3', 6 => 'statut6', 99 => 'statut8');
 
-		return 1;
-	}
+        return 1;
+    }
 
-	/**
-	 * Create object in database
-	 *
-	 * @param 	User	$user	User that create
-	 * @return 	int				<0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf;
+    /**
+     * Create object in database
+     *
+     * @param   User    $user   User that create
+     * @return  int             <0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf;
 
-		$now = dol_now();
+        $now = dol_now();
 
-		$this->db->begin();
+        $this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-		$sql.= "ref";
-		$sql.= ",total_ht";
-		$sql.= ",total_ttc";
-		$sql.= ",total_tva";
-		$sql.= ",date_debut";
-		$sql.= ",date_fin";
-		$sql.= ",date_create";
-		$sql.= ",fk_user_author";
-		$sql.= ",fk_user_validator";
-		$sql.= ",fk_statut";
-		$sql.= ",fk_c_paiement";
-		$sql.= ",paid";
-		$sql.= ",note_public";
-		$sql.= ",note_private";
-		$sql.= ") VALUES(";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$this->total_ht;
-		$sql.= ", ".$this->total_ttc;
-		$sql.= ", ".$this->total_tva;
-		$sql.= ", '".$this->db->idate($this->date_debut)."'";
-		$sql.= ", '".$this->db->idate($this->date_fin)."'";
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".($user->id > 0 ? $user->id:"null");
-		$sql.= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
-		$sql.= ", ".($this->fk_statut > 1 ? $this->fk_statut:0);
-		$sql.= ", ".($this->modepaymentid?$this->modepaymentid:"null");
-		$sql.= ", 0";
-		$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ")";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+        $sql.= "ref";
+        $sql.= ",total_ht";
+        $sql.= ",total_ttc";
+        $sql.= ",total_tva";
+        $sql.= ",date_debut";
+        $sql.= ",date_fin";
+        $sql.= ",date_create";
+        $sql.= ",fk_user_author";
+        $sql.= ",fk_user_validator";
+        $sql.= ",fk_statut";
+        $sql.= ",fk_c_paiement";
+        $sql.= ",paid";
+        $sql.= ",note_public";
+        $sql.= ",note_private";
+        $sql.= ") VALUES(";
+        $sql.= "'(PROV)'";
+        $sql.= ", ".$this->total_ht;
+        $sql.= ", ".$this->total_ttc;
+        $sql.= ", ".$this->total_tva;
+        $sql.= ", '".$this->db->idate($this->date_debut)."'";
+        $sql.= ", '".$this->db->idate($this->date_fin)."'";
+        $sql.= ", '".$this->db->idate($now)."'";
+        $sql.= ", ".($user->id > 0 ? $user->id:"null");
+        $sql.= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
+        $sql.= ", ".($this->fk_statut > 1 ? $this->fk_statut:0);
+        $sql.= ", ".($this->modepaymentid?$this->modepaymentid:"null");
+        $sql.= ", 0";
+        $sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
+        $sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
+        $sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-			$this->ref='(PROV'.$this->id.')';
+        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+            $this->ref='(PROV'.$this->id.')';
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->ref."' WHERE rowid=".$this->id;
-			dol_syslog(get_class($this)."::create sql=".$sql);
-			$resql=$this->db->query($sql);
-			if (!$resql) $error++;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->ref."' WHERE rowid=".$this->id;
+            dol_syslog(get_class($this)."::create sql=".$sql);
+            $resql=$this->db->query($sql);
+            if (!$resql) $error++;
 
-			foreach ($this->lignes as $i => $val)
-			{
-				$newndfline=new ExpenseReportLine($this->db);
-				$newndfline=$this->lignes[$i];
-				$newndfline->fk_expensereport=$this->id;
-				if ($result >= 0)
-				{
-					$result=$newndfline->insert();
-				}
-				if ($result < 0)
-				{
-					$error++;
-					break;
-				}
-			}
+            foreach ($this->lignes as $i => $val)
+            {
+                $newndfline=new ExpenseReportLine($this->db);
+                $newndfline=$this->lignes[$i];
+                $newndfline->fk_expensereport=$this->id;
+                if ($result >= 0)
+                {
+                    $result=$newndfline->insert();
+                }
+                if ($result < 0)
+                {
+                    $error++;
+                    break;
+                }
+            }
 
-			if (! $error)
-			{
-				$result=$this->update_price();
-				if ($result > 0)
-				{
-					$this->db->commit();
-					return $this->id;
-				}
-				else
-				{
-					$this->db->rollback();
-					return -3;
-				}
-			}
-			else
-			{
-				dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
-				$this->db->rollback();
-				return -2;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error()." sql=".$sql;
-			$this->db->rollback();
-			return -1;
-		}
+            if (! $error)
+            {
+                $result=$this->update_price();
+                if ($result > 0)
+                {
+                    $this->db->commit();
+                    return $this->id;
+                }
+                else
+                {
+                    $this->db->rollback();
+                    return -3;
+                }
+            }
+            else
+            {
+                dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
+                $this->db->rollback();
+                return -2;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error()." sql=".$sql;
+            $this->db->rollback();
+            return -1;
+        }
 
-	}
+    }
 
-	/**
-	 * update
-	 *
-	 * @param 	User	$user		User making change
-	 * @return 	int					<0 if KO, >0 if OK
-	 */
-	function update($user)
-	{
-		global $langs;
+    /**
+     * update
+     *
+     * @param   User    $user       User making change
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function update($user)
+    {
+        global $langs;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-		$sql.= " total_ht = ".$this->total_ht;
-		$sql.= " , total_ttc = ".$this->total_ttc;
-		$sql.= " , total_tva = ".$this->total_tva;
-		$sql.= " , date_debut = '".$this->db->idate($this->date_debut)."'";
-		$sql.= " , date_fin = '".$this->db->idate($this->date_fin)."'";
-		$sql.= " , fk_user_author = ".($user->id > 0 ? "'".$user->id."'":"null");
-		$sql.= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
-		$sql.= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid:"null");
-		$sql.= " , fk_user_paid = ".($this->fk_user_paid > 0 ? $this->fk_user_paid:"null");
-		$sql.= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut:'0');
-		$sql.= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
-		$sql.= " , note_public = ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"''");
-		$sql.= " , note_private = ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"''");
-		$sql.= " , detail_refuse = ".(!empty($this->detail_refuse)?"'".$this->db->escape($this->detail_refuse)."'":"''");
-		$sql.= " WHERE rowid = ".$this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+        $sql.= " total_ht = ".$this->total_ht;
+        $sql.= " , total_ttc = ".$this->total_ttc;
+        $sql.= " , total_tva = ".$this->total_tva;
+        $sql.= " , date_debut = '".$this->db->idate($this->date_debut)."'";
+        $sql.= " , date_fin = '".$this->db->idate($this->date_fin)."'";
+        $sql.= " , fk_user_author = ".($user->id > 0 ? "'".$user->id."'":"null");
+        $sql.= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
+        $sql.= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid:"null");
+        $sql.= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut:'0');
+        $sql.= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
+        $sql.= " , note_public = ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"''");
+        $sql.= " , note_private = ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"''");
+        $sql.= " , detail_refuse = ".(!empty($this->detail_refuse)?"'".$this->db->escape($this->detail_refuse)."'":"''");
+        $sql.= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
+        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
 
-	/**
-	 *	Load an object from database
-	 *
-	 *	@param	int		$id		Id
-	 *	@param	string	$ref	Ref
-	 *	@return	int				<0 if KO, >0 if OK
-	 */
-	function fetch($id, $ref='')
-	{
-		global $conf;
+    /**
+     *  Load an object from database
+     *
+     *  @param  int     $id     Id
+     *  @param  string  $ref    Ref
+     *  @return int             <0 if KO, >0 if OK
+     */
+    function fetch($id, $ref='')
+    {
+        global $conf;
 
-		$sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,";									// DEFAULT
-		$sql.= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; 				// ACTIONS
-		$sql.= " d.date_refuse, d.date_cancel,";														// ACTIONS
-		$sql.= " d.total_ht, d.total_ttc, d.total_tva,"; 												// TOTAUX (int)
-		$sql.= " d.date_debut, d.date_fin, d.date_create, d.date_valid, d.date_approve, d.date_paiement,"; 			// DATES (datetime)
-		$sql.= " d.fk_user_author, d.fk_user_validator, d.fk_statut as status, d.fk_c_paiement,";
-		$sql.= " d.fk_user_valid, d.fk_user_approve, d.fk_user_paid,";
-		$sql.= " dp.libelle as libelle_paiement, dp.code as code_paiement";								// INNER JOIN paiement
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
-		if ($ref) $sql.= " WHERE d.ref = '".$this->db->escape($ref)."'";
-		else $sql.= " WHERE d.rowid = ".$id;
-		$sql.= $restrict;
+        $sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,";                                 // DEFAULT
+        $sql.= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,";                // ACTIONS
+        $sql.= " d.date_refuse, d.date_cancel,";                                                        // ACTIONS
+        $sql.= " d.total_ht, d.total_ttc, d.total_tva,";                                                // TOTAUX (int)
+        $sql.= " d.date_debut, d.date_fin, d.date_create, d.date_valid, d.date_approve,";           // DATES (datetime)
+        $sql.= " d.fk_user_author, d.fk_user_validator, d.fk_statut as status, d.fk_c_paiement,";
+        $sql.= " d.fk_user_valid, d.fk_user_approve,";
+        $sql.= " dp.libelle as libelle_paiement, dp.code as code_paiement";                             // INNER JOIN paiement
+        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
+        if ($ref) $sql.= " WHERE d.ref = '".$this->db->escape($ref)."'";
+        else $sql.= " WHERE d.rowid = ".$id;
+        $sql.= $restrict;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
-		$resql = $this->db->query($sql) ;
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
-				$this->id       	= $obj->rowid;
-				$this->ref          = $obj->ref;
-				$this->total_ht 	= $obj->total_ht;
-				$this->total_tva 	= $obj->total_tva;
-				$this->total_ttc 	= $obj->total_ttc;
-				$this->note_public	= $obj->note_public;
-				$this->note_private	= $obj->note_private;
-				$this->detail_refuse = $obj->detail_refuse;
-				$this->detail_cancel = $obj->detail_cancel;
+        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        $resql = $this->db->query($sql) ;
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj)
+            {
+                $this->id           = $obj->rowid;
+                $this->ref          = $obj->ref;
+                $this->total_ht     = $obj->total_ht;
+                $this->total_tva    = $obj->total_tva;
+                $this->total_ttc    = $obj->total_ttc;
+                $this->note_public  = $obj->note_public;
+                $this->note_private = $obj->note_private;
+                $this->detail_refuse = $obj->detail_refuse;
+                $this->detail_cancel = $obj->detail_cancel;
 
-				$this->date_debut		= $this->db->jdate($obj->date_debut);
-				$this->date_fin			= $this->db->jdate($obj->date_fin);
-				$this->date_paiement	= $this->db->jdate($obj->date_paiement);
-				$this->date_valid		= $this->db->jdate($obj->date_valid);
-				$this->date_approve		= $this->db->jdate($obj->date_approve);
-				$this->date_create		= $this->db->jdate($obj->date_create);
-				$this->date_refuse		= $this->db->jdate($obj->date_refuse);
-				$this->date_cancel		= $this->db->jdate($obj->date_cancel);
+                $this->date_debut       = $this->db->jdate($obj->date_debut);
+                $this->date_fin         = $this->db->jdate($obj->date_fin);
+                $this->date_valid       = $this->db->jdate($obj->date_valid);
+                $this->date_approve     = $this->db->jdate($obj->date_approve);
+                $this->date_create      = $this->db->jdate($obj->date_create);
+                $this->date_refuse      = $this->db->jdate($obj->date_refuse);
+                $this->date_cancel      = $this->db->jdate($obj->date_cancel);
 
-				$this->fk_user_author			= $obj->fk_user_author;
-				$this->fk_user_validator		= $obj->fk_user_validator;
-				$this->fk_user_valid			= $obj->fk_user_valid;
-				$this->fk_user_refuse			= $obj->fk_user_refuse;
-				$this->fk_user_cancel			= $obj->fk_user_cancel;
-				$this->fk_user_approve			= $obj->fk_user_approve;
-				$this->fk_user_paid				= $obj->fk_user_paid;
+                $this->fk_user_author           = $obj->fk_user_author;
+                $this->fk_user_validator        = $obj->fk_user_validator;
+                $this->fk_user_valid            = $obj->fk_user_valid;
+                $this->fk_user_refuse           = $obj->fk_user_refuse;
+                $this->fk_user_cancel           = $obj->fk_user_cancel;
+                $this->fk_user_approve          = $obj->fk_user_approve;
 
-				$user_author = new User($this->db);
-				if ($this->fk_user_author > 0) $user_author->fetch($this->fk_user_author);
+                $user_author = new User($this->db);
+                if ($this->fk_user_author > 0) $user_author->fetch($this->fk_user_author);
 
-				$this->user_author_infos = dolGetFirstLastname($user_author->firstname, $user_author->lastname);
+                $this->user_author_infos = dolGetFirstLastname($user_author->firstname, $user_author->lastname);
 
-				$user_approver = new User($this->db);
-				if ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator);
-				$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
+                $user_approver = new User($this->db);
+                if ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator);
+                $this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
-				$this->fk_statut 				= $obj->status;
-				$this->status                   = $obj->status;
-				$this->fk_c_paiement			= $obj->fk_c_paiement;
-				$this->paid						= $obj->paid;
+                $this->fk_statut                = $obj->status;
+                $this->status                   = $obj->status;
+                $this->fk_c_paiement            = $obj->fk_c_paiement;
+                $this->paid                     = $obj->paid;
 
-				if ($this->fk_statut==5 || $this->fk_statut==6)
-				{
-					$user_valid = new User($this->db);
-					if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
-					$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
-				}
+                if ($this->fk_statut==5 || $this->fk_statut==6)
+                {
+                    $user_valid = new User($this->db);
+                    if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
+                    $this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
+                }
 
-				if ($this->fk_statut==6)
-				{
-					$user_paid = new User($this->db);
-					if ($this->fk_user_paid > 0) $user_paid->fetch($this->fk_user_paid);
-					$this->user_paid_infos = dolGetFirstLastname($user_paid->firstname, $user_paid->lastname);
-				}
+                $this->libelle_statut   = $obj->libelle_statut;
+                $this->libelle_paiement = $obj->libelle_paiement;
+                $this->code_statut      = $obj->code_statut;
+                $this->code_paiement    = $obj->code_paiement;
 
-				$this->libelle_statut 	= $obj->libelle_statut;
-				$this->libelle_paiement = $obj->libelle_paiement;
-				$this->code_statut 		= $obj->code_statut;
-				$this->code_paiement 	= $obj->code_paiement;
+                $this->lignes = array();    // deprecated
+                $this->lines = array();
 
-				$this->lignes = array();	// deprecated
-				$this->lines = array();
+                $result=$this->fetch_lines();
 
-				$result=$this->fetch_lines();
-
-				return $result;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
+                return $result;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
 
     /**
      *    Classify the expense report as paid
      *
-     *    @param	int		$id           	    id of expense report
-     *    @return   int      					<0 if KO, >0 if OK
+     *    @param    int     $id                 Id of expense report
+     *    @param    user    $fuser              User making change
+     *    @return   int                         <0 if KO, >0 if OK
      */
-    function set_paid($id)
+    function set_paid($id, $fuser)
     {
-        $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport SET fk_statut = 6";
-        $sql.= " WHERE rowid = $id AND fk_statut = 5";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport";
+        $sql.= " SET fk_statut = 6";
+        $sql.= " WHERE rowid = ".$id." AND fk_statut = 5";
 
+        dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -402,1092 +394,1075 @@ class ExpenseReport extends CommonObject
         }
     }
 
-	/**
-	 *	Returns the label status
-	 *
-	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 *	@return     string      		Label
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *	Returns the label of a statut
-	 *
-	 *	@param      int		$status     id statut
-	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 *	@return     string      		Label
-	 */
-	function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-			return $langs->trans($this->statuts[$status]);
-
-		if ($mode == 1)
-			return $langs->trans($this->statuts_short[$status]);
-
-		if ($mode == 2)
-			return img_picto($langs->trans($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->trans($this->statuts_short[$status]);
-
-		if ($mode == 3)
-			return img_picto($langs->trans($this->statuts_short[$status]), $this->statuts_logo[$status]);
-
-		if ($mode == 4)
-			return img_picto($langs->trans($this->statuts_short[$status]),$this->statuts_logo[$status]).' '.$langs->trans($this->statuts[$status]);
-
-		if ($mode == 5)
-			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$status]).' </span>'.img_picto($langs->trans($this->statuts_short[$status]),$this->statuts_logo[$status]);
-
-	}
-
-
-	/**
-	 * 	Load information on object
-	 *
-	 *	@param	int		$id      Id of object
-	 *	@return	void
-	 */
-	function info($id)
-	{
-		global $conf;
-
-		$sql = "SELECT f.rowid,";
-		$sql.= " f.date_create as datec,";
-		$sql.= " f.tms as date_modification,";
-		$sql.= " f.date_valid as datev,";
-		$sql.= " f.date_approve as datea,";
-		$sql.= " f.fk_user_author as fk_user_creation,";
-		$sql.= " f.fk_user_modif as fk_user_modification,";
-		$sql.= " f.fk_user_valid,";
-		$sql.= " f.fk_user_approve";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as f";
-		$sql.= " WHERE f.rowid = ".$id;
-		$sql.= " AND f.entity = ".$conf->entity;
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id                = $obj->rowid;
-
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
-				$this->date_validation   = $this->db->jdate($obj->datev);
-				$this->date_approbation  = $this->db->jdate($obj->datea);
-
-				$cuser = new User($this->db);
-				$cuser->fetch($obj->fk_user_author);
-				$this->user_creation     = $cuser;
-
-				if ($obj->fk_user_creation)
-				{
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_creation);
-					$this->user_creation     = $cuser;
-				}
-				if ($obj->fk_user_valid)
-				{
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation     = $vuser;
-				}
-				if ($obj->fk_user_modification)
-				{
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modification);
-					$this->user_modification   = $muser;
-				}
-
-			}
-			$this->db->free($resql);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-
-
-	/**
-	 *  Initialise an instance with random values.
-	 *  Used to build previews or test instances.
-	 *	id must be 0 if object instance is a specimen.
-	 *
-	 *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		global $user,$langs,$conf;
-
-		$now=dol_now();
-
-		// Initialise parametres
-		$this->id=0;
-		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
-		$this->date_create = $now;
-		$this->date_debut = $now;
-		$this->date_fin = $now;
-		$this->date_approve = $now;
-
-		$this->status = 5;
-		$this->fk_statut = 5;
-
-		$this->fk_user_author = $user->id;
-		$this->fk_user_valid = $user->id;
-		$this->fk_user_approve = $user->id;
-		$this->fk_user_validator = $user->id;
-
-		$this->note_private='Private note';
-		$this->note_public='SPECIMEN';
-		$nbp = 5;
-		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
-			$line=new ExpenseReportLine($this->db);
-			$line->comments=$langs->trans("Comment")." ".$xnbp;
-			$line->date=($now-3600*(1+$xnbp));
-			$line->total_ht=100;
-			$line->total_tva=20;
-			$line->total_ttc=120;
-			$line->qty=1;
-			$line->vatrate=20;
-			$line->value_unit=120;
-			$line->fk_expensereport=0;
-			$line->type_fees_code='TRA';
-
-			$line->projet_ref = 'ABC';
-
-			$this->lines[$xnbp]=$line;
-			$xnbp++;
-
-			$this->total_ht+=$line->total_ht;
-			$this->total_tva+=$line->total_tva;
-			$this->total_ttc+=$line->total_ttc;
-		}
-	}
-
-	/**
-	 * fetch_line_by_project
-	 *
-	 * @param 	int		$projectid		Project id
-	 * @param 	User	$user			User
-	 * @return	int						<0 if KO, >0 if OK
-	 */
-	function fetch_line_by_project($projectid,$user='')
-	{
-		global $conf,$db,$langs;
-
-		$langs->load('trips');
-
-		if($user->rights->expensereport->lire) {
-
-			$sql = "SELECT de.fk_expensereport, de.date, de.comments, de.total_ht, de.total_ttc";
-			$sql.= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
-			$sql.= " WHERE de.fk_projet = ".$projectid;
-
-			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
-			$result = $db->query($sql) ;
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-				$i = 0;
-				$total_HT = 0;
-				$total_TTC = 0;
-
-				while ($i < $num)
-				{
-
-					$objp = $db->fetch_object($result);
-
-					$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut";
-					$sql2.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
-					$sql2.= " WHERE d.rowid = '".$objp->fk_expensereport."'";
-
-					$result2 = $db->query($sql2);
-					$obj = $db->fetch_object($result2);
-
-					$objp->fk_user_author = $obj->fk_user_author;
-					$objp->ref = $obj->ref;
-					$objp->fk_c_expensereport_status = $obj->fk_statut;
-					$objp->rowid = $obj->rowid;
-
-					$total_HT = $total_HT + $objp->total_ht;
-					$total_TTC = $total_TTC + $objp->total_ttc;
-					$author = new User($db);
-					$author->fetch($objp->fk_user_author);
-
-					print '<tr>';
-					print '<td><a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$objp->rowid.'">'.$objp->ref_num.'</a></td>';
-					print '<td align="center">'.dol_print_date($objp->date,'day').'</td>';
-					print '<td>'.$author->getNomUrl().'</td>';
-					print '<td>'.$objp->comments.'</td>';
-					print '<td align="right">'.price($objp->total_ht).'</td>';
-					print '<td align="right">'.price($objp->total_ttc).'</td>';
-					print '<td align="right">';
-
-					switch($objp->fk_c_expensereport_status) {
-						case 4:
-							print img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-							break;
-						case 1:
-							print $langs->trans('Draft').' '.img_picto($langs->trans('Draft'),'statut0');
-							break;
-						case 2:
-							print $langs->trans('TripForValid').' '.img_picto($langs->trans('TripForValid'),'statut3');
-							break;
-						case 5:
-							print $langs->trans('TripForPaid').' '.img_picto($langs->trans('TripForPaid'),'statut3');
-							break;
-						case 6:
-							print $langs->trans('TripPaid').' '.img_picto($langs->trans('TripPaid'),'statut4');
-							break;
-					}
-					/*
-					 if ($status==4) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-					if ($status==1) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
-					if ($status==2) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
-					if ($status==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
-					if ($status==5) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
-					if ($status==6) return img_picto($langs->trans('StatusOrderOnProcess'),'statut6');
-					*/
-					print '</td>';
-					print '</tr>';
-
-					$i++;
-				}
-
-				print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>';
-				print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_HT).'</td>';
-				print '<td align="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_TTC).'</td>';
-				print '<td>&nbsp;</td>';
-				print '</tr>';
-
-			}
-			else
-			{
-				$this->error=$db->error();
-				return -1;
-			}
-		}
-
-	}
-
-	/**
-	 * recalculer
-	 * TODO Replace this with call to update_price if not already done
-	 *
-	 * @param 	int			$id		Id of expense report
-	 * @return 	int					<0 if KO, >0 if OK
-	 */
-	function recalculer($id)
-	{
-		$sql = 'SELECT tt.total_ht, tt.total_ttc, tt.total_tva';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as tt';
-		$sql.= ' WHERE tt.'.$this->fk_element.' = '.$id;
-
-		$total_ht = 0; $total_tva = 0; $total_ttc = 0;
-
-		dol_syslog('ExpenseReport::recalculer sql='.$sql,LOG_DEBUG);
-
-		$result = $this->db->query($sql);
-		if($result)
-		{
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			while ($i < $num):
-			$objp = $this->db->fetch_object($result);
-			$total_ht+=$objp->total_ht;
-			$total_tva+=$objp->total_tva;
-			$i++;
-			endwhile;
-
-			$total_ttc = $total_ht + $total_tva;
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-			$sql.= " total_ht = ".$total_ht;
-			$sql.= " , total_ttc = ".$total_ttc;
-			$sql.= " , total_tva = ".$total_tva;
-			$sql.= " WHERE rowid = ".$id;
-			$result = $this->db->query($sql);
-			if($result):
-			$this->db->free($result);
-			return 1;
-			else:
-			$this->error=$this->db->error();
-			dol_syslog('ExpenseReport::recalculer: Error '.$this->error,LOG_ERR);
-			return -3;
-			endif;
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			dol_syslog('ExpenseReport::recalculer: Error '.$this->error,LOG_ERR);
-			return -3;
-		}
-	}
-
-	/**
-	 * fetch_lines
-	 *
-	 * @return	int		<0 if OK, >0 if KO
-	 */
-	function fetch_lines()
-	{
-		$this->lines=array();
-
-		$sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date,';
-		$sql.= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_projet, de.fk_c_tva, de.tva_tx as vatrate,';
-		$sql.= ' de.total_ht, de.total_tva, de.total_ttc,';
-		$sql.= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
-		$sql.= ' p.ref as ref_projet, p.title as title_projet';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
-		$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
-		$sql.= ' WHERE de.'.$this->fk_element.' = '.$this->id;
-
-		dol_syslog('ExpenseReport::fetch_lines sql='.$sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$objp = $this->db->fetch_object($resql);
-
-				$deplig = new ExpenseReportLine($this->db);
-
-				$deplig->rowid	    	= $objp->rowid;
-				$deplig->comments		= $objp->comments;
-				$deplig->qty			= $objp->qty;
-				$deplig->value_unit 	= $objp->value_unit;
-				$deplig->date			= $objp->date;
-
-				$deplig->fk_expensereport = $objp->fk_expensereport;
-				$deplig->fk_c_type_fees = $objp->fk_c_type_fees;
-				$deplig->fk_projet		= $objp->fk_projet;
-				$deplig->fk_c_tva		= $objp->fk_c_tva;
-
-				$deplig->total_ht		= $objp->total_ht;
-				$deplig->total_tva		= $objp->total_tva;
-				$deplig->total_ttc		= $objp->total_ttc;
-
-				$deplig->type_fees_code 	= $objp->code_type_fees;
-				$deplig->type_fees_libelle 	= $objp->libelle_type_fees;
-				$deplig->vatrate			= $objp->vatrate;
-				$deplig->projet_ref			= $objp->ref_projet;
-				$deplig->projet_title		= $objp->title_projet;
-
-				$this->lignes[$i] = $deplig;
-				$this->lines[$i] = $deplig;
-
-				$i++;
-			}
-			$this->db->free($resql);
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog('ExpenseReport::fetch_lines: Error '.$this->error, LOG_ERR);
-			return -3;
-		}
-	}
-
-
-	/**
-	 * delete
-	 *
-	 * @param 	int		$rowid		Id to delete (optional)
-	 * @param	User	$fuser		User that delete
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function delete($rowid=0, User $fuser=null)
-	{
-		global $user,$langs,$conf;
-
-		if (! $rowid) $rowid=$this->id;
-
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
-		if ($this->db->query($sql))
-		{
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->error()." sql=".$sql;
-				dol_syslog("ExpenseReport.class::delete ".$this->error, LOG_ERR);
-				$this->db->rollback();
-				return -6;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error()." sql=".$sql;
-			dol_syslog("ExpenseReport.class::delete ".$this->error, LOG_ERR);
-			$this->db->rollback();
-			return -4;
-		}
-	}
-
-	/**
-	 * Set to status validate
-	 *
-	 * @param 	User	$fuser		User
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function setValidate($fuser)
-	{
-		global $conf,$langs;
-
-		$expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
-
-		// Sélection du numéro de ref suivant
-		$ref_next = $this->getNextNumRef();
-		$ref_number_int = ($this->ref+1)-1;
-
-		// Sélection de la date de début de la NDF
-		$sql = 'SELECT date_debut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE rowid = '.$this->id;
-		$result = $this->db->query($sql);
-		$objp = $this->db->fetch_object($result);
-		$this->date_debut = $this->db->jdate($objp->date_debut);
-
-		// Création du ref_number suivant
-		if($ref_next)
-		{
-			$prefix="ER";
-			if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
-			$this->ref = strtoupper($fuser->login).$expld_car.$prefix.$this->ref.$expld_car.dol_print_date($this->date_debut,'%y%m%d');
-		}
-
-		if ($this->fk_statut != 2)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET ref = '".$this->ref."', fk_statut = 2, fk_user_valid = ".$fuser->id.",";
-			$sql.= " ref_number_int = ".$ref_number_int;
-			$sql.= ' WHERE rowid = '.$this->id;
-
-			dol_syslog(get_class($this)."::set_save sql=".$sql, LOG_DEBUG);
-
-			if ($this->db->query($sql))
-			{
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::set_save expensereport already with save status", LOG_WARNING);
-		}
-	}
-
-	/**
-	 * set_save_from_refuse
-	 *
-	 * @param 	User	$fuser		User
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function set_save_from_refuse($fuser)
-	{
-		global $conf,$langs;
-
-		// Sélection de la date de début de la NDF
-		$sql = 'SELECT date_debut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE rowid = '.$this->id;
-
-		$result = $this->db->query($sql);
-
-		$objp = $this->db->fetch_object($result);
-
-		$this->date_debut = $this->db->jdate($objp->date_debut);
-
-		if ($this->fk_statut != 2)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_statut = 2";
-			$sql.= ' WHERE rowid = '.$this->id;
-
-			dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
-
-			if ($this->db->query($sql))
-			{
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
-		}
-	}
-
-	/**
-	 * Set status to approved
-	 *
-	 * @param 	User	$fuser		User
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function setApproved($fuser)
-	{
-		$now=dol_now();
-
-		// date approval
-		$this->date_approve = $this->db->idate($now);
-		if ($this->fk_statut != 5)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET ref = '".$this->ref."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
-			$sql.= " date_approve='".$this->date_approve."'";
-			$sql.= ' WHERE rowid = '.$this->id;
-			if ($this->db->query($sql))
-			{
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::set_valide expensereport already with valide status", LOG_WARNING);
-		}
-	}
-
-	/**
-	 * setDeny
-	 *
-	 * @param User		$fuser		User
-	 * @param Details	$details	Details
-	 */
-	function setDeny($fuser,$details)
-	{
-		$now = dol_now();
-
-		// date de refus
-		if ($this->fk_statut != 99)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
-			$sql.= " date_refuse='".$this->db->idate($now)."',";
-			$sql.= " detail_refuse='".$this->db->escape($details)."'";
-			$sql.= " fk_user_approve=NULL,";
-			$sql.= ' WHERE rowid = '.$this->id;
-			if ($this->db->query($sql))
-			{
-				$this->fk_statut = 99;
-				$this->fk_user_refuse = $fuser->id;
-				$this->detail_refuse = $details;
-				$this->date_refuse = $now;
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
-		}
-	}
-
-	/**
-	 * setPaid
-	 *
-	 * @param 	User	$fuser		User
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function setPaid($fuser)
-	{
-		$now= dol_now();
-
-		$this->date_paiement = $this->db->idate($now);
-		if ($this->fk_statut != 6)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_statut = 6, fk_user_paid = ".$fuser->id.",";
-			$sql.= " date_paiement='".$this->db->idate($this->date_paiement)."'";
-			$sql.= ' WHERE rowid = '.$this->id;
-
-			dol_syslog(get_class($this)."::setPaid sql=".$sql, LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::set_paid expensereport already with paid status", LOG_WARNING);
-		}
-	}
-
-	/**
-	 * set_unpaid
-	 *
-	 * @param 	User	$fuser		User
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function set_unpaid($fuser)
-	{
-		if ($this->fk_c_deplacement_statuts != 5)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_statut = 5";
-			$sql.= ' WHERE rowid = '.$this->id;
-
-			dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
-
-			if ($this->db->query($sql)):
-			return 1;
-			else:
-			$this->error=$this->db->error();
-			return -1;
-			endif;
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
-		}
-	}
-
-	/**
-	 * set_cancel
-	 *
-	 * @param 	User	$fuser		User
-	 * @param	string	$detail		Detail
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function set_cancel($fuser,$detail)
-	{
-		$this->date_cancel = $this->db->idate(gmmktime());
-		if ($this->fk_statut != 4)
-		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_statut = 4, fk_user_cancel = ".$fuser->id;
-			$sql.= ", date_cancel='".$this->date_cancel."'";
-			$sql.= " ,detail_cancel='".$this->db->escape($detail)."'";
-			$sql.= ' WHERE rowid = '.$this->id;
-
-			dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
-
-			if ($this->db->query($sql))
-			{
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
-		}
-	}
-
-	function getNextNumRef()
-	{
-		global $conf;
-
-		$expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
-		$num_car = (empty($conf->global->NDF_NUM_CAR_REF))?"5":$conf->global->NDF_NUM_CAR_REF;
-
-		$sql = 'SELECT de.ref_number_int';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' de';
-		$sql.= ' ORDER BY de.ref_number_int DESC';
-
-		$result = $this->db->query($sql);
-
-		if($this->db->num_rows($result) > 0):
-		$objp = $this->db->fetch_object($result);
-		$this->ref = $objp->ref_number_int;
-		$this->ref++;
-		while(strlen($this->ref) < $num_car):
-		$this->ref = "0".$this->ref;
-		endwhile;
-		else:
-		$this->ref = 1;
-		while(strlen($this->ref) < $num_car):
-		$this->ref = "0".$this->ref;
-		endwhile;
-		endif;
-
-		if ($result):
-		return 1;
-		else:
-		$this->error=$this->db->error();
-		return -1;
-		endif;
-	}
-
-
-	/**
-	 *	Return clicable name (with picto eventually)
-	 *
-	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 *	@return		string					Chaine avec URL
-	 */
-	function getNomUrl($withpicto=0)
-	{
-		global $langs;
-
-		$result='';
-
-		$link = '<a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$this->id.'">';
-		$linkend='</a>';
-
-		$picto='trip';
-
-		$label=$langs->trans("Show").': '.$this->ref;
-
-		if ($withpicto) $result.=($link.img_object($label,$picto).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
-		return $result;
-	}
-
-
-	function update_totaux_add($ligne_total_ht,$ligne_total_tva){
-		$this->total_ht = $this->total_ht + $ligne_total_ht;
-		$this->total_tva = $this->total_tva + $ligne_total_tva;
-		$this->total_ttc = $this->total_ht + $this->total_tva;
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-		$sql.= " total_ht = ".$this->total_ht;
-		$sql.= " , total_ttc = ".$this->total_ttc;
-		$sql.= " , total_tva = ".$this->total_tva;
-		$sql.= " WHERE rowid = ".$this->id;
-
-		$result = $this->db->query($sql);
-		if ($result):
-		return 1;
-		else:
-		$this->error=$this->db->error();
-		return -1;
-		endif;
-	}
-
-	function update_totaux_del($ligne_total_ht,$ligne_total_tva){
-		$this->total_ht = $this->total_ht - $ligne_total_ht;
-		$this->total_tva = $this->total_tva - $ligne_total_tva;
-		$this->total_ttc = $this->total_ht + $this->total_tva;
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-		$sql.= " total_ht = ".$this->total_ht;
-		$sql.= " , total_ttc = ".$this->total_ttc;
-		$sql.= " , total_tva = ".$this->total_tva;
-		$sql.= " WHERE rowid = ".$this->id;
-
-		$result = $this->db->query($sql);
-		if ($result):
-		return 1;
-		else:
-		$this->error=$this->db->error();
-		return -1;
-		endif;
-	}
-
-
-	/**
-	 * updateline
-	 *
-	 * @param 	int			$rowid					Line to edit
-	 * @param 	int			$type_fees_id			Type payment
-	 * @param 	int			$projet_id				Project id
-	 * @param 	double		$vatrate				Vat rate
-	 * @param 	string		$comments				Description
-	 * @param 	real		$qty					Qty
-	 * @param 	double		$value_unit				Value init
-	 * @param 	int			$date					Date
-	 * @param 	int			$expensereport_id		Expense report id
-	 * @return	int									<0 if KO, >0 if OK
-	 */
-	function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $expensereport_id)
-	{
-		global $user;
-
-		if ($this->fk_statut==0 || $this->fk_statut==99)
-		{
-			$this->db->begin();
-
-			// calcul de tous les totaux de la ligne
-			$total_ttc	= price2num($qty*$value_unit, 'MT');
-
-			$tx_tva = $vatrate / 100;
-			$tx_tva	= $tx_tva + 1;
-			$total_ht 	= price2num($total_ttc/$tx_tva, 'MT');
-
-			$total_tva = price2num($total_ttc - $total_ht, 'MT');
-			// fin calculs
-
-			$ligne = new ExpenseReportLine($this->db);
-			$ligne->comments		= $comments;
-			$ligne->qty				= $qty;
-			$ligne->value_unit 		= $value_unit;
-			$ligne->date			= $date;
-
-			$ligne->fk_expensereport= $expensereport_id;
-			$ligne->fk_c_type_fees 	= $type_fees_id;
-			$ligne->fk_projet		= $projet_id;
-
-			$ligne->total_ht		= $total_ht;
-			$ligne->total_tva		= $total_tva;
-			$ligne->total_ttc		= $total_ttc;
-			$ligne->vatrate			= price2num($vatrate);
-			$ligne->rowid			= $rowid;
-
-			// Select des infos sur le type fees
-			$sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-			$sql.= " WHERE c.id = ".$type_fees_id;
-			$result = $this->db->query($sql);
-			$objp_fees = $this->db->fetch_object($result);
-			$ligne->type_fees_code 		= $objp_fees->code_type_fees;
-			$ligne->type_fees_libelle 	= $objp_fees->libelle_type_fees;
-
-			// Select des informations du projet
-			$sql = "SELECT p.ref as ref_projet, p.title as title_projet";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-			$sql.= " WHERE p.rowid = ".$projet_id;
-			$result = $this->db->query($sql);
-			$objp_projet = $this->db->fetch_object($result);
-			$ligne->projet_ref			= $objp_projet->ref_projet;
-			$ligne->projet_title		= $objp_projet->title_projet;
-
-			$result = $ligne->update($user);
-			if ($result > 0)
-			{
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->error=$ligne->error;
-				$this->errors=$ligne->errors;
-				$this->db->rollback();
-				return -2;
-			}
-		}
-	}
-
-	/**
-	 * deleteline
-	 *
-	 * @param 	int		$rowid		Row id
-	 * @param 	User	$fuser		User
-	 * @return 	int					<0 if KO, >0 if OK
-	 */
-	function deleteline($rowid, $fuser='')
-	{
-		$this->db->begin();
-
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid = '.$rowid;
-
-		dol_syslog(get_class($this)."::deleteline sql=".$sql);
-		$result = $this->db->query($sql);
-		if (!$result)
-		{
-			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
-			$this->db->rollback();
-			return -1;
-		}
-
-		$this->db->commit();
-
-		return 1;
-	}
-
-	/**
-	 * periode_existe
-	 *
-	 * @param 	User	$fuser			User
-	 * @param 	Date	$date_debut		Start date
-	 * @param 	Date	$date_fin		End date
-	 * @return	int						<0 if KO, >0 if OK
-	 */
-	function periode_existe($fuser, $date_debut, $date_fin)
-	{
-		$sql = "SELECT rowid, date_debut, date_fin";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " WHERE fk_user_author = '{$fuser->id}'";
-
-		dol_syslog(get_class($this)."::periode_existe sql=".$sql);
-		$result = $this->db->query($sql);
-		if($result)
-		{
-			$num_lignes = $this->db->num_rows($result); $i = 0;
-
-			if ($num_lignes>0)
-			{
-				$date_d_form = $date_debut;
-				$date_f_form = $date_fin;
-
-				$existe = false;
-
-				while ($i < $num_lignes)
-				{
-					$objp = $this->db->fetch_object($result);
-
-					$date_d_req = $this->db->jdate($objp->date_debut); // 3
-					$date_f_req = $this->db->jdate($objp->date_fin);	  // 4
-
-					if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) $existe = true;
-
-					$i++;
-				}
-
-				if($existe) return 1;
-				else return 0;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::periode_existe  Error ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-
-	/**
-	 * Return list of people with permission to validate trips and expenses
-	 *
-	 * @return	array		Array of user ids
-	 */
-	function fetch_users_approver_expensereport()
-	{
-		$users_validator=array();
-
-		$sql = "SELECT fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
-		$sql.= " WHERE ur.fk_id = rd.id and module = 'expensereport' AND perms = 'approve'";					// Permission 'Approve';
-
-		dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
-		$result = $this->db->query($sql);
-		if($result)
-		{
-			$num_lignes = $this->db->num_rows($result); $i = 0;
-			while ($i < $num_lignes)
-			{
-				$objp = $this->db->fetch_object($result);
-				array_push($users_validator,$objp->fk_user);
-				$i++;
-			}
-			return $users_validator;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch_users_approver_expensereport  Error ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Create a document onto disk accordign to template module.
-	 *
-	 *  @param	    string		$modele			Force le mnodele a utiliser ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
-	 *  @param      int			$hidedetails    Hide details of lines
-	 *  @param      int			$hidedesc       Hide description
-	 *  @param      int			$hideref        Hide ref
-	 *  @return     int         				0 if KO, 1 if OK
-	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-	{
-		global $conf,$langs;
-
-		$langs->load("trips");
-
-		// Positionne le modele sur le nom du modele a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->EXPENSEREPORT_ADDON_PDF))
-			{
-				$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
-			}
-			else
-			{
-				$modele = 'standard';
-			}
-		}
-
-		$modelpath = "core/modules/expensereport/doc/";
-
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	}
-
-	/**
-	 * List of types
-	 *
-	 * @param	int		$active		Active or not
-	 * @return	array
-	 */
-	function listOfTypes($active=1)
-	{
-		global $langs;
-		$ret=array();
-		$sql = "SELECT id, code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees";
-		$sql.= " WHERE active = ".$active;
-		dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ( $result )
-		{
-			$num = $this->db->num_rows($result);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-				$ret[$obj->code]=(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label);
-				$i++;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $ret;
-	}
+    /**
+     *  Returns the label status
+     *
+     *  @param      int     $mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     *  @return     string              Label
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
+
+    /**
+     *  Returns the label of a statut
+     *
+     *  @param      int     $status     id statut
+     *  @param      int     $mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     *  @return     string              Label
+     */
+    function LibStatut($status,$mode=0)
+    {
+        global $langs;
+
+        if ($mode == 0)
+            return $langs->transnoentities($this->statuts[$status]);
+
+        if ($mode == 1)
+            return $langs->transnoentities($this->statuts_short[$status]);
+
+        if ($mode == 2)
+            return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts_short[$status]);
+
+        if ($mode == 3)
+            return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]);
+
+        if ($mode == 4)
+            return img_picto($langs->transnoentities($this->statuts_short[$status]),$this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts[$status]);
+
+        if ($mode == 5)
+            return '<span class="hideonsmartphone">'.$langs->transnoentities($this->statuts_short[$status]).' </span>'.img_picto($langs->transnoentities($this->statuts_short[$status]),$this->statuts_logo[$status]);
+
+    }
+
+
+    /**
+     *  Load information on object
+     *
+     *  @param  int     $id      Id of object
+     *  @return void
+     */
+    function info($id)
+    {
+        global $conf;
+
+        $sql = "SELECT f.rowid,";
+        $sql.= " f.date_create as datec,";
+        $sql.= " f.tms as date_modification,";
+        $sql.= " f.date_valid as datev,";
+        $sql.= " f.date_approve as datea,";
+        $sql.= " f.fk_user_author as fk_user_creation,";
+        $sql.= " f.fk_user_modif as fk_user_modification,";
+        $sql.= " f.fk_user_valid,";
+        $sql.= " f.fk_user_approve";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as f";
+        $sql.= " WHERE f.rowid = ".$id;
+        $sql.= " AND f.entity = ".$conf->entity;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id                = $obj->rowid;
+
+                $this->date_creation     = $this->db->jdate($obj->datec);
+                $this->date_modification = $this->db->jdate($obj->date_modification);
+                $this->date_validation   = $this->db->jdate($obj->datev);
+                $this->date_approbation  = $this->db->jdate($obj->datea);
+
+                $cuser = new User($this->db);
+                $cuser->fetch($obj->fk_user_author);
+                $this->user_creation     = $cuser;
+
+                if ($obj->fk_user_creation)
+                {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_creation);
+                    $this->user_creation     = $cuser;
+                }
+                if ($obj->fk_user_valid)
+                {
+                    $vuser = new User($this->db);
+                    $vuser->fetch($obj->fk_user_valid);
+                    $this->user_validation     = $vuser;
+                }
+                if ($obj->fk_user_modification)
+                {
+                    $muser = new User($this->db);
+                    $muser->fetch($obj->fk_user_modification);
+                    $this->user_modification   = $muser;
+                }
+
+            }
+            $this->db->free($resql);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+
+
+    /**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *  id must be 0 if object instance is a specimen.
+     *
+     *  @return void
+     */
+    function initAsSpecimen()
+    {
+        global $user,$langs,$conf;
+
+        $now=dol_now();
+
+        // Initialise parametres
+        $this->id=0;
+        $this->ref = 'SPECIMEN';
+        $this->specimen=1;
+        $this->date_create = $now;
+        $this->date_debut = $now;
+        $this->date_fin = $now;
+        $this->date_approve = $now;
+
+        $this->status = 5;
+        $this->fk_statut = 5;
+
+        $this->fk_user_author = $user->id;
+        $this->fk_user_valid = $user->id;
+        $this->fk_user_approve = $user->id;
+        $this->fk_user_validator = $user->id;
+
+        $this->note_private='Private note';
+        $this->note_public='SPECIMEN';
+        $nbp = 5;
+        $xnbp = 0;
+        while ($xnbp < $nbp)
+        {
+            $line=new ExpenseReportLine($this->db);
+            $line->comments=$langs->trans("Comment")." ".$xnbp;
+            $line->date=($now-3600*(1+$xnbp));
+            $line->total_ht=100;
+            $line->total_tva=20;
+            $line->total_ttc=120;
+            $line->qty=1;
+            $line->vatrate=20;
+            $line->value_unit=120;
+            $line->fk_expensereport=0;
+            $line->type_fees_code='TRA';
+
+            $line->projet_ref = 'ABC';
+
+            $this->lines[$xnbp]=$line;
+            $xnbp++;
+
+            $this->total_ht+=$line->total_ht;
+            $this->total_tva+=$line->total_tva;
+            $this->total_ttc+=$line->total_ttc;
+        }
+    }
+
+    /**
+     * fetch_line_by_project
+     *
+     * @param   int     $projectid      Project id
+     * @param   User    $user           User
+     * @return  int                     <0 if KO, >0 if OK
+     */
+    function fetch_line_by_project($projectid,$user='')
+    {
+        global $conf,$db,$langs;
+
+        $langs->load('trips');
+
+        if($user->rights->expensereport->lire) {
+
+            $sql = "SELECT de.fk_expensereport, de.date, de.comments, de.total_ht, de.total_ttc";
+            $sql.= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
+            $sql.= " WHERE de.fk_projet = ".$projectid;
+
+            dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+            $result = $db->query($sql) ;
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+                $i = 0;
+                $total_HT = 0;
+                $total_TTC = 0;
+
+                while ($i < $num)
+                {
+
+                    $objp = $db->fetch_object($result);
+
+                    $sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut";
+                    $sql2.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
+                    $sql2.= " WHERE d.rowid = '".$objp->fk_expensereport."'";
+
+                    $result2 = $db->query($sql2);
+                    $obj = $db->fetch_object($result2);
+
+                    $objp->fk_user_author = $obj->fk_user_author;
+                    $objp->ref = $obj->ref;
+                    $objp->fk_c_expensereport_status = $obj->fk_statut;
+                    $objp->rowid = $obj->rowid;
+
+                    $total_HT = $total_HT + $objp->total_ht;
+                    $total_TTC = $total_TTC + $objp->total_ttc;
+                    $author = new User($db);
+                    $author->fetch($objp->fk_user_author);
+
+                    print '<tr>';
+                    print '<td><a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$objp->rowid.'">'.$objp->ref_num.'</a></td>';
+                    print '<td align="center">'.dol_print_date($objp->date,'day').'</td>';
+                    print '<td>'.$author->getNomUrl().'</td>';
+                    print '<td>'.$objp->comments.'</td>';
+                    print '<td align="right">'.price($objp->total_ht).'</td>';
+                    print '<td align="right">'.price($objp->total_ttc).'</td>';
+                    print '<td align="right">';
+
+                    switch($objp->fk_c_expensereport_status) {
+                        case 4:
+                            print img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+                            break;
+                        case 1:
+                            print $langs->trans('Draft').' '.img_picto($langs->trans('Draft'),'statut0');
+                            break;
+                        case 2:
+                            print $langs->trans('TripForValid').' '.img_picto($langs->trans('TripForValid'),'statut3');
+                            break;
+                        case 5:
+                            print $langs->trans('TripForPaid').' '.img_picto($langs->trans('TripForPaid'),'statut3');
+                            break;
+                        case 6:
+                            print $langs->trans('TripPaid').' '.img_picto($langs->trans('TripPaid'),'statut4');
+                            break;
+                    }
+                    /*
+                     if ($status==4) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+                    if ($status==1) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
+                    if ($status==2) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
+                    if ($status==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
+                    if ($status==5) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
+                    if ($status==6) return img_picto($langs->trans('StatusOrderOnProcess'),'statut6');
+                    */
+                    print '</td>';
+                    print '</tr>';
+
+                    $i++;
+                }
+
+                print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>';
+                print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_HT).'</td>';
+                print '<td align="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_TTC).'</td>';
+                print '<td>&nbsp;</td>';
+                print '</tr>';
+
+            }
+            else
+            {
+                $this->error=$db->error();
+                return -1;
+            }
+        }
+
+    }
+
+    /**
+     * recalculer
+     * TODO Replace this with call to update_price if not already done
+     *
+     * @param   int         $id     Id of expense report
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function recalculer($id)
+    {
+        $sql = 'SELECT tt.total_ht, tt.total_ttc, tt.total_tva';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as tt';
+        $sql.= ' WHERE tt.'.$this->fk_element.' = '.$id;
+
+        $total_ht = 0; $total_tva = 0; $total_ttc = 0;
+
+        dol_syslog('ExpenseReport::recalculer sql='.$sql,LOG_DEBUG);
+
+        $result = $this->db->query($sql);
+        if($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            while ($i < $num):
+            $objp = $this->db->fetch_object($result);
+            $total_ht+=$objp->total_ht;
+            $total_tva+=$objp->total_tva;
+            $i++;
+            endwhile;
+
+            $total_ttc = $total_ht + $total_tva;
+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+            $sql.= " total_ht = ".$total_ht;
+            $sql.= " , total_ttc = ".$total_ttc;
+            $sql.= " , total_tva = ".$total_tva;
+            $sql.= " WHERE rowid = ".$id;
+            $result = $this->db->query($sql);
+            if($result):
+            $this->db->free($result);
+            return 1;
+            else:
+            $this->error=$this->db->error();
+            dol_syslog('ExpenseReport::recalculer: Error '.$this->error,LOG_ERR);
+            return -3;
+            endif;
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            dol_syslog('ExpenseReport::recalculer: Error '.$this->error,LOG_ERR);
+            return -3;
+        }
+    }
+
+    /**
+     * fetch_lines
+     *
+     * @return  int     <0 if OK, >0 if KO
+     */
+    function fetch_lines()
+    {
+        $this->lines=array();
+
+        $sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date,';
+        $sql.= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_projet, de.tva_tx as vatrate,';
+        $sql.= ' de.total_ht, de.total_tva, de.total_ttc,';
+        $sql.= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
+        $sql.= ' p.ref as ref_projet, p.title as title_projet';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
+        $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
+        $sql.= ' WHERE de.'.$this->fk_element.' = '.$this->id;
+
+        dol_syslog('ExpenseReport::fetch_lines sql='.$sql, LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $objp = $this->db->fetch_object($resql);
+
+                $deplig = new ExpenseReportLine($this->db);
+
+                $deplig->rowid          = $objp->rowid;
+                $deplig->comments       = $objp->comments;
+                $deplig->qty            = $objp->qty;
+                $deplig->value_unit     = $objp->value_unit;
+                $deplig->date           = $objp->date;
+
+                $deplig->fk_expensereport = $objp->fk_expensereport;
+                $deplig->fk_c_type_fees = $objp->fk_c_type_fees;
+                $deplig->fk_projet      = $objp->fk_projet;
+
+                $deplig->total_ht       = $objp->total_ht;
+                $deplig->total_tva      = $objp->total_tva;
+                $deplig->total_ttc      = $objp->total_ttc;
+
+                $deplig->type_fees_code     = $objp->code_type_fees;
+                $deplig->type_fees_libelle  = $objp->libelle_type_fees;
+                $deplig->vatrate            = $objp->vatrate;
+                $deplig->projet_ref         = $objp->ref_projet;
+                $deplig->projet_title       = $objp->title_projet;
+
+                $this->lignes[$i] = $deplig;
+                $this->lines[$i] = $deplig;
+
+                $i++;
+            }
+            $this->db->free($resql);
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog('ExpenseReport::fetch_lines: Error '.$this->error, LOG_ERR);
+            return -3;
+        }
+    }
+
+
+    /**
+     * delete
+     *
+     * @param   int     $rowid      Id to delete (optional)
+     * @param   User    $fuser      User that delete
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function delete($rowid=0, User $fuser=null)
+    {
+        global $user,$langs,$conf;
+
+        if (! $rowid) $rowid=$this->id;
+
+        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
+        if ($this->db->query($sql))
+        {
+            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->error()." sql=".$sql;
+                dol_syslog("ExpenseReport.class::delete ".$this->error, LOG_ERR);
+                $this->db->rollback();
+                return -6;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error()." sql=".$sql;
+            dol_syslog("ExpenseReport.class::delete ".$this->error, LOG_ERR);
+            $this->db->rollback();
+            return -4;
+        }
+    }
+
+    /**
+     * Set to status validate
+     *
+     * @param   User    $fuser      User
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function setValidate($fuser)
+    {
+        global $conf,$langs;
+
+        $expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
+
+        // Sélection du numéro de ref suivant
+        $ref_next = $this->getNextNumRef();
+        $ref_number_int = ($this->ref+1)-1;
+
+        // Sélection de la date de début de la NDF
+        $sql = 'SELECT date_debut';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE rowid = '.$this->id;
+        $result = $this->db->query($sql);
+        $objp = $this->db->fetch_object($result);
+        $this->date_debut = $this->db->jdate($objp->date_debut);
+
+        // Création du ref_number suivant
+        if($ref_next)
+        {
+            $prefix="ER";
+            if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
+            $this->ref = strtoupper($fuser->login).$expld_car.$prefix.$this->ref.$expld_car.dol_print_date($this->date_debut,'%y%m%d');
+        }
+
+        if ($this->fk_statut != 2)
+        {
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql.= " SET ref = '".$this->ref."', fk_statut = 2, fk_user_valid = ".$fuser->id.",";
+            $sql.= " ref_number_int = ".$ref_number_int;
+            $sql.= ' WHERE rowid = '.$this->id;
+
+            dol_syslog(get_class($this)."::set_save sql=".$sql, LOG_DEBUG);
+
+            if ($this->db->query($sql))
+            {
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->error();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::set_save expensereport already with save status", LOG_WARNING);
+        }
+    }
+
+    /**
+     * set_save_from_refuse
+     *
+     * @param   User    $fuser      User
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function set_save_from_refuse($fuser)
+    {
+        global $conf,$langs;
+
+        // Sélection de la date de début de la NDF
+        $sql = 'SELECT date_debut';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE rowid = '.$this->id;
+
+        $result = $this->db->query($sql);
+
+        $objp = $this->db->fetch_object($result);
+
+        $this->date_debut = $this->db->jdate($objp->date_debut);
+
+        if ($this->fk_statut != 2)
+        {
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql.= " SET fk_statut = 2";
+            $sql.= ' WHERE rowid = '.$this->id;
+
+            dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
+
+            if ($this->db->query($sql))
+            {
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
+        }
+    }
+
+    /**
+     * Set status to approved
+     *
+     * @param   User    $fuser      User
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function setApproved($fuser)
+    {
+        $now=dol_now();
+
+        // date approval
+        $this->date_approve = $this->db->idate($now);
+        if ($this->fk_statut != 5)
+        {
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql.= " SET ref = '".$this->ref."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
+            $sql.= " date_approve='".$this->date_approve."'";
+            $sql.= ' WHERE rowid = '.$this->id;
+            if ($this->db->query($sql))
+            {
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::set_valide expensereport already with valide status", LOG_WARNING);
+        }
+    }
+
+    /**
+     * setDeny
+     *
+     * @param User      $fuser      User
+     * @param Details   $details    Details
+     */
+    function setDeny($fuser,$details)
+    {
+        $now = dol_now();
+
+        // date de refus
+        if ($this->fk_statut != 99)
+        {
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
+            $sql.= " date_refuse='".$this->db->idate($now)."',";
+            $sql.= " detail_refuse='".$this->db->escape($details)."'";
+            $sql.= " fk_user_approve=NULL,";
+            $sql.= ' WHERE rowid = '.$this->id;
+            if ($this->db->query($sql))
+            {
+                $this->fk_statut = 99;
+                $this->fk_user_refuse = $fuser->id;
+                $this->detail_refuse = $details;
+                $this->date_refuse = $now;
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
+        }
+    }
+
+    /**
+     * set_unpaid
+     *
+     * @param   User    $fuser      User
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function set_unpaid($fuser)
+    {
+        if ($this->fk_c_deplacement_statuts != 5)
+        {
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql.= " SET fk_statut = 5";
+            $sql.= ' WHERE rowid = '.$this->id;
+
+            dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
+
+            if ($this->db->query($sql)):
+            return 1;
+            else:
+            $this->error=$this->db->error();
+            return -1;
+            endif;
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
+        }
+    }
+
+    /**
+     * set_cancel
+     *
+     * @param   User    $fuser      User
+     * @param   string  $detail     Detail
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function set_cancel($fuser,$detail)
+    {
+        $this->date_cancel = $this->db->idate(gmmktime());
+        if ($this->fk_statut != 4)
+        {
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql.= " SET fk_statut = 4, fk_user_cancel = ".$fuser->id;
+            $sql.= ", date_cancel='".$this->date_cancel."'";
+            $sql.= " ,detail_cancel='".$this->db->escape($detail)."'";
+            $sql.= ' WHERE rowid = '.$this->id;
+
+            dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
+
+            if ($this->db->query($sql))
+            {
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->error();
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
+        }
+    }
+
+    /**
+     * Return next reference of expense report not already used
+     *
+     * @return    string            free ref
+     */
+    function getNextNumRef()
+    {
+        global $conf;
+
+        $expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
+        $num_car = (empty($conf->global->NDF_NUM_CAR_REF))?"5":$conf->global->NDF_NUM_CAR_REF;
+
+        $sql = 'SELECT de.ref_number_int';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' de';
+        $sql.= ' ORDER BY de.ref_number_int DESC';
+
+        $result = $this->db->query($sql);
+
+        if($this->db->num_rows($result) > 0):
+        $objp = $this->db->fetch_object($result);
+        $this->ref = $objp->ref_number_int;
+        $this->ref++;
+        while(strlen($this->ref) < $num_car):
+        $this->ref = "0".$this->ref;
+        endwhile;
+        else:
+        $this->ref = 1;
+        while(strlen($this->ref) < $num_car):
+        $this->ref = "0".$this->ref;
+        endwhile;
+        endif;
+
+        if ($result):
+        return 1;
+        else:
+        $this->error=$this->db->error();
+        return -1;
+        endif;
+    }
+
+    /**
+     *  Return clicable name (with picto eventually)
+     *
+     *  @param      int     $withpicto      0=No picto, 1=Include picto into link, 2=Only picto
+     *  @return     string                  String with URL
+     */
+    function getNomUrl($withpicto=0)
+    {
+        global $langs;
+
+        $result='';
+
+        $link = '<a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$this->id.'">';
+        $linkend='</a>';
+
+        $picto='trip';
+
+        $label=$langs->trans("Show").': '.$this->ref;
+
+        if ($withpicto) $result.=($link.img_object($label,$picto).$linkend);
+        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+        return $result;
+    }
+
+    /**
+     *  Update total of an expense report when you add a line.
+     *
+     *  @param    string    $ligne_total_ht    Amount without taxes
+     *  @param    string    $ligne_total_tva    Amount of all taxes
+     *  @return    void
+     */
+    function update_totaux_add($ligne_total_ht,$ligne_total_tva)
+    {
+        $this->total_ht = $this->total_ht + $ligne_total_ht;
+        $this->total_tva = $this->total_tva + $ligne_total_tva;
+        $this->total_ttc = $this->total_ht + $this->total_tva;
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+        $sql.= " total_ht = ".$this->total_ht;
+        $sql.= " , total_ttc = ".$this->total_ttc;
+        $sql.= " , total_tva = ".$this->total_tva;
+        $sql.= " WHERE rowid = ".$this->id;
+
+        $result = $this->db->query($sql);
+        if ($result):
+        return 1;
+        else:
+        $this->error=$this->db->error();
+        return -1;
+        endif;
+    }
+
+    /**
+     *  Update total of an expense report when you delete a line.
+     *
+     *  @param    string    $ligne_total_ht    Amount without taxes
+     *  @param    string    $ligne_total_tva    Amount of all taxes
+     *  @return    void
+     */
+    function update_totaux_del($ligne_total_ht,$ligne_total_tva)
+    {
+        $this->total_ht = $this->total_ht - $ligne_total_ht;
+        $this->total_tva = $this->total_tva - $ligne_total_tva;
+        $this->total_ttc = $this->total_ht + $this->total_tva;
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+        $sql.= " total_ht = ".$this->total_ht;
+        $sql.= " , total_ttc = ".$this->total_ttc;
+        $sql.= " , total_tva = ".$this->total_tva;
+        $sql.= " WHERE rowid = ".$this->id;
+
+        $result = $this->db->query($sql);
+        if ($result):
+        return 1;
+        else:
+        $this->error=$this->db->error();
+        return -1;
+        endif;
+    }
+
+
+    /**
+     * updateline
+     *
+     * @param   int         $rowid                  Line to edit
+     * @param   int         $type_fees_id           Type payment
+     * @param   int         $projet_id              Project id
+     * @param   double      $vatrate                Vat rate
+     * @param   string      $comments               Description
+     * @param   real        $qty                    Qty
+     * @param   double      $value_unit             Value init
+     * @param   int         $date                   Date
+     * @param   int         $expensereport_id       Expense report id
+     * @return  int                                 <0 if KO, >0 if OK
+     */
+    function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $expensereport_id)
+    {
+        global $user;
+
+        if ($this->fk_statut==0 || $this->fk_statut==99)
+        {
+            $this->db->begin();
+
+            // calcul de tous les totaux de la ligne
+            $total_ttc  = price2num($qty*$value_unit, 'MT');
+
+            $tx_tva = $vatrate / 100;
+            $tx_tva = $tx_tva + 1;
+            $total_ht   = price2num($total_ttc/$tx_tva, 'MT');
+
+            $total_tva = price2num($total_ttc - $total_ht, 'MT');
+            // fin calculs
+
+            $ligne = new ExpenseReportLine($this->db);
+            $ligne->comments        = $comments;
+            $ligne->qty             = $qty;
+            $ligne->value_unit      = $value_unit;
+            $ligne->date            = $date;
+
+            $ligne->fk_expensereport= $expensereport_id;
+            $ligne->fk_c_type_fees  = $type_fees_id;
+            $ligne->fk_projet       = $projet_id;
+
+            $ligne->total_ht        = $total_ht;
+            $ligne->total_tva       = $total_tva;
+            $ligne->total_ttc       = $total_ttc;
+            $ligne->vatrate         = price2num($vatrate);
+            $ligne->rowid           = $rowid;
+
+            // Select des infos sur le type fees
+            $sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
+            $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+            $sql.= " WHERE c.id = ".$type_fees_id;
+            $result = $this->db->query($sql);
+            $objp_fees = $this->db->fetch_object($result);
+            $ligne->type_fees_code      = $objp_fees->code_type_fees;
+            $ligne->type_fees_libelle   = $objp_fees->libelle_type_fees;
+
+            // Select des informations du projet
+            $sql = "SELECT p.ref as ref_projet, p.title as title_projet";
+            $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+            $sql.= " WHERE p.rowid = ".$projet_id;
+            $result = $this->db->query($sql);
+            $objp_projet = $this->db->fetch_object($result);
+            $ligne->projet_ref          = $objp_projet->ref_projet;
+            $ligne->projet_title        = $objp_projet->title_projet;
+
+            $result = $ligne->update($user);
+            if ($result > 0)
+            {
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->error=$ligne->error;
+                $this->errors=$ligne->errors;
+                $this->db->rollback();
+                return -2;
+            }
+        }
+    }
+
+    /**
+     * deleteline
+     *
+     * @param   int     $rowid      Row id
+     * @param   User    $fuser      User
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function deleteline($rowid, $fuser='')
+    {
+        $this->db->begin();
+
+        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+        $sql.= ' WHERE rowid = '.$rowid;
+
+        dol_syslog(get_class($this)."::deleteline sql=".$sql);
+        $result = $this->db->query($sql);
+        if (!$result)
+        {
+            $this->error=$this->db->error();
+            dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
+            $this->db->rollback();
+            return -1;
+        }
+
+        $this->db->commit();
+
+        return 1;
+    }
+
+    /**
+     * periode_existe
+     *
+     * @param   User    $fuser          User
+     * @param   Date    $date_debut     Start date
+     * @param   Date    $date_fin       End date
+     * @return  int                     <0 if KO, >0 if OK
+     */
+    function periode_existe($fuser, $date_debut, $date_fin)
+    {
+        $sql = "SELECT rowid, date_debut, date_fin";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " WHERE fk_user_author = '{$fuser->id}'";
+
+        dol_syslog(get_class($this)."::periode_existe sql=".$sql);
+        $result = $this->db->query($sql);
+        if($result)
+        {
+            $num_lignes = $this->db->num_rows($result); $i = 0;
+
+            if ($num_lignes>0)
+            {
+                $date_d_form = $date_debut;
+                $date_f_form = $date_fin;
+
+                $existe = false;
+
+                while ($i < $num_lignes)
+                {
+                    $objp = $this->db->fetch_object($result);
+
+                    $date_d_req = $this->db->jdate($objp->date_debut); // 3
+                    $date_f_req = $this->db->jdate($objp->date_fin);      // 4
+
+                    if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) $existe = true;
+
+                    $i++;
+                }
+
+                if($existe) return 1;
+                else return 0;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog(get_class($this)."::periode_existe  Error ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+
+    /**
+     * Return list of people with permission to validate trips and expenses
+     *
+     * @return  array       Array of user ids
+     */
+    function fetch_users_approver_expensereport()
+    {
+        $users_validator=array();
+
+        $sql = "SELECT fk_user";
+        $sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
+        $sql.= " WHERE ur.fk_id = rd.id and module = 'expensereport' AND perms = 'approve'";                    // Permission 'Approve';
+
+        dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
+        $result = $this->db->query($sql);
+        if($result)
+        {
+            $num_lignes = $this->db->num_rows($result); $i = 0;
+            while ($i < $num_lignes)
+            {
+                $objp = $this->db->fetch_object($result);
+                array_push($users_validator,$objp->fk_user);
+                $i++;
+            }
+            return $users_validator;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog(get_class($this)."::fetch_users_approver_expensereport  Error ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+    /**
+     *  Create a document onto disk accordign to template module.
+     *
+     *  @param      string      $modele         Force le mnodele a utiliser ('' to not force)
+     *  @param      Translate   $outputlangs    objet lang a utiliser pour traduction
+     *  @param      int         $hidedetails    Hide details of lines
+     *  @param      int         $hidedesc       Hide description
+     *  @param      int         $hideref        Hide ref
+     *  @return     int                         0 if KO, 1 if OK
+     */
+    public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+    {
+        global $conf,$langs;
+
+        $langs->load("trips");
+
+        // Positionne le modele sur le nom du modele a utiliser
+        if (! dol_strlen($modele))
+        {
+            if (! empty($conf->global->EXPENSEREPORT_ADDON_PDF))
+            {
+                $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
+            }
+            else
+            {
+                $modele = 'standard';
+            }
+        }
+
+        $modelpath = "core/modules/expensereport/doc/";
+
+        return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    }
+
+    /**
+     * List of types
+     *
+     * @param   int     $active     Active or not
+     * @return  array
+     */
+    function listOfTypes($active=1)
+    {
+        global $langs;
+        $ret=array();
+        $sql = "SELECT id, code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees";
+        $sql.= " WHERE active = ".$active;
+        dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ( $result )
+        {
+            $num = $this->db->num_rows($result);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+                $ret[$obj->code]=(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label);
+                $i++;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $ret;
+    }
 
 }
 
@@ -1497,238 +1472,235 @@ class ExpenseReport extends CommonObject
  */
 class ExpenseReportLine
 {
-	var $db;
-	var $error;
+    var $db;
+    var $error;
 
-	var $rowid;
-	var $comments;
-	var $qty;
-	var $value_unit;
-	var $date;
+    var $rowid;
+    var $comments;
+    var $qty;
+    var $value_unit;
+    var $date;
 
-	var $fk_c_tva;
-	var $fk_c_type_fees;
-	var $fk_projet;
-	var $fk_expensereport;
+    var $fk_c_type_fees;
+    var $fk_projet;
+    var $fk_expensereport;
 
-	var $type_fees_code;
-	var $type_fees_libelle;
+    var $type_fees_code;
+    var $type_fees_libelle;
 
-	var $projet_ref;
-	var $projet_title;
+    var $projet_ref;
+    var $projet_title;
 
-	var $vatrate;
-	var $total_ht;
-	var $total_tva;
-	var $total_ttc;
+    var $vatrate;
+    var $total_ht;
+    var $total_tva;
+    var $total_ttc;
 
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB	$db		Handlet database
-	 */
-	function ExpenseReportLine($db)
-	{
-		$this->db= $db;
-	}
+    /**
+     * Constructor
+     *
+     * @param DoliDB    $db     Handlet database
+     */
+    function ExpenseReportLine($db)
+    {
+        $this->db= $db;
+    }
 
-	/**
-	 * fetch record
-	 *
-	 * @param	int		$rowid		Row id to fetch
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function fetch($rowid)
-	{
-		$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_projet, fde.date,';
-		$sql.= ' fde.fk_c_tva as fk_c_tva, fde.tva_tx as vatrate, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
-		$sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
-		$sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
-		$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
-		$sql.= ' WHERE fde.rowid = '.$rowid;
+    /**
+     * fetch record
+     *
+     * @param   int     $rowid      Id of object to load
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function fetch($rowid)
+    {
+        $sql = 'SELECT fde.rowid, fde.ref, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_projet, fde.date,';
+        $sql.= ' fde.tva_tx as vatrate, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
+        $sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
+        $sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
+        $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
+        $sql.= ' WHERE fde.rowid = '.$rowid;
 
-		$result = $this->db->query($sql);
+        $result = $this->db->query($sql);
 
-		if($result)
-		{
-			$objp = $this->db->fetch_object($result);
+        if($result)
+        {
+            $objp = $this->db->fetch_object($result);
 
-			$this->rowid = $objp->rowid;
-			$this->fk_expensereport = $objp->fk_expensereport;
-			$this->comments = $objp->comments;
-			$this->qty = $objp->qty;
-			$this->date = $objp->date;
-			$this->value_unit = $objp->value_unit;
-			$this->fk_c_tva = $objp->fk_c_tva;
-			$this->fk_c_type_fees = $objp->fk_c_type_fees;
-			$this->fk_projet = $objp->fk_projet;
-			$this->type_fees_code = $objp->type_fees_code;
-			$this->type_fees_libelle = $objp->type_fees_libelle;
-			$this->projet_ref = $objp->projet_ref;
-			$this->projet_title = $objp->projet_title;
-			$this->vatrate = $objp->vatrate;
-			$this->total_ht = $objp->total_ht;
-			$this->total_tva = $objp->total_tva;
-			$this->total_ttc = $objp->total_ttc;
+            $this->rowid = $objp->rowid;
+            $this->id = $obj->rowid;
+            $this->ref = $obj->ref;
+            $this->fk_expensereport = $objp->fk_expensereport;
+            $this->comments = $objp->comments;
+            $this->qty = $objp->qty;
+            $this->date = $objp->date;
+            $this->value_unit = $objp->value_unit;
+            $this->fk_c_type_fees = $objp->fk_c_type_fees;
+            $this->fk_projet = $objp->fk_projet;
+            $this->type_fees_code = $objp->type_fees_code;
+            $this->type_fees_libelle = $objp->type_fees_libelle;
+            $this->projet_ref = $objp->projet_ref;
+            $this->projet_title = $objp->projet_title;
+            $this->vatrate = $objp->vatrate;
+            $this->total_ht = $objp->total_ht;
+            $this->total_tva = $objp->total_tva;
+            $this->total_ttc = $objp->total_ttc;
 
-			$this->db->free($result);
-		} else {
-			dol_print_error($this->db);
-		}
-	}
+            $this->db->free($result);
+        } else {
+            dol_print_error($this->db);
+        }
+    }
 
-	/**
-	 * insert
-	 *
-	 * @param 	int		$notrigger		1=No trigger
-	 * @return 	int						<0 if KO, >0 if OK
-	 */
-	function insert($notrigger=0)
-	{
-		global $langs,$user,$conf;
+    /**
+     * insert
+     *
+     * @param   int     $notrigger      1=No trigger
+     * @return  int                     <0 if KO, >0 if OK
+     */
+    function insert($notrigger=0)
+    {
+        global $langs,$user,$conf;
 
-		$error=0;
+        $error=0;
 
-		dol_syslog("ExpenseReportLine::Insert rang=".$this->rang, LOG_DEBUG);
+        dol_syslog("ExpenseReportLine::Insert rang=".$this->rang, LOG_DEBUG);
 
-		// Clean parameters
-		$this->comments=trim($this->comments);
-		if (!$this->value_unit_HT) $this->value_unit_HT=0;
-		$this->qty = price2num($this->qty);
-		$this->vatrate = price2num($this->vatrate);
+        // Clean parameters
+        $this->comments=trim($this->comments);
+        if (!$this->value_unit_HT) $this->value_unit_HT=0;
+        $this->qty = price2num($this->qty);
+        $this->vatrate = price2num($this->vatrate);
 
-		$this->db->begin();
+        $this->db->begin();
 
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'expensereport_det';
-		$sql.= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
-		$sql.= ' fk_c_tva, tva_tx, comments, qty, value_unit, total_ht, total_tva, total_ttc, date)';
-		$sql.= " VALUES (".$this->fk_expensereport.",";
-		$sql.= " ".$this->fk_c_type_fees.",";
-		$sql.= " ".($this->fk_projet>0?$this->fk_projet:'null').",";
-		$sql.= " ".($this->fk_c_tva?$this->fk_c_tva:"null").",";
-		$sql.= " ".$this->vatrate.",";
-		$sql.= " '".$this->db->escape($this->comments)."',";
-		$sql.= " ".$this->qty.",";
-		$sql.= " ".$this->value_unit.",";
-		$sql.= " ".$this->total_ht.",";
-		$sql.= " ".$this->total_tva.",";
-		$sql.= " ".$this->total_ttc.",";
-		$sql.= "'".$this->db->idate($this->date)."'";
-		$sql.= ")";
+        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'expensereport_det';
+        $sql.= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
+        $sql.= ' tva_tx, comments, qty, value_unit, total_ht, total_tva, total_ttc, date)';
+        $sql.= " VALUES (".$this->fk_expensereport.",";
+        $sql.= " ".$this->fk_c_type_fees.",";
+        $sql.= " ".($this->fk_projet>0?$this->fk_projet:'null').",";
+        $sql.= " ".$this->vatrate.",";
+        $sql.= " '".$this->db->escape($this->comments)."',";
+        $sql.= " ".$this->qty.",";
+        $sql.= " ".$this->value_unit.",";
+        $sql.= " ".$this->total_ht.",";
+        $sql.= " ".$this->total_tva.",";
+        $sql.= " ".$this->total_ttc.",";
+        $sql.= "'".$this->db->idate($this->date)."'";
+        $sql.= ")";
 
-		dol_syslog("ExpenseReportLine::insert sql=".$sql);
+        dol_syslog("ExpenseReportLine::insert sql=".$sql);
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
 
-			$tmpparent=new ExpenseReport($this->db);
-			$tmpparent->fetch($this->fk_expensereport);
-			$result = $tmpparent->update_price();
-			if ($result < 0)
-			{
-				$error++;
-				$this->error = $tmpparent->error;
-				$this->errors = $tmpparent->errors;
-			}
-		}
+            $tmpparent=new ExpenseReport($this->db);
+            $tmpparent->fetch($this->fk_expensereport);
+            $result = $tmpparent->update_price();
+            if ($result < 0)
+            {
+                $error++;
+                $this->error = $tmpparent->error;
+                $this->errors = $tmpparent->errors;
+            }
+        }
 
-		if (! $error)
-		{
-			$this->db->commit();
-			return $this->rowid;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
-			$this->db->rollback();
-			return -2;
-		}
-	}
+        if (! $error)
+        {
+            $this->db->commit();
+            return $this->rowid;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
+            $this->db->rollback();
+            return -2;
+        }
+    }
 
-	/**
-	 * update
-	 *
-	 * @param	User	$fuser		User
-	 * @return 	int					<0 if KO, >0 if OK
-	 */
-	function update($fuser)
-	{
-		global $fuser,$langs,$conf;
+    /**
+     * update
+     *
+     * @param   User    $fuser      User
+     * @return  int                 <0 if KO, >0 if OK
+     */
+    function update($fuser)
+    {
+        global $fuser,$langs,$conf;
 
-		$error=0;
+        $error=0;
 
-		// Clean parameters
-		$this->comments=trim($this->comments);
-		$this->vatrate = price2num($this->vatrate);
+        // Clean parameters
+        $this->comments=trim($this->comments);
+        $this->vatrate = price2num($this->vatrate);
 
-		$this->db->begin();
+        $this->db->begin();
 
-		// Mise a jour ligne en base
-		$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
-		$sql.= " comments='".$this->db->escape($this->comments)."'";
-		$sql.= ",value_unit=".$this->value_unit."";
-		$sql.= ",qty=".$this->qty."";
-		$sql.= ",date='".$this->db->idate($this->date)."'";
-		$sql.= ",total_ht=".$this->total_ht."";
-		$sql.= ",total_tva=".$this->total_tva."";
-		$sql.= ",total_ttc=".$this->total_ttc."";
-		$sql.= ",tva_tx=".$this->vatrate;
-		if ($this->fk_c_type_fees) $sql.= ",fk_c_type_fees=".$this->fk_c_type_fees;
-		else $sql.= ",fk_c_type_fees=null";
-		if ($this->fk_projet) $sql.= ",fk_projet=".$this->fk_projet;
-		else $sql.= ",fk_projet=null";
-		if ($this->fk_c_tva) $sql.= ",fk_c_tva=".$this->fk_c_tva;
-		else $sql.= ",fk_c_tva=null";
-		$sql.= " WHERE rowid = ".$this->rowid;
+        // Mise a jour ligne en base
+        $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
+        $sql.= " comments='".$this->db->escape($this->comments)."'";
+        $sql.= ",value_unit=".$this->value_unit."";
+        $sql.= ",qty=".$this->qty."";
+        $sql.= ",date='".$this->db->idate($this->date)."'";
+        $sql.= ",total_ht=".$this->total_ht."";
+        $sql.= ",total_tva=".$this->total_tva."";
+        $sql.= ",total_ttc=".$this->total_ttc."";
+        $sql.= ",tva_tx=".$this->vatrate;
+        if ($this->fk_c_type_fees) $sql.= ",fk_c_type_fees=".$this->fk_c_type_fees;
+        else $sql.= ",fk_c_type_fees=null";
+        if ($this->fk_projet) $sql.= ",fk_projet=".$this->fk_projet;
+        else $sql.= ",fk_projet=null";
+        $sql.= " WHERE rowid = ".$this->rowid;
 
-		dol_syslog("ExpenseReportLine::update sql=".$sql);
+        dol_syslog("ExpenseReportLine::update sql=".$sql);
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$tmpparent=new ExpenseReport($this->db);
-			$result = $tmpparent->fetch($this->fk_expensereport);
-			if ($result > 0)
-			{
-				$result = $tmpparent->update_price();
-				if ($result < 0)
-				{
-					$error++;
-					$this->error = $tmpparent->error;
-					$this->errors = $tmpparent->errors;
-				}
-			}
-			else
-			{
-				$error++;
-				$this->error = $tmpparent->error;
-				$this->errors = $tmpparent->errors;
-			}
-		}
-		else
-		{
-			$error++;
-			dol_print_error($this->db);
-		}
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $tmpparent=new ExpenseReport($this->db);
+            $result = $tmpparent->fetch($this->fk_expensereport);
+            if ($result > 0)
+            {
+                $result = $tmpparent->update_price();
+                if ($result < 0)
+                {
+                    $error++;
+                    $this->error = $tmpparent->error;
+                    $this->errors = $tmpparent->errors;
+                }
+            }
+            else
+            {
+                $error++;
+                $this->error = $tmpparent->error;
+                $this->errors = $tmpparent->errors;
+            }
+        }
+        else
+        {
+            $error++;
+            dol_print_error($this->db);
+        }
 
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
-			$this->db->rollback();
-			return -2;
-		}
-	}
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
+            $this->db->rollback();
+            return -2;
+        }
+    }
 }
 
 
@@ -1736,74 +1708,74 @@ class ExpenseReportLine
  *    Retourne la liste deroulante des differents etats d'une note de frais.
  *    Les valeurs de la liste sont les id de la table c_expensereport_statuts
  *
- *    @param    int		$selected    	preselect status
- *    @param	string	$htmlname		Name of HTML select
- *    @param	int		$useempty		1=Add empty line
- *    @return	string					HTML select with status
+ *    @param    int     $selected       preselect status
+ *    @param    string  $htmlname       Name of HTML select
+ *    @param    int     $useempty       1=Add empty line
+ *    @return   string                  HTML select with status
  */
 function select_expensereport_statut($selected='',$htmlname='fk_statut',$useempty=1)
 {
-	global $db;
+    global $db;
 
-	$tmpep=new ExpenseReport($db);
+    $tmpep=new ExpenseReport($db);
 
-	print '<select class="flat" name="'.$htmlname.'">';
-	if ($useempty) print '<option value="-1">&nbsp;</option>';
-	foreach ($tmpep->statuts as $key => $val)
-	{
-		if ($selected != '' && $selected == $key)
-		{
-			print '<option value="'.$key.'" selected>';
-		}
-		else
-		{
-			print '<option value="'.$key.'">';
-		}
-		print $val;
-		print '</option>';
-	}
-	print '</select>';
+    print '<select class="flat" name="'.$htmlname.'">';
+    if ($useempty) print '<option value="-1">&nbsp;</option>';
+    foreach ($tmpep->statuts as $key => $val)
+    {
+        if ($selected != '' && $selected == $key)
+        {
+            print '<option value="'.$key.'" selected>';
+        }
+        else
+        {
+            print '<option value="'.$key.'">';
+        }
+        print $val;
+        print '</option>';
+    }
+    print '</select>';
 }
 
 /**
- *	Return list of types of notes with select value = id
+ *  Return list of types of notes with select value = id
  *
- *	@param      int		$selected       Preselected type
- *	@param      string	$htmlname       Name of field in form
- * 	@param		int		$showempty		Add an empty field
- *  @return		string					Select html
+ *  @param      int     $selected       Preselected type
+ *  @param      string  $htmlname       Name of field in form
+ *  @param      int     $showempty      Add an empty field
+ *  @return     string                  Select html
  */
 function select_type_fees_id($selected='',$htmlname='type',$showempty=0)
 {
-	global $db,$langs,$user;
-	$langs->load("trips");
+    global $db,$langs,$user;
+    $langs->load("trips");
 
-	print '<select class="flat" name="'.$htmlname.'">';
-	if ($showempty)
-	{
-		print '<option value="-1"';
-		if ($selected == -1) print ' selected';
-		print '>&nbsp;</option>';
-	}
+    print '<select class="flat" name="'.$htmlname.'">';
+    if ($showempty)
+    {
+        print '<option value="-1"';
+        if ($selected == -1) print ' selected';
+        print '>&nbsp;</option>';
+    }
 
-	$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-	$sql.= " ORDER BY c.label ASC";
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
+    $sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+    $sql.= " ORDER BY c.label ASC";
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
 
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			print '<option value="'.$obj->id.'"';
-			if ($obj->code == $selected || $obj->id == $selected) print ' selected';
-			print '>';
-			if ($obj->code != $langs->trans($obj->code)) print $langs->trans($obj->code);
-			else print $langs->trans($obj->type);
-			$i++;
-		}
-	}
-	print '</select>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            print '<option value="'.$obj->id.'"';
+            if ($obj->code == $selected || $obj->id == $selected) print ' selected';
+            print '>';
+            if ($obj->code != $langs->trans($obj->code)) print $langs->trans($obj->code);
+            else print $langs->trans($obj->type);
+            $i++;
+        }
+    }
+    print '</select>';
 }
diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
index 3a2010ce340..817d651c3e8 100644
--- a/htdocs/expensereport/export_csv.php
+++ b/htdocs/expensereport/export_csv.php
@@ -126,9 +126,8 @@ if (isset($_POST['action']))
 		$outputlangs = $langs;
 		$outputlangs->charset_output = 'UTF-8';
 
-		$sql = "SELECT d.rowid, d.ref, d.date_paiement, d.total_ht, d.total_tva, d.total_ttc";
+		$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
-		$sql.= " WHERE date_paiement LIKE '".$select_date."%'";
 		$sql.= " ORDER BY d.rowid";
 
 		$result = $db->query($sql);
@@ -146,7 +145,7 @@ if (isset($_POST['action']))
 				$objet->total_tva = number_format($objet->total_tva,2);
 				$objet->total_ttc = number_format($objet->total_ttc,2);
 				$objet->ref = trim($objet->ref);
-				$ligne.= "{$objet->rowid}, {$objet->ref}, ----, {$objet->date_paiement}, {$objet->total_ht}, {$objet->total_tva}, {$objet->total_ttc}\n";
+				$ligne.= "{$objet->rowid}, {$objet->ref}, ----, {$objet->total_ht}, {$objet->total_tva}, {$objet->total_ttc}\n";
 
 				$ligne.= "--->, Ligne, Type, Description, ----, ----, ----\n";
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 5b157f6df8b..e98921362ff 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003		Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004		Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2011	Regis Houssin        <regis.houssin@capnetworks.com>
  *
@@ -70,13 +70,11 @@ $totalnb=$totalsum=0;
 $sql = "SELECT tf.code, tf.label, count(de.rowid) as nb, sum(de.total_ht) as km";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensereport_det as de, ".MAIN_DB_PREFIX."c_type_fees as tf";
 $sql.= " WHERE de.fk_expensereport = d.rowid AND de.fk_c_type_fees = tf.id";
-
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous))
 {
 	$sql.= " AND d.fk_user_author IN (".join(',',$childids).")\n";
 }
-
 $sql.= " GROUP BY tf.code, tf.label";
 
 $result = $db->query($sql);
@@ -202,7 +200,7 @@ if ($result)
     }
     else
     {
-        print '<tr '.$bc[$var].'><td colspan="2">'.$langs->trans("None").'</td></tr>';
+        print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
     }
     print '</table><br>';
 }
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index c0b30b6c873..8b83f69ee12 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -191,7 +191,7 @@ if ($resql)
 	print_liste_field_titre($langs->trans("TotalVAT"),$_SERVER["PHP_SELF"],"d.total_tva","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("TotalTTC"),$_SERVER["PHP_SELF"],"d.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Statut"),$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	// Filters
@@ -245,16 +245,21 @@ if ($resql)
 	$total_total_ht = 0;
 	$total_total_ttc = 0;
 	$total_total_tva = 0;
+	
+	$expensereportstatic=new ExpenseReport($db);
 
 	if($num > 0)
 	{
 		while ($i < min($num,$limit))
 		{
 			$objp = $db->fetch_object($resql);
+			
+			$expensereportstatic->id=$objp->rowid;
+			$expensereportstatic->ref=$objp->ref;
 
 			$var=!$var;
 			print "<tr ".$bc[$var].">";
-			print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$objp->ref.'</a></td>';
+			print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
 			print '<td align="center">'.($objp->date_debut > 0 ? dol_print_date($objp->date_debut, 'day') : '').'</td>';
 			print '<td align="center">'.($objp->date_fin > 0 ? dol_print_date($objp->date_fin, 'day') : '').'</td>';
 			print '<td align="left"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->id_user.'">'.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($objp->firstname, $objp->lastname).'</a></td>';
@@ -263,10 +268,13 @@ if ($resql)
 			print '<td align="right">'.price($objp->total_ttc).'</td>';
 
 			$expensereporttmp->status=$objp->status;
-			print '<td align="right" colspan="2">';
+			print '<td align="right">';
 			//print $objp->status;
 			print $expensereporttmp->getLibStatut(5);
 			print '</td>';
+
+			print '<td></td>';
+
 			print "</tr>\n";
 
 			$total_total_ht = $total_total_ht + $objp->total_ht;
diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php
index 58fcbaee301..90eb4bd4674 100644
--- a/htdocs/expensereport/synchro_compta.php
+++ b/htdocs/expensereport/synchro_compta.php
@@ -33,8 +33,6 @@ if ($_GET["action"] == 'confirm_ndf_to_account' && $_GET["confirm"] == "yes"):
 	$expensereport = new ExpenseReport($db);
 	$expensereport->fetch($idTrip,$user);
 
-	$datePaiement = explode("-",$expensereport->date_paiement);
-
 	$dateop 	= dol_mktime(12,0,0,$datePaiement[1],$datePaiement[2],$datePaiement[0]);
 	$operation	= $expensereport->code_paiement;
 	$label		= "Règlement ".$expensereport->ref;
@@ -43,7 +41,7 @@ if ($_GET["action"] == 'confirm_ndf_to_account' && $_GET["confirm"] == "yes"):
 	$cat1		= '';
 
 	$user = new User($db);
-	$user->fetch($expensereport->fk_user_paid);
+	$user->fetch($user->id);
 
 	$acct=new Account($db,$idAccount);
 	$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 72037500606..1c5d157188a 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -46,7 +46,6 @@ class Export
 
 	// To store export modules
 	var $hexa;
-	var $hexafilter;
 	var $hexafiltervalue;
 	var $datatoexport;
 	var $model_name;
@@ -635,9 +634,6 @@ class Export
 		$this->db->begin();
 
 		$filter='';
-		if (! empty($this->hexafilter) && ! empty($this->hexafiltervalue)) {
-			$filter = json_encode(array('field' => $this->hexafilter, 'value' => $this->hexafiltervalue));
-		}
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
 		$sql.= 'label,';
@@ -646,12 +642,12 @@ class Export
 		$sql.= 'filter';
 		$sql.= ') VALUES (';
 		$sql.= "'".$this->db->escape($this->model_name)."',";
-		$sql.= "'".$this->datatoexport."',";
-		$sql.= "'".$this->hexa."',";
-		$sql.= (! empty($filter)?"'".$filter."'":"null");
+		$sql.= "'".$this->db->escape($this->datatoexport)."',";
+		$sql.= "'".$this->db->escape($this->hexa)."',";
+		$sql.= "'".$this->db->escape($this->hexafiltervalue)."'";
 		$sql.= ")";
 
-		dol_syslog("Export::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -675,7 +671,7 @@ class Export
 	 */
 	function fetch($id)
 	{
-		$sql = 'SELECT em.rowid, em.field, em.label, em.type, em.filter';
+		$sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
 		$sql.= ' WHERE em.rowid = '.$id;
 
@@ -687,13 +683,11 @@ class Export
 			if ($obj)
 			{
 				$this->id				= $obj->rowid;
-				$this->hexa				= $obj->field;
 				$this->model_name		= $obj->label;
 				$this->datatoexport		= $obj->type;
-
-				$filter					= json_decode($obj->filter, true);
-				$this->hexafilter		= (isset($filter['field'])?$filter['field']:'');
-				$this->hexafiltervalue	= (isset($filter['value'])?$filter['value']:'');
+				
+				$this->hexa				= $obj->field;
+				$this->hexafiltervalue	= $obj->filter;
 
 				return 1;
 			}
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index c1b0262fd40..3418acc6f18 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -105,7 +105,7 @@ $entitytolang = array(
 );
 
 $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
-$array_filtervalue=isset($_SESSION["export_FilterValue_fields"])?$_SESSION["export_FilterValue_fields"]:array();
+$array_filtervalue=isset($_SESSION["export_filtered_fields"])?$_SESSION["export_filtered_fields"]:array();
 $datatoexport=GETPOST("datatoexport");
 $action=GETPOST('action', 'alpha');
 $confirm=GETPOST('confirm', 'alpha');
@@ -228,7 +228,6 @@ if ($action=='downfield' || $action=='upfield')
 if ($step == 1 || $action == 'cleanselect')
 {
     $_SESSION["export_selected_fields"]=array();
-    //$_SESSION["export_FilterValue_fields"]=array();
     $_SESSION["export_filtered_fields"]=array();
     $array_selected=array();
     $array_filtervalue=array();
@@ -286,12 +285,15 @@ if ($action == 'add_export_model')
 		}
 
 		$hexafiltervalue='';
-		foreach($array_filtervalue as $key=>$val)
+		if (! empty($array_filtervalue) && is_array($array_filtervalue))
 		{
-			if ($hexafilter) $hexafiltervalue.=',';
-			$hexafiltervalue.=$key.'='.$val;
+			foreach($array_filtervalue as $key=>$val)
+			{
+				if ($hexafiltervalue) $hexafiltervalue.=',';
+				$hexafiltervalue.=$key.'='.$val;
+			}
 		}
-
+		
 	    $objexport->model_name = $export_name;
 	    $objexport->datatoexport = $datatoexport;
 	    $objexport->hexa = $hexa;
@@ -317,10 +319,11 @@ if ($action == 'add_export_model')
 	}
 }
 
+// Reload an predefined export model
 if ($step == 2 && $action == 'select_model')
 {
     $_SESSION["export_selected_fields"]=array();
-    $_SESSION["export_FilterValue_fields"]=array();
+    $_SESSION["export_filtered_fields"]=array();
 
     $array_selected=array();
     $array_filtervalue=array();
@@ -337,16 +340,15 @@ if ($step == 2 && $action == 'select_model')
 		}
 		$_SESSION["export_selected_fields"]=$array_selected;
 
-		$fieldsarray=explode(',',$objexport->hexafilter);
 		$fieldsarrayvalue=explode(',',$objexport->hexafiltervalue);
 		$i=1;
-		foreach($fieldsarray as $val)
+		foreach($fieldsarrayvalue as $val)
 		{
 			$tmp=explode('=',$val);
 			$array_filtervalue[$tmp[0]]=$tmp[1];
 			$i++;
 		}
-		$_SESSION["export_FilterValue_fields"]=$array_filtervalue;
+		$_SESSION["export_filtered_fields"]=$array_filtervalue;
     }
 }
 
@@ -356,7 +358,7 @@ if ($step == 4 && $action == 'submitFormField')
 	// on boucle sur les champs selectionne pour recuperer la valeur
 	if (is_array($objexport->array_export_TypeFields[0]))
 	{
-		$_SESSION["export_FilterValue_fields"]=array();
+		$_SESSION["export_filtered_fields"]=array();
 		//var_dump($_POST);
 		foreach($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
 		{
@@ -372,7 +374,7 @@ if ($step == 4 && $action == 'submitFormField')
 			}
 		}
 		$array_filtervalue=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
-		$_SESSION["export_FilterValue_fields"]=$array_filtervalue;
+		$_SESSION["export_filtered_fields"]=$array_filtervalue;
 	}
 }
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 523b826ee90..b73d2281a3a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
@@ -332,24 +332,33 @@ else if ($action == 'add' && $user->rights->ficheinter->creer)
 	    }
 	    else
 	    {
-	    	// Extrafields
-			$extrafields = new ExtraFields($db);
-			$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-			$array_options = $extrafields->getOptionalsFromPost($extralabels);
+	    	// Fill array 'array_options' with data from add form
+	    	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	    	if ($ret < 0) {
+	    		$error ++;
+	    		$action = 'create';
+	    	}
 
-	        $object->array_options = $array_options;
+	    	if (! $error)
+	    	{
+	    		// Extrafields
+	    		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+	    		$array_options = $extrafields->getOptionalsFromPost($extralabels);
 
-			$result = $object->create($user);
-	        if ($result > 0)
-	        {
-	            $id=$result;      // Force raffraichissement sur fiche venant d'etre cree
-	        }
-	        else
-	        {
-	            $langs->load("errors");
-	            setEventMessages($object->error, $object->errors, 'errors');
-	            $action = 'create';
-	        }
+	    		$object->array_options = $array_options;
+
+	    		$result = $object->create($user);
+	    		if ($result > 0)
+	    		{
+	    			$id=$result;      // Force raffraichissement sur fiche venant d'etre cree
+	    		}
+	    		else
+	    		{
+	    			$langs->load("errors");
+	    			setEventMessages($object->error, $object->errors, 'errors');
+	    			$action = 'create';
+	    		}
+	    	}
         }
     }
     else
@@ -1371,6 +1380,7 @@ else if ($id > 0 || ! empty($ref))
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
 
+	// Line of interventions
  	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
  	{
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
@@ -1547,9 +1557,9 @@ else if ($id > 0 || ! empty($ref))
 				print '<td colspan="4">&nbsp;</td>';
 				print "</tr>\n";
 
-				$var=false;
+				$var=true;
 
-				print '<tr '.$bc[$var].">\n";
+				print '<tr '.$bcnd[$var].">\n";
 				print '<td>';
 				// editeur wysiwyg
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -1786,8 +1796,11 @@ else if ($id > 0 || ! empty($ref))
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div class="clearboth"></div>';
 		print '<br>';
-		print_titre($langs->trans('SendInterventionByMail'));
+		print_fiche_titre($langs->trans('SendInterventionByMail'));
+
+		dol_fiche_head('');
 
 		// Create form object
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -1851,7 +1864,7 @@ else if ($id > 0 || ! empty($ref))
 
 		print $formmail->get_form();
 
-		print '<br>';
+		dol_fiche_end();
 	}
 }
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 1c3582620ab..0e9a5a8c4e0 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -145,7 +145,7 @@ if ($result)
 		print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder);
 	}
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('',$_SERVER["PHP_SELF"], '');
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -224,6 +224,7 @@ else
 	dol_print_error($db);
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
\ No newline at end of file
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index d1ecbf4e5b8..beead03469c 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -30,7 +30,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-alpha');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-beta');
 
 if (! defined('EURO')) define('EURO',chr(128));
 
@@ -57,12 +57,16 @@ if (defined('DOL_INC_FOR_VERSION_ERROR')) return;
 // Define vars
 $conffiletoshowshort = "conf.php";
 // Define localization of conf file
+// --- Start of part replaced by Dolibarr packager makepack-dolibarr
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
 //$conffile = "/etc/dolibarr/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
+
+// Include configuration
+// --- End of part replaced by Dolibarr packager makepack-dolibarr
 // Replace conf filename with "conf" parameter on url by GET
 if (! empty($_GET['conf']))
 {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 03ff0ff1eb2..1bf286ff5aa 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
- *	Copyright (C) 2015      Bahfir Abbes			<bafbes@gmail.com>
+ * Copyright (C) 2015       Bahfir Abbes            <bafbes@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -504,39 +504,41 @@ class FactureFournisseur extends CommonInvoice
                 {
                     $obj = $this->db->fetch_object($resql_rows);
 
-                    $this->lines[$i]					= new SupplierInvoiceLine($this->db);
+	                $line = new SupplierInvoiceLine($this->db);
 
-                    $this->lines[$i]->id				= $obj->rowid;
-                    $this->lines[$i]->rowid				= $obj->rowid;
-                    $this->lines[$i]->description		= $obj->description;
-                    $this->lines[$i]->product_ref		= $obj->product_ref;       // Internal reference
-                    $this->lines[$i]->ref				= $obj->product_ref;       // deprecated.
-                    $this->lines[$i]->ref_supplier		= $obj->ref_supplier;      // Reference product supplier TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields it into updateline
-                    $this->lines[$i]->libelle			= $obj->label;             // Deprecated
-                    $this->lines[$i]->label  			= $obj->label;             // This field may contains label of product (when invoice create from order)
-                    $this->lines[$i]->product_desc		= $obj->product_desc;      // Description du produit
-                    $this->lines[$i]->subprice			= $obj->pu_ht;
-                    $this->lines[$i]->pu_ht				= $obj->pu_ht;
-                    $this->lines[$i]->pu_ttc			= $obj->pu_ttc;
-                    $this->lines[$i]->tva_tx			= $obj->tva_tx;
-                    $this->lines[$i]->localtax1_tx		= $obj->localtax1_tx;
-                    $this->lines[$i]->localtax2_tx		= $obj->localtax2_tx;
-                    $this->lines[$i]->qty				= $obj->qty;
-                    $this->lines[$i]->remise_percent    = $obj->remise_percent;
-                    $this->lines[$i]->tva				= $obj->total_tva;
-                    $this->lines[$i]->total_ht			= $obj->total_ht;
-                    $this->lines[$i]->total_tva			= $obj->total_tva;
-                    $this->lines[$i]->total_localtax1	= $obj->total_localtax1;
-                    $this->lines[$i]->total_localtax2	= $obj->total_localtax2;
-                    $this->lines[$i]->total_ttc			= $obj->total_ttc;
-                    $this->lines[$i]->fk_product		= $obj->fk_product;
-                    $this->lines[$i]->product_type		= $obj->product_type;
-                    $this->lines[$i]->product_label		= $obj->label;
-                    $this->lines[$i]->info_bits		    = $obj->info_bits;
-                    $this->lines[$i]->fk_parent_line    = $obj->fk_parent_line;
-                    $this->lines[$i]->special_code		= $obj->special_code;
-                    $this->lines[$i]->rang       		= $obj->rang;
-                    $this->lines[$i]->fk_unit           = $obj->fk_unit;
+                    $line->id				= $obj->rowid;
+                    $line->rowid				= $obj->rowid;
+                    $line->description		= $obj->description;
+                    $line->product_ref		= $obj->product_ref;
+                    $line->ref				= $obj->product_ref;
+                    $line->ref_supplier		= $obj->ref_supplier;
+                    $line->libelle			= $obj->label;
+                    $line->label  			= $obj->label;
+                    $line->product_desc		= $obj->product_desc;
+                    $line->subprice			= $obj->pu_ht;
+                    $line->pu_ht				= $obj->pu_ht;
+                    $line->pu_ttc			= $obj->pu_ttc;
+                    $line->tva_tx			= $obj->tva_tx;
+                    $line->localtax1_tx		= $obj->localtax1_tx;
+                    $line->localtax2_tx		= $obj->localtax2_tx;
+                    $line->qty				= $obj->qty;
+                    $line->remise_percent    = $obj->remise_percent;
+                    $line->tva				= $obj->total_tva;
+                    $line->total_ht			= $obj->total_ht;
+                    $line->total_tva			= $obj->total_tva;
+                    $line->total_localtax1	= $obj->total_localtax1;
+                    $line->total_localtax2	= $obj->total_localtax2;
+                    $line->total_ttc			= $obj->total_ttc;
+                    $line->fk_product		= $obj->fk_product;
+                    $line->product_type		= $obj->product_type;
+                    $line->product_label		= $obj->label;
+                    $line->info_bits		    = $obj->info_bits;
+                    $line->fk_parent_line    = $obj->fk_parent_line;
+                    $line->special_code		= $obj->special_code;
+                    $line->rang       		= $obj->rang;
+                    $line->fk_unit           = $obj->fk_unit;
+
+	                $this->lines[$i] = $line;
 
                     $i++;
                 }
@@ -1281,82 +1283,44 @@ class FactureFournisseur extends CommonInvoice
             $product_type = $type;
         }
 
-        $this->db->begin();
+	    $line = new SupplierInvoiceLine($this->db);
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-        $sql.= " description ='".$this->db->escape($desc)."'";
-        $sql.= ", pu_ht = ".price2num($pu_ht);
-        $sql.= ", pu_ttc = ".price2num($pu_ttc);
-        $sql.= ", qty = ".price2num($qty);
-        $sql.= ", remise_percent = ".price2num($remise_percent);
-        $sql.= ", tva_tx = ".price2num($vatrate);
-        $sql.= ", localtax1_tx = ".price2num($txlocaltax1);
-        $sql.= ", localtax2_tx = ".price2num($txlocaltax2);
-		$sql.= ", localtax1_type = '".$localtaxes_type[0]."'";
-		$sql.= ", localtax2_type = '".$localtaxes_type[2]."'";
-        $sql.= ", total_ht = ".price2num($total_ht);
-        $sql.= ", tva= ".price2num($total_tva);
-        $sql.= ", total_localtax1= ".price2num($total_localtax1);
-        $sql.= ", total_localtax2= ".price2num($total_localtax2);
-        $sql.= ", total_ttc = ".price2num($total_ttc);
-        if ($idproduct) $sql.= ", fk_product = ".$idproduct;
-        else $sql.= ", fk_product = null";
-        $sql.= ", product_type = ".$product_type;
-        $sql.= ", info_bits = ".$info_bits;
-	    $sql.= ", fk_unit = ".($fk_unit ? "'".$this->db->escape($fk_unit)."'":"null");
-        $sql.= " WHERE rowid = ".$id;
+	    if ($line->fetch($id) < 1) {
+		    return -1;
+	    }
 
-        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->rowid = $id;
+	    $line->description = $desc;
+	    $line->subprice = $pu_ht;
+	    $line->pu_ht = $pu_ht;
+	    $line->pu_ttc = $pu_ttc;
+	    $line->qty = $qty;
+	    $line->remise_percent = $remise_percent;
+	    $line->tva_tx = $vatrate;
+	    $line->localtax1_tx = $txlocaltax1;
+	    $line->localtax2_tx = $txlocaltax2;
+		$line->localtax1_type = $localtaxes_type[0];
+		$line->localtax2_type = $localtaxes_type[2];
+	    $line->total_ht = $total_ht;
+	    $line->total_tva = $total_tva;
+	    $line->total_localtax1 = $total_localtax1;
+	    $line->total_localtax2 = $total_localtax2;
+	    $line->total_ttc = $total_ttc;
+	    $line->fk_product = $idproduct;
+	    $line->product_type = $product_type;
+	    $line->info_bits = $info_bits;
+	    $line->fk_unit = $fk_unit;
+	    $line->array_options = $array_options;
 
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-			{
-				$linetmp = new SupplierInvoiceLine($this->db);
-				$linetmp->id=$this->rowid;
-				$linetmp->array_options = $array_options;
-				$result=$linetmp->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
+	    $res = $line->update($notrigger);
 
-            if (! $error && ! $notrigger)
-            {
-                global $conf, $langs, $user;
-                // Call trigger
-                $result=$this->call_trigger('LINEBILL_SUPPLIER_UPDATE',$user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
-            }
+	    if ($res < 1) {
+		    $this->errors[] = $line->error;
+	    } else {
+		    // Update total price into invoice record
+		    $res = $this->update_price('','auto');
+	    }
 
-            // Update total price into invoice record
-            $result=$this->update_price('','auto');
-
-			if (! $error)
-			{
-	            $this->db->commit();
-            	return $result;
-			}
-			else
-			{
-	            $this->db->rollback();
-            	return -1;
-			}
-        }
-        else
-        {
-            $this->db->rollback();
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
+	    return $res;
     }
 
     /**
@@ -1368,53 +1332,25 @@ class FactureFournisseur extends CommonInvoice
      */
     function deleteline($rowid, $notrigger=0)
     {
-    	global $user, $langs, $conf;
-
-        if (! $rowid) $rowid=$this->id;
-
-        dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
-
-        $error=0;
-    	$this->db->begin();
-
-		if (! $error && ! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('LINEBILL_SUPPLIER_DELETE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
+        if (!$rowid) {
+	        $rowid = $this->id;
         }
 
-    	if (! $error)
-    	{
-	        // Supprime ligne
-	        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';
-	        $sql.= ' WHERE rowid = '.$rowid;
-        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-	        $resql = $this->db->query($sql);
-	        if (! $resql)
-	        {
-	        	$error++;
-	        	$this->error=$this->db->lasterror();
-	        }
-    	}
+	    $line = new SupplierInvoiceLine($this->db);
 
-    	if (! $error)
-    	{
-	        // Mise a jour prix facture
-    		$result=$this->update_price();
-    	}
+	    if ($line->fetch($rowid) < 1) {
+		    return -1;
+	    }
 
-    	if (! $error)
-    	{
-    		$this->db->commit();
-        	return 1;
-    	}
-    	else
-    	{
-			$this->db->rollback();
-    		return -1;
-    	}
+	    $res = $line->delete($notrigger);
+
+	    if ($res < 1) {
+		    $this->errors[] = $line->error;
+	    } else {
+		    $res = $this->update_price();
+	    }
+
+    	return $res;
     }
 
 
@@ -1905,13 +1841,26 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 * @see product_ref
 	 */
 	public $ref;
+	/**
+	 * Internal ref
+	 * @var string
+	 */
 	public $product_ref;
+	/**
+	 * Reference product supplier
+	 * TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields it into updateline
+	 * @var string
+	 */
 	public $ref_supplier;
 	/**
 	 * @deprecated
 	 * @see label
 	 */
 	public $libelle;
+	/**
+	 * Product description
+	 * @var string
+	 */
 	public $product_desc;
 
 	/**
@@ -1946,6 +1895,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 	/**
 	 * Product label
+	 * This field may contains label of product (when invoice create from order)
 	 * @var string
 	 */
 	var $label;
@@ -1968,6 +1918,26 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public $fk_prev_id;
 
+	public $tva_tx;
+	public $localtax1_tx;
+	public $localtax2_tx;
+	public $qty;
+	public $remise_percent;
+	public $total_ht;
+	public $total_ttc;
+	public $total_localtax1;
+	public $total_localtax2;
+	public $fk_product;
+	public $product_type;
+	public $product_label;
+	public $info_bits;
+	public $fk_parent_line;
+	public $special_code;
+	public $rang;
+	public $localtax1_type;
+	public $localtax2_type;
+
+
 	/**
      *	Constructor
      *
@@ -1978,6 +1948,226 @@ class SupplierInvoiceLine extends CommonObjectLine
         $this->db= $db;
     }
 
+	/**
+	 * Retrieves a supplier invoice line
+	 *
+	 * @param    int    $rowid    Line id
+	 * @return   int              <0 KO; 0 NOT FOUND; 1 OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
+		$sql.= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+		$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
+		$sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
+		$sql.= ' WHERE f.rowid = '.$rowid;
+		$sql.= ' ORDER BY f.rang, f.rowid';
 
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			$this->errors[] = $this->db->error();
+			return -1;
+		}
+
+		if (!$this->db->num_rows($query)) {
+			return 0;
+		}
+
+		$obj = $this->db->fetch_object($query);
+
+		$this->id				= $obj->rowid;
+		$this->rowid				= $obj->rowid;
+		$this->description		= $obj->description;
+		$this->product_ref		= $obj->product_ref;
+		$this->ref				= $obj->product_ref;
+		$this->ref_supplier		= $obj->ref_supplier;
+		$this->libelle			= $obj->label;
+		$this->label  			= $obj->label;
+		$this->product_desc		= $obj->product_desc;
+		$this->subprice			= $obj->pu_ht;
+		$this->pu_ht				= $obj->pu_ht;
+		$this->pu_ttc			= $obj->pu_ttc;
+		$this->tva_tx			= $obj->tva_tx;
+		$this->localtax1_tx		= $obj->localtax1_tx;
+		$this->localtax2_tx		= $obj->localtax2_tx;
+		$this->localtax1_type		= $obj->localtax1_type;
+		$this->localtax2_type		= $obj->localtax2_type;
+		$this->qty				= $obj->qty;
+		$this->remise_percent    = $obj->remise_percent;
+		$this->tva				= $obj->total_tva;
+		$this->total_ht			= $obj->total_ht;
+		$this->total_tva			= $obj->total_tva;
+		$this->total_localtax1	= $obj->total_localtax1;
+		$this->total_localtax2	= $obj->total_localtax2;
+		$this->total_ttc			= $obj->total_ttc;
+		$this->fk_product		= $obj->fk_product;
+		$this->product_type		= $obj->product_type;
+		$this->product_label		= $obj->label;
+		$this->info_bits		    = $obj->info_bits;
+		$this->fk_parent_line    = $obj->fk_parent_line;
+		$this->special_code		= $obj->special_code;
+		$this->rang       		= $obj->rang;
+		$this->fk_unit           = $obj->fk_unit;
+
+		return 1;
+	}
+
+	/**
+	 * Deletes a line
+	 *
+	 * @param     bool|int    $notrigger    1=Does not execute triggers, 0= execute triggers
+	 * @return    int                       0 if KO, 1 if OK
+	 */
+	public function delete($notrigger = 0)
+	{
+		global $user;
+
+		dol_syslog(get_class($this)."::deleteline rowid=".$this->id, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$notrigger) {
+			if ($this->call_trigger('LINEBILL_SUPPLIER_DELETE',$user) < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// Supprime ligne
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';
+			$sql .= ' WHERE rowid = '.$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Update a supplier invoice line
+	 *
+	 * @param int $notrigger Disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update($notrigger = 0)
+	{
+		global $conf;
+
+		$pu = price2num($this->pu_ht);
+		$qty  = price2num($this->qty);
+
+		// Check parameters
+		if (! is_numeric($pu) || ! is_numeric($qty)) {
+			return -1;
+		}
+
+		if ($this->product_type < 0) {
+			return -1;
+		}
+
+		// Clean parameters
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+
+		$this->db->begin();
+
+		if ($this->fk_product) {
+			$fk_product = "null";
+		} else {
+			$fk_product = $this->fk_product;
+		}
+
+		if ($this->fk_unit) {
+			$fk_unit = "'".$this->db->escape($this->fk_unit)."'";
+		} else {
+			$fk_unit = "null";
+		}
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
+		$sql.= " description ='".$this->db->escape($this->description)."'";
+		$sql.= ", pu_ht = ".price2num($this->pu_ht);
+		$sql.= ", pu_ttc = ".price2num($this->pu_ttc);
+		$sql.= ", qty = ".price2num($this->qty);
+		$sql.= ", remise_percent = ".price2num($this->remise_percent);
+		$sql.= ", tva_tx = ".price2num($this->tva_tx);
+		$sql.= ", localtax1_tx = ".price2num($this->localtax1_tx);
+		$sql.= ", localtax2_tx = ".price2num($this->localtax2_tx);
+		$sql.= ", localtax1_type = '".$this->localtax1_type."'";
+		$sql.= ", localtax2_type = '".$this->localtax2_type."'";
+		$sql.= ", total_ht = ".price2num($this->total_ht);
+		$sql.= ", tva= ".price2num($this->total_tva);
+		$sql.= ", total_localtax1= ".price2num($this->total_localtax1);
+		$sql.= ", total_localtax2= ".price2num($this->total_localtax2);
+		$sql.= ", total_ttc = ".price2num($this->total_ttc);
+		$sql.= ", fk_product = ".$fk_product;
+		$sql.= ", product_type = ".$this->product_type;
+		$sql.= ", info_bits = ".$this->info_bits;
+		$sql.= ", fk_unit = ".$fk_unit;
+		$sql.= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->db->rollback();
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+
+		$this->rowid = $this->id;
+		$error = 0;
+
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+		{
+			if ($this->insertExtraFields() < 0) {
+				$error++;
+			}
+		}
+
+		if (! $error && ! $notrigger)
+		{
+			global $langs, $user;
+
+			// Call trigger
+			if ($this->call_trigger('LINEBILL_SUPPLIER_UPDATE',$user) < 0) {
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		}
+
+		$this->db->commit();
+		return 1;
+	}
 }
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index b79663445ed..27a33216865 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric	Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
@@ -1754,7 +1754,7 @@ elseif (! empty($object->id))
 	 */
 	if ($action	== 'commande')
 	{
-		$date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+		$date_com = dol_mktime(GETPOST('rehour'),GETPOST('remin'),GETPOST('resec'),GETPOST("remonth"),GETPOST("reday"),GETPOST("reyear"));
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
 
 	}
@@ -2216,9 +2216,9 @@ elseif (! empty($object->id))
 
             print '<br>';
             print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
-            print $form->select_date($date_start,'date_start'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'');
+            print $form->select_date($date_start,'date_start'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'',1,0,1);
             print ' '.$langs->trans('to').' ';
-            print $form->select_date($date_end,'date_end'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'');
+            print $form->select_date($date_end,'date_end'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'',1,0,1);
 
 			print '</td>';
 			print '<td>';
@@ -2296,9 +2296,11 @@ elseif (! empty($object->id))
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div class="clearboth"></div>';
 		print '<br>';
+		print_fiche_titre($langs->trans('SendOrderByMail'));
 
-		print_titre($langs->trans('SendOrderByMail'));
+		dol_fiche_head('');
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -2367,7 +2369,7 @@ elseif (! empty($object->id))
 		// Show form
 		print $formmail->get_form();
 
-		print '<br>';
+		dol_fiche_end();
 	}
 	/*
 	 * Action webservice
@@ -2788,7 +2790,7 @@ elseif (! empty($object->id))
 			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
 			print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
 			$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-			print $form->select_date($date_com,'',1,1,'',"commande");
+			print $form->select_date($date_com,'',1,1,'',"commande",1,0,1);
 			print '</td></tr>';
 
 			print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
@@ -2815,7 +2817,7 @@ elseif (! empty($object->id))
 			print '<table class="border" width="100%">';
 			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
 			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-			print $form->select_date('','',1,1,'',"commande");
+			print $form->select_date('','',1,1,'',"commande",1,0,1);
 			print "</td></tr>\n";
 
 			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 88cf3a48555..c21830e66e8 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
@@ -200,7 +200,7 @@ if ($resql)
 	print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('DateDeliveryPlanned'),$_SERVER["PHP_SELF"],'cf.date_livraison','',$param, 'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cf.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -308,7 +308,9 @@ if ($resql)
 
 
 		// Statut
-		print '<td align="right" colspan="2">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
+		print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
+
+		print '<td></td>';
 
 		print "</tr>\n";
 		$i++;
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 24a481be61f..49c16d38bc8 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -462,7 +462,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print_liste_field_titre($langs->trans('DeliveryDate'), 'orderstoinvoice.php', 'c.date_livraison', '', '&amp;socid=' . $socid, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
 		print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
-		print '</tr>';
+		print "</tr>\n";
 
 		// Lignes des champs de filtre
 		print '<form method="get" action="orderstoinvoice.php">';
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index acdac3ab9a1..13520b723b5 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -101,9 +101,10 @@ if ($result)
     print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin, "", "", $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, "", "", $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, "", "", $sortfield,$sortorder);
-    print '<td class="liste_titre">'.$langs->trans("Email").'</td>';
-    print '<td class="liste_titre">'.$langs->trans("Phone").'</td>';
+    print_liste_field_titre($langs->trans("Email"));
+    print_liste_field_titre($langs->trans("Phone"));
     print "</tr>\n";
+
     $var=True;
     $i = 0;
     while ($i < min($num,$limit))
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cda640f2f38..c3bbced76bd 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2313,6 +2313,11 @@ else
 
             print '<div class="tabsAction">';
 
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+		                                                                                          // modified by hook
+		if (empty($reshook)) {
+
 		    // Modify a validated invoice with no payments
 			if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer)
 			{
@@ -2432,6 +2437,7 @@ else
 				print '</div></div></div>';
                 //print '</td></tr></table>';
             }
+		}
         }
         /*
          * Show mail form
@@ -2474,8 +2480,11 @@ else
                 $file=$fileparams['fullname'];
             }
 
+			print '<div class="clearboth"></div>';
             print '<br>';
-            print_titre($langs->trans('SendBillByMail'));
+            print_fiche_titre($langs->trans('SendBillByMail'));
+
+            dol_fiche_head('');
 
             // Cree l'objet formulaire mail
             include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -2539,7 +2548,7 @@ else
             // Show form
             print $formmail->get_form();
 
-            print '<br>';
+            dol_fiche_end();
         }
     }
 }
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 26cfbacb6bf..d93f1c4beea 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015	   juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015 	   Abbes Bahfir 	<bafbes@gmail.com>
  * Copyright (C) 2015	   Ferran Marcet		<fmarcet@2byte.es>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -264,7 +264,7 @@ if ($resql)
 	print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"fac.total_ht","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"fac.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
-	print '<td class="liste_titre">&nbsp;</td>';
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	// Line for filters
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 28dc4545a5f..20cf8f250bd 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -545,7 +545,7 @@ if (empty($action))
         print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$paramlist,'align="right"',$sortfield,$sortorder);
         //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder);
-        print '<td class="liste_titre">&nbsp;</td>';
+		print_liste_field_titre('');
 		print "</tr>\n";
 
         // Lines for filters fields
diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php
index f5f4d4dc897..3333ffefba2 100644
--- a/htdocs/fourn/list.php
+++ b/htdocs/fourn/list.php
@@ -42,6 +42,7 @@ $search_supplier_code		= GETPOST("search_supplier_code");
 $search_supplier_accounting = GETPOST("search_supplier_accounting");
 $search_datec				= GETPOST("search_datec");
 $search_categ				= GETPOST('search_categ','int');
+$search_status              = GETPOST("search_status",'int');
 $catid						= GETPOST("catid",'int');
 
 // Security check
@@ -73,9 +74,12 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_supplier_accounting="";
 	$search_datec="";
 	$search_categ="";
+    $search_status='';
 	$catid="";
 }
 
+if ($search_status=='') $search_status=1; // always display activ customer first
+
 $extrafields->fetch_name_optionals_label('thirdparty');
 
 
@@ -92,6 +96,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
  *	View
  */
 
+$form=new Form($db);
 $htmlother=new FormOther($db);
 $thirdpartystatic=new Societe($db);
 
@@ -105,7 +110,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.f
 foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
 // Add fields from hooks
 $parameters=array();
-$result=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef ON ef.fk_object = s.rowid";
@@ -121,30 +126,22 @@ if ($socname) {
 	$sortfield = "s.nom";
 	$sortorder = "ASC";
 }
-if ($search_name) {
-	$sql .= natural_search(
-		array(
-			's.nom',
-			's.name_alias'
-		),
-		$search_name
-	);
-}
+if ($search_name) $sql .= natural_search(array('s.nom', 's.name_alias'), $search_name);
 if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape($search_zipcode)."%'";
-if ($search_town) {
-	$sql .= natural_search('s.town', $search_town);
-}
+if ($search_town) $sql .= natural_search('s.town', $search_town);
 if ($search_supplier_code)   $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_supplier_code)."%'";
 if ($search_supplier_accounting) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_supplier_accounting)."%'";
 if ($search_datec)   $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'";
+if ($search_status!='')  $sql.= " AND s.status = ".$db->escape($search_status);
 if ($catid > 0)          $sql.= " AND cf.fk_categorie = ".$catid;
 if ($catid == -2)        $sql.= " AND cf.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql.= " AND cf.fk_categorie = ".$search_categ;
 if ($search_categ == -2) $sql.= " AND cf.fk_categorie IS NULL";
 // Add where from hooks
 $parameters=array();
-$result=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
+
 // Count total nb of records
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -165,8 +162,9 @@ if ($resql)
 
 	$param = "&amp;search_name=".$search_name."&amp;search_supplier_code=".$search_supplier_code."&amp;search_zipcode=".$search_zipcode."&amp;search_town=".$search_town;
  	if ($search_categ != '') $param.='&amp;search_categ='.$search_categ;
+ 	if ($search_status != '') $param.='&amp;search_status='.$search_status;
 
-	print_barre_liste($langs->trans("ListOfSuppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+	print_barre_liste($langs->trans("ListOfSuppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies');
 
 	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 
@@ -183,6 +181,9 @@ if ($resql)
 	{
 		print '<div class="liste_titre">';
 		print $moreforfilter;
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	print $hookmanager->resPrint;
 		print '</div>';
 	}
 
@@ -200,7 +201,8 @@ if ($resql)
     $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -227,9 +229,13 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
+    print '<td class="liste_titre" align="center">';
+    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
+    print '</td>';
+
 	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+    print "</td>\n";
 
 	print '</tr>';
 
@@ -259,7 +265,9 @@ if ($resql)
 		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
-		print '<td align="right">'.$thirdpartystatic->getLibStatut(3).'</td>';
+		print '<td align="center">'.$thirdpartystatic->getLibStatut(3).'</td>';
+
+		print '<td></td>';
 
 		print "</tr>\n";
 		$i++;
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index 6b1bb5923bc..c1222213b5c 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2012-2103 Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2012-2015 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
  * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
  *
@@ -56,267 +56,6 @@ print_fiche_titre($langs->trans('ConfCP'), $linkback, 'title_hrm.png');
 
 $cp = new Holiday($db);
 
-// Contrôle du formulaire
-if ($action == "add")
-{
-    $error = 0;
-
-    // Option du groupe de validation
-    /*if (!$cp->updateConfCP('userGroup',$_POST['userGroup']))
-    {
-        $error++;
-    }*/
-
-    // Option du délai pour faire une demande de congés payés
-    if (!$cp->updateConfCP('delayForRequest',$_POST['delayForRequest']))
-    {
-        $error++;
-    }
-
-    // Option du nombre de jours à ajouter chaque mois
-    $nbHolidayEveryMonth = price2num($_POST['nbHolidayEveryMonth'],5);
-
-    if(!$cp->updateConfCP('nbHolidayEveryMonth',$nbHolidayEveryMonth))
-    {
-        $error++;
-    }
-
-    // Option du nombre de jours pour un mariage
-    $OptMariageCP = price2num($_POST['OptMariage'],5);
-
-    if(!$cp->updateConfCP('OptMariage',$OptMariageCP)) {
-        $error++;
-    }
-
-    // Option du nombre de jours pour un décés d'un proche
-    $OptDecesProcheCP = price2num($_POST['OptDecesProche'],5);
-
-    if(!$cp->updateConfCP('OptDecesProche',$OptDecesProcheCP)) {
-        $error++;
-    }
-
-    // Option du nombre de jours pour un mariage d'un enfant
-    $OptMariageProcheCP = price2num($_POST['OptMariageProche'],5);
-
-    if(!$cp->updateConfCP('OptMariageProche',$OptMariageProcheCP)) {
-        $error++;
-    }
-
-    // Option du nombre de jours pour un décés d'un parent
-    $OptDecesParentsCP = price2num($_POST['OptDecesParents'],5);
-
-    if(!$cp->updateConfCP('OptDecesParents',$OptDecesParentsCP)) {
-        $error++;
-    }
-
-    // Option pour avertir le valideur si délai de demande incorrect
-    if(isset($_POST['AlertValidatorDelay'])) {
-        if(!$cp->updateConfCP('AlertValidatorDelay','1')) {
-            $error++;
-        }
-    } else {
-        if(!$cp->updateConfCP('AlertValidatorDelay','0')) {
-            $error++;
-        }
-    }
-
-    // Option pour avertir le valideur si solde des congés de l'utilisateur inccorect
-    if(isset($_POST['AlertValidatorSolde'])) {
-        if(!$cp->updateConfCP('AlertValidatorSolde','1')) {
-            $error++;
-        }
-    } else {
-        if(!$cp->updateConfCP('AlertValidatorSolde','0')) {
-            $error++;
-        }
-    }
-
-    // Option du nombre de jours à déduire pour 1 jour de congés
-    $nbHolidayDeducted = price2num($_POST['nbHolidayDeducted'],5);
-
-    if(!$cp->updateConfCP('nbHolidayDeducted',$nbHolidayDeducted))
-    {
-        $error++;
-    }
-
-    if ($error)
-    {
-	    setEventMessage($langs->trans('ErrorUpdateConfCP'), 'errors');
-    } else {
-	    setEventMessage($langs->trans('UpdateConfCPOK'));
-    }
-
-    // Si première mise à jour, prévenir l'utilisateur de mettre à jour le solde des congés payés
-    $sql = "SELECT *";
-    $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users";
-
-    $result = $db->query($sql);
-    $num = $db->num_rows($sql);
-    if($num < 1)
-    {
-        $cp->createCPusers();
-	    setEventMessage($langs->trans('AddCPforUsers'), 'warnings');
-    }
-
-    // Si il s'agit de créer un event
-}
-elseif ($action == 'create_event')
-{
-    $error = 0;
-
-    $optName = trim($optName);
-    $optValue = price2num($optValue,5);
-
-    if (! $optName)
-    {
-	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), 'errors');
-        $error++;
-    }
-    if (! $optValue > 0)
-    {
-	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Value")), 'errors');
-    	$error++;
-    }
-
-    $cp->optName = $optName;
-    $cp->optValue = $optValue;
-
-    if (! $error)
-    {
-        $result = $cp->createEventCP($user);
-        if($result > 0)
-        {
-	        setEventMessage('OkCreateEventCP');
-            $optName='';
-            $optValue='';
-        }
-        else
-        {
-	        setEventMessage($cp->error, 'errors');
-        }
-    }
-}
-elseif($action == 'event' && isset($_POST['update_event']))
-{
-    $error = 0;
-
-    $eventId = array_keys($_POST['update_event']);
-    $eventId = $eventId[0];
-
-    $eventName = $optName;
-    $eventName = $eventName[$eventId];
-
-    $eventValue = $optValue;
-    $eventValue = $eventValue[$eventId];
-
-    if (!empty($eventName))
-    {
-        $eventName = trim($eventName);
-    } else {
-        $error++;
-    }
-
-    if (!empty($eventValue))
-    {
-        $eventValue = price2num($eventValue,5);
-    } else {
-        $error++;
-    }
-
-    if (!$error)
-    {
-        // Mise à jour des congés de l'utilisateur
-        $update = $cp->updateEventCP($eventId,$eventName,$eventValue);
-        if(!$update) {
-	        setEventMessage('ErrorUpdateEventCP', 'errors');
-        } else {
-	        setEventMessage('UpdateEventOkCP');
-        }
-    } else {
-	    setEventMessage('ErrorUpdateEventCP', 'errors');
-    }
-}
-elseif($action && isset($_POST['delete_event']))
-{
-    $eventId = array_keys($_POST['delete_event']);
-    $eventId = $eventId[0];
-
-    $result = $cp->deleteEventCP($eventId);
-
-    if($result) {
-        print '<div class="tabBar">';
-        print $langs->trans('DeleteEventOkCP');
-        print '</div>';
-    } else {
-        print '<div class="tabBar">';
-        print $langs->trans('ErrorDeleteEventCP');
-        print '</div>';
-    }
-}
-
-/*print '<br>';
-
-print_fiche_titre($langs->trans('TitleOptionMainCP'),'','');
-
-
-dol_fiche_head(array(),'','');
-
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?leftmenu=setup" name="config">'."\n";
-print '<input type="hidden" name="action" value="add" />'."\n";
-
-print '<table class="noborder" width="100%">';
-print '<tbody>';
-print '<tr class="liste_titre">';
-print '<th class="liste_titre">'.$langs->trans('DescOptionCP').'</td>';
-print '<th class="liste_titre">'.$langs->trans('ValueOptionCP').'</td>';
-print '</tr>';
-
-$var=true;
-
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td style="padding:5px;">'.$langs->trans('DelayForSubmitCP').'</td>'."\n";
-print '<td style="padding:5px;"><input class="flat" type="text" name="delayForRequest" value="'.$cp->getConfCP('delayForRequest').'" size="2" /> '.$langs->trans('DurationDays').'</td>'."\n";
-print '</tr>'."\n";
-
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td style="padding:5px;">'.$langs->trans('AlertValidatorDelayCP').'</td>'."\n";
-print '<td style="padding:5px;"><input class="flat" type="checkbox" name="AlertValidatorDelay" '.$cp->getCheckOption('AlertValidatorDelay').'/></td>'."\n";
-print '</tr>'."\n";
-
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td style="padding:5px;">'.$langs->trans('AlertValidorSoldeCP').'</td>'."\n";
-print '<td style="padding:5px;"><input class="flat" type="checkbox" name="AlertValidatorSolde" '.$cp->getCheckOption('AlertValidatorSolde').'/></td>'."\n";
-print '</tr>'."\n";
-
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td style="padding:5px;">'.$langs->trans('nbHolidayEveryMonthCP').'</td>'."\n";
-print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayEveryMonth" value="'.$cp->getConfCP('nbHolidayEveryMonth').'" size="5"/> '.$langs->trans('DurationDays').'</td>'."\n";
-print '</tr>'."\n";
-
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td style="padding:5px;">'.$langs->trans('nbHolidayDeductedCP').'</td>'."\n";
-print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayDeducted" value="'.$cp->getConfCP('nbHolidayDeducted').'" size="2"/> '.$langs->trans('DurationDays').'</td>'."\n";
-print '</tr>'."\n";
-
-print '</tbody>'."\n";
-print '</table>'."\n";
-
-print '<div align="center"><input type="submit" value="'.$langs->trans("ConfirmConfigCP").'" name="bouton" class="button"/></div>'."\n";
-print '</form>'."\n\n";
-
-dol_fiche_end();
-*/
-
-/*$var=!$var;
-print $langs->trans('nbUserCP').': '."\n";
-print $cp->getConfCP('nbUser')."<br>\n";
-*/
-
 print '<br>'.$langs->trans("GoIntoDictionaryHolidayTypes").'<br><br>';
 
 $var=!$var;
@@ -325,85 +64,6 @@ if ($cp->getConfCP('lastUpdate')) print '<strong>'.dol_print_date($db->jdate($cp
 else print $langs->trans('None');
 print "</div><br>\n";
 
-/*
-print '<br>';
-
-print_fiche_titre($langs->trans('TitleOptionEventCP'),'','');
-
-dol_fiche_head(array(),'','');
-
-
-$cp_events = $cp->fetchEventsCP();
-
-if($cp_events == 1) {
-
-    $var = false;
-    $i = 0;
-
-    print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?leftmenu=setup" name="event_update">'."\n";
-    print '<input type="hidden" name="action" value="event" />'."\n";
-
-    print '<table class="noborder" width="100%">'."\n";
-    print '<tbody>'."\n";
-    print '<tr class="liste_titre">'."\n";
-
-    print '<td class="liste_titre" width="40%">'.$langs->trans('NameEventCP').'</td>'."\n";
-    print '<td class="liste_titre" width="20%">'.$langs->trans('ValueOptionCP').'</td>'."\n";
-    print '<td class="liste_titre">&nbsp;</td>'."\n";
-    print '<td class="liste_titre">&nbsp;</td>'."\n";
-
-    print '</tr>'."\n";
-
-    foreach($cp->events as $infos_event)
-    {
-        $var=!$var;
-
-        print '<tr '.$bc[$var].'>'."\n";
-        print '<td><input class="flat" type="text" size="40" name="optName['.$infos_event['rowid'].']" value="'.$infos_event['name'].'" /></td>'."\n";
-        print '<td><input class="flat" type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('DurationDays').'</td>'."\n";
-        print '<td><input type="submit" class="button" name="update_event['.$infos_event['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'"/></td>'."\n";
-        print '<td width="20px" align="right"><input type="image" alt="'.$langs->trans("Delete").'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n";
-        print '</tr>';
-
-        $i++;
-    }
-
-    print '</tbody>'."\n";
-    print '</table>'."\n";
-    print '</form>'."\n";
-    print '<br />'."\n\n";
-
-}
-
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?leftmenu=setup" name="event_create">'."\n";
-print '<input type="hidden" name="action" value="create_event" />'."\n";
-
-print $langs->trans('TitleCreateEventCP');
-
-print '<table class="noborder" width="100%">';
-print '<tbody>';
-
-print '<tr class="liste_titre">';
-
-print '<td class="liste_titre" width="40%">'.$langs->trans('NameEventCP').'</td>';
-print '<td class="liste_titre" width="20%">'.$langs->trans('ValueOptionCP').'</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-
-print '</tr>';
-
-print '<tr class="pair">';
-print '<td><input class="flat" type="text" size="40" name="optName" value="'.(is_array($optName)?'':$optName).'" /></td>'."\n";
-print '<td><input class="flat" type="text" size="2" name="optValue" value="'.(is_array($optValue)?'':$optValue).'" /> '.$langs->trans('DurationDays').'</td>'."\n";
-print '<td><input type="submit" class="button" name="button" value="'.$langs->trans('CreateEventCP').'" /></td>'."\n";
-print '</tr>'."\n";
-
-print '</tbody>';
-print '</table>';
-
-print '</form>';
-
-dol_fiche_end();
-*/
 
 // Fin de page
 llxFooter();
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 308bbac2661..23c78641462 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -51,7 +51,6 @@ $now=dol_now();
  * Actions
  */
 
-// Si création de la demande
 if ($action == 'create')
 {
 	$cp = new Holiday($db);
@@ -66,12 +65,15 @@ if ($action == 'create')
 
     if (! $error)
     {
+    	$db->begin();
+
 	    $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
 	    $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
 	    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
 	    $date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
 	    $starthalfday=GETPOST('starthalfday');
 	    $endhalfday=GETPOST('endhalfday');
+	    $type=GETPOST('type');
 	    $halfday=0;
 	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
 	    else if ($starthalfday == 'afternoon') $halfday=-1;
@@ -131,17 +133,22 @@ if ($action == 'create')
 	    $cp->date_fin = $date_fin;
 	    $cp->fk_validator = $valideur;
 		$cp->halfday = $halfday;
+		$cp->fk_type = $type;
 
-	    $verif = $cp->create($userid);
+		$verif = $cp->create($user);
 
 	    // Si pas d'erreur SQL on redirige vers la fiche de la demande
 	    if ($verif > 0)
 	    {
-	        header('Location: card.php?id='.$verif);
+			$db->commit();
+
+	    	header('Location: card.php?id='.$verif);
 	        exit;
 	    }
 	    else
-	    {
+		{
+	    	$db->rollback();
+
 	        // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
 	        header('Location: card.php?action=request&error=SQL_Create&msg='.$cp->error);
 	        exit;
@@ -242,44 +249,41 @@ if ($action == 'update')
 }
 
 // Si suppression de la demande
-if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes')
+if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights->holiday->delete)
 {
-    if($user->rights->holiday->delete)
-    {
-    	$error=0;
+	$error=0;
 
-    	$db->begin();
+	$db->begin();
 
-        $cp = new Holiday($db);
-        $cp->fetch($id);
+	$cp = new Holiday($db);
+	$cp->fetch($id);
 
-        $canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
+	$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
 
-        // Si c'est bien un brouillon
-        if ($cp->statut == 1 || $cp->statut == 3)
-        {
-            // Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
-            if ($canedit)
-            {
-                $result=$cp->delete($id);
-            }
-            else
-            {
-                $error = $langs->trans('ErrorCantDeleteCP');
-            }
-        }
+	// Si c'est bien un brouillon
+	if ($cp->statut == 1 || $cp->statut == 3)
+	{
+		// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
+		if ($canedit)
+		{
+			$result=$cp->delete($id);
+		}
+		else
+		{
+			$error = $langs->trans('ErrorCantDeleteCP');
+		}
+	}
 
-       	if (! $error)
-        {
-          	$db->commit();
-           	header('Location: index.php');
-           	exit;
-        }
-        else
-        {
-        	$db->rollback();
-        }
-    }
+	if (! $error)
+	{
+		$db->commit();
+		header('Location: list.php');
+		exit;
+	}
+	else
+	{
+		$db->rollback();
+	}
 }
 
 // Si envoi de la demande
@@ -466,7 +470,7 @@ if ($action == 'confirm_valid')
 
 if ($action == 'confirm_refuse')
 {
-    if (!empty($_POST['detail_refuse']))
+    if (! empty($_POST['detail_refuse']))
     {
         $cp = new Holiday($db);
         $cp->fetch($_GET['id']);
@@ -770,6 +774,8 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
 
         print '<table class="border" width="100%">';
         print '<tbody>';
+
+        // User
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
         print '<td>';
@@ -781,6 +787,24 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
         print '</td>';
         print '</tr>';
+
+        // Type
+        print '<tr>';
+        print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
+        print '<td>';
+        $typeleaves=$cp->getTypes(1,1);
+        $arraytypeleaves=array();
+        foreach($typeleaves as $key => $val)
+        {
+        	$labeltoshow = $val['label'];
+        	$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
+			$arraytypeleaves[$val['rowid']]=$labeltoshow;
+        }
+        print $form->selectarray('type', $arraytypeleaves, (GETPOST('type')?GETPOST('type'):''), 1);
+        print '</td>';
+        print '</tr>';
+
+        // Date start
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("DateDebCP").' ('.$langs->trans("FirstDayOfHoliday").')</td>';
         print '<td>';
@@ -795,6 +819,8 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):'morning'));
         print '</td>';
         print '</tr>';
+
+        // Date end
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("DateFinCP").' ('.$langs->trans("LastDayOfHoliday").')</td>';
         print '<td>';
@@ -813,7 +839,6 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         // Approved by
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
-        // Liste des utiliseurs du groupe choisi dans la config
         $validator = new UserGroup($db);
         $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
         $valideurobjects = $validator->listUsersForGroup($excludefilter);
@@ -952,9 +977,9 @@ else
                 if ($action == 'edit' && $cp->statut == 1)
                 {
                     $edit = true;
-                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$_GET['id'].'">'."\n";
+                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$id.'">'."\n";
                     print '<input type="hidden" name="action" value="update"/>'."\n";
-                    print '<input type="hidden" name="holiday_id" value="'.$_GET['id'].'" />'."\n";
+                    print '<input type="hidden" name="holiday_id" value="'.$id.'" />'."\n";
                 }
 
                 print '<table class="border" width="100%">';
@@ -974,6 +999,15 @@ else
         		print $userRequest->getNomUrl(1);
         		print '</td></tr>';
 
+		        // Type
+		        print '<tr>';
+		        print '<td>'.$langs->trans("Type").'</td>';
+		        print '<td>';
+		        $typeleaves=$cp->getTypes(1,1);
+		        print $typeleaves[$cp->fk_type]['label'];
+		        print '</td>';
+		        print '</tr>';
+
 			    $starthalfday=($cp->halfday == -1 || $cp->halfday == 2)?'afternoon':'morning';
 			    $endhalfday=($cp->halfday == 1 || $cp->halfday == 2)?'morning':'afternoon';
 
@@ -1053,6 +1087,7 @@ else
                     print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$cp->description.'</textarea></td>';
                     print '</tr>';
                 }
+
                 print '</tbody>';
                 print '</table>'."\n";
 
@@ -1083,14 +1118,15 @@ else
                 } else {
                     print '<tr>';
                     print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
-                    // Liste des utiliseurs du groupes choisi dans la config
-                    $idGroupValid = $cp->getConfCP('userGroup');
 
-                    $validator = new UserGroup($db);
-                    $valideur = $validator->listUsersForGroup('',1);
+			        $validator = new UserGroup($db);
+			        $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
+			        $valideurobjects = $validator->listUsersForGroup($excludefilter);
+			        $valideurarray = array();
+			        foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
 
                     print '<td>';
-                    $form->select_users($cp->fk_validator,"valideur",1,"",0,$valideur,'');
+        			print $form->select_dolusers($user->fk_user, "valideur", 1, "", 0, $valideurarray);	// By default, hierarchical parent
                     print '</td>';
                     print '</tr>';
                 }
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 6743ce102a7..3e68bb6bce5 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -53,7 +53,7 @@ class Holiday extends CommonObject
     var $date_debut_gmt='';		// Date start in GMT
     var $date_fin_gmt='';		// Date end in GMT
     var $halfday='';
-    var $statut='';			// 1=draft, 2=validated, 3=approved
+    var $statut='';				// 1=draft, 2=validated, 3=approved
     var $fk_validator;
     var $date_valid='';
     var $fk_user_valid;
@@ -62,6 +62,7 @@ class Holiday extends CommonObject
     var $date_cancel='';
     var $fk_user_cancel;
     var $detail_refuse='';
+    var $fk_type;
 
     var $holiday = array();
     var $events = array();
@@ -71,6 +72,7 @@ class Holiday extends CommonObject
     var $optValue = '';
     var $optRowid = '';
 
+
     /**
      *   Constructor
      *
@@ -83,18 +85,30 @@ class Holiday extends CommonObject
 
 
     /**
-     * updateSold. Update sold and check table of users for holidays is complete. If not complete.
+     * Update balance of vacations and check table of users for holidays is complete. If not complete.
      *
-     * @return	int			Return 1
+     * @return	int			<0 if KO, >0 if OK
      */
-    function updateSold()
+    function updateBalance()
     {
-	    // Mets à jour les congés payés en début de mois
-	    $this->updateSoldeCP();
+    	$this->db->begin();
 
-	    // Vérifie le nombre d'utilisateur et mets à jour si besoin
-	    $this->verifNbUsers($this->countActiveUsersWithoutCP(),$this->getConfCP('nbUser'));
-	    return 1;
+	    // Update sold of vocations
+	    $result = $this->updateSoldeCP();
+
+	    // Check nb of users into table llx_holiday_users and update with empty lines
+	    //if ($result > 0) $result = $this->verifNbUsers($this->countActiveUsersWithoutCP(), $this->getConfCP('nbUser'));
+
+	    if ($result >= 0)
+	    {
+	    	$this->db->commit();
+	    	return 1;
+	    }
+	    else
+		{
+	    	$this->db->rollback();
+	    	return -1;
+		}
     }
 
     /**
@@ -124,10 +138,10 @@ class Holiday extends CommonObject
         $sql.= "date_fin,";
         $sql.= "halfday,";
         $sql.= "statut,";
-        $sql.= "fk_validator";
+        $sql.= "fk_validator,";
+        $sql.= "fk_type,";
+        $sql.= "fk_user_create";
         $sql.= ") VALUES (";
-
-        // User
         $sql.= "'".$this->fk_user."',";
         $sql.= " '".$this->db->idate($now)."',";
         $sql.= " '".$this->db->escape($this->description)."',";
@@ -135,8 +149,9 @@ class Holiday extends CommonObject
         $sql.= " '".$this->db->idate($this->date_fin)."',";
         $sql.= " ".$this->halfday.",";
         $sql.= " '1',";
-        $sql.= " '".$this->fk_validator."'";
-
+        $sql.= " '".$this->fk_validator."',";
+        $sql.= " '".$this->fk_type."',";
+        $sql.= " ".$user->id;
         $sql.= ")";
 
         $this->db->begin();
@@ -150,7 +165,6 @@ class Holiday extends CommonObject
         if (! $error)
         {
             $this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
-
         }
 
         // Commit or rollback
@@ -200,7 +214,9 @@ class Holiday extends CommonObject
         $sql.= " cp.fk_user_cancel,";
         $sql.= " cp.detail_refuse,";
         $sql.= " cp.note_private,";
-        $sql.= " cp.note_public";
+        $sql.= " cp.note_public,";
+        $sql.= " cp.fk_user_create,";
+        $sql.= " cp.fk_type";
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
         $sql.= " WHERE cp.rowid = ".$id;
 
@@ -213,8 +229,8 @@ class Holiday extends CommonObject
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id    = $obj->rowid;
-                $this->rowid    = $obj->rowid;	// deprecated
-                $this->ref    = $obj->rowid;
+                $this->rowid = $obj->rowid;	// deprecated
+                $this->ref   = $obj->rowid;
                 $this->fk_user = $obj->fk_user;
                 $this->date_create = $this->db->jdate($obj->date_create);
                 $this->description = $obj->description;
@@ -234,6 +250,8 @@ class Holiday extends CommonObject
                 $this->detail_refuse = $obj->detail_refuse;
                 $this->note_private = $obj->note_private;
                 $this->note_public = $obj->note_public;
+                $this->fk_user_create = $obj->fk_user_create;
+                $this->fk_type = $obj->fk_type;
             }
             $this->db->free($resql);
 
@@ -767,61 +785,6 @@ class Holiday extends CommonObject
 
     }
 
-    /**
-     *	Retourne un select HTML des groupes d'utilisateurs
-     *
-     *  @param	string	$prefix     nom du champ dans le formulaire
-     *  @return string				retourne le select des groupes
-     */
-    function selectUserGroup($prefix)
-    {
-        // On récupère le groupe déjà configuré
-        $group.= "SELECT value";
-        $group.= " FROM ".MAIN_DB_PREFIX."holiday_config";
-        $group.= " WHERE name = 'userGroup'";
-
-        $resultat = $this->db->query($group);
-        $objet = $this->db->fetch_object($resultat);
-        $groupe = $objet->value;
-
-        // On liste les groupes de Dolibarr
-        $sql = "SELECT u.rowid, u.nom as name";
-        $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as u";
-        $sql.= " ORDER BY u.rowid";
-
-        dol_syslog(get_class($this)."::selectUserGroup", LOG_DEBUG);
-        $result = $this->db->query($sql);
-
-        // Si pas d'erreur SQL
-        if ($result)
-        {
-            // On créer le select HTML
-            $selectGroup = '<select name="'.$prefix.'" class="flat">'."\n";
-            $selectGroup.= '<option value="-1">&nbsp;</option>'."\n";
-
-            // On liste les utilisateurs
-            while ($obj = $this->db->fetch_object($result))
-            {
-                if($groupe==$obj->rowid) {
-                    $selectGroup.= '<option value="'.$obj->rowid.'" selected>'.$obj->name.'</option>'."\n";
-                } else {
-                    $selectGroup.= '<option value="'.$obj->rowid.'">'.$obj->name.'</option>'."\n";
-                }
-            }
-            $selectGroup.= '</select>'."\n";
-            $this->db->free($result);
-        }
-        else
-        {
-            // Erreur SQL
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-
-        // Retourne le select HTML
-        return $selectGroup;
-    }
-
     /**
      *  Met à jour une option du module Holiday Payés
      *
@@ -895,8 +858,9 @@ class Holiday extends CommonObject
             // Si mise à jour pour tout le monde en début de mois
 			$now=dol_now();
 
-            // Mois actuel
             $month = date('m',$now);
+
+            // Get month of last update
             $lastUpdate = $this->getConfCP('lastUpdate');
             $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
 			//print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate;exit;
@@ -906,41 +870,52 @@ class Holiday extends CommonObject
             {
             	$this->db->begin();
 
+            	$users = $this->fetchUsers(false,false);
+	            $nbUser = count($users);
+
                 $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
                 $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
                 $sql.= " WHERE name = 'lastUpdate'";
 
                 $result = $this->db->query($sql);
 
-				$typeleaves=$cp->getTypes(1,1);
+				$typeleaves=$this->getTypes(1,1);
     			foreach($typeleaves as $key => $val)
     			{
 	                // On ajoute x jours à chaque utilisateurs
 	                $nb_holiday = $val['newByMonth'];
 					if (empty($nb_holiday)) $nb_holiday=0;
 
-	                $users = $this->fetchUsers(false,false);
-	                $nbUser = count($users);
+					if ($nb_holiday > 0)
+					{
+						dol_syslog("We update leavefor everybody for type ".$key, LOG_DEBUG);
 
-	                $i = 0;
-	                while ($i < $nbUser)
-	                {
-	                    $now_holiday = $this->getCPforUser($users[$i]['rowid'], $val['rowid']);
-	                    $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
+		                $i = 0;
+		                while ($i < $nbUser)
+		                {
+		                    $now_holiday = $this->getCPforUser($users[$i]['rowid'], $val['rowid']);
+		                    $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
 
-	                    // On ajoute la modification dans le LOG
-	                    $this->addLogCP($user->id, $users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $new_solde, $val['rowid']);
+		                    // We add a log for each user
+		                    $this->addLogCP($user->id, $users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $new_solde, $val['rowid']);
 
-	                    $i++;
-	                }
+		                    $i++;
+		                }
 
-	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
-	                $sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
-					$sql2.= " WHERE fk_type = ".$val['rowid'];
+		                // Now we update counter for all users at once
+		                $sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
+		                $sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
+						$sql2.= " WHERE fk_type = ".$val['rowid'];
 
-	                $result= $this->db->query($sql2);
+		                $result= $this->db->query($sql2);
 
-	                if (! $result) break;
+		                if (! $result)
+		                {
+		                	dol_print_error($this->db);
+		                	break;
+		                }
+					}
+					else dol_syslog("No change for leave of type ".$key, LOG_DEBUG);
     			}
 
 				if ($result)
@@ -1121,17 +1096,16 @@ class Holiday extends CommonObject
     }
 
     /**
-     *    Liste la liste des utilisateurs du module congés
-     *    uniquement pour vérifier si il existe de nouveau utilisateur
+     *    Get list of Users or list of vacation balance.
      *
-     *    @param      boolean	$liste	    si vrai retourne une liste, si faux retourne un array
-     *    @param      boolean   $type		si vrai retourne pour Dolibarr, si faux retourne pour CP
-     *    @return     string      			retourne un tableau de tout les utilisateurs actifs
+     *    @param      boolean			$stringlist	    If true return a string list of id. If false, return an array
+     *    @param      boolean   		$type			If true, read Dolibarr user list, if false, return vacation balance list.
+     *    @return     array|string|int      			Return an array
      */
-    function fetchUsers($liste=true,$type=true)
+    function fetchUsers($stringlist=true,$type=true)
     {
         // Si vrai donc pour user Dolibarr
-        if ($liste)
+        if ($stringlist)
         {
             if($type)
             {
@@ -1149,23 +1123,23 @@ class Holiday extends CommonObject
 
                     $i = 0;
                     $num = $this->db->num_rows($resql);
-                    $liste = '';
+                    $stringlist = '';
 
                     // Boucles du listage des utilisateurs
-                    while($i < $num) {
-
+                    while($i < $num)
+                    {
                         $obj = $this->db->fetch_object($resql);
 
                         if($i == 0) {
-                            $liste.= $obj->rowid;
+                            $stringlist.= $obj->rowid;
                         } else {
-                            $liste.= ', '.$obj->rowid;
+                            $stringlist.= ', '.$obj->rowid;
                         }
 
                         $i++;
                     }
                     // Retoune le tableau des utilisateurs
-                    return $liste;
+                    return $stringlist;
                 }
                 else
                 {
@@ -1176,9 +1150,10 @@ class Holiday extends CommonObject
 
             }
             else
-           { // Si utilisateur du module Congés Payés
-                $sql = "SELECT u.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as u";
+           {
+           		// We want only list of user id
+                $sql = "SELECT DISTINCT cpu.fk_user";
+                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu";
 
                 dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
@@ -1188,26 +1163,26 @@ class Holiday extends CommonObject
 
                     $i = 0;
                     $num = $this->db->num_rows($resql);
-                    $liste = '';
+                    $stringlist = '';
 
                     // Boucles du listage des utilisateurs
-                    while($i < $num) {
-
+                    while($i < $num)
+                    {
                         $obj = $this->db->fetch_object($resql);
 
                         if($i == 0) {
-                            $liste.= $obj->fk_user;
+                            $stringlist.= $obj->fk_user;
                         } else {
-                            $liste.= ', '.$obj->fk_user;
+                            $stringlist.= ', '.$obj->fk_user;
                         }
 
                         $i++;
                     }
                     // Retoune le tableau des utilisateurs
-                    return $liste;
+                    return $stringlist;
                 }
                 else
-                {
+              {
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
                     return -1;
@@ -1218,7 +1193,7 @@ class Holiday extends CommonObject
         else
        { // Si faux donc user Congés Payés
 
-            // Si c'est pour les utilisateurs de Dolibarr
+            // List for Dolibarr users
             if ($type)
             {
                 $sql = "SELECT u.rowid, u.lastname, u.firstname";
@@ -1229,8 +1204,8 @@ class Holiday extends CommonObject
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
-                if ($resql) {
-
+                if ($resql)
+                {
                     $i = 0;
                     $tab_result = $this->holiday;
                     $num = $this->db->num_rows($resql);
@@ -1242,7 +1217,10 @@ class Holiday extends CommonObject
 
                         $tab_result[$i]['rowid'] = $obj->rowid;
                         $tab_result[$i]['name'] = $obj->lastname;
+                        $tab_result[$i]['lastname'] = $obj->lastname;
                         $tab_result[$i]['firstname'] = $obj->firstname;
+                        $tab_result[$i]['type'] = $obj->type;
+                        $tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
 
                         $i++;
                     }
@@ -1250,18 +1228,16 @@ class Holiday extends CommonObject
                     return $tab_result;
                 }
                 else
-                {
+				{
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
                     return -1;
                 }
-
-                // Si c'est pour les utilisateurs du module Congés Payés
             }
             else
            {
-
-                $sql = "SELECT DISTINCT cpu.fk_user, u.lastname, u.firstname";
+				// List of vacation balance users
+                $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname";
                 $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu,";
                 $sql.= " ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE cpu.fk_user = u.rowid";
@@ -1270,20 +1246,23 @@ class Holiday extends CommonObject
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
-                if ($resql) {
-
+                if ($resql)
+                {
                     $i = 0;
                     $tab_result = $this->holiday;
                     $num = $this->db->num_rows($resql);
 
                     // Boucles du listage des utilisateurs
-                    while($i < $num) {
-
+                    while($i < $num)
+                    {
                         $obj = $this->db->fetch_object($resql);
 
                         $tab_result[$i]['rowid'] = $obj->fk_user;
                         $tab_result[$i]['name'] = $obj->lastname;
+                        $tab_result[$i]['lastname'] = $obj->lastname;
                         $tab_result[$i]['firstname'] = $obj->firstname;
+                        $tab_result[$i]['type'] = $obj->type;
+                        $tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
 
                         $i++;
                     }
@@ -1291,7 +1270,7 @@ class Holiday extends CommonObject
                     return $tab_result;
                 }
                 else
-                {
+				{
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
                     return -1;
@@ -1305,16 +1284,16 @@ class Holiday extends CommonObject
      *
      *  @return     int      retourne le nombre d'utilisateur
      */
-    function countActiveUsers() {
-
+    function countActiveUsers()
+    {
         $sql = "SELECT count(u.rowid) as compteur";
         $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 		$sql.= " WHERE u.statut > 0";
 
         $result = $this->db->query($sql);
         $objet = $this->db->fetch_object($result);
-        return $objet->compteur;
 
+        return $objet->compteur;
     }
     /**
      *	Compte le nombre d'utilisateur actifs dans Dolibarr sans CP
@@ -1325,12 +1304,12 @@ class Holiday extends CommonObject
 
         $sql = "SELECT count(u.rowid) as compteur";
         $sql.= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
-		$sql.= " WHERE u.statut > 0 AND hu.fk_user IS NULL ";
+		$sql.= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
 
         $result = $this->db->query($sql);
         $objet = $this->db->fetch_object($result);
-        return $objet->compteur;
 
+        return $objet->compteur;
     }
 
     /**
@@ -1338,19 +1317,19 @@ class Holiday extends CommonObject
      *
      *  @param    int	$userDolibarrWithoutCP	Number of active users in Dolibarr without holidays
      *  @param    int	$userCP    				Number of active users into table of holidays
-     *  @return   void
+     *  @return   int							<0 if KO, >0 if OK
      */
-    function verifNbUsers($userDolibarrWithoutCP,$userCP)
+    function verifNbUsers($userDolibarrWithoutCP, $userCP)
     {
     	if (empty($userCP)) $userCP=0;
     	dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarrWithoutCP.' userCP='.$userCP);
-
+/*
         // On vérifie les users Dolibarr sans CP
         if ($userDolibarrWithoutCP > 0)
         {
         	$this->db->begin();
 
-            $this->updateConfCP('nbUser',$userDolibarrWithoutCP);
+            //$this->updateConfCP('nbUser',$userDolibarrWithoutCP);
 
             $listUsersCP = $this->fetchUsers(true,false);
 
@@ -1430,7 +1409,8 @@ class Holiday extends CommonObject
                 return -1;
             }
         }
-
+*/
+        return 1;
     }
 
 
@@ -1841,7 +1821,7 @@ class Holiday extends CommonObject
 	    	{
 	    		while ($obj = $this->db->fetch_object($result))
 	    		{
-	    			$types[] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newByMonth);
+	    			$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newByMonth);
 	    		}
 
 	    		return $types;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 4aae0ab7f7d..c0179c55bd0 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -39,6 +39,8 @@ $action=GETPOST('action');
 
 $holiday = new Holiday($db);
 
+$langs->load('users');
+
 
 /*
  * Actions
@@ -100,7 +102,7 @@ if ($action == 'update' && isset($_POST['update_cp']))
 		}
     }
 
-    if (! $error) setEventMessage($langs->trans('UpdateConfCPOK'));
+    if (! $error) setEventMessages($langs->trans('UpdateConfCPOK'), '', 'mesgs');
 }
 elseif($action == 'add_event')
 {
@@ -120,7 +122,7 @@ elseif($action == 'add_event')
 
     if ($error)
     {
-	    setEventMessage($langs->trans('ErrorAddEventToUserCP'), 'errors');
+	    setEventMessages($langs->trans('ErrorAddEventToUserCP'), '', 'errors');
     }
     else
 	{
@@ -133,7 +135,7 @@ elseif($action == 'add_event')
 
         $holiday->updateSoldeCP($userCP,$new_holiday);
 
-		setEventMessage($langs->trans('AddEventToUserOkCP'));
+		setEventMessages($langs->trans('AddEventToUserOkCP'), '', 'mesgs');
     }
 }
 
@@ -145,13 +147,20 @@ elseif($action == 'add_event')
 $form = new Form($db);
 $userstatic=new User($db);
 
-$langs->load('users');
-
 llxHeader(array(),$langs->trans('CPTitreMenu'));
 
 print_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
 
-$holiday->updateSold();	// Create users into table holiday if they don't exists. TODO Remove if we use field into table user.
+print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
+if ($holiday->getConfCP('lastUpdate')) print '<strong>'.dol_print_date($db->jdate($holiday->getConfCP('lastUpdate')),'dayhour','tzuser').'</strong>';
+else print $langs->trans('None');
+print "</div><br>\n";
+
+$result = $holiday->updateBalance();	// Create users into table holiday if they don't exists. TODO Remove this whif we use field into table user.
+if ($result < 0)
+{
+	setEventMessages($holiday->error, $holiday->errors, 'errors');
+}
 
 $listUsers = $holiday->fetchUsers(false,true);
 
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
new file mode 100644
index 00000000000..63d07cebddf
--- /dev/null
+++ b/htdocs/holiday/document.php
@@ -0,0 +1,236 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
+ * Copyright (C) 2011-2012 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/holiday/document.php
+ *       \ingroup    fichinter
+ *       \brief      Page des documents joints sur les contrats
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load("other");
+$langs->load("holidays");
+$langs->load("companies");
+
+$id = GETPOST('id','int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action','alpha');
+$confirm = GETPOST('confirm','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'holiday', $id, 'holiday');
+
+
+// Get parameters
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+
+$object = new Holiday($db);
+$object->fetch($id, $ref);
+
+$upload_dir = $conf->holiday->dir_output.'/'.get_exdir($object->id, 0, 0, 0, $object, 'holiday').dol_sanitizeFileName($object->ref);
+$modulepart='holiday';
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
+
+llxHeader("","",$langs->trans("InterventionCard"));
+
+
+if ($object->id)
+{
+	$valideur = new User($db);
+	$valideur->fetch($object->fk_validator);
+
+	$userRequest = new User($db);
+	$userRequest->fetch($object->fk_user);
+
+	$head=holiday_prepare_head($object);
+
+	dol_fiche_head($head, 'documents',$langs->trans("CPTitreMenu"),0,'holiday');
+
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+
+    print '<table class="border" width="100%">';
+
+    $linkback='';
+
+    print '<tr>';
+    print '<td width="25%">'.$langs->trans("Ref").'</td>';
+    print '<td>';
+    print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref');
+    print '</td>';
+    print '</tr>';
+
+    print '<td>'.$langs->trans("User").'</td>';
+    print '<td>';
+    print $userRequest->getNomUrl(1);
+    print '</td></tr>';
+
+    // Type
+    print '<tr>';
+    print '<td>'.$langs->trans("Type").'</td>';
+    print '<td>';
+    $typeleaves=$object->getTypes(1,1);
+    print $typeleaves[$object->fk_type]['label'];
+    print '</td>';
+    print '</tr>';
+
+    $starthalfday=($object->halfday == -1 || $object->halfday == 2)?'afternoon':'morning';
+    $endhalfday=($object->halfday == 1 || $object->halfday == 2)?'morning':'afternoon';
+
+    if(!$edit)
+    {
+    	print '<tr>';
+    	print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+    	print '<td>'.dol_print_date($object->date_debut,'day');
+    	print ' &nbsp; &nbsp; ';
+    	print $langs->trans($listhalfday[$starthalfday]);
+    	print '</td>';
+    	print '</tr>';
+    }
+    else
+    {
+    	print '<tr>';
+    	print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+    	print '<td>';
+    	$form->select_date($object->date_debut,'date_debut_');
+    	print ' &nbsp; &nbsp; ';
+    	print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
+    	print '</td>';
+    	print '</tr>';
+    }
+
+    if (!$edit)
+    {
+    	print '<tr>';
+    	print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+    	print '<td>'.dol_print_date($object->date_fin,'day');
+    	print ' &nbsp; &nbsp; ';
+    	print $langs->trans($listhalfday[$endhalfday]);
+    	print '</td>';
+    	print '</tr>';
+    }
+    else
+    {
+    	print '<tr>';
+    	print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+    	print '<td>';
+    	$form->select_date($object->date_fin,'date_fin_');
+    	print ' &nbsp; &nbsp; ';
+    	print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
+    	print '</td>';
+    	print '</tr>';
+    }
+    print '<tr>';
+    print '<td>'.$langs->trans('NbUseDaysCP').'</td>';
+    print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
+    print '</tr>';
+
+    // Status
+    print '<tr>';
+    print '<td>'.$langs->trans('StatutCP').'</td>';
+    print '<td>'.$object->getLibStatut(2).'</td>';
+    print '</tr>';
+    if ($object->statut == 5)
+    {
+    	print '<tr>';
+    	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
+    	print '<td>'.$object->detail_refuse.'</td>';
+    	print '</tr>';
+    }
+
+    // Description
+    if (!$edit)
+    {
+    	print '<tr>';
+    	print '<td>'.$langs->trans('DescCP').'</td>';
+    	print '<td>'.nl2br($object->description).'</td>';
+    	print '</tr>';
+    }
+    else
+    {
+    	print '<tr>';
+    	print '<td>'.$langs->trans('DescCP').'</td>';
+    	print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
+    	print '</tr>';
+    }
+
+    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+    print '</table>';
+
+    dol_fiche_end();
+
+    $modulepart = 'holiday';
+    $permission = $user->rights->holiday->write;
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+}
+else
+{
+	print $langs->trans("ErrorUnknown");
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/list.php
similarity index 94%
rename from htdocs/holiday/index.php
rename to htdocs/holiday/list.php
index cd8e0daaced..f5d67b13517 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/list.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2013	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012	Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2013-2015 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ $holidaystatic=new Holiday($db);
 $fuser = new User($db);
 
 // Update sold
-$holiday->updateSold();
+$result = $holiday->updateBalance();
 
 $max_year = 5;
 $min_year = 10;
@@ -187,7 +187,7 @@ if ($id > 0)
 	$user_id = $fuser->id;
 }
 // Récupération des congés payés de l'utilisateur ou de tous les users
-if (!$user->rights->holiday->write_all || $id > 0)
+if (empty($user->rights->holiday->write_all) || $id > 0)
 {
 	$holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);	// Load array $holiday->holiday
 }
@@ -276,7 +276,7 @@ print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','',
 print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre('');
+print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 // FILTRES
@@ -292,13 +292,18 @@ $formother->select_year($year_create,'year_create',1, $min_year, 0);
 print '</td>';
 
 // UTILISATEUR
-if($user->rights->holiday->write_all)
+if ($user->rights->holiday->write_all)
 {
     print '<td class="liste_titre" align="left">';
     print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,32);
     print '</td>';
-} else {
-    print '<td class="liste_titre">&nbsp;</td>';
+}
+else
+{
+    //print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre" align="left">';
+    print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,32);
+    print '</td>';
 }
 
 // VALIDEUR
@@ -390,7 +395,8 @@ if (! empty($holiday->holiday))
 		print '</td>';
 		print '<td align="center">'.dol_print_date($infos_CP['date_debut'],'day').'</td>';
 		print '<td align="center">'.dol_print_date($infos_CP['date_fin'],'day').'</td>';
-		print '<td align="right" colspan="2">'.$holidaystatic->LibStatut($infos_CP['statut'],5).'</td>';
+		print '<td align="right">'.$holidaystatic->LibStatut($infos_CP['statut'],5).'</td>';
+		print '<td></td>';
 		print '</tr>'."\n";
 
 	}
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 2d0df2b692d..caf04e90bd1 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      François Legastelois <flegastelois@teclib.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@ if ($user->societe_id > 0) accessforbidden();
 
 
 // Si l'utilisateur n'a pas le droit de lire cette page
-if(!$user->rights->holiday->month_report) accessforbidden();
+if(!$user->rights->holiday->read_all) accessforbidden();
 
 
 
@@ -73,18 +73,24 @@ $num = $db->num_rows($result);
 
 print_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm.png');
 
-print '<div class="tabBar">';
+// Get month of last update
+$lastUpdate = $cp->getConfCP('lastUpdate', 0);
+$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+$yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
+print $langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong><br><br>'."\n";
+
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 
+dol_fiche_head();
+
 print $langs->trans('Month').': ';
 print $htmlother->select_month($month, 'month_start').' ';
 print $htmlother->select_year($year,'year_start',1,10,3);
 
 print '<input type="submit" value="'.$langs->trans("Refresh").'" class="button" />';
 
-print '</form>';
-
+print '<br>';
 print '<br>';
 
 $var=true;
@@ -137,7 +143,11 @@ if($num == '0') {
 	}
 }
 print '</table>';
-print '</div>';
+
+dol_fiche_end();
+
+print '</form>';
+
 
 // Fin de page
 llxFooter();
diff --git a/htdocs/holiday/tomergewithdefine_holiday.php b/htdocs/holiday/tomergewithdefine_holiday.php
deleted file mode 100644
index 707783712a5..00000000000
--- a/htdocs/holiday/tomergewithdefine_holiday.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/* Copyright (C) 2007-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011      Dimitri Mouillard <dmouillard@teclib.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       define_congespayes.php
- *      \ingroup    congespayes
- *      \brief      File that defines the balance of paid leave of users.
- *      \version    $Id: define_congespayes.php,v 1.00 2011/09/15 11:00:00 dmouillard Exp $
- *      \author      dmouillard@teclib.com <Dimitri Mouillard>
- *      \remarks      File that defines the balance of paid leave of users.
- */
-
-require('../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
-
-// Protection if external user
-if ($user->societe_id > 0) accessforbidden();
-
-// If the user does not have perm to read the page
-if(!$user->rights->holiday->define_holiday) accessforbidden();
-
-
-/*
- * View
- */
-
-llxHeader(array(),$langs->trans('CPTitreMenu'));
-
-
-print_fiche_titre($langs->trans('MenuConfCP'));
-
-$congespayes = new Holiday($db);
-$listUsers = $congespayes->fetchUsers(false, true);
-
-// Si il y a une action de mise à jour
-if (isset($_POST['action']) && $_POST['action'] == 'update') {
-
-   $fk_type = $_POST['fk_type'];
-
-   foreach ($_POST['nb_conges'] as $user_id => $compteur) {
-      if (!empty($compteur)) {
-         $userValue = str_replace(',', '.', $compteur);
-         $userValue = number_format($userValue, 2, '.', '');
-      } else {
-         $userValue = '0.00';
-      }
-      $congespayes->updateSoldeCP($user_id,$userValue,$fk_type);
-   }
-
-   print '<div class="tabBar">';
-   print $langs->trans('UpdateConfCPOK');
-   print '</div>';
-
-}
-
-$var = true;
-$i = 0;
-
-foreach($congespayes->getTypes() as $type)
-{
-   if($type['affect']==1)
-   {
-      print '<div class="tabBar" style="float:left;width:300px;margin-right:10px;">';
-
-         print '<h3>'.$type['label'].'</h3>';
-
-         print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">' . "\n";
-         print '<input type="hidden" name="action" value="update" />';
-         print '<input type="hidden" name="fk_type" value="'.$type['rowid'].'" />';
-
-         print '<table class="noborder" width="100%;">';
-            print "<tr class=\"liste_titre\">";
-               print '<td width="50%">' . $langs->trans('Employee') . '</td>';
-               print '<td width="30%">' . $langs->trans('Counter') . '</td>';
-            print '</tr>';
-
-         foreach ($listUsers as $users) {
-            $var = !$var;
-            print '<tr ' . $bc[$var] . '>';
-               print '<td>' . $users['name'] . ' ' . $users['firstname'] . '</td>';
-               print '<td>';
-               print '<input type="text" value="' .
-                              $congespayes->getCPforUser($users['rowid'],$type['rowid']) .
-                           '" name="nb_conges[' . $users['rowid'] . ']"
-                           size="5" style="text-align: center;"/>';
-               print ' jours</td>' . "\n";
-            print '</tr>';
-
-            $i++;
-         }
-
-         echo "<tr>";
-            print '<td colspan="2"><input type="submit" value="'
-                           . $langs->trans("UpdateEventOptionCP") .
-                           ' ' . $type['label'] .
-                           '" name="bouton" class="button" style="margin: 10px;"></td>';
-         echo "</tr>";
-
-         print '</table>';
-         print '</form>';
-
-      print '</div>';
-   }
-}
-
-// Fin de page
-$db->close();
-llxFooter();
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 6ccd9f38665..766478ed9de 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if ($user->societe_id > 0) accessforbidden();
 
 // Si l'utilisateur n'a pas le droit de lire cette page
-if(!$user->rights->holiday->view_log) accessforbidden();
+if(!$user->rights->holiday->read_all) accessforbidden();
 
 $year=GETPOST('year');
 if (empty($year))
@@ -41,22 +41,27 @@ if (empty($year))
 	$year=$tmpdate['year'];
 }
 
+$langs->load('users');
+
 
 /*
  * View
  */
 
-$langs->load('users');
+$cp = new Holiday($db);
 
 llxHeader(array(),$langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
 
-
-$cp = new Holiday($db);
 // Recent changes are more important than old changes
 $log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC', " AND date_action BETWEEN '".$db->idate(dol_get_first_day($year,1,1))."' AND '".$db->idate(dol_get_last_day($year,12,1))."'");	// Load $cp->logs
 
 print load_fiche_titre($langs->trans('LogCP'), '<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'">&lt;</a><li class="pagination"><a href="">'.$langs->trans("Year").' '.$year.'</a></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'">&gt;</a></li></lu></div>', 'title_hrm.png');
 
+print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
+if ($cp->getConfCP('lastUpdate')) print '<strong>'.dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser').'</strong>';
+else print $langs->trans('None');
+print "</div><br>\n";
+
 print '<table class="noborder" width="100%">';
 print '<tbody>';
 print '<tr class="liste_titre">';
@@ -107,6 +112,6 @@ print '</tbody>'."\n";
 print '</table>'."\n";
 
 
-// Fin de page
-$db->close();
 llxFooter();
+
+$db->close();
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index c46854ec5c1..9c48c680c3f 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -886,9 +886,10 @@ if ($step == 4 && $datatoimport)
 				if ($objimport->array_import_convertvalue[0][$code]['rule']=='fetchidfromcodeid') $htmltext.=$langs->trans("DataComeFromIdFoundFromCodeId",$filecolumn,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).'<br>';
 			}
 		}
+		// Source required
 		$htmltext.=$langs->trans("SourceRequired").': <b>'.yn(preg_match('/\*$/',$label)).'</b><br>';
 		$example=$objimport->array_import_examplevalues[0][$code];
-
+		// Example
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
 		    if ($example) $htmltext.=$langs->trans("SourceExample").': <b>'.$example.'</b><br>';
@@ -898,6 +899,11 @@ if ($step == 4 && $datatoimport)
 		    if ($objimport->array_import_convertvalue[0][$code]['rule']=='fetchidfromref')    $htmltext.=$langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement",$entitylang).($example?' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')':'').'</b><br>';
 		    if ($objimport->array_import_convertvalue[0][$code]['rule']=='fetchidfromcodeid') $htmltext.=$langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary",$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example?' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')':'').'</b><br>';
 		}
+		// Format control rule
+		if (! empty($objimport->array_import_regex[0][$code]))
+		{
+			$htmltext.=$langs->trans("FormatControlRule").': <b>'.$objimport->array_import_regex[0][$code].'</b><br>';
+		}
 		$htmltext.='<br>';
 		// Target field info
 		$htmltext.='<b><u>'.$langs->trans("FieldTarget").'</u></b><br>';
diff --git a/htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js b/htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js
index 6acca8c7b81..90ce5d64df3 100644
--- a/htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js
+++ b/htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js
@@ -1,10 +1,10 @@
 /*!
  * jQuery blockUI plugin
- * Version 2.43 (29-JUL-2012)
- * @requires jQuery v1.2.3 or later
+ * Version 2.70.0-2014.11.23
+ * Requires jQuery v1.7 or later
  *
  * Examples at: http://malsup.com/jquery/block/
- * Copyright (c) 2007-2010 M. Alsup
+ * Copyright (c) 2007-2013 M. Alsup
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
  * http://www.gnu.org/licenses/gpl.html
@@ -13,22 +13,20 @@
  */
 
 ;(function() {
+/*jshint eqeqeq:false curly:false latedef:false */
+"use strict";
 
 	function setup($) {
-		if (/1\.(0|1|2)\.(0|1|2)/.test($.fn.jquery) || /^1.1/.test($.fn.jquery)) {
-			alert('blockUI requires jQuery v1.2.3 or later!  You are using v' + $.fn.jquery);
-			return;
-		}
-
 		$.fn._fadeIn = $.fn.fadeIn;
 
-		var noOp = function() {};
+		var noOp = $.noop || function() {};
 
 		// this bit is to ensure we don't call setExpression when we shouldn't (with extra muscle to handle
-		// retarded userAgent strings on Vista)
+		// confusing userAgent strings on Vista)
+		var msie = /MSIE/.test(navigator.userAgent);
+		var ie6  = /MSIE 6.0/.test(navigator.userAgent) && ! /MSIE 8.0/.test(navigator.userAgent);
 		var mode = document.documentMode || 0;
-		var setExpr = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8);
-		var ie6 = $.browser.msie && /MSIE 6.0/.test(navigator.userAgent) && !mode;
+		var setExpr = $.isFunction( document.createElement('div').style.setExpression );
 
 		// global $ methods for blocking/unblocking the entire page
 		$.blockUI   = function(opts) { install(window, opts); };
@@ -39,17 +37,47 @@
 			var $m = $('<div class="growlUI"></div>');
 			if (title) $m.append('<h1>'+title+'</h1>');
 			if (message) $m.append('<h2>'+message+'</h2>');
-			if (timeout == undefined) timeout = 3000;
-			$.blockUI({
-				message: $m, fadeIn: 700, fadeOut: 1000, centerY: false,
-				timeout: timeout, showOverlay: false,
-				onUnblock: onClose,
-				css: $.blockUI.defaults.growlCSS
+			if (timeout === undefined) timeout = 3000;
+
+			// Added by konapun: Set timeout to 30 seconds if this growl is moused over, like normal toast notifications
+			var callBlock = function(opts) {
+				opts = opts || {};
+
+				$.blockUI({
+					message: $m,
+					fadeIn : typeof opts.fadeIn  !== 'undefined' ? opts.fadeIn  : 700,
+					fadeOut: typeof opts.fadeOut !== 'undefined' ? opts.fadeOut : 1000,
+					timeout: typeof opts.timeout !== 'undefined' ? opts.timeout : timeout,
+					centerY: false,
+					showOverlay: false,
+					onUnblock: onClose,
+					css: $.blockUI.defaults.growlCSS
+				});
+			};
+
+			callBlock();
+			var nonmousedOpacity = $m.css('opacity');
+			$m.mouseover(function() {
+				callBlock({
+					fadeIn: 0,
+					timeout: 30000
+				});
+
+				var displayBlock = $('.blockMsg');
+				displayBlock.stop(); // cancel fadeout if it has started
+				displayBlock.fadeTo(300, 1); // make it easier to read the message by removing transparency
+			}).mouseout(function() {
+				$('.blockMsg').fadeOut(1000);
 			});
+			// End konapun additions
 		};
 
 		// plugin method for blocking element content
 		$.fn.block = function(opts) {
+			if ( this[0] === window ) {
+				$.blockUI( opts );
+				return this;
+			}
 			var fullOpts = $.extend({}, $.blockUI.defaults, opts || {});
 			this.each(function() {
 				var $el = $(this);
@@ -59,30 +87,35 @@
 			});
 
 			return this.each(function() {
-				if ($.css(this,'position') == 'static')
+				if ($.css(this,'position') == 'static') {
 					this.style.position = 'relative';
-				if ($.browser.msie)
-					this.style.zoom = 1; // force 'hasLayout'
+					$(this).data('blockUI.static', true);
+				}
+				this.style.zoom = 1; // force 'hasLayout' in ie
 				install(this, opts);
 			});
 		};
 
 		// plugin method for unblocking element content
 		$.fn.unblock = function(opts) {
+			if ( this[0] === window ) {
+				$.unblockUI( opts );
+				return this;
+			}
 			return this.each(function() {
 				remove(this, opts);
 			});
 		};
 
-		$.blockUI.version = 2.42; // 2nd generation blocking at no extra cost!
+		$.blockUI.version = 2.70; // 2nd generation blocking at no extra cost!
 
 		// override these in your code to change the default behavior and style
 		$.blockUI.defaults = {
 			// message displayed when blocking (use null for no message)
 			message:  '<h1>Please wait...</h1>',
 
-			title: null,	  // title string; only used when theme == true
-			draggable: true,  // only used when theme == true (requires jquery-ui.js to be loaded)
+			title: null,		// title string; only used when theme == true
+			draggable: true,	// only used when theme == true (requires jquery-ui.js to be loaded)
 
 			theme: false, // set to true to use with jQuery UI themes
 
@@ -111,30 +144,35 @@
 
 			// styles for the overlay
 			overlayCSS:  {
-				backgroundColor: '#000',
-				opacity:	  	 0.6,
-				cursor:		  	 'wait'
+				backgroundColor:	'#000',
+				opacity:			0.6,
+				cursor:				'wait'
 			},
 
+			// style to replace wait cursor before unblocking to correct issue
+			// of lingering wait cursor
+			cursorReset: 'default',
+
 			// styles applied when using $.growlUI
 			growlCSS: {
-				width:  	'350px',
+				width:		'350px',
 				top:		'10px',
-				left:   	'',
-				right:  	'10px',
-				border: 	'none',
+				left:		'',
+				right:		'10px',
+				border:		'none',
 				padding:	'5px',
 				opacity:	0.6,
-				cursor: 	'default',
+				cursor:		'default',
 				color:		'#fff',
 				backgroundColor: '#000',
-				'-webkit-border-radius': '10px',
-				'-moz-border-radius':	 '10px',
-				'border-radius': 		 '10px'
+				'-webkit-border-radius':'10px',
+				'-moz-border-radius':	'10px',
+				'border-radius':		'10px'
 			},
 
 			// IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w
 			// (hat tip to Jorge H. N. de Vasconcelos)
+			/*jshint scripturl:true */
 			iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank',
 
 			// force usage of iframe in non-IE browsers (handy for blocking applets)
@@ -174,8 +212,12 @@
 			// page blocking
 			focusInput: true,
 
+            // elements that can receive focus
+            focusableElements: ':input:enabled:visible',
+
 			// suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity)
-			applyPlatformOpacityRules: true,
+			// no longer needed in 2012
+			// applyPlatformOpacityRules: true,
 
 			// callback method invoked when fadeIn has completed and blocking message is visible
 			onBlock: null,
@@ -183,9 +225,13 @@
 			// callback method invoked when unblocking has completed; the callback is
 			// passed the element that has been unblocked (which is the window object for page
 			// blocks) and the options that were passed to the unblock call:
-			//	 onUnblock(element, options)
+			//	onUnblock(element, options)
 			onUnblock: null,
 
+			// callback method invoked when the overlay area is clicked.
+			// setting this will turn the cursor to a pointer, otherwise cursor defined in overlayCss will be used.
+			onOverlayClick: null,
+
 			// don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493
 			quirksmodeOffsetHack: 4,
 
@@ -212,6 +258,9 @@
 
 			opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {});
 			css = $.extend({}, $.blockUI.defaults.css, opts.css || {});
+			if (opts.onOverlayClick)
+				opts.overlayCSS.cursor = 'pointer';
+
 			themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {});
 			msg = msg === undefined ? opts.message : msg;
 
@@ -241,30 +290,31 @@
 			// layer1 is the iframe layer which is used to supress bleed through of underlying content
 			// layer2 is the overlay layer which has opacity and a wait cursor (by default)
 			// layer3 is the message content that is displayed while blocking
+			var lyr1, lyr2, lyr3, s;
+			if (msie || opts.forceIframe)
+				lyr1 = $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>');
+			else
+				lyr1 = $('<div class="blockUI" style="display:none"></div>');
 
-			var lyr1 = ($.browser.msie || opts.forceIframe)
-				? $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>')
-				: $('<div class="blockUI" style="display:none"></div>');
+			if (opts.theme)
+				lyr2 = $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>');
+			else
+				lyr2 = $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>');
 
-			var lyr2 = opts.theme
-				? $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>')
-				: $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>');
-
-			var lyr3, s;
 			if (opts.theme && full) {
 				s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:fixed">';
-	        	if ( opts.title ) {
+				if ( opts.title ) {
 					s += '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>';
-	        	}
-		        s += '<div class="ui-widget-content ui-dialog-content"></div>';
+				}
+				s += '<div class="ui-widget-content ui-dialog-content"></div>';
 				s += '</div>';
 			}
 			else if (opts.theme) {
 				s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:absolute">';
-        		if ( opts.title ) {
-          			s += '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>'
-        		}  
-        		s += '<div class="ui-widget-content ui-dialog-content"></div>';
+				if ( opts.title ) {
+					s += '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>';
+				}
+				s += '<div class="ui-widget-content ui-dialog-content"></div>';
 				s += '</div>';
 			}
 			else if (full) {
@@ -286,12 +336,12 @@
 			}
 
 			// style the overlay
-			if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
+			if (!opts.theme /*&& (!opts.applyPlatformOpacityRules)*/)
 				lyr2.css(opts.overlayCSS);
 			lyr2.css('position', full ? 'fixed' : 'absolute');
 
 			// make iframe layer transparent in IE
-			if ($.browser.msie || opts.forceIframe)
+			if (msie || opts.forceIframe)
 				lyr1.css('opacity',0.0);
 
 			//$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el);
@@ -308,28 +358,32 @@
 			}
 
 			// ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling)
-			var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0);
+			var expr = setExpr && (!$.support.boxModel || $('object,embed', full ? null : el).length > 0);
 			if (ie6 || expr) {
 				// give body 100% height
-				if (full && opts.allowBodyStretch && $.boxModel)
+				if (full && opts.allowBodyStretch && $.support.boxModel)
 					$('html,body').css('height','100%');
 
 				// fix ie6 issue when blocked element has a border width
-				if ((ie6 || !$.boxModel) && !full) {
+				if ((ie6 || !$.support.boxModel) && !full) {
 					var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth');
 					var fixT = t ? '(0 - '+t+')' : 0;
 					var fixL = l ? '(0 - '+l+')' : 0;
 				}
 
 				// simulate fixed position
-				$.each([lyr1,lyr2,lyr3], function(i,o) {
+				$.each(layers, function(i,o) {
 					var s = o[0].style;
 					s.position = 'absolute';
 					if (i < 2) {
-						full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"')
-							 : s.setExpression('height','this.parentNode.offsetHeight + "px"');
-						full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"')
-							 : s.setExpression('width','this.parentNode.offsetWidth + "px"');
+						if (full)
+							s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.support.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"');
+						else
+							s.setExpression('height','this.parentNode.offsetHeight + "px"');
+						if (full)
+							s.setExpression('width','jQuery.support.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"');
+						else
+							s.setExpression('width','this.parentNode.offsetWidth + "px"');
 						if (fixL) s.setExpression('left', fixL);
 						if (fixT) s.setExpression('top', fixT);
 					}
@@ -338,7 +392,7 @@
 						s.marginTop = 0;
 					}
 					else if (!opts.centerY && full) {
-						var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0;
+						var top = (opts.css && opts.css.top) ? parseInt(opts.css.top, 10) : 0;
 						var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"';
 						s.setExpression('top',expression);
 					}
@@ -355,7 +409,7 @@
 					$(msg).show();
 			}
 
-			if (($.browser.msie || opts.forceIframe) && opts.showOverlay)
+			if ((msie || opts.forceIframe) && opts.showOverlay)
 				lyr1.show(); // opacity is zero
 			if (opts.fadeIn) {
 				var cb = opts.onBlock ? opts.onBlock : noOp;
@@ -372,7 +426,7 @@
 				if (msg)
 					lyr3.show();
 				if (opts.onBlock)
-					opts.onBlock();
+					opts.onBlock.bind(lyr3)();
 			}
 
 			// bind key and mouse events
@@ -380,7 +434,7 @@
 
 			if (full) {
 				pageBlock = lyr3[0];
-				pageBlockEls = $(':input:enabled:visible',pageBlock);
+				pageBlockEls = $(opts.focusableElements,pageBlock);
 				if (opts.focusInput)
 					setTimeout(focus, 20);
 			}
@@ -390,14 +444,18 @@
 			if (opts.timeout) {
 				// auto-unblock
 				var to = setTimeout(function() {
-					full ? $.unblockUI(opts) : $(el).unblock(opts);
+					if (full)
+						$.unblockUI(opts);
+					else
+						$(el).unblock(opts);
 				}, opts.timeout);
 				$(el).data('blockUI.timeout', to);
 			}
-		};
+		}
 
 		// remove the block
 		function remove(el, opts) {
+			var count;
 			var full = (el == window);
 			var $el = $(el);
 			var data = $el.data('blockUI.history');
@@ -418,21 +476,36 @@
 			if (full) // crazy selector to handle odd field errors in ie6/7
 				els = $('body').children().filter('.blockUI').add('body > .blockUI');
 			else
-				els = $('.blockUI', el);
+				els = $el.find('>.blockUI');
+
+			// fix cursor issue
+			if ( opts.cursorReset ) {
+				if ( els.length > 1 )
+					els[1].style.cursor = opts.cursorReset;
+				if ( els.length > 2 )
+					els[2].style.cursor = opts.cursorReset;
+			}
 
 			if (full)
 				pageBlock = pageBlockEls = null;
 
 			if (opts.fadeOut) {
-				els.fadeOut(opts.fadeOut);
-				setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut);
+				count = els.length;
+				els.stop().fadeOut(opts.fadeOut, function() {
+					if ( --count === 0)
+						reset(els,data,opts,el);
+				});
 			}
 			else
 				reset(els, data, opts, el);
-		};
+		}
 
 		// move blocking element back into the DOM where it started
 		function reset(els,data,opts,el) {
+			var $el = $(el);
+			if ( $el.data('blockUI.isBlocked') )
+				return;
+
 			els.each(function(i,o) {
 				// remove via DOM calls so we don't lose event handlers
 				if (this.parentNode)
@@ -442,14 +515,24 @@
 			if (data && data.el) {
 				data.el.style.display = data.display;
 				data.el.style.position = data.position;
+				data.el.style.cursor = 'default'; // #59
 				if (data.parent)
 					data.parent.appendChild(data.el);
-				$(el).removeData('blockUI.history');
+				$el.removeData('blockUI.history');
+			}
+
+			if ($el.data('blockUI.static')) {
+				$el.css('position', 'static'); // #22
 			}
 
 			if (typeof opts.onUnblock == 'function')
 				opts.onUnblock(el,opts);
-		};
+
+			// fix issue in Safari 6 where block artifacts remain until reflow
+			var body = $(document.body), w = body.width(), cssW = body[0].style.width;
+			body.width(w-1).width(w);
+			body[0].style.width = cssW;
+		}
 
 		// bind/unbind the handler
 		function bind(b, el, opts) {
@@ -462,40 +545,47 @@
 			$el.data('blockUI.isBlocked', b);
 
 			// don't bind events when overlay is not in use or if bindEvents is false
-			if (!opts.bindEvents || (b && !opts.showOverlay))
+			if (!full || !opts.bindEvents || (b && !opts.showOverlay))
 				return;
 
 			// bind anchors and inputs for mouse and key events
-			var events = 'mousedown mouseup keydown keypress';
-			b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler);
+			var events = 'mousedown mouseup keydown keypress keyup touchstart touchend touchmove';
+			if (b)
+				$(document).bind(events, opts, handler);
+			else
+				$(document).unbind(events, handler);
 
 		// former impl...
-		//	   var $e = $('a,:input');
-		//	   b ? $e.bind(events, opts, handler) : $e.unbind(events, handler);
-		};
+		//		var $e = $('a,:input');
+		//		b ? $e.bind(events, opts, handler) : $e.unbind(events, handler);
+		}
 
 		// event handler to suppress keyboard/mouse events when blocking
 		function handler(e) {
 			// allow tab navigation (conditionally)
-			if (e.keyCode && e.keyCode == 9) {
+			if (e.type === 'keydown' && e.keyCode && e.keyCode == 9) {
 				if (pageBlock && e.data.constrainTabKey) {
 					var els = pageBlockEls;
 					var fwd = !e.shiftKey && e.target === els[els.length-1];
 					var back = e.shiftKey && e.target === els[0];
 					if (fwd || back) {
-						setTimeout(function(){focus(back)},10);
+						setTimeout(function(){focus(back);},10);
 						return false;
 					}
 				}
 			}
 			var opts = e.data;
+			var target = $(e.target);
+			if (target.hasClass('blockOverlay') && opts.onOverlayClick)
+				opts.onOverlayClick(e);
+
 			// allow events within the message content
-			if ($(e.target).parents('div.' + opts.blockMsgClass).length > 0)
+			if (target.parents('div.' + opts.blockMsgClass).length > 0)
 				return true;
 
 			// allow events for content that is not being blocked
-			return $(e.target).parents().children().filter('div.blockUI').length == 0;
-		};
+			return target.parents().children().filter('div.blockUI').length === 0;
+		}
 
 		function focus(back) {
 			if (!pageBlockEls)
@@ -503,7 +593,7 @@
 			var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0];
 			if (e)
 				e.focus();
-		};
+		}
 
 		function center(el, x, y) {
 			var p = el.parentNode, s = el.style;
@@ -511,15 +601,16 @@
 			var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth');
 			if (x) s.left = l > 0 ? (l+'px') : '0';
 			if (y) s.top  = t > 0 ? (t+'px') : '0';
-		};
+		}
 
 		function sz(el, p) {
-			return parseInt($.css(el,p))||0;
-		};
+			return parseInt($.css(el,p),10)||0;
+		}
 
-	};
+	}
 
 
+	/*global define:true */
 	if (typeof define === 'function' && define.amd && define.amd.jQuery) {
 		define(['jquery'], setup);
 	} else {
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index a13a3923eab..26d1c057219 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -489,11 +489,11 @@ IMG;
 		$name=preg_replace('/\.odt/i', '', $name);
 		if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))
 		{
-			$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.$name.' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
+			$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
 		}
 		else
 		{
-			$command = '../../scripts/odt2pdf/odt2pdf.sh '.$name.' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
+			$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
 		}
 
 
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 4149691302e..0b9b08f3b68 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,8 +44,7 @@ $forcedfile="./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
 if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
 
-dolibarr_install_syslog("Dolibarr install/upgrade process started");
-
+dolibarr_install_syslog("--- check: Dolibarr install/upgrade process started");
 
 
 /*
@@ -167,11 +167,11 @@ if ($memmaxorig != '')
 }
 
 
-// If config file presente and filled
+// If config file present and filled
 clearstatcache();
 if (is_readable($conffile) && filesize($conffile) > 8)
 {
-	dolibarr_install_syslog("conf file '$conffile' already defined");
+	dolibarr_install_syslog("check: conf file '" . $conffile . "' already defined");
 	$confexists=1;
 	include_once $conffile;
 
@@ -189,19 +189,19 @@ if (is_readable($conffile) && filesize($conffile) > 8)
 else
 {
 	// If not, we create it
-	dolibarr_install_syslog("we try to create conf file '$conffile'");
+	dolibarr_install_syslog("check: we try to create conf file '" . $conffile . "'");
 	$confexists=0;
 
 	// First we try by copying example
 	if (@copy($conffile.".example", $conffile))
 	{
 		// Success
-		dolibarr_install_syslog("copied file ".$conffile.".example into ".$conffile." done successfully.");
+		dolibarr_install_syslog("check: successfully copied file " . $conffile . ".example into " . $conffile);
 	}
 	else
 	{
 		// If failed, we try to create an empty file
-		dolibarr_install_syslog("failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
+		dolibarr_install_syslog("check: failed to copy file " . $conffile . ".example into " . $conffile . ". We try to create it.", LOG_WARNING);
 
 		$fp = @fopen($conffile, "w");
 		if ($fp)
@@ -210,7 +210,7 @@ else
 			@fputs($fp,"\n");
 			fclose($fp);
 		}
-		else dolibarr_install_syslog("failed to create a new file ".$conffile." into current dir ".getcwd().". Check permission.", LOG_ERR);
+		else dolibarr_install_syslog("check: failed to create a new file " . $conffile . " into current dir " . getcwd() . ". Please check permissions.", LOG_ERR);
 	}
 
 	// First install, we can't upgrade
@@ -282,7 +282,7 @@ else
 				if (! file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php"))
 				{
 				    print '<font class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</font><br>'."\n";
-				    dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING);
+				    dol_syslog("A '" . $conffiletoshow . "' file exists with a dolibarr_main_document_root to " . $dolibarr_main_document_root . " that seems wrong. Try to fix or remove the '" . $conffiletoshow . "' file.", LOG_WARNING);
 				}
 				else
 				{
@@ -531,5 +531,6 @@ $(".runupgrade").click(function() {
 
 </script>';
 
+dolibarr_install_syslog("--- check: end");
 pFooter(true);	// Never display next button
 
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 04f8a3caf4c..21e975f8b29 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -36,7 +36,7 @@ $langs->setDefaultLang($setuplang);
 $langs->load("install");
 $langs->load("errors");
 
-dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
+dolibarr_install_syslog("--- fileconf: entering fileconf.php page");
 
 // You can force preselected values of the config step of Dolibarr by adding a file
 // install.forced.php into directory htdocs/install (This is the case with some wizard
@@ -71,12 +71,14 @@ if (@file_exists($forcedfile)) {
 
 session_start();	// To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
 
-pHeader($langs->trans("ConfigurationFile"),"etape1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'));
+pHeader($langs->trans("ConfigurationFile"),"step1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'));
 
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
+    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING);
+	dolibarr_install_syslog("--- fileconf: end");
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
@@ -306,7 +308,8 @@ if (! empty($force_install_message))
                     $class='DoliDB'.ucfirst($type);
                     include_once $dir."/".$file;
 
-                    if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation
+                    if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+                    if ($type == 'sqlite3') continue;   // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
 
 		            // Version min of database
                     $versionbasemin=explode('.',$class::VERSIONMIN);
@@ -584,4 +587,5 @@ function jscheckparam()
 
 // $db->close();	Not database connexion yet
 
+dolibarr_install_syslog("--- fileconf: end");
 pFooter($err,$setuplang,'jscheckparam');
diff --git a/htdocs/install/filelist.xml b/htdocs/install/filelist.xml
index 59f7aff100b..ede224b2820 100644
--- a/htdocs/install/filelist.xml
+++ b/htdocs/install/filelist.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <checksum_list>
-<dolibarr_root_dir version="3.8.0-alpha">
+<dolibarr_root_dir version="3.8.0-beta">
 <dir name="/opensurvey/css" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="style.css">75d01810c3b8e5a95cbf57f10cd5021b</md5file>
 </dir>
 <dir name="/opensurvey" >
-<md5file name="results.php">5c0b601305047d39f40fcf2430b38813</md5file>
+<md5file name="results.php">b828f36cbf7fdeda360f3b8e4cf9e083</md5file>
 <md5file name="exportcsv.php">67798229e915f5841274ee70487feec4</md5file>
-<md5file name="card.php">a878486e9d0682a1c4cfea064377d698</md5file>
+<md5file name="card.php">e79e5340d17846dcb7fc0a8096f92b13</md5file>
 </dir>
 <dir name="/opensurvey/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -16,14 +16,14 @@
 </dir>
 <dir name="/opensurvey/wizard" >
 <md5file name="choix_date.php">6734d43389eded6e6ec04df0d0ac6a0c</md5file>
-<md5file name="create_survey.php">d8b44471a15855388398352843563db5</md5file>
+<md5file name="create_survey.php">35313acdb23a7c1d6cca7ca345cef93e</md5file>
 <md5file name="choix_autre.php">8948df2f592a82d0f5e8a9b438267127</md5file>
 <md5file name="index.php">aa62843d604aa6a058bc2a342a3f4abf</md5file>
 </dir>
 <dir name="/opensurvey" >
 <md5file name="fonctions.php">9f5b847472c19606e9ffc71373ebc1ec</md5file>
 <md5file name="index.php">e96ac27ffffd6c056faada99f2238a59</md5file>
-<md5file name="list.php">f2dec5bab910432d81d0314c916dfc66</md5file>
+<md5file name="list.php">2848bc03343a8855143addb33c993024</md5file>
 </dir>
 <dir name="/opensurvey/img" >
 <md5file name="next.png">6d57fc3e3529573832640f2d8f5431fa</md5file>
@@ -45,13 +45,13 @@
 <md5file name="rewind.png">6877820eee61e7159f1b50d17b63c2df</md5file>
 </dir>
 <dir name="/support" >
-<md5file name="default.css">76a34fc34fe2844982e0e7c8a639aea5</md5file>
+<md5file name="default.css">bc5a13300a595233325ab158211a1007</md5file>
 <md5file name="mail.png">6c5b043b72d32408f4002090e802d6e8</md5file>
 <md5file name="helpcenter.png">f994d768919712c348a9f4018c6d4ee5</md5file>
 <md5file name="internet.png">e7a0c91845d001672e8238f4f4b608c7</md5file>
 <md5file name="star.png">6151a7c4134040854886bc5006a0f7c9</md5file>
 <md5file name="sparkangels.png">73e54239e073c5e776f0c9b0318ba330</md5file>
-<md5file name="index.php">6471ec07cf574132fbdbde8d506b71b2</md5file>
+<md5file name="index.php">55f035a0bb2edc2b91890f5d68b1df3e</md5file>
 <md5file name="redstar.png">78f3bac5801105879cebaeb0bdcbb03b</md5file>
 <md5file name="who.png">313274ccfbc6586080382c481cd00264</md5file>
 <md5file name="pagemaster.png">a7288deb697b6946baff286db59b738d</md5file>
@@ -91,15 +91,15 @@
 </dir>
 <dir name="/imports" >
 <md5file name="index.php">604a3c1fd670af360b4e8dd070316b32</md5file>
-<md5file name="import.php">9e7eaaddf736f8f8401edb6a5a12cc6b</md5file>
+<md5file name="import.php">24966736ae7585ad61addfdee01bdcbb</md5file>
 <md5file name="emptyexample.php">08194ccdf2c8801e9ce4acd3fc6a8829</md5file>
 </dir>
 <dir name="/admin" >
-<md5file name="agenda_extsites.php">a666ee19f70e382c7d50df170c118c54</md5file>
-<md5file name="dict.php">e568011b124421bf2e89d471b2ece2c4</md5file>
+<md5file name="agenda_extsites.php">7e0ab482b8ef39034ed9d418239177fa</md5file>
+<md5file name="dict.php">5ab82210873ed389e3c913dfe263fa4c</md5file>
 <md5file name="barcode.php">a92b0b6374f698c980928a3bee17ff9a</md5file>
-<md5file name="ihm.php">987b52b299e46db0725f7e2a82c376a0</md5file>
-<md5file name="agenda.php">6eca275e9d8b90607606f4d4d75055f9</md5file>
+<md5file name="ihm.php">1f6bee4026eabdb0ff5268e566e47475</md5file>
+<md5file name="agenda.php">f8ba5662241d9c908f1f791f72481eb7</md5file>
 <md5file name="security.php">2f1931c293e0ab260b31e2d1b0134f73</md5file>
 <md5file name="prelevement.php">7367da82258c07fb35aaf3aafd3e1bb7</md5file>
 <md5file name="order_extrafields.php">dd9cf0fdcd7a32f49882b31d894f9bcb</md5file>
@@ -110,13 +110,13 @@
 <dir name="/admin/tools" >
 <md5file name="update.php">b702c4be259106f2e031a8d7a57462a9</md5file>
 <md5file name="export.php">ab13e413223fede4e27cdd0d5a112cd4</md5file>
-<md5file name="listsessions.php">6864d4611d4bb6ca66fdd6fd933a2ba1</md5file>
+<md5file name="listsessions.php">876371cf283ebd2982d4cacc1640536c</md5file>
 <md5file name="dolibarr_import.php">7f5ed41c70e65cc91e731dbf88692d8d</md5file>
 <md5file name="index.php">e3fa076bfc94a80430f9a32aee318da8</md5file>
 <md5file name="eaccelerator.php">c31f65e979da57d157bfb7ec4cdc65df</md5file>
-<md5file name="purge.php">c04e9fe4e8db9686ea7d681d833ba0f3</md5file>
+<md5file name="purge.php">2a13bfa6db4c63aeab46d3aa2beb353c</md5file>
 <md5file name="dolibarr_export.php">52c888dc40740df458733c9f66f39bcb</md5file>
-<md5file name="listevents.php">4b54225faf233987cfa72cebd73781d1</md5file>
+<md5file name="listevents.php">50fb79f208e947c162b31aeba81f504e</md5file>
 </dir>
 <dir name="/admin" >
 <md5file name="delais.php">5188256bdd7cb073a043f8b65be2adbb</md5file>
@@ -135,7 +135,7 @@
 <md5file name="supplier_invoice.php">9167ee0137e4d8e27a380b605409b0a0</md5file>
 <md5file name="confexped.php">c704d69e4e509d8fecd98259b4dc4696</md5file>
 <md5file name="ldap.php">448d58bdfda4baa87885d3be0131ef1d</md5file>
-<md5file name="taxes.php">ff450462c83cdf66bf254597c9b9a25a</md5file>
+<md5file name="taxes.php">ec03df3d04a5533ec8cadb86d67e385c</md5file>
 <md5file name="geoipmaxmind.php">7bfd53154d651a07bf5d6861b382d50a</md5file>
 <md5file name="boxes.php">7a48e375b7d77c532d3fad60186f1aa9</md5file>
 <md5file name="propal.php">7d63e6e9475d16e4599040b8a41a53fe</md5file>
@@ -145,7 +145,7 @@
 <md5file name="sms.php">492dc95d5efe02dd3bca4574a8682830</md5file>
 <md5file name="translation.php">f61c878d3c2b9d7e12dc91384426b5c2</md5file>
 <md5file name="spip.php">116e9a092013cf1274f96985a620ce6c</md5file>
-<md5file name="expensereport.php">640ad64d0a2ccc00d0db0acfed8195e4</md5file>
+<md5file name="expensereport.php">616208b226e5d0f544681f69cd65b19b</md5file>
 <md5file name="loan.php">5de32c6034d43acef1f831622db0fdf0</md5file>
 </dir>
 <dir name="/admin/system" >
@@ -155,8 +155,8 @@
 <md5file name="dbtable.php">1d4faf84da5cb7cf4ec45f41fca4c789</md5file>
 <md5file name="about.php">83ffab5c97a69b23ffec364a795132c1</md5file>
 <md5file name="index.php">5d4aefbb80446c57442e7e7e45471c29</md5file>
-<md5file name="filecheck.php">d5333f6f618164c532190b0851f99182</md5file>
-<md5file name="perf.php">1725de04cb20a0d3a8983531f869946c</md5file>
+<md5file name="filecheck.php">feb0ceb17133f67435ea943b9d90ee57</md5file>
+<md5file name="perf.php">6ae63003bb6b26597cc06312401b3a9e</md5file>
 <md5file name="xdebug.php">fd5d1d799fde0113ed7dfff59ce7f829</md5file>
 <md5file name="dolibarr.php">149760ed8fadcb899e8ba8e3e4a564c3</md5file>
 <md5file name="constall.php">f723e0514d0a3b56160b072da038081d</md5file>
@@ -169,7 +169,7 @@
 <dir name="/admin" >
 <md5file name="events.php">4eb6bf940da326c8d507b96e02441a30</md5file>
 <md5file name="triggers.php">e418c1f44e48e5d1efd949eec8854d41</md5file>
-<md5file name="agenda_other.php">112774fc734705b5eb274534ee95338b</md5file>
+<md5file name="agenda_other.php">9723236a5c42cbf2475ab9d61a904375</md5file>
 <md5file name="index.php">63a117bad7a888f3ec6afda0e7fd16c2</md5file>
 <md5file name="supplierinvoice_extrafields.php">b06bdb8f2eb308f51eac8eb213ce324a</md5file>
 <md5file name="supplierorderdet_extrafields.php">eb3573fcc14887e31aaf4f00800e1ab4</md5file>
@@ -186,25 +186,25 @@
 <md5file name="stock.php">8d961f94da4667b144e1eb113c7874fa</md5file>
 <md5file name="livraison.php">4786d8e95b4fceb269f3d6a62ea66ef8</md5file>
 <md5file name="bank.php">01e7e410650ffc5f9877826e085b44a4</md5file>
-<md5file name="mails.php">859c165ef5394d447c2be3989a493c59</md5file>
+<md5file name="mails.php">8868b7d0779aa09e9b52c965e1e96b8a</md5file>
 <md5file name="notification.php">5c06b9772a487667c388ae2b5714fa91</md5file>
 <md5file name="syslog.php">b2e983fe3f64bb7ec0bd09a8d7225acc</md5file>
-<md5file name="company.php">2cc7239659a5abc15a31fe100e741d07</md5file>
+<md5file name="company.php">d70614f47197ca550298c51550dc0ea9</md5file>
 <md5file name="menus.php">bc667a42f1ade75c59cb5ad6103847b7</md5file>
-<md5file name="const.php">06676bd05bb70cc406f0345fc6cac8fa</md5file>
+<md5file name="const.php">d63455783346f56c804c166f71bf72b0</md5file>
 <md5file name="ldap_users.php">31bbae8a1de3e1fb630ac4d83db62d71</md5file>
 <md5file name="modules.php">7a4968d27f1d5b6bd51403978327c417</md5file>
 <md5file name="external_rss.php">dffbd73d8de5768a2cc32565732dd9cc</md5file>
 <md5file name="supplier_order.php">baa289b36690f1d210e78612a3822171</md5file>
 <md5file name="bank_extrafields.php">07b0a3d9980fdc81c37bfedb597204a6</md5file>
 <md5file name="supplierinvoicedet_extrafields.php">4bf3ac228b311e0cf07ef2fc4fc8037e</md5file>
-<md5file name="agenda_xcal.php">7f81dc82b60d2f874756e8796df47c85</md5file>
+<md5file name="agenda_xcal.php">db66a55e69c3d86828051d75c0dedf1c</md5file>
 <md5file name="supplierorder_extrafields.php">15e33c41fec315a0dc8b0a1f4e08ce93</md5file>
 <md5file name="agenda_extrafields.php">deab2738e25782c55f8daefd0157de3e</md5file>
 <md5file name="clicktodial.php">ae8c315cfbe5998e5a067a09866e455b</md5file>
 <md5file name="ldap_groups.php">62a7d69cf85d612ce8df9956b6d9a77e</md5file>
 <md5file name="proxy.php">8a009d5933a9c9c35b01d210febb6e21</md5file>
-<md5file name="compta.php">2b66c2136b930d8391dffdad0c6f7441</md5file>
+<md5file name="compta.php">a0024e1b8052eb2bc9bb8622b329cdb8</md5file>
 </dir>
 <dir name="/printing/admin" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -226,7 +226,7 @@
 </dir>
 <dir name="/paypal/lib" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paypal.lib.php">7468fa868231227ba807b05967d91b5c</md5file>
+<md5file name="paypal.lib.php">89d187e5e5b2b377c097101aa2f1438f</md5file>
 <md5file name="paypalfunctions.lib.php">296b5b4000a78d2b6641d6f87b54b1d5</md5file>
 </dir>
 <dir name="/paypal/img" >
@@ -235,23 +235,22 @@
 </dir>
 <dir name="/holiday/admin" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="tomergewithholiday.php">8864af0237a64b7d40ea2466c33470ec</md5file>
-<md5file name="holiday.php">3e693506b63ac541c1463b20ac446350</md5file>
+<md5file name="holiday.php">97647f01d78d2ceb0afb7e59273bbdce</md5file>
 </dir>
 <dir name="/holiday" >
-<md5file name="card.php">c8159d7f239eab452f238023b0b11392</md5file>
-<md5file name="month_report.php">1798725090e74dd4d13d14a8a5533455</md5file>
+<md5file name="document.php">c3a091f382b8d46073d526656abafa08</md5file>
+<md5file name="card.php">aaa422ae508e2b6fd9a936924c20fc2e</md5file>
+<md5file name="month_report.php">3e49a455e52720605b60a343d9c3fd3f</md5file>
 </dir>
 <dir name="/holiday/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="holiday.class.php">756b32775d767e0b2a8855fadaf5ae96</md5file>
+<md5file name="holiday.class.php">a345b7179b0b8624a64ac33dff310df8</md5file>
 </dir>
 <dir name="/holiday" >
-<md5file name="view_log.php">478e5819f5df66e9ace00694e8370216</md5file>
-<md5file name="index.php">090c9ae64d2028ee39c7175de50dca47</md5file>
+<md5file name="view_log.php">37ed710e40414cc35a8451695d101da9</md5file>
 <md5file name="common.inc.php">26c66f78f5db62e9af07cb11280afc24</md5file>
-<md5file name="tomergewithdefine_holiday.php">9bba5c89e5dd034e4d6ddd1b19a8abd7</md5file>
-<md5file name="define_holiday.php">5c25310c78417e37fd75c8769e3c172f</md5file>
+<md5file name="list.php">d4b12c1b7b5d88598b2ff29997bbc516</md5file>
+<md5file name="define_holiday.php">79f999818e93c5d84a639d470c100ffd</md5file>
 </dir>
 <dir name="/holiday/img" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -4938,65 +4937,68 @@
 <md5file name="config.js">35c63682b9f0ab3638c5e7c987e1a892</md5file>
 <md5file name="styles.js">d5e952f44c649481aa8597d2fd0159b3</md5file>
 </dir>
-<dir name="/includes/jquery/css/smoothness/images" >
-<md5file name="ui-bg_glass_75_dadada_1x400.png">c12c6510dad3ebfa64c8a30e959a2469</md5file>
-<md5file name="ui-bg_highlight-soft_75_cccccc_1x100.png">72c593d16e998952cd8d798fee33c6f3</md5file>
-<md5file name="ui-bg_flat_0_aaaaaa_40x100.png">2a44fbdb7360c60122bcf6dcef0387d8</md5file>
-<md5file name="ui-bg_flat_75_ffffff_40x100.png">8692e6efddf882acbff144c38ea7dfdf</md5file>
-<md5file name="ui-icons_2e83ff_256x240.png">6e7a87edf112d7544015589f8291e752</md5file>
-<md5file name="ui-icons_888888_256x240.png">9c46d7cab43e22a14bad26d2d4806d80</md5file>
-<md5file name="ui-bg_glass_75_e6e6e6_1x400.png">f4254356c2a8c9a383205ef2c4de22c4</md5file>
-<md5file name="ui-bg_glass_95_fef1ec_1x400.png">5a3be2d8fff8324d59aec3df7b0a0c83</md5file>
-<md5file name="ui-icons_cd0a0a_256x240.png">3e450c2a2c66328d9498e7001ad7197c</md5file>
-<md5file name="ui-icons_222222_256x240.png">ebe6b6902a408fbf9cac6379a1477525</md5file>
-<md5file name="ui-bg_glass_55_fbf9ee_1x400.png">6e9e2694b7318954aefba787732dda44</md5file>
-<md5file name="ui-bg_glass_65_ffffff_1x400.png">e5a8f32e28fd5c27bf0fed33c8a8b9b5</md5file>
-<md5file name="ui-icons_454545_256x240.png">119dd0c2e94ad689de873ef39fd43e6e</md5file>
-</dir>
 <dir name="/includes/jquery/css/smoothness" >
-<md5file name="jquery-ui-latest.custom.css">cee2d3d516d9940ddbfd859d2dbbe55b</md5file>
-<md5file name="jquery-ui-latest.custom.min.css">c78db4dde38bd36c9d6c8ff0cb6502e4</md5file>
+<md5file name="jquery-ui.css">64dfb75ef30cbf691e7858dc1992b4df</md5file>
+<md5file name="theme.css">a001312cbf93827d531c91c2610610f2</md5file>
+<md5file name="jquery-ui.min.css">840cca94d5e33faf324bcd4988fa8401</md5file>
 </dir>
-<dir name="/includes/jquery/css/ui-lightness/images" >
-<md5file name="ui-bg_diagonals-thick_20_666666_40x40.png">f040b255ca13e693da34ab33c7d6b554</md5file>
-<md5file name="ui-icons_ef8c08_256x240.png">ef9a6ccfe3b14041928ddc708665b226</md5file>
-<md5file name="ui-icons_228ef1_256x240.png">79f41c0765e9ec18562b20b0801d748b</md5file>
-<md5file name="ui-bg_highlight-soft_100_eeeeee_1x100.png">384c3f17709ba0f809b023b6e7b10b84</md5file>
-<md5file name="ui-bg_glass_100_f6f6f6_1x400.png">5f1847175ba18c41322cb9cb0581e0fb</md5file>
-<md5file name="ui-bg_diagonals-thick_18_b81900_40x40.png">1c7fc3f027768438a5e12572a3ca1233</md5file>
-<md5file name="ui-bg_highlight-soft_75_ffe45c_1x100.png">b806658954cb4d16ade8977af737f486</md5file>
-<md5file name="ui-bg_flat_10_000000_40x100.png">c18cd01623c7fed23c80d53e2f5e7c78</md5file>
-<md5file name="ui-icons_ffd27a_256x240.png">39c5a5f53ff0e6cebaec731706427bbb</md5file>
-<md5file name="ui-bg_glass_100_fdf5ce_1x400.png">d26e8f463195a7b86f86b7d550cfc114</md5file>
-<md5file name="ui-icons_222222_256x240.png">ebe6b6902a408fbf9cac6379a1477525</md5file>
-<md5file name="ui-bg_glass_65_ffffff_1x400.png">e5a8f32e28fd5c27bf0fed33c8a8b9b5</md5file>
-<md5file name="ui-bg_gloss-wave_35_f6a828_500x100.png">8aba3e2c8aad049e56a11eb5ee095941</md5file>
-<md5file name="ui-icons_ffffff_256x240.png">342bc03f6264c75d3f1d7f99e34295b9</md5file>
+<dir name="/includes/jquery/css/smoothness/images" >
+<md5file name="ui-bg_glass_75_dadada_1x400.png">04646fb634cba8c8b6487d26200c5fcc</md5file>
+<md5file name="ui-bg_highlight-soft_75_cccccc_1x100.png">ac76811df9c1bf8af392f21e7cb9dff7</md5file>
+<md5file name="ui-bg_flat_0_aaaaaa_40x100.png">d47047084ba4c0d911f6332bb664a292</md5file>
+<md5file name="ui-bg_flat_75_ffffff_40x100.png">cc546fa0a4b98fad0917c5693587bc6b</md5file>
+<md5file name="ui-icons_2e83ff_256x240.png">14d55152e99f22245c9e1e8bb784a7f6</md5file>
+<md5file name="ui-icons_888888_256x240.png">e63c67228df4a03cd91321bdf98e7555</md5file>
+<md5file name="ui-bg_glass_75_e6e6e6_1x400.png">7de5a7addad547244d33f4209e3d6306</md5file>
+<md5file name="ui-bg_glass_95_fef1ec_1x400.png">9a3f2305cb5cb2921ca7184bd955744e</md5file>
+<md5file name="ui-icons_cd0a0a_256x240.png">b00a65a4b157ec627ee9ff4d0c8f1176</md5file>
+<md5file name="ui-icons_222222_256x240.png">4c27b34156b7a3776f31cc456ca01c10</md5file>
+<md5file name="ui-bg_glass_55_fbf9ee_1x400.png">3c59f14abdbc105190b9db0ec30c232c</md5file>
+<md5file name="ui-bg_glass_65_ffffff_1x400.png">487b704edf1cf3ce0f8c153bb29652cf</md5file>
+<md5file name="ui-icons_454545_256x240.png">ec5e59da4b23573927bda544cbb29401</md5file>
 </dir>
 <dir name="/includes/jquery/css/ui-lightness" >
-<md5file name="jquery-ui-latest.custom.css">a714d87749fb1eddfd91141d931f483b</md5file>
-<md5file name="jquery-ui-latest.custom.min.css">c3006f32bd19f09628292ae1b3df25f4</md5file>
+<md5file name="jquery-ui.css">f635c10273900261c5f52f8fbd574bd2</md5file>
+<md5file name="theme.css">5588e19871bc8ef086ed20773e8a726f</md5file>
+<md5file name="jquery-ui.min.css">26812a28850395f8f865be4893fb20c7</md5file>
 </dir>
-<dir name="/includes/jquery/css/redmond/images" >
-<md5file name="ui-bg_glass_85_dfeffc_1x400.png">3c9852ae1a4d25e9cbdadb68bb0e1f1a</md5file>
-<md5file name="ui-bg_inset-hard_100_f5f8f9_1x100.png">3964ec1cd6fcbc20fbc2ed63d320caf6</md5file>
-<md5file name="ui-icons_469bdd_256x240.png">6572c4e13eaa937ff62163ee7faaf33f</md5file>
-<md5file name="ui-bg_flat_0_aaaaaa_40x100.png">2a44fbdb7360c60122bcf6dcef0387d8</md5file>
-<md5file name="ui-bg_inset-hard_100_fcfdfd_1x100.png">2b6a88b05b94c56fb478fe70dad68cdc</md5file>
-<md5file name="ui-icons_2e83ff_256x240.png">2b99a5e48d3c3957d03027d36a25e8bb</md5file>
-<md5file name="ui-icons_217bc0_256x240.png">7ebb3ccb0f2a3defbe84b59a1c07fd45</md5file>
-<md5file name="ui-bg_glass_75_d0e5f5_1x400.png">adcf31a940ace9fb4c104672cfd2d6f9</md5file>
-<md5file name="ui-bg_flat_55_fbec88_40x100.png">2b8885da50e2324557185fb0890ce2b7</md5file>
-<md5file name="ui-bg_gloss-wave_55_5c9ccc_500x100.png">527d96cb51eaa54fa74a90db078008c4</md5file>
-<md5file name="ui-bg_glass_95_fef1ec_1x400.png">5a3be2d8fff8324d59aec3df7b0a0c83</md5file>
-<md5file name="ui-icons_cd0a0a_256x240.png">3e450c2a2c66328d9498e7001ad7197c</md5file>
-<md5file name="ui-icons_6da8d5_256x240.png">0dea943064353cbced50464e82de12ae</md5file>
-<md5file name="ui-icons_d8e7f3_256x240.png">afc0b83bada23f6dbec51c8e28029efd</md5file>
-<md5file name="ui-icons_f9bd01_256x240.png">50200576c149315cf45b3293e427a671</md5file>
+<dir name="/includes/jquery/css/ui-lightness/images" >
+<md5file name="ui-bg_diagonals-thick_20_666666_40x40.png">ad50c108697ff83dd558748e1c9ea7f8</md5file>
+<md5file name="ui-icons_ef8c08_256x240.png">772a64d6df4b93d230e9b38e1ab7522a</md5file>
+<md5file name="ui-icons_228ef1_256x240.png">2f257489d9600ddf56d195a179ebc9df</md5file>
+<md5file name="ui-bg_highlight-soft_100_eeeeee_1x100.png">03bee68eecdc1d143e569e8517af3749</md5file>
+<md5file name="ui-bg_glass_100_f6f6f6_1x400.png">54064d41a49fe243986fecfc9ec046e7</md5file>
+<md5file name="ui-bg_diagonals-thick_18_b81900_40x40.png">592779e1e4a8aa19fe709b34050d3142</md5file>
+<md5file name="ui-bg_highlight-soft_75_ffe45c_1x100.png">9a8f7e2a56ba13b2501705f95a24eb84</md5file>
+<md5file name="ui-bg_flat_10_000000_40x100.png">70838ab03f80181fa093b46a5fbadffd</md5file>
+<md5file name="ui-icons_ffd27a_256x240.png">6686d21b904e18b100210169bb1c04ad</md5file>
+<md5file name="ui-bg_glass_100_fdf5ce_1x400.png">332ec194bd7357cb91329af979e396ae</md5file>
+<md5file name="ui-icons_222222_256x240.png">4c27b34156b7a3776f31cc456ca01c10</md5file>
+<md5file name="ui-bg_glass_65_ffffff_1x400.png">f480b208e508b20d5b652898d489dc43</md5file>
+<md5file name="ui-bg_gloss-wave_35_f6a828_500x100.png">e8ffc200d8522cb3f314ef7313a18f5a</md5file>
+<md5file name="ui-icons_ffffff_256x240.png">a19fe1b2d726e920c12e43a65df9039a</md5file>
 </dir>
 <dir name="/includes/jquery/css/redmond" >
-<md5file name="jquery-ui-latest.custom.css">65e2f06da6de8b5a9bdc7a9fc8b01458</md5file>
-<md5file name="jquery-ui-latest.custom.min.css">e9df9178a05deb95474788697500028c</md5file>
+<md5file name="jquery-ui.css">5de561c1c27bb1453107348b9e92d977</md5file>
+<md5file name="theme.css">8494a94ad7948c50a669e62c8c08733e</md5file>
+<md5file name="jquery-ui.min.css">d6a56d252b964da228bb404668dee5ac</md5file>
+</dir>
+<dir name="/includes/jquery/css/redmond/images" >
+<md5file name="ui-bg_glass_85_dfeffc_1x400.png">112568d2753ad95785e341d36cefcb70</md5file>
+<md5file name="ui-bg_inset-hard_100_f5f8f9_1x100.png">fbd7d8dabfa60c6d61bcb823abf5222a</md5file>
+<md5file name="ui-icons_469bdd_256x240.png">080b00f6697b0f7833ba8120cad52c6a</md5file>
+<md5file name="ui-bg_flat_0_aaaaaa_40x100.png">b6a05b4421a9c33a4f192aa76572d41a</md5file>
+<md5file name="ui-bg_inset-hard_100_fcfdfd_1x100.png">f69a174582a503bef24e2abf6612bd7f</md5file>
+<md5file name="ui-icons_2e83ff_256x240.png">14d55152e99f22245c9e1e8bb784a7f6</md5file>
+<md5file name="ui-icons_217bc0_256x240.png">32e2393f2396da0a6c6ee53d47082645</md5file>
+<md5file name="ui-bg_glass_75_d0e5f5_1x400.png">f826d3df9d67db8817530da59f9771b5</md5file>
+<md5file name="ui-bg_flat_55_fbec88_40x100.png">ebe8f4b28bfcbb4c60ce10a22eeb2c6d</md5file>
+<md5file name="ui-bg_gloss-wave_55_5c9ccc_500x100.png">ced970610f0690c509e5bf6ffb43c9e8</md5file>
+<md5file name="ui-bg_glass_95_fef1ec_1x400.png">c41fe8e9026b84ca2ab9b8878f7656be</md5file>
+<md5file name="ui-icons_cd0a0a_256x240.png">b00a65a4b157ec627ee9ff4d0c8f1176</md5file>
+<md5file name="ui-icons_6da8d5_256x240.png">a7214cd935445d287135563231dff356</md5file>
+<md5file name="ui-icons_d8e7f3_256x240.png">f6757d92918ca3958efce37d8ee7eb1d</md5file>
+<md5file name="ui-icons_f9bd01_256x240.png">1c022347540410dd9bcf1f37dbf11f6e</md5file>
 </dir>
 <dir name="/includes/jquery/plugins/jqueryFileTree" >
 <md5file name="jqueryFileTree.css">4effee5b896fb71cb6d9106340118b7c</md5file>
@@ -5187,7 +5189,7 @@
 <md5file name="jquery.jnotify.css">8bc18a7b64cde9d8fd204e30a8ad7172</md5file>
 </dir>
 <dir name="/includes/jquery/plugins/blockUI" >
-<md5file name="jquery.blockUI.js">c3616907aa8a1b91b1ffcc2cebf3705e</md5file>
+<md5file name="jquery.blockUI.js">5c98c0cbfacee6dab0783112cb0e233d</md5file>
 </dir>
 <dir name="/includes/jquery/plugins/jcrop/css" >
 <md5file name="jquery.Jcrop.css">3888e9f93e218814c97a146069d104f1</md5file>
@@ -5232,40 +5234,40 @@
 <md5file name="jquery.treeview.js">db5cf23edb637b47a757468a06e6a717</md5file>
 </dir>
 <dir name="/includes/jquery/plugins/flot" >
-<md5file name="jquery.flot.navigate.min.js">d678f496270f4b144ca5f60807a09cfb</md5file>
+<md5file name="jquery.flot.navigate.min.js">deba38d5ced26f81b023389233eafcef</md5file>
 <md5file name="excanvas.min.js">ee9e3fee14270b7b27fcaa0e2cf2e042</md5file>
-<md5file name="jquery.flot.canvas.min.js">8c62e0877101b378a2fcb4e818cacf35</md5file>
+<md5file name="jquery.flot.canvas.min.js">2117410817385079bb44523d472c4395</md5file>
 <md5file name="excanvas.js">e5b3968f64661f1893cf740191e959c5</md5file>
-<md5file name="jquery.colorhelpers.min.js">5081f3ba73ec28380b8e0e2ac7e94d1a</md5file>
-<md5file name="jquery.flot.navigate.js">3af2127003919c5777dd0a36074817a2</md5file>
-<md5file name="jquery.flot.time.js">5744f9f3abeda8979635f87a1c892949</md5file>
-<md5file name="jquery.flot.crosshair.js">bd7bb74aae07122ee6288f5f5ece6134</md5file>
-<md5file name="jquery.flot.errorbars.js">d70d9eb28f1fe2f749adf494a50faa66</md5file>
-<md5file name="jquery.flot.threshold.min.js">5b9dd9d9eef220379a2de503d1ca6418</md5file>
-<md5file name="jquery.flot.resize.min.js">59e5c87e9d8a26adc90e35532fd36d58</md5file>
-<md5file name="jquery.flot.categories.js">c52fb7a817e7519fa2779d73040b1243</md5file>
-<md5file name="jquery.flot.symbol.min.js">0f9612a2b219856f8fb9fb980703983e</md5file>
-<md5file name="jquery.flot.symbol.js">4c5647ac00f62f00d9584c17ab7c3504</md5file>
-<md5file name="jquery.flot.categories.min.js">8aa24366a73e0e02cf427f7631005447</md5file>
-<md5file name="jquery.colorhelpers.js">c4cfe1c0db251f00e4a074d1c3556d27</md5file>
-<md5file name="jquery.flot.selection.js">21c94faa16f9fdc7bbccd9486d21428c</md5file>
-<md5file name="jquery.flot.fillbetween.js">1331764178f082e53bd0938583ba9c9d</md5file>
-<md5file name="jquery.flot.canvas.js">0f2da7e8eb75ec9c688677631f81c8fb</md5file>
-<md5file name="jquery.flot.js">35da51dbfed52e2f12ba3a0a832cd1dc</md5file>
-<md5file name="jquery.flot.image.min.js">a4407ed736d6d821d839ee517b3afc21</md5file>
-<md5file name="jquery.flot.stack.js">aec4b7a509e24fc101d78bcee93aa3b3</md5file>
-<md5file name="jquery.flot.time.min.js">20b789a8c2053e44309d5b83f9d2ff1d</md5file>
-<md5file name="jquery.flot.stack.min.js">19c611ee5a7f93785a4507cd723e03eb</md5file>
-<md5file name="jquery.flot.errorbars.min.js">581242fd17550f2bbb546b12f1829c55</md5file>
-<md5file name="jquery.flot.selection.min.js">0ffba049a349094a1c160bc0beca3649</md5file>
-<md5file name="jquery.flot.crosshair.min.js">63098ee9b67be59c25279b7ad5613637</md5file>
-<md5file name="jquery.flot.pie.min.js">0b0ef7ff9ff85dfd27cab71f4731cc3b</md5file>
-<md5file name="jquery.flot.image.js">b2c067e9a9585e997bd726dcf567c009</md5file>
-<md5file name="jquery.flot.pie.js">f1092e3ac0dc38e9008a43981ff31799</md5file>
-<md5file name="jquery.flot.min.js">af877a7946403c96546bf83e9b9916d1</md5file>
-<md5file name="jquery.flot.resize.js">db13d00b66e6af44559f19aadb24d4e5</md5file>
-<md5file name="jquery.flot.fillbetween.min.js">a73c5af628597d1fc68576de7ff5b58d</md5file>
-<md5file name="jquery.flot.threshold.js">0c66c85cfffbbf9b5bdf3ddb943626b4</md5file>
+<md5file name="jquery.colorhelpers.min.js">d1c7eeeaaa602164df3f1cb5aaca5a26</md5file>
+<md5file name="jquery.flot.navigate.js">0fd6d20c90a468fd43d5573542cfab4b</md5file>
+<md5file name="jquery.flot.time.js">6a49d955cbc76f5c2fecce8a185f6291</md5file>
+<md5file name="jquery.flot.crosshair.js">78077b855f710839538571453a245a33</md5file>
+<md5file name="jquery.flot.errorbars.js">73fcfdc8eb3b79de42e4e9a009749127</md5file>
+<md5file name="jquery.flot.threshold.min.js">6c59b644fd0c0bfefdbf8ae1feb79285</md5file>
+<md5file name="jquery.flot.resize.min.js">31e21fd1856200b80b1ed9f64f78dee0</md5file>
+<md5file name="jquery.flot.categories.js">b404141c778bcfa27d02f943352fbc4e</md5file>
+<md5file name="jquery.flot.symbol.min.js">f24ebe4ddc2b92c2f563ccad40dc56c7</md5file>
+<md5file name="jquery.flot.symbol.js">ca6ad22013ca6285353f1cf0ed07b90e</md5file>
+<md5file name="jquery.flot.categories.min.js">ca6ccf0c7988a62a59b95b5d54cceb3e</md5file>
+<md5file name="jquery.colorhelpers.js">88e3b66abe16e03c573a0c969dde3f3c</md5file>
+<md5file name="jquery.flot.selection.js">6e4a2701adaf2ace52c100aba5c3eace</md5file>
+<md5file name="jquery.flot.fillbetween.js">84e8ec6c5278063e64ee6e574190303a</md5file>
+<md5file name="jquery.flot.canvas.js">a8710d08b758015617c9518fcad90a69</md5file>
+<md5file name="jquery.flot.js">89bc8ea971e99653717fa69a73d70bb4</md5file>
+<md5file name="jquery.flot.image.min.js">b990f2654a3c25307b53ee8e6cab972e</md5file>
+<md5file name="jquery.flot.stack.js">76945205e6094cc16871aef9b27606d7</md5file>
+<md5file name="jquery.flot.time.min.js">0881020d81c98c180dbc32bcfda83f0a</md5file>
+<md5file name="jquery.flot.stack.min.js">36efc25bd21112ead30b411a7ebe3054</md5file>
+<md5file name="jquery.flot.errorbars.min.js">dd1716d6ebeb7fabd861df3567a39a71</md5file>
+<md5file name="jquery.flot.selection.min.js">95a3d65bcf192081de779cf234e00d3f</md5file>
+<md5file name="jquery.flot.crosshair.min.js">3dd08a3b6a41baa85b81f6d775c396c1</md5file>
+<md5file name="jquery.flot.pie.min.js">4c5dd184344ef5b4b80d3cb5208d0fdc</md5file>
+<md5file name="jquery.flot.image.js">2947d3bde8e2384bd85e3faf6f44c433</md5file>
+<md5file name="jquery.flot.pie.js">62dbbef98865feaa20a7f936c56ab931</md5file>
+<md5file name="jquery.flot.min.js">9927ea93540a2a08b3c5125ff2126102</md5file>
+<md5file name="jquery.flot.resize.js">826b0d2739932ac103bf420dbadd048e</md5file>
+<md5file name="jquery.flot.fillbetween.min.js">298b75e124b11f0a23b859dc0587f65e</md5file>
+<md5file name="jquery.flot.threshold.js">acee3dea7eab3e1637f64ee5fa5adb98</md5file>
 </dir>
 <dir name="/includes/jquery/plugins/datatables/css" >
 <md5file name="jquery.dataTables.css">39907ce9f1887b1a027cb9661dacfa21</md5file>
@@ -5340,10 +5342,10 @@
 <md5file name="jquery.dataTables.min.js">f1e6c13d39826544090e00e128207edb</md5file>
 </dir>
 <dir name="/includes/jquery/js" >
-<md5file name="jquery-latest.min.js">0b6ecf17e30037994d3ffee51b525914</md5file>
-<md5file name="jquery-ui-latest.custom.min.js">38886cd44c85297638cb669771be9efe</md5file>
-<md5file name="jquery-ui-latest.custom.js">8a4740b64e36fae06dd6317922c94629</md5file>
-<md5file name="jquery-latest.js">3a316818411b5a80ef878dc5c8483950</md5file>
+<md5file name="jquery-ui.js">04a4db2983450a2970c459ba87b4210a</md5file>
+<md5file name="jquery.min.js">895323ed2f7258af4fae2c738c8aea49</md5file>
+<md5file name="jquery-ui.min.js">d935d506ae9c8dd9e0f96706fbb91f65</md5file>
+<md5file name="jquery.js">7f38dcbfb11aff050652ff3b754adb63</md5file>
 </dir>
 <dir name="/includes/tcpdf" >
 <md5file name="composer.json">3c06688411baa451d053f64eeccb1834</md5file>
@@ -5771,7 +5773,7 @@
 <dir name="/includes/odtphp" >
 <md5file name="Segment.php">898baf66f1dd853750e80807b751781d</md5file>
 <md5file name="SegmentIterator.php">aa549e38162bbebca92c3568439e6cca</md5file>
-<md5file name="odf.php">241a18da4b5253d1a2d32322a76de9b8</md5file>
+<md5file name="odf.php">9445a3c5996ff19deeb342cb676fe76e</md5file>
 </dir>
 <dir name="/includes/evalmath" >
 <md5file name="evalmath.class.php">cf0c603a372ec04408f4f0390e508ada</md5file>
@@ -5965,7 +5967,7 @@
 </dir>
 <dir name="/public/test" >
 <md5file name="test_forms.php">1245667ac7ce0e2b7d37c061a34a9b56</md5file>
-<md5file name="test_arrays.php">da862b021205d193544a119fbf0aaed8</md5file>
+<md5file name="test_arrays.php">e84f0e554a7e872f590d1b49ca8c7865</md5file>
 </dir>
 <dir name="/public/emailing" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -5976,26 +5978,26 @@
 <md5file name="offline.php">fc8213a4a5a98ee458ddacc6bdd363c4</md5file>
 </dir>
 <dir name="/public/paypal" >
-<md5file name="paymentok.php">edc900f68ee6af819ace6dc30b968d80</md5file>
-<md5file name="newpayment.php">324a9cb32843ece469725ce732255e2d</md5file>
+<md5file name="paymentok.php">18b0f07e18283aab5700efe826921489</md5file>
+<md5file name="newpayment.php">113c537c0a66f07a58e9ba754a7ee2a7</md5file>
 <md5file name="index.php">6d6695e08c63ce635ca3e2f6a1d6f402</md5file>
-<md5file name="paymentko.php">e5d6f1a85bcb2c54d64d10ff8c9a2e10</md5file>
+<md5file name="paymentko.php">1272ec0d12432850c50005d9c1bb9d92</md5file>
 </dir>
 <dir name="/public" >
 <md5file name="error-404.php">69caa949b7e0f3137c6ce7482f38e0f8</md5file>
 </dir>
 <dir name="/public/agenda" >
-<md5file name="agendaexport.php">a040ae2fc7273f1761c0b6294465db86</md5file>
+<md5file name="agendaexport.php">60e55d40812bbd154f08dce43e689ae4</md5file>
 <md5file name="index.php">a0fa0788291ee95ccb306b8aded3fce3</md5file>
 </dir>
 <dir name="/public" >
 <md5file name="index.php">c857cbd23a138dfdef6dbcbb475ccca2</md5file>
 </dir>
 <dir name="/public/paybox" >
-<md5file name="paymentok.php">830365de65420fac0ff53836c6ba35a7</md5file>
-<md5file name="newpayment.php">9c005c87af89e53f7a0200a9801f4ecb</md5file>
+<md5file name="paymentok.php">8dec2eebeb8dc5a3a1cf95232b003cad</md5file>
+<md5file name="newpayment.php">c9851093aa835ac2ab1bdd30e6c9befb</md5file>
 <md5file name="index.php">7724aa95e287dd12bfcd6a4a9c0e0e72</md5file>
-<md5file name="paymentko.php">ba5074adaa5d00355e3b689f8f5647cc</md5file>
+<md5file name="paymentko.php">c2e932610f10f683fb0111a7b7722565</md5file>
 </dir>
 <dir name="/public/api" >
 <md5file name="index.php">cc6872bf5f498a24ad9b06fb66e5a642</md5file>
@@ -6034,9 +6036,9 @@
 </dir>
 <dir name="/public/members" >
 <md5file name="index.php">ac2861b424e2b7e30a532f37b33d6889</md5file>
-<md5file name="public_list.php">e9594048069038636a1d18e97ae7ea1a</md5file>
-<md5file name="public_card.php">0e13d9d18f310343be541366fb75b5d9</md5file>
-<md5file name="new.php">1303ab57428f751cdaa33c2a78be1c0f</md5file>
+<md5file name="public_list.php">4b9acab98ecbda7e226a1f6848ddfc41</md5file>
+<md5file name="public_card.php">913604462a67f54fd2b2e439373687f1</md5file>
+<md5file name="new.php">b9f9aa3edd84818810e333354981c3ad</md5file>
 </dir>
 <dir name="/public/theme/common" >
 <md5file name="user_anonymous.png">d727abe4a721179026bbf1092cec946c</md5file>
@@ -6050,10 +6052,10 @@
 </dir>
 <dir name="/public/cron" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cron_run_jobs.php">8ea20800d43bbdfdb20363355521c20c</md5file>
+<md5file name="cron_run_jobs.php">ed31672779c081565dc562a6fd1fb347</md5file>
 </dir>
 <dir name="/public/donations" >
-<md5file name="donateurs_code.php">b91c2fd4c009222433c796dc160958b1</md5file>
+<md5file name="donateurs_code.php">8a505d7ed420ab3a93ed504fb1db0a7b</md5file>
 <md5file name="index.php">823e0c612e7de62db2d41adf37214bea</md5file>
 </dir>
 <dir name="/public" >
@@ -6068,7 +6070,7 @@
 </dir>
 <dir name="/cashdesk/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="facturation1.tpl.php">2990d0dd53aa50a5e9e74a7125ad0360</md5file>
+<md5file name="facturation1.tpl.php">a8daea57ce57ec26d9e69bae09a4de68</md5file>
 <md5file name="validation2.tpl.php">745adf0a86c9402ae8d08ad2f198d366</md5file>
 <md5file name="liste_articles.tpl.php">ea919d13e77370c2542e7c20defe5a46</md5file>
 <md5file name="ticket.tpl.php">1b331e41775794399092b13709a36a3b</md5file>
@@ -6130,7 +6132,7 @@
 <dir name="/barcode" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="printsheet.php">6457b5ab56dbe9577737d8a1792ef3d9</md5file>
-<md5file name="codeinit.php">8672a75caaae3429f5b06ae7a9940ec9</md5file>
+<md5file name="codeinit.php">ccbbf4d5e94f37abf3ba9e9b31b2ac8b</md5file>
 </dir>
 <dir name="/comm" >
 <md5file name="remise.php">62ba1c7207971f4f83d00d194263e7ae</md5file>
@@ -6141,7 +6143,7 @@
 <dir name="/comm/action" >
 <md5file name="peruser.php">a7c697338876e29ed840849c30c9f0ba</md5file>
 <md5file name="document.php">858d2732221359ba9e0a9965353848c3</md5file>
-<md5file name="card.php">3213dde81f752bf22cd8280aa0403f7f</md5file>
+<md5file name="card.php">50c5c8fa045f19035b9de94c9545ac75</md5file>
 <md5file name="listactions.php">74b0f949aaa721cf34189aa6ea1b5e14</md5file>
 </dir>
 <dir name="/comm/action/class" >
@@ -6151,7 +6153,7 @@
 <md5file name="ical.class.php">563dbdf25cbfd4e4b50649530f7e1151</md5file>
 </dir>
 <dir name="/comm/action" >
-<md5file name="index.php">5959a3383528a9f6778f9c7ccab9b138</md5file>
+<md5file name="index.php">93d9ec745fe4385ab0bc8054c0378666</md5file>
 <md5file name="info.php">0a81d81144952f49baecb31cfc610fee</md5file>
 </dir>
 <dir name="/comm/admin" >
@@ -6162,30 +6164,30 @@
 <md5file name="propal_extrafields.php">49bd0e15735812688cd294348054a60e</md5file>
 </dir>
 <dir name="/comm/mailing" >
-<md5file name="card.php">07db931260390390a5a8bd003c85abd2</md5file>
+<md5file name="card.php">d7f205e587e6a41f82ef5e0961a27225</md5file>
 </dir>
 <dir name="/comm/mailing/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="mailing.class.php">a17ce976bfc75278c92275913622ca36</md5file>
 </dir>
 <dir name="/comm/mailing" >
-<md5file name="cibles.php">e122c4a3c7fd8e1814f52d447e2d1a87</md5file>
+<md5file name="cibles.php">d4bf21d9624e8fef1f9d20465d2e5503</md5file>
 <md5file name="index.php">62fc08bff6c9c08fc68bd5ddab35e443</md5file>
 <md5file name="info.php">24ec97e48bfe034f3ee795ae9ceb282f</md5file>
 <md5file name="list.php">0ea32bda75dc7855fd061f23d129c35c</md5file>
 </dir>
 <dir name="/comm" >
-<md5file name="card.php">f2a1293e79f791587df603d9e95d15dc</md5file>
-<md5file name="propal.php">ff8ccafb742284b82c8144c4722f80f4</md5file>
+<md5file name="card.php">b29ca1c2036e356de00415d9f1b59fc8</md5file>
+<md5file name="propal.php">6ebc9da3c9ccadb8757966539467af5d</md5file>
 <md5file name="address.php">25b3ce6e2f12f227c4a1ac8db9fab357</md5file>
 </dir>
 <dir name="/comm/prospect" >
 <md5file name="recap-prospect.php">af321d136a1e674037ba2c163db3d2b2</md5file>
 <md5file name="index.php">52d341018e13d223ebe22401649d6efc</md5file>
-<md5file name="list.php">be28322957fba26e965603b678ef50a0</md5file>
+<md5file name="list.php">17e5ab2c7725575b8cbd6c4fbca22fea</md5file>
 </dir>
 <dir name="/comm" >
-<md5file name="contact.php">c82d5d5abb089b8ef750558b75e23f81</md5file>
+<md5file name="contact.php">637c350b86faf4b9066532d41dc87fdb</md5file>
 <md5file name="recap-client.php">ffb22ad3767850ed93e7a462fc8616e6</md5file>
 <md5file name="index.php">be649c02d533439a6d320c9bb229bdee</md5file>
 <md5file name="multiprix.php">23a9fe711137f3cb4f06dd011d38c23b</md5file>
@@ -6196,7 +6198,7 @@
 </dir>
 <dir name="/comm/askpricesupplier" >
 <md5file name="document.php">9b2c6de73503cceb102e875a364f6626</md5file>
-<md5file name="card.php">4bfa5bac17cbb39be828e7c1b0b23608</md5file>
+<md5file name="card.php">c1c2a08cd15a461d364c203881f1165c</md5file>
 <md5file name="note.php">65e54e9e6458c353a92eeaafdb0d0022</md5file>
 </dir>
 <dir name="/comm/askpricesupplier/class" >
@@ -6204,16 +6206,16 @@
 <md5file name="askpricesupplier.class.php">a1ca8ff6fcc1b96eaea5866310797374</md5file>
 </dir>
 <dir name="/comm/askpricesupplier" >
-<md5file name="index.php">8a6845f5a3f6180df651c1be45e24878</md5file>
+<md5file name="index.php">f75345935391cd5b303b9b059401d9e8</md5file>
 <md5file name="info.php">bebba22e7a5fdb20a52dfcf1b64772a1</md5file>
-<md5file name="list.php">477b247136b3b54b251d5257ed61ee19</md5file>
+<md5file name="list.php">76b0dbbea2bf64439e204970f68bc73b</md5file>
 </dir>
 <dir name="/comm/propal/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="linkedobjectblock.tpl.php">0ac7cc84f48f255d71c0be34442038c1</md5file>
 </dir>
 <dir name="/comm/propal/stats" >
-<md5file name="index.php">c0d648628888711eefc88b69a86f3dd1</md5file>
+<md5file name="index.php">d9e716d421005a9192d620ea95cf6001</md5file>
 </dir>
 <dir name="/comm/propal" >
 <md5file name="document.php">60beb0705c4819ef3ff88e49f02e2628</md5file>
@@ -6221,18 +6223,18 @@
 </dir>
 <dir name="/comm/propal/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="propalestats.class.php">04a37d56af20d503aae45187b81ebaa2</md5file>
+<md5file name="propalestats.class.php">e901d2a8027ea0d4a2fd0a2f0c4254c4</md5file>
 <md5file name="propal.class.php">02a2d23da6ed45194bc7466e84cdbb62</md5file>
 </dir>
 <dir name="/comm/propal" >
 <md5file name="contact.php">abefa8f7d035ae87eb5b45b0c43843be</md5file>
 <md5file name="index.php">20499163339a4537c804d926c9619714</md5file>
 <md5file name="info.php">1228532a69cfc2e4ce917fbedb9321aa</md5file>
-<md5file name="list.php">edb7e22311622170ba4945cc5b5eb8e8</md5file>
+<md5file name="list.php">4032fa0aca1db6fc5e020d25ed7fab41</md5file>
 <md5file name="apercu.php">e3670650548097d9a7aaeb346f3bd5ef</md5file>
 </dir>
 <dir name="/comm" >
-<md5file name="list.php">165afcdf30e26104d2e1bf83fd17b0f9</md5file>
+<md5file name="list.php">d0bf76a584562ca01bcc46670b39af32</md5file>
 <md5file name="remx.php">a7a90ee73e8f7f25267dc0ed66b3d8aa</md5file>
 </dir>
 <dir name="/categories" >
@@ -6253,7 +6255,7 @@
 <md5file name="categorie.class.php">59cf2bf9b98a11168ae573b7940d9eee</md5file>
 </dir>
 <dir name="/categories" >
-<md5file name="index.php">2f066ad853327cc1ac192c34861f838d</md5file>
+<md5file name="index.php">5defe63162e700a0f88ed31b5f4feb23</md5file>
 <md5file name="categorie.php">7513073720e3165c5b9b2a8080eecd18</md5file>
 <md5file name="viewcat.php">b3fd9f9544438ef81401c880177d40fd</md5file>
 <md5file name="photos.php">5c0c423540accb30a32265a7e909078f</md5file>
@@ -6261,14 +6263,13 @@
 <dir name="/contact" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="document.php">d9ff39f1a2c4f71d77142d3e022ed51b</md5file>
-<md5file name="card.php">dd323f4403f6e814d76154b7c1b0362d</md5file>
+<md5file name="card.php">b86ac4038afa94cfcd3786ceb523c5a9</md5file>
 <md5file name="note.php">502547de717912a19aca06ddd223995c</md5file>
 <md5file name="ldap.php">4c457d8c88e79b1bab6c830a9162e718</md5file>
-<md5file name="exportimport.php">2395be35cede1fb715ef9a4e497300a0</md5file>
 <md5file name="vcard.php">1877fb02fc4332fdc3e3699df586c157</md5file>
 </dir>
 <dir name="/contact/class" >
-<md5file name="contact.class.php">0b1dc2f4f490fbed06618cf794673bee</md5file>
+<md5file name="contact.class.php">831f135bc3173f843fd28121d4e5efd2</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 </dir>
 <dir name="/contact/canvas" >
@@ -6290,9 +6291,9 @@
 <md5file name="actions_contactcard_common.class.php">66ad801403f54ab0067a1c525ed542e6</md5file>
 </dir>
 <dir name="/contact" >
-<md5file name="perso.php">1798b090be4b9a93555b0ef05d9391c1</md5file>
+<md5file name="perso.php">94819f93fcff199704b6195a50c12d94</md5file>
 <md5file name="info.php">f88b0bd9aa40d1267c48c44d44ed2288</md5file>
-<md5file name="list.php">baad652f1202920b23cd5106fbdad593</md5file>
+<md5file name="list.php">85fb324a99f3c6654c9ee36b3cc736de</md5file>
 </dir>
 <dir name="/product/composition" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6328,9 +6329,9 @@
 <md5file name="editor.php">20c72a55796b1e64cff84f004b04e76b</md5file>
 </dir>
 <dir name="/product" >
-<md5file name="price.php">efde09d6de65671adb4a21e228c0818e</md5file>
-<md5file name="document.php">4d303f94b9e72ff1647371555ddbd4a6</md5file>
-<md5file name="card.php">27e3b4d38701cef60454bea158289821</md5file>
+<md5file name="price.php">46c9b95058f0691afc133290b29f5d07</md5file>
+<md5file name="document.php">f15bf7e5916adfd39a30d1d984c28b75</md5file>
+<md5file name="card.php">7e75336b6e957d14ca88b3d0708c7db6</md5file>
 </dir>
 <dir name="/product/ajax" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6344,9 +6345,9 @@
 <md5file name="service.class.php">3e8b72640f3dd0117bde24b366b7a8f5</md5file>
 <md5file name="propalmergepdfproduct.class.php">56ab66872574c4005a138883a610053c</md5file>
 <md5file name="html.formproduct.class.php">5c07caec4119e65b0f413c36382fc1fd</md5file>
-<md5file name="productcustomerprice.class.php">6f6227ce98c203851dcddd1f027a86d5</md5file>
+<md5file name="productcustomerprice.class.php">45b121da7ae1043feb0990220f7af311</md5file>
 <md5file name="productbatch.class.php">c33149ba892e6b8cf73f789c84b1a427</md5file>
-<md5file name="product.class.php">a92f3a4b6c20883d8495c64986d32bbe</md5file>
+<md5file name="product.class.php">4060c3cce6569f93d3a288d6412f62e7</md5file>
 <md5file name="api_product.class.php">d8bb05e304774532c20b3bfd2640be79</md5file>
 </dir>
 <dir name="/product" >
@@ -6383,7 +6384,7 @@
 </dir>
 <dir name="/product" >
 <md5file name="index.php">071faf5f3f1609cfa78fc7c4e265946f</md5file>
-<md5file name="list.php">d549db11eb663a84b509c7b5d169c814</md5file>
+<md5file name="list.php">4e29bea0c5013afb255817dc9707a222</md5file>
 <md5file name="reassort.php">9f47f9849fee99035c0be2a00423cf28</md5file>
 </dir>
 <dir name="/product/stock/tpl" >
@@ -6391,10 +6392,10 @@
 <md5file name="stockcorrection.tpl.php">c300f5e0a2acf0e551181b99e73d86b5</md5file>
 </dir>
 <dir name="/product/stock" >
-<md5file name="product.php">0d6dec242d7bf698bf91defe4e784698</md5file>
+<md5file name="product.php">101a0b273f2b9a41680969e990d7f452</md5file>
 <md5file name="massstockmove.php">b12dc16907aa1499ea6b6dfcc484baa2</md5file>
-<md5file name="replenish.php">9d932117dea8c94074548c48d6cfb870</md5file>
-<md5file name="card.php">865b010c9c2f0a9dff0285b67d21ebb3</md5file>
+<md5file name="replenish.php">4d88ff2e0fa6834392b18f0410602ccd</md5file>
+<md5file name="card.php">8f99f0fd2ed217328dd4647819cba0bb</md5file>
 </dir>
 <dir name="/product/stock/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6402,7 +6403,7 @@
 <md5file name="mouvementstock.class.php">4a2f4e9a468213059b86e3a715c19de0</md5file>
 </dir>
 <dir name="/product/stock" >
-<md5file name="mouvement.php">e945fcae93427c570c00a52591d8ec96</md5file>
+<md5file name="mouvement.php">c3de4747a1eada082e15fbbcd69848c0</md5file>
 <md5file name="replenishorders.php">22a2ab52185732bcafd64fbd4a68eea8</md5file>
 <md5file name="index.php">7b425cd596259f2a3bd9a1ffb228d0de</md5file>
 <md5file name="fiche-valo.php">ebb2e597917e22900853dfa300de88da</md5file>
@@ -6413,7 +6414,7 @@
 </dir>
 <dir name="/product/stock" >
 <md5file name="info.php">32df7d91f327cfdcd67d831f6e7535eb</md5file>
-<md5file name="list.php">bb1c450495617f6e6f360301ea58a235</md5file>
+<md5file name="list.php">16dd6747941c95ce720f09ea8f732253</md5file>
 <md5file name="valo.php">9c15e013ef6cee78eeba5c41747d96a1</md5file>
 </dir>
 <dir name="/product/stock/img" >
@@ -6534,7 +6535,7 @@
 <dir name="/core" >
 <md5file name="actions_setnotes.inc.php">255c511cf57d5c863564fd3ec0bae654</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="search_page.php">957b9030b18c319e7c1529a4ffc72b85</md5file>
+<md5file name="search_page.php">7a257121b2c9d54226e1e51d67232505</md5file>
 <md5file name="antispamimage.php">6b6851714ab5e4f9491c2500a26c8ceb</md5file>
 <md5file name="actions_fetchobject.inc.php">85d3d8fc243475727700d322daf769c8</md5file>
 </dir>
@@ -6550,24 +6551,24 @@
 <md5file name="fileupload_main.tpl.php">5ef3117292cb272cb72190d67bda189d</md5file>
 </dir>
 <dir name="/core/tpl" >
-<md5file name="admin_extrafields_add.tpl.php">2f31ebd77501765d299f8a250105a023</md5file>
+<md5file name="admin_extrafields_add.tpl.php">12493ac31aa1376058c5f1bb4eea48e1</md5file>
 <md5file name="resource_add.tpl.php">5ec80ad81b6e65f39303b9fd47661e04</md5file>
 <md5file name="originproductline.tpl.php">f0b37bba830b2bf5fc563baf227c34eb</md5file>
 <md5file name="footer.tpl.php">080945adaf8304688ce778f8acc821fe</md5file>
-<md5file name="login.tpl.php">71f09d12471afa3a287ee4a7fce92872</md5file>
+<md5file name="login.tpl.php">32049cd54587de758b01e1393a0daff9</md5file>
 <md5file name="bloc_showhide.tpl.php">8cc4b11d20b0e01eb7e7b7401c2f12c8</md5file>
 <md5file name="notes.tpl.php">10740fb22bfc2ac1b339e9d784cb9c23</md5file>
 <md5file name="extrafields_view.tpl.php">ce17807396da33afe7a8723514357b3f</md5file>
-<md5file name="objectline_create.tpl.php">e06de727bebe18a590336e0a3a25f066</md5file>
+<md5file name="objectline_create.tpl.php">fcaee3f322b1028c3f1df99b955b6bc7</md5file>
 <md5file name="document_actions_post_headers.tpl.php">29e218c7e580c35cf99d19f5876b1709</md5file>
 <md5file name="admin_extrafields_view.tpl.php">bd68e17f01cde910409d40075ec640bf</md5file>
 <md5file name="contacts.tpl.php">abf21aa57d70ffb9f31b5d6071ab8fb1</md5file>
 <md5file name="header.tpl.php">b7c3b27785924f5b023754855bbe3177</md5file>
 <md5file name="objectline_view.tpl.php">2775e6e61e2ab0bdfd17b7ed63dea86e</md5file>
 <md5file name="document_actions_pre_headers.tpl.php">eae682af8697c57a41214d1199101b50</md5file>
-<md5file name="admin_extrafields_edit.tpl.php">78f5e90e52db77dfba800bb179847c64</md5file>
+<md5file name="admin_extrafields_edit.tpl.php">3c5adedd71ef8c08b8dfd0213767a814</md5file>
 <md5file name="resource_view.tpl.php">fa1602ccc625f1e35a7be5e0a2083020</md5file>
-<md5file name="objectline_edit.tpl.php">96e9843066210ff6b9498dd2bec10596</md5file>
+<md5file name="objectline_edit.tpl.php">b6deabc3f14689e29cd57dbb4fbba7de</md5file>
 </dir>
 <dir name="/core" >
 <md5file name="actions_lineupdown.inc.php">a4a1f69d36f0c22e9eb2767ea3f0adbd</md5file>
@@ -6580,7 +6581,7 @@
 <md5file name="empty.php">048dc07dc5cab8e296892a0a435244e0</md5file>
 <md5file name="eldy_menu.php">783b88cbef3e0dd4c05b607eae4aab9d</md5file>
 <md5file name="auguria_menu.php">85df266f4d854833292920582558e462</md5file>
-<md5file name="eldy.lib.php">f5027a9479a17e5359f5bccb0c48d652</md5file>
+<md5file name="eldy.lib.php">ac5bd8ec52faf0bea226af2002618c9a</md5file>
 <md5file name="auguria.lib.php">4ac7e2d2fba4ba0ccaed009acdf673c8</md5file>
 </dir>
 <dir name="/core/menus" >
@@ -6616,39 +6617,39 @@
 <md5file name="openid.class.php">f1937e8c9562055c849883a5e39a42a5</md5file>
 <md5file name="smtps.class.php">c80194edc5fa2e3362b1c75ea42a4912</md5file>
 <md5file name="html.formmargin.class.php">d29ea5774ef6055ff2a376efa8e1b629</md5file>
-<md5file name="cookie.class.php">41b0b33ae0455dc00ec6fd787c2ce9af</md5file>
+<md5file name="cookie.class.php">2c7d88183b1aeeaa3c4fcffeb081cb86</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="html.formbank.class.php">ea0ade3d5fb275e8a5975194122b7cd4</md5file>
-<md5file name="html.formorder.class.php">f1d4e5437f7dc169646020108c30e32a</md5file>
+<md5file name="html.formorder.class.php">62bad207f0d4f8630ef0d2a23a365574</md5file>
 <md5file name="link.class.php">d67feaff91ea41dbdb614dce38ba542f</md5file>
 <md5file name="workboardresponse.class.php">9d12d7b1dffb846c4c732a6017da3027</md5file>
 <md5file name="google.class.php">6a42f85c4852916c71548c179234aeef</md5file>
 <md5file name="canvas.class.php">0db78f95e23062feab46593d28704532</md5file>
 <md5file name="commonstickergenerator.class.php">d13a1b0fbbc6cafcecd93f460a494cbd</md5file>
 <md5file name="commonorder.class.php">084f9694188a61f84e337a78ed05441d</md5file>
-<md5file name="html.form.class.php">ca42492483e9ffd2d49663710887cf52</md5file>
+<md5file name="html.form.class.php">c79b603f5579990369f549285d1e5a35</md5file>
 <md5file name="html.formmailing.class.php">02c3c91fb006d3ae2e15455d1d559a91</md5file>
-<md5file name="html.formprojet.class.php">cd60142f258d2e234dc8506d26731eaa</md5file>
+<md5file name="html.formprojet.class.php">1dcba20f86eb537010c01ee8ccfe6451</md5file>
 <md5file name="html.formsocialcontrib.class.php">a5fa4f2f169cad1915a191fc151ad265</md5file>
 <md5file name="html.formactions.class.php">9d5b8b886cb8c023c20aa0e1026debb2</md5file>
-<md5file name="commonobject.class.php">62fa9c381bcab962c35dd26f1b13c90f</md5file>
-<md5file name="html.formpropal.class.php">c7322a1ee35ad995e3b538ca6a3f3f58</md5file>
-<md5file name="hookmanager.class.php">7e47accb329d20f1298f06776301dcae</md5file>
-<md5file name="html.formfile.class.php">50368592242edb46f412ea98d139e73c</md5file>
+<md5file name="commonobject.class.php">28ee550959be8f4d8beaca416382d5b7</md5file>
+<md5file name="html.formpropal.class.php">c663d2cee4ea71d024f2defd840527bc</md5file>
+<md5file name="hookmanager.class.php">3371bf1cd01eaa3b2f29f09b03d3ff72</md5file>
+<md5file name="html.formfile.class.php">bac5693de4fd1720c8cf21a7d3353298</md5file>
 <md5file name="dolprintipp.class.php">52a5f7f52fe45bc60d38ca4a96194125</md5file>
 <md5file name="discount.class.php">51947a30f8a81923a63f5a0b92d756a0</md5file>
 <md5file name="doleditor.class.php">05bf526e791c88cef09875a2199a1f00</md5file>
 <md5file name="infobox.class.php">94cf1cf189b0f0a0d50411c4502ff252</md5file>
-<md5file name="menu.class.php">2018122638c1032d5dc0c228e825faf5</md5file>
+<md5file name="menu.class.php">7ab52342b3b370b5b6f6298dc5d4c182</md5file>
 <md5file name="html.formintervention.class.php">4e6fa59e238b5d4855818e3197dc9931</md5file>
 <md5file name="dolexception.class.php">6cbfa567b0f4153bbc7f74adfe6bb4d2</md5file>
 <md5file name="extrafields.class.php">25dc23bc5f5d6987a515cc428040788e</md5file>
-<md5file name="translate.class.php">f05a924e95129ba6eac7846dcb1a3b4d</md5file>
+<md5file name="translate.class.php">46a492f2314937e191d768bc23138826</md5file>
 <md5file name="fileupload.class.php">ff02ed2bea96d88f500167a09413c7c0</md5file>
 <md5file name="html.formsms.class.php">59877377a38dd5dcee93798ea7923bee</md5file>
 <md5file name="commonobjectline.class.php">4b0797a4faaa9475bd19337f4825284e</md5file>
 <md5file name="ccountry.class.php">daff44759e4f9c193a667ed427ba5444</md5file>
-<md5file name="html.formmail.class.php">e7fd12bc38a59fc40dc42f9ceddc5cb9</md5file>
+<md5file name="html.formmail.class.php">8fa96bb0dfebc2381a144334fd94eace</md5file>
 <md5file name="html.formaskpricesupplier.class.php">8ba37911c24d75473a9a07fc3dd3c371</md5file>
 <md5file name="dolgeoip.class.php">f4d35924864fb87b787ab9a9925fb091</md5file>
 <md5file name="ldap.class.php">a68083f41b5382ebc083828d08928342</md5file>
@@ -6659,17 +6660,17 @@
 <md5file name="events.class.php">ef5e6dcc9065d652696cc5e9b4613f20</md5file>
 <md5file name="antivir.class.php">ed773b5b64093d6017aecdf1ca79fef5</md5file>
 <md5file name="commondocgenerator.class.php">d3c354ab0d023ccd5740d7fd45e34bea</md5file>
-<md5file name="dolgraph.class.php">5aa1784308a7dd6a6c041e3f7f22bd2d</md5file>
+<md5file name="dolgraph.class.php">5ab4686cbf0b0d798b37873a6c9bb3df</md5file>
 <md5file name="html.formcron.class.php">1889b6eeeef65ae427813873a606a06f</md5file>
-<md5file name="html.formother.class.php">b82ed827175c14830665afb5b90ebea6</md5file>
+<md5file name="html.formother.class.php">efe91cff88a79f70ec958a9b13c1bf33</md5file>
 <md5file name="conf.class.php">24473676a97d1671cb429d7340626815</md5file>
-<md5file name="rssparser.class.php">a239faf6b54526481abaffe15d1f594d</md5file>
-<md5file name="CMailFile.class.php">22ce4445ac8946f3224b2f045de2a8c1</md5file>
+<md5file name="rssparser.class.php">4b09fb6f2102d0dc31cccb6a021a275c</md5file>
+<md5file name="CMailFile.class.php">c906bb04ad054e8b5230155591c54c5e</md5file>
 <md5file name="fiscalyear.class.php">8437bf8c5e1e85f4344c0a96d52ee61d</md5file>
 <md5file name="commoninvoice.class.php">34a8dbdc41d76d2c95b702cc0c770f8b</md5file>
-<md5file name="stats.class.php">eacf3fbb02c754db03fa848310c384bc</md5file>
-<md5file name="menubase.class.php">9cd800459fee7c66968424ad7ad27668</md5file>
-<md5file name="html.formcompany.class.php">edfa46077595cb572ac1f729f26bc855</md5file>
+<md5file name="stats.class.php">8e828313fe38455d85a78b7f237e449d</md5file>
+<md5file name="menubase.class.php">445dc8957e4b73ac842bbfdc8cbbd243</md5file>
+<md5file name="html.formcompany.class.php">3db7079275b3e1ba0126ec337f998412</md5file>
 <md5file name="CSMSFile.class.php">3338b73e47bcad98695e11e3b32ebcfa</md5file>
 </dir>
 <dir name="/core/db" >
@@ -6677,33 +6678,33 @@
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="mysql.class.php">0c9593d63e7784fd68197afd2c2d984f</md5file>
 <md5file name="sqlite3.class.php">bf7a691239cd0c0677bdaf061d0ad837</md5file>
-<md5file name="DoliDB.class.php">a477835956dad6bbc70c990129153773</md5file>
+<md5file name="DoliDB.class.php">289840af2b48d265fb46e11ddf2628da</md5file>
 <md5file name="pgsql.class.php">a80675539176a1d8cdb5b5b566574522</md5file>
 <md5file name="mssql.class.php">d40f2bc5d4e74945aff1b8663bf33d0f</md5file>
 <md5file name="Database.interface.php">e6aecd57572a5165653ffc7a9b283178</md5file>
-<md5file name="mysqli.class.php">9b025978bc59f56c9d1759ee59768bb8</md5file>
+<md5file name="mysqli.class.php">cdc6614241d3e9f0dccb16ee1dcca221</md5file>
 </dir>
 <dir name="/core" >
 <md5file name="actions_sendmails.inc.php">0105de39da47e5826bf8604b8b1e5a13</md5file>
 <md5file name="tools.php">a1bd66b209ee6f52c176d5d0f1c62da1</md5file>
-<md5file name="photos_resize.php">f146eaff3b0dab48aa4054807a4a9130</md5file>
+<md5file name="photos_resize.php">14632aa89ec3fafa4b2d795dcbfa57c9</md5file>
 </dir>
 <dir name="/core/lib" >
 <md5file name="ws.lib.php">dc056bd161ceeab388b54c28790ad27f</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="product.lib.php">e403f819edbccb676580a4bab5dc9b85</md5file>
-<md5file name="security2.lib.php">123e12474f60c1bb22564b4fad2249e0</md5file>
+<md5file name="security2.lib.php">381ed6aa92f0185f6783608fbfa5dd8b</md5file>
 <md5file name="xcal.lib.php">327de623b6318783a31bf2402764855e</md5file>
-<md5file name="contact.lib.php">3577cf4a26b3d6d86ad1166fba4d1446</md5file>
-<md5file name="tax.lib.php">b394ff3daa1fab4885fffdb4d9db265e</md5file>
+<md5file name="contact.lib.php">07374752b32e65ac21f86c1801ada777</md5file>
+<md5file name="tax.lib.php">54792f8b7e3ece6de787379f6a1084f6</md5file>
 <md5file name="emailing.lib.php">84b8be2d20c1d6d6811f0298d2234ca8</md5file>
 <md5file name="security.lib.php">3ee0585d35eb07dd1fed04763d579075</md5file>
-<md5file name="member.lib.php">5c6a94675b1bce52ab5f30500c90803a</md5file>
+<md5file name="member.lib.php">97c7c02853a505affefb76c9556c383d</md5file>
 <md5file name="format_cards.lib.php">b45e62638dc04cdc8cac22d4c82a0c1e</md5file>
 <md5file name="geturl.lib.php">08c0e8d503166a6dc73d1cc4ba78333b</md5file>
 <md5file name="functionsnumtoword.lib.php">130ce96d80430c90a6998055db294685</md5file>
 <md5file name="salaries.lib.php">93d1ba6dd796c844428cf9149ee2e801</md5file>
-<md5file name="bank.lib.php">65bf50f2241abc6a2c6bc18d970b57bc</md5file>
+<md5file name="bank.lib.php">631b72d5f8ff6ea74b7864f522aa70c0</md5file>
 <md5file name="fourn.lib.php">4175f4b0b8b1bad303aa966c954ddc25</md5file>
 <md5file name="import.lib.php">6b58f5c0cad8d233b94b0874a41e4c7d</md5file>
 <md5file name="fiscalyear.lib.php">9596a02e5898fe117ac4d2f080a1b3bf</md5file>
@@ -6713,42 +6714,42 @@
 <md5file name="categories.lib.php">1258865536912e11c70ae0c343576d11</md5file>
 <md5file name="cron.lib.php">07e043e1c42a0fe90d2226eaacb013e2</md5file>
 <md5file name="accounting.lib.php">4cd01a2e1b1d02f7bfaff7792fb45da9</md5file>
-<md5file name="project.lib.php">8eb7d9088b4ecd56fa47bd6f61d503bc</md5file>
-<md5file name="ajax.lib.php">25da6e39993fd91f14f8d2ac6503e717</md5file>
+<md5file name="project.lib.php">4f6c260bcdde8b1bba888557bd564d1c</md5file>
+<md5file name="ajax.lib.php">78f6029aabbd9f1e2568187f7d2f98c9</md5file>
 <md5file name="order.lib.php">a969dd13ed2ab6f921564ecd22121515</md5file>
 <md5file name="json.lib.php">4f26289ba425f1491a2e47f4ba30d0a1</md5file>
-<md5file name="usergroups.lib.php">d9531e2f2fdfcf7a17e0ee59f52ffc5e</md5file>
+<md5file name="usergroups.lib.php">487b0c9b855ee29b3f079d5d885130cd</md5file>
 <md5file name="images.lib.php">fb6dfe418a92f6803616c17def007cd2</md5file>
 <md5file name="sendings.lib.php">48cf595e8d99291e756b6f0945c4a656</md5file>
 <md5file name="ldap.lib.php">60c540c4dfb653ef65e67a628645f590</md5file>
 <md5file name="agenda.lib.php">f1c69f4290457e688b877f0e868ce8a3</md5file>
-<md5file name="functions2.lib.php">1cacaac872cf0bb7748c7e60ebae3ef4</md5file>
+<md5file name="functions2.lib.php">cbb7d4d27f84262d9a9e5048c7637ec7</md5file>
 <md5file name="stock.lib.php">98ca2d412c720690b46b8bf566cf4fb5</md5file>
 <md5file name="propal.lib.php">a9d45ffd6281800146fcfb2e3ab90ab6</md5file>
 <md5file name="fichinter.lib.php">66b21a3ea2de0ae271e470c339c40d07</md5file>
-<md5file name="treeview.lib.php">f75496cec20915d96d0f761d5f2e8b69</md5file>
+<md5file name="treeview.lib.php">6af21caa27ea2f68aa6d35b89cf94499</md5file>
 <md5file name="payments.lib.php">b416db3eacff1ad448692d14aadff327</md5file>
 <md5file name="date.lib.php">2008e5acb7824c94383c45ec1b2f0688</md5file>
 <md5file name="files.lib.php">7004611a444be3c549032d41b57a92c4</md5file>
 <md5file name="doc.lib.php">0bbc469b628cbc940ebdd59f2e218b6c</md5file>
-<md5file name="report.lib.php">313aa6b5eb5c7943a3ef9c5a4c970d5b</md5file>
+<md5file name="report.lib.php">db17262d65ec5b72a8fdf3fc42693a6a</md5file>
 <md5file name="barcode.lib.php">116c4c10fccce8d73c9193e742834d3a</md5file>
-<md5file name="company.lib.php">9626585383174bd03eff8e545573ed37</md5file>
+<md5file name="company.lib.php">2cac6b935360f3523e285b91faed9ace</md5file>
 <md5file name="memory.lib.php">c044677f3506ffda693f586b94981e00</md5file>
-<md5file name="functions.lib.php">dabfb702c571513776fa0d1670c33b11</md5file>
-<md5file name="admin.lib.php">a56d984287ec89c15af7d7b9fce6125e</md5file>
+<md5file name="functions.lib.php">9f06fc9874d3eda9452ff86d34a0bb38</md5file>
+<md5file name="admin.lib.php">d028b498f4c914ba897cacf8718c19a7</md5file>
 <md5file name="askpricesupplier.lib.php">595325924223d40b0ea97c9df4ebfde4</md5file>
 <md5file name="invoice.lib.php">aa7ebaddf8d815b3dfd1b3281f26de84</md5file>
-<md5file name="holiday.lib.php">59519c8b2bd240bdfc50476ea344cf8a</md5file>
+<md5file name="holiday.lib.php">a4bc5e69c8ddf4379a84b9c36588d6ca</md5file>
 <md5file name="expensereport.lib.php">c96798f2266b05d2c7fe35ad2226ce8f</md5file>
 <md5file name="price.lib.php">7494683dbd566b69f5913fec5a97b99d</md5file>
 <md5file name="contract.lib.php">6caf87260cfa1e46a3a9145ee88b89be</md5file>
 <md5file name="invoice2.lib.php">7097ba988bc2e9100b8857863e276932</md5file>
 <md5file name="functions_ch.lib.php">3cfbb9ef9c493bf739d501114cbe798c</md5file>
-<md5file name="prelevement.lib.php">0d3a43a7afc190f34f52855f28a34e4f</md5file>
+<md5file name="prelevement.lib.php">4eaa5c0e7ce4116e821af9c6ce8c53ed</md5file>
 <md5file name="loan.lib.php">d372e4fa4638a20b28b5811fbad0c08c</md5file>
 <md5file name="ecm.lib.php">48f9b2c134655de1b0f5f7d50f01b765</md5file>
-<md5file name="pdf.lib.php">d0754b939060f51a6becf469b1881dd1</md5file>
+<md5file name="pdf.lib.php">42ec1f0025434e34ee97fbe1ff36a812</md5file>
 <md5file name="mailmanspip.lib.php">70c6fc7d08f3c562322c9f53273f1393</md5file>
 </dir>
 <dir name="/core" >
@@ -6770,11 +6771,11 @@
 <md5file name="box_members.php">f759f3e6ce0d743fb9a50cfb1d7bdb55</md5file>
 <md5file name="box_graph_invoices_supplier_permonth.php">4ec1d00a283dde86f3d2d2dfe861322b</md5file>
 <md5file name="box_graph_propales_permonth.php">27899639279dd869734a9adfcca90928</md5file>
-<md5file name="box_task.php">0bb3659e089d54ce36b617409b3e3d15</md5file>
+<md5file name="box_task.php">48a64b5a5db96016ac4215a0d9539359</md5file>
 <md5file name="box_contacts.php">af3530e454a7bfa42a0b84dd748c5b6c</md5file>
-<md5file name="box_graph_product_distribution.php">f4e96af615a9145a65c2422a4ec24cdc</md5file>
+<md5file name="box_graph_product_distribution.php">571c3314f679515eeb7e783e772a91d8</md5file>
 <md5file name="box_prospect.php">b9a9ed2ae622ec2927200802d7f69260</md5file>
-<md5file name="modules_boxes.php">59f6ba257eca6b5a93e882c9efc300ec</md5file>
+<md5file name="modules_boxes.php">8b161e9605cb5167551218d6052ce08b</md5file>
 <md5file name="box_graph_orders_supplier_permonth.php">4635f7e2ec630f95a9c40f8a70e4a5ad</md5file>
 <md5file name="box_factures_fourn.php">b569393287bd79b472ea2ffddae509d0</md5file>
 <md5file name="box_comptes.php">bad676eea7524bc274e069c4bad959ee</md5file>
@@ -6793,7 +6794,7 @@
 <md5file name="actions_printing.inc.php">8c78f30a301fd7c5092ed59d95f2f688</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modSociete.class.php">4eb9e3e2158097eb3b61e30a6aa1b0f5</md5file>
+<md5file name="modSociete.class.php">5bff1ab9fe9838de913f05dfa44be458</md5file>
 </dir>
 <dir name="/core/modules/member" >
 <md5file name="modules_cards.php">9f4114f75bc477d32d3eee0964ce9538</md5file>
@@ -6810,26 +6811,26 @@
 <md5file name="pdf_paiement.class.php">d5c21facbb1b56e3cad3749b7d0512be</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modDeplacement.class.php">7a9feac091b9f087e7322a83b0afdc21</md5file>
-<md5file name="modDynamicPrices.class.php">7a51402b704c540b3e4bdbeeaef698f2</md5file>
-<md5file name="modImport.class.php">aaf48588ea6e8869af087e971013d334</md5file>
+<md5file name="modDeplacement.class.php">4cbc1db0aee725f1bf4638c8e02003f2</md5file>
+<md5file name="modDynamicPrices.class.php">a8e40eab967d374369a9c2ebeff3f17c</md5file>
+<md5file name="modImport.class.php">03b977acb32cacc51e89dc4446c7a8a0</md5file>
 </dir>
 <dir name="/core/modules/action" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="rapport.pdf.php">93e6457929d7e0366360e7380aa8957a</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modCashDesk.class.php">10e2b90883ac49fc2e326e92b8a3499d</md5file>
-<md5file name="modLdap.class.php">637487fcf15c0eee4150965305c5ee67</md5file>
-<md5file name="modFacture.class.php">c3989ca27b238404582e5a68a89ce762</md5file>
-<md5file name="modSyncSupplierWebServices.class.php">839121c6c5a2fc023989e9838cbc3489</md5file>
+<md5file name="modCashDesk.class.php">69982f8171837cd8669bfe9c2f08dc8f</md5file>
+<md5file name="modLdap.class.php">ddf6dfeb77c98411b4d5434f20c24483</md5file>
+<md5file name="modFacture.class.php">cb220f99e4f42d3e9a9da1fb1c4777ed</md5file>
+<md5file name="modSyncSupplierWebServices.class.php">90a300e9bd857966226c68dca8660456</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modIncoterm.class.php">fe9a9dd7d2de23e09b7b795593045236</md5file>
-<md5file name="modFTP.class.php">67943a240a0a9b61348541e85802edf1</md5file>
-<md5file name="DolibarrModules.class.php">6b51ec7d01085ec827834be0b21c41fe</md5file>
-<md5file name="modCategorie.class.php">499efdb8a0fab2037333ec248fd1ebdb</md5file>
-<md5file name="modOpenSurvey.class.php">2b19c3592fbed5e4bd96730f87af438c</md5file>
-<md5file name="modAskPriceSupplier.class.php">0996bc0b593f8be92dd1b396aae350a0</md5file>
+<md5file name="modIncoterm.class.php">b4e9f07aa5268af49d3bb9429719b201</md5file>
+<md5file name="modFTP.class.php">8293bd60fe13ac64c22f8500b346821c</md5file>
+<md5file name="DolibarrModules.class.php">f950935f1ac4978b7b3e59401556025d</md5file>
+<md5file name="modCategorie.class.php">413af6ca18377689660d2b2eeed2be98</md5file>
+<md5file name="modOpenSurvey.class.php">d2df1ec90f2bebb3ebfb74eba81bcec7</md5file>
+<md5file name="modAskPriceSupplier.class.php">c3b801c60645dff594d33cf0acc43fa5</md5file>
 </dir>
 <dir name="/core/modules/printing" >
 <md5file name="printipp.modules.php">de943e7a2b8a603c3ebc34507309a46d</md5file>
@@ -6838,11 +6839,11 @@
 <md5file name="modules_printing.php">eac58079934a9b7df5b0239980a09102</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modDocumentGeneration.class.php">9ca2223ffbaaeca2bc607504b6c61ba1</md5file>
-<md5file name="modCommande.class.php">22d8c625941f5fbfd577978772d1ab36</md5file>
-<md5file name="modSkype.class.php">b58aebf1a81b0a34e8e66e39e0e9ead1</md5file>
-<md5file name="modSyslog.class.php">8a527c66631be349deaf8cd3c8c65ee2</md5file>
-<md5file name="modProduct.class.php">81dea9427859b77208a3ff2c5dab87bd</md5file>
+<md5file name="modDocumentGeneration.class.php">bd98e5ab25a629b3ad77dbd8d65f57f9</md5file>
+<md5file name="modCommande.class.php">febadec42096e65c8982cef3a589d19b</md5file>
+<md5file name="modSkype.class.php">4d175fad9d26a2ea288302fd9e3bc10e</md5file>
+<md5file name="modSyslog.class.php">1decbba7d8c340e96fef7e7c8f76cec5</md5file>
+<md5file name="modProduct.class.php">29a7dbf3fbac0e46deafeff78a239592</md5file>
 </dir>
 <dir name="/core/modules/contract/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6856,7 +6857,7 @@
 <md5file name="modules_contract.php">32b93afec2aa49078d275f31e5bcfdb0</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modFckeditor.class.php">27f3aeddababdd2cba655e311acbeff9</md5file>
+<md5file name="modFckeditor.class.php">f15135e330ceb4d36cbb3d115337a69a</md5file>
 </dir>
 <dir name="/core/modules/barcode/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6869,11 +6870,11 @@
 <md5file name="mod_barcode_product_standard.php">b5a01bef49b36577ec34e6e0956b8727</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modPrelevement.class.php">2e641a6f3d3eca6cf4a71cd88fd59469</md5file>
-<md5file name="modGravatar.class.php">45e509ced59b0892813e5ce3675e9e57</md5file>
-<md5file name="modApi.class.php">da6cd389294d65669f82dce9f1f6350c</md5file>
-<md5file name="modUser.class.php">25543070320d79432d5c2e04130a7eba</md5file>
-<md5file name="modExport.class.php">3bfd2ce4fa4073f4522c912c372a418d</md5file>
+<md5file name="modPrelevement.class.php">b64c20cb648e8af5082db258e235937e</md5file>
+<md5file name="modGravatar.class.php">e8beeb31ba3517a1c3858365072fa333</md5file>
+<md5file name="modApi.class.php">da423e7cd677fb61f72236ebd66088dd</md5file>
+<md5file name="modUser.class.php">7add2e5b0248d36b01738eea450ded59</md5file>
+<md5file name="modExport.class.php">7f20953dd1bbbc6a6bc7fe4aecd11fb5</md5file>
 </dir>
 <dir name="/core/modules/product" >
 <md5file name="modules_product.class.php">5a78d16a02c5aeb129cd550ec0a5c28a</md5file>
@@ -6882,8 +6883,8 @@
 <md5file name="mod_codeproduct_elephant.php">53843c95c90b7200505f1e44ee5270bb</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modProductBatch.class.php">993422f5ae5753a77f148b4fcac94a79</md5file>
-<md5file name="modBarcode.class.php">a0e86b8c9edb28f66955411c74aa2a92</md5file>
+<md5file name="modProductBatch.class.php">d7ce5caf474c325b8a660583b48df39e</md5file>
+<md5file name="modBarcode.class.php">2053f68714d0a18f36e8cfe9f9b7ac4c</md5file>
 </dir>
 <dir name="/core/modules/syslog" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6903,8 +6904,8 @@
 <md5file name="export_excel2007.modules.php">4a3fbf99bbd978bb9d145282c6092ee2</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modResource.class.php">be2501654806eef25eeb53b767cf5c41</md5file>
-<md5file name="modBanque.class.php">aadbd6778d02197f539d57c97a81e530</md5file>
+<md5file name="modResource.class.php">0bf2e38d4ce8df49eea23b091ea492f1</md5file>
+<md5file name="modBanque.class.php">6d435016fdc903533b6e9c12b7e248de</md5file>
 </dir>
 <dir name="/core/modules/security/generate" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6917,7 +6918,7 @@
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modContrat.class.php">4652c9d3a56043fc1af28e62a6b9264b</md5file>
+<md5file name="modContrat.class.php">30037f514ac398d1e320938d71d234ae</md5file>
 </dir>
 <dir name="/core/modules/societe" >
 <md5file name="mod_codeclient_elephant.php">3bdfbda286294b2d05d3d0f0620bda42</md5file>
@@ -6935,8 +6936,8 @@
 <md5file name="mod_codeclient_leopard.php">7bc409d442508ec7f8638e4d710c6508</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modAgenda.class.php">28fbf879c5488303a825bb3164e33484</md5file>
-<md5file name="modAccounting.class.php">7dd32cf451cdb733940f1e20497222d4</md5file>
+<md5file name="modAgenda.class.php">eec7fc8003e18a10833c47bcb4f950e7</md5file>
+<md5file name="modAccounting.class.php">0bef4e5592e8ff7f23749cd196531db9</md5file>
 </dir>
 <dir name="/core/modules/expedition/doc" >
 <md5file name="pdf_merou.modules.php">779b645476e7901147c51e6ed9064878</md5file>
@@ -6967,7 +6968,7 @@
 <md5file name="pomme.modules.php">4bbee56e9f7b9e39373a5afc8983bd22</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modExpenseReport.class.php">46aa698852fcb286c6721f0314446e87</md5file>
+<md5file name="modExpenseReport.class.php">d4a7645ed2f93468506e45cc0bef3149</md5file>
 </dir>
 <dir name="/core/modules/dons" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6976,14 +6977,14 @@
 <md5file name="modules_don.php">7d605e5564840c03d4ac31ddad615c31</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modHoliday.class.php">35063f32bb86ee8cd1460cc9b50460ba</md5file>
-<md5file name="modNotification.class.php">cc44ae6151419f24f801a399a8da8e9a</md5file>
-<md5file name="modFournisseur.class.php">8477d79d3fffeb3b656890a208b7a7b9</md5file>
+<md5file name="modHoliday.class.php">f2a0008379f48d3be741b6309e47bc12</md5file>
+<md5file name="modNotification.class.php">75dadfb0411c68a97cffc44bbd7bbb8e</md5file>
+<md5file name="modFournisseur.class.php">8f351caaf973aa775420027a1fe1a734</md5file>
 </dir>
 <dir name="/core/modules/facture/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="doc_generic_invoice_odt.modules.php">6b8b8ce50599e40cb74603a883f5d49b</md5file>
-<md5file name="pdf_crabe.modules.php">2c97916a4a1bc63d1f329bdfcaf0741f</md5file>
+<md5file name="pdf_crabe.modules.php">80f3f4eab528fe31671922d9fcd10188</md5file>
 </dir>
 <dir name="/core/modules/facture" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -6993,10 +6994,10 @@
 <md5file name="modules_facture.php">2f711cd15f3d1808bc190e46f9770e29</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modClickToDial.class.php">6b30f5dbc6bf06787542ec9414975f15</md5file>
-<md5file name="modStock.class.php">ea9892b2aaf71d576fa090c246d80bc2</md5file>
-<md5file name="modCron.class.php">e2c3c57abca7c86cf8dd772334b5fbfe</md5file>
-<md5file name="modPaybox.class.php">4b351c64c714586873ccc475ac8ccbcd</md5file>
+<md5file name="modClickToDial.class.php">7b82d8b4f260bf77647648b2c691f5ef</md5file>
+<md5file name="modStock.class.php">6a122f2e8c40bbe8ef62929ce7558e3a</md5file>
+<md5file name="modCron.class.php">4ec0b3b616a0298a698385da45464506</md5file>
+<md5file name="modPaybox.class.php">5976e30c457bcfd8152c783869aa44f5</md5file>
 </dir>
 <dir name="/core/modules/cheque" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7007,11 +7008,11 @@
 <md5file name="modules_chequereceipts.php">3f870cc77afc8277b700c1492dd0d75f</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modDon.class.php">c65e9609962d1341657f52efc760e142</md5file>
-<md5file name="modWebServices.class.php">ee19a99da183183338ea6ad5362ccd13</md5file>
-<md5file name="modPaypal.class.php">065e6c85b9a555fc7280e14a0f686b22</md5file>
-<md5file name="modBookmark.class.php">711f25ae86a9b0767bd4b50e40280c08</md5file>
-<md5file name="modLoan.class.php">c6c4b0859b573c48498229f6046befdc</md5file>
+<md5file name="modDon.class.php">3dcffe741ffb595be53a68dcd17d17b1</md5file>
+<md5file name="modWebServices.class.php">cf35ef4c0d5285ba00fa8e651cfbde50</md5file>
+<md5file name="modPaypal.class.php">760e788770fa00311687d3b98710a2d6</md5file>
+<md5file name="modBookmark.class.php">981b343d89fd2c32200bcf32deb07128</md5file>
+<md5file name="modLoan.class.php">6713b5b4c3681653d7ca9bc07dda7055</md5file>
 </dir>
 <dir name="/core/modules/livraison/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7024,9 +7025,9 @@
 <md5file name="mod_livraison_jade.php">b3f46a3f7cc553bcda255db88fd2309a</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modECM.class.php">bd2bc7e196f60efcbd3a834e9862b333</md5file>
-<md5file name="modWorkflow.class.php">6bb3fb472a3ff31f31945a68bb806cde</md5file>
-<md5file name="modTax.class.php">29977b078710f6ebe992f5b534b7d897</md5file>
+<md5file name="modECM.class.php">03ffdb8b37122df3823dccc947fc944c</md5file>
+<md5file name="modWorkflow.class.php">fe46f69ee9c9a7cbf321c71e5c3e3fd3</md5file>
+<md5file name="modTax.class.php">8cb5d1cbe370a277e811c6548dfae574</md5file>
 <md5file name="modExternalRss.class.php">e1efd5d8bc348da70c325a08fc8c37a8</md5file>
 </dir>
 <dir name="/core/modules/askpricesupplier/doc" >
@@ -7041,7 +7042,7 @@
 <md5file name="modules_askpricesupplier.php">13e922bcc8c5b80bccd436037b6d1983</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modProjet.class.php">8eb1ce99a78dfc9cab4037d219ea5563</md5file>
+<md5file name="modProjet.class.php">52c04654456daae65e3f969d97539881</md5file>
 </dir>
 <dir name="/core/modules/project/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7067,7 +7068,7 @@
 <md5file name="mod_project_simple.php">67aacfba9a773fd702d1cbdb527c2389</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modAdherent.class.php">315d747ec96db1b4888f13a085e4c37d</md5file>
+<md5file name="modAdherent.class.php">d66c28a1f6a4bde2c1ae0d9477b4d4c3</md5file>
 </dir>
 <dir name="/core/modules/printsheet/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7091,8 +7092,8 @@
 <md5file name="modules_commandefournisseur.php">25fe73dfb05c08526e94d7ba7f241d9e</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modMailmanSpip.class.php">e610c70b7d93d2a7ba1e3658a80f2ec6</md5file>
-<md5file name="modPrinting.class.php">0e04da24f5b199415711a0c152ff5cd2</md5file>
+<md5file name="modMailmanSpip.class.php">e55b01cb8e535d7dc9430a15a8a67444</md5file>
+<md5file name="modPrinting.class.php">70f39e958a5afd70eaaa0e129b132dd5</md5file>
 </dir>
 <dir name="/core/modules/fichinter/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7110,14 +7111,14 @@
 <md5file name="modules_import.php">5828492fffa3239827af9cbd350fe1a7</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modService.class.php">f75ad03e2950c4f82c814cab2efd00d2</md5file>
-<md5file name="modFicheinter.class.php">349177aa231b93e37929db2d115c37c5</md5file>
-<md5file name="modPropale.class.php">68a901f0b2febcb04277d93415602595</md5file>
-<md5file name="modSalaries.class.php">a6c842e6f2a79bf9ed94174e25e6681a</md5file>
-<md5file name="modLabel.class.php">0ab8fe506db31d3e1a2a40b8d0eec509</md5file>
-<md5file name="modComptabilite.class.php">ca96fc96ed612e73229b17a153fa4dec</md5file>
-<md5file name="modGeoIPMaxmind.class.php">3caa2579fcc42d0179ed6e40f035c602</md5file>
-<md5file name="modExpedition.class.php">8b4c716b906f0c72d326fea013c0551f</md5file>
+<md5file name="modService.class.php">945eb348431be7fd0eaed9f64a0d9b87</md5file>
+<md5file name="modFicheinter.class.php">cb8d00fea4038cdb54e050ae6de48a52</md5file>
+<md5file name="modPropale.class.php">8b6661a6f4c699a8cd97427ab0ee08d1</md5file>
+<md5file name="modSalaries.class.php">a59627487d73770521d29e4180245fd6</md5file>
+<md5file name="modLabel.class.php">8d614ddd6b6545db3c21bf5a0ee84819</md5file>
+<md5file name="modComptabilite.class.php">a40db54a993475953aa25bbef592d0e3</md5file>
+<md5file name="modGeoIPMaxmind.class.php">673b31203f66bc4c61d0b84014515e00</md5file>
+<md5file name="modExpedition.class.php">da890bba90301957e6998622eef0ca57</md5file>
 </dir>
 <dir name="/core/modules/supplier_invoice" >
 <md5file name="mod_facture_fournisseur_cactus.php">b5b8aca26aec574d1ab401fe8411e144</md5file>
@@ -7144,16 +7145,16 @@
 <md5file name="modules_commande.php">5a24a30915985f4921e9977ef5591d37</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modMargin.class.php">32cfbcb58d6ae71455e0c58f951f2849</md5file>
+<md5file name="modMargin.class.php">1a81e2c1584303fcbd35ffa7959a9548</md5file>
 </dir>
 <dir name="/core/modules/expensereport" >
 <md5file name="modules_expensereport.php">581bf4f5d80169d20b9ac13270b44e0c</md5file>
 </dir>
 <dir name="/core/modules/expensereport/doc" >
-<md5file name="pdf_standard.modules.php">c5a5814570d187568731daa5c158aa35</md5file>
+<md5file name="pdf_standard.modules.php">3c97d68ace8480de987acd8387c006e1</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modExternalSite.class.php">2573e46733c7208e2235284e4e09179e</md5file>
+<md5file name="modExternalSite.class.php">95cefbf95698a54bc23c935f43f2dcd6</md5file>
 </dir>
 <dir name="/core/modules/propale/doc" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7167,7 +7168,7 @@
 <md5file name="mod_propale_saphir.php">eea69eebcbf32860db846f30a803b9e5</md5file>
 </dir>
 <dir name="/core/modules" >
-<md5file name="modMailing.class.php">05afeb97327056d436d21d891b041057</md5file>
+<md5file name="modMailing.class.php">fde7ea38cf5e65adbf47bd6453eeb1b2</md5file>
 </dir>
 <dir name="/core/login" >
 <md5file name="functions_ldap.php">ec2b8a20ae51bead882df818e695f524</md5file>
@@ -7196,10 +7197,10 @@
 <md5file name="jnotify.js">1390ded165db331385a1a0b5873c2da5</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="lib_photosresize.js">8a34202e7012f992d9dd2adb1ca533b4</md5file>
-<md5file name="lib_head.js">254b5f623a4ebd0f52af25fa0851d62e</md5file>
+<md5file name="lib_head.js">8182c78486ec04ef7effe8dc698515b9</md5file>
 <md5file name="editinplace.js">a24a4e8582b19a3d805e6cbf21a6a1a2</md5file>
 <md5file name="datepicker.js.php">bcff6120a04c2644c3139ab28b982506</md5file>
-<md5file name="lib_batch.js">e1e875671e566acb90ca03d16b7e63ed</md5file>
+<md5file name="lib_batch.js">02c41413bcc17b24738048dd4454300b</md5file>
 <md5file name="lib_rare.js">be1a34c1c77c5431dfcee9caaabcfd88</md5file>
 <md5file name="timepicker.js.php">f71705be8958fd18f828eb64eb254202</md5file>
 <md5file name="timesheet.js">2073ab08b1875d5f37194576d7e2664e</md5file>
@@ -7208,8 +7209,8 @@
 </dir>
 <dir name="/loan" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="document.php">7e5e0da2e9f56b27d3f9fc116c316e12</md5file>
-<md5file name="card.php">8fc906739a61a90cb79cdf471643beee</md5file>
+<md5file name="document.php">01f9894c9477d0999632fe95a59be344</md5file>
+<md5file name="card.php">99eedafb85b2c7a1b8621829019bfbd5</md5file>
 <md5file name="note.php">d8933061942eb3a0528e7709332afbb2</md5file>
 </dir>
 <dir name="/loan/payment" >
@@ -7247,11 +7248,11 @@
 <md5file name="server_category.php">6bcc750e4e3bcf3e3f130e84fa76c000</md5file>
 </dir>
 <dir name="/exports" >
-<md5file name="export.php">605be49268441962e9c3c8fd270cb681</md5file>
+<md5file name="export.php">768245f5c1cdcbe3b84a91af1ff9f2e1</md5file>
 </dir>
 <dir name="/exports/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="export.class.php">ec86caf8b27bdabb788705fc19b23986</md5file>
+<md5file name="export.class.php">13c083999f847614a6fd6462f1918e11</md5file>
 </dir>
 <dir name="/exports" >
 <md5file name="index.php">d93c6b0e8c40afea1cb04473e7125fad</md5file>
@@ -7269,7 +7270,7 @@
 </dir>
 <dir name="/resource" >
 <md5file name="element_resource.php">ea8da23396efd8ad8ce5aa9e1ea2cdd7</md5file>
-<md5file name="list.php">7f5917eab017c126b9c26979acc0f9f9</md5file>
+<md5file name="list.php">5b5b52ff72d105f06dbf0d41b6468f32</md5file>
 </dir>
 <dir name="/resource/img" >
 <md5file name="object_resource.png">0f5edd10e423f8ad19ff6ccb3e0f0d5e</md5file>
@@ -7281,7 +7282,7 @@
 <md5file name="checkVatPopup.php">e209d1327b4fcf06d9e2566bd1c5c74d</md5file>
 </dir>
 <dir name="/societe" >
-<md5file name="agenda.php">c259154cf9f1e38c3120db8668f22d5b</md5file>
+<md5file name="agenda.php">7c62bec97b5bc04de0c593aebb28c3bb</md5file>
 </dir>
 <dir name="/societe/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7294,9 +7295,9 @@
 </dir>
 <dir name="/societe" >
 <md5file name="ajaxcountries.php">366995b763c1aead04b0b2f0a125038f</md5file>
-<md5file name="price.php">fef326be8db688c921660438bf537d44</md5file>
+<md5file name="price.php">c0f374d9ff494271ae5cbb27a09846d1</md5file>
 <md5file name="societecontact.php">c239aa6287f01ee787c1a437089e5b5b</md5file>
-<md5file name="document.php">7e3434cee54affa8341e2b25584d375a</md5file>
+<md5file name="document.php">53ff7f8c058d42c8be873e4ee5ae6dce</md5file>
 </dir>
 <dir name="/societe/ajax" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7304,14 +7305,14 @@
 </dir>
 <dir name="/societe" >
 <md5file name="ajaxcompanies.php">79b8c989d344fdd08b832d875fb1e161</md5file>
-<md5file name="note.php">6141398a9640da249e514350dd464fd1</md5file>
+<md5file name="note.php">5315bd279f34c0ffbe43329c38eb036c</md5file>
 <md5file name="commerciaux.php">a2c3436e9e188ba9bb2653ce58bffc0e</md5file>
 </dir>
 <dir name="/societe/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="companybankaccount.class.php">a58db04e4c5e0dd974693e436b777162</md5file>
+<md5file name="companybankaccount.class.php">1f21bb9a5810af59b93c076fd23f22f8</md5file>
 <md5file name="address.class.php">abdede0b95ba0317afc2b84d41c6d466</md5file>
-<md5file name="societe.class.php">144c675095326b4659f9e05880edfee9</md5file>
+<md5file name="societe.class.php">201efae28672a7e617212bedb0beaa8c</md5file>
 <md5file name="api_thirdparty.class.php">8132fb847569fa766adc0c4573f88d01</md5file>
 <md5file name="api_contact.class.php">890b8461abd8f0b87b126e9e770b9909</md5file>
 <md5file name="client.class.php">1f02fab7a9f6f9c4f7e6f55b70d39ad7</md5file>
@@ -7332,7 +7333,7 @@
 <md5file name="actions_card_individual.class.php">1ac4641f6dff205071a01803b06887ef</md5file>
 </dir>
 <dir name="/societe/canvas" >
-<md5file name="actions_card_common.class.php">183b3f6870fc9669752358975b71323d</md5file>
+<md5file name="actions_card_common.class.php">865ee06d70436c2d7a9eae83cbeca9af</md5file>
 </dir>
 <dir name="/societe/canvas/company" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7347,18 +7348,18 @@
 <md5file name="actions_card_company.class.php">f4485433cb66de63f4478a8780c7e4b8</md5file>
 </dir>
 <dir name="/societe" >
-<md5file name="rib.php">445d4a442f26203446ef5254b25dc760</md5file>
-<md5file name="index.php">ae826c83585afee3ffa5a56793e1005c</md5file>
-<md5file name="societe.php">569169ec1f694194560c0f27117ce095</md5file>
+<md5file name="rib.php">11b50c97effbc90d2bb3a8fdfdf10d82</md5file>
+<md5file name="index.php">4515ecf5368c76f648cf6b436419f117</md5file>
 <md5file name="info.php">140594da0770777344664f990f15d409</md5file>
+<md5file name="list.php">420ca27e9e8703f76580acfe7dbd081b</md5file>
 </dir>
 <dir name="/societe/notify" >
-<md5file name="card.php">deb7a03d105db6ec6324a5f2d5aa3c5a</md5file>
+<md5file name="card.php">98a5d4c239d3736d1f4d477225fa75f3</md5file>
 <md5file name="index.php">1921a40ef2e203a9c7e33e33d8481630</md5file>
 </dir>
 <dir name="/societe" >
-<md5file name="soc.php">f353086a6d731d067e3c24bc09411ff7</md5file>
-<md5file name="consumption.php">9ccb4efac0c2927e8c48f31a4e20578a</md5file>
+<md5file name="soc.php">65f3740002edcca80642203f82266883</md5file>
+<md5file name="consumption.php">7a987b0b04caa4006220a538d0565830</md5file>
 </dir>
 <dir name="/expedition/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7369,7 +7370,7 @@
 <md5file name="index.php">7d040a1858a6f1e8b3d8e7fc68b1b008</md5file>
 </dir>
 <dir name="/expedition" >
-<md5file name="card.php">73715bd3a0508984345293db3e4eb7a6</md5file>
+<md5file name="card.php">256a7453b7c468dbacbb559ed71b4c8f</md5file>
 <md5file name="note.php">a267dd6d9a787dbaa95ee81e9812a81a</md5file>
 </dir>
 <dir name="/expedition/class" >
@@ -7381,7 +7382,7 @@
 <dir name="/expedition" >
 <md5file name="contact.php">1699071ff4bb09210ac267d430c05352</md5file>
 <md5file name="index.php">aaf4a17044e33a5bc381b67af0e5fa1a</md5file>
-<md5file name="list.php">63025fb0424bdfeec0773c146c88b866</md5file>
+<md5file name="list.php">e608bfdc1dcb6e0083ef2f07d6abcc80</md5file>
 <md5file name="shipment.php">f8c37ac09b01f4a6bcdcf0318716eebc</md5file>
 </dir>
 <dir name="" >
@@ -7412,7 +7413,7 @@
 <md5file name="adherent.php">626d8b5925475bd539d310df50ba813d</md5file>
 </dir>
 <dir name="/adherents" >
-<md5file name="card_subscriptions.php">cda3eb41eca2b3d060ff8b12499478e9</md5file>
+<md5file name="card_subscriptions.php">7b7b56e407200e7b0bcf31eaf10dab43</md5file>
 </dir>
 <dir name="/adherents/stats" >
 <md5file name="byproperties.php">8f950f0c02a403cf239f8e47bafdbbcf</md5file>
@@ -7421,10 +7422,10 @@
 </dir>
 <dir name="/adherents" >
 <md5file name="document.php">2f12577c1d455111bb528f3866b65893</md5file>
-<md5file name="card.php">4192e6cb58b900c7bf30bc123b919b94</md5file>
+<md5file name="card.php">d0124d92402005a80985fe779314dc3e</md5file>
 <md5file name="note.php">280a1ab7fd33d892d6726f352e555c4d</md5file>
 <md5file name="ldap.php">68dc3ea2cd9c6508a925df50fa011221</md5file>
-<md5file name="type.php">8dd24611c7d0ae71dcf894ac560873df</md5file>
+<md5file name="type.php">889d74c9f09cac845f0690e082028925</md5file>
 <md5file name="fiche_subscription.php">deac83a4c0eda829eedb0f9136a1fae5</md5file>
 </dir>
 <dir name="/adherents/class" >
@@ -7458,7 +7459,7 @@
 <md5file name="info_subscription.php">866c20b40a82e12f5dfc6167586cdf5c</md5file>
 <md5file name="htpasswd.php">836fcb1eded545bbd9a2baeec41a4f62</md5file>
 <md5file name="info.php">9415a071a1be518bfc801462984551d4</md5file>
-<md5file name="list.php">d6dcf54aee7bc5c3e706a538bccf2497</md5file>
+<md5file name="list.php">a48291fa7995f310d18f6455df21cd47</md5file>
 </dir>
 <dir name="/accountancy" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7467,41 +7468,41 @@
 <md5file name="export.php">a537dc687786d8516536a2275806fef3</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="journaux.php">da3b7bee20aeaa2f5e659d5211035377</md5file>
-<md5file name="productaccount.php">fb0a52c0f6e12945e2d1ea322e8e6652</md5file>
+<md5file name="productaccount.php">ae9aa9de06f80e04c1c1e2fa91d799c8</md5file>
 <md5file name="fiscalyear_card.php">94032a10e3003af1c4e7bb6473be7022</md5file>
-<md5file name="card.php">5ac441622303f6c6a3fa3003c8f0557e</md5file>
-<md5file name="account.php">f27eb8254d7b1596f0bb8d0ec006be2d</md5file>
+<md5file name="card.php">4bb4f5f5f5e289f27477b5576aae1d1f</md5file>
+<md5file name="account.php">7e7f4a8196c6d624ff838bca9a3e9f7e</md5file>
 <md5file name="fiscalyear.php">3725c8c2c95cc8ce3148b249ddbc0866</md5file>
-<md5file name="index.php">35bd2525482d199b8b6202e622dcd634</md5file>
+<md5file name="index.php">39da19753218678851b5f795809a74fe</md5file>
 <md5file name="fiscalyear_info.php">5e9d738becb2303ff019772b11a2c339</md5file>
 <md5file name="importaccounts.php">215b05ae9013cb9b54602454067100ec</md5file>
 </dir>
 <dir name="/accountancy/supplier" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="card.php">1372790e6457eef9f97ec0c3bbc3ef15</md5file>
-<md5file name="lines.php">a8aec4a40818d6280bcb55128ae3cb48</md5file>
+<md5file name="lines.php">6d1741584e00f41d10644d8a58c9abff</md5file>
 <md5file name="index.php">71cc690beb655d5b7d852f7eaa19ff69</md5file>
-<md5file name="list.php">8cec2de2981aa6b01b98d1db8a008aa4</md5file>
+<md5file name="list.php">3dc1ca1b13ad0d0e16c93cc055d33ea4</md5file>
 </dir>
 <dir name="/accountancy/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="html.formventilation.class.php">c8ba89aa3f1ce99b6733cb1bf34721a9</md5file>
+<md5file name="html.formventilation.class.php">b73b7cc98c778e4a11470ab9fff305fa</md5file>
 <md5file name="accountancysystem.class.php">e50a2b68928dd49c7a5472f36ceee6db</md5file>
-<md5file name="accountingaccount.class.php">7fba20d7d9af0b9ffbc9b96fe7700689</md5file>
+<md5file name="accountingaccount.class.php">e5e0259da44a27a29394be4f1c90cd0d</md5file>
 <md5file name="bookkeeping.class.php">bbe44bcb153a4d179a62233f871f1d7a</md5file>
 </dir>
 <dir name="/accountancy/journal" >
-<md5file name="purchasesjournal.php">fb2746b23ba5984a941b21e4640e912a</md5file>
+<md5file name="purchasesjournal.php">a4a7731890ea627086ca5e7f6eb83ab9</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="sellsjournal.php">fc67405f0b08a6256750ceb2ddacee75</md5file>
-<md5file name="bankjournal.php">5a93f6f55548aa718dcd47cdea3b1df8</md5file>
+<md5file name="sellsjournal.php">19d2749b396e4b86b4634ee0c920684f</md5file>
+<md5file name="bankjournal.php">ae08eae32f5e7802852471409fa76357</md5file>
 <md5file name="index.php">3b29a33fb5f50c27d39d0645b1d1d96b</md5file>
 </dir>
 <dir name="/accountancy/bookkeeping" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="listbyyear.php">3477c7fa74309e4d0519d696663df65a</md5file>
-<md5file name="card.php">5c0969bade7963678b0a4cc522225738</md5file>
-<md5file name="list.php">df651b36e5b7209623d21da1fc2dd395</md5file>
+<md5file name="listbyyear.php">c9afe05b21f4c59e88c61e1197646cdb</md5file>
+<md5file name="card.php">f5e92bcc1cd71d07aa6daf31a707c1d0</md5file>
+<md5file name="list.php">54f60431bdc226aedbf3f47c8a3b2b0d</md5file>
 <md5file name="balancebymonth.php">e9e9f0f842977b2c05d0b5b47aaecab1</md5file>
 </dir>
 <dir name="" >
@@ -7522,38 +7523,42 @@
 <md5file name="project_extrafields.php">ace625529635a30786e1f83d82bf09d4</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="project_task_extrafields.php">8a8adca33245aca45fa1400db7689102</md5file>
-<md5file name="project.php">ecc2e8224953f8ca4d5f9eef47332364</md5file>
+<md5file name="project.php">07cd846e2933b5d191f672bd90921875</md5file>
+</dir>
+<dir name="/projet/stats" >
+<md5file name="index.php">476964aa77dbfc449a34b17e9fd1b1bb</md5file>
 </dir>
 <dir name="/projet/activity" >
-<md5file name="perday.php">7b689a85a7522fdb80569ba709a91b76</md5file>
-<md5file name="perweek.php">53cd0baf0d602776d84ab84514e69225</md5file>
-<md5file name="index.php">387389bfe4569240ffc5be73689d1785</md5file>
+<md5file name="perday.php">7cb6ec8fb8cf260839005eea7da4b08d</md5file>
+<md5file name="perweek.php">be1cae8dfdd010f3115a54346c3557f8</md5file>
+<md5file name="index.php">6bd38b6af505407d62c60a9eefdf208b</md5file>
 </dir>
 <dir name="/projet" >
 <md5file name="document.php">d10524316d94a05190315ed2a537e590</md5file>
-<md5file name="card.php">bfcb449a720acb626b7c269742a485aa</md5file>
+<md5file name="card.php">7d7c0021738e3854e8c8340e82fd4629</md5file>
 <md5file name="note.php">c1ac4d0440f0210376068d50d51c11a5</md5file>
 </dir>
 <dir name="/projet/tasks" >
 <md5file name="document.php">0529ddc77e8c681c33c47b9b7687e810</md5file>
 <md5file name="note.php">faa2eda13c5607ace72e34e9c0966a0c</md5file>
 <md5file name="contact.php">72ddc5bafe07d7b1963a002ff2638ce9</md5file>
-<md5file name="time.php">5f0e6ef10e19963fc935da65fb883f25</md5file>
-<md5file name="task.php">a159afd90fa7e1673e1c235bb1e1db2c</md5file>
-<md5file name="index.php">96c99ba0ac9caec76611b3c53393274f</md5file>
+<md5file name="time.php">fa129c75620d5d861c1d1e5b4df3e6b2</md5file>
+<md5file name="task.php">9e6bbdc99eed41d9480ff63f9c187e81</md5file>
+<md5file name="index.php">66acdd22822f1289380e41dcf397e576</md5file>
 </dir>
 <dir name="/projet/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="task.class.php">de3eed7c99e03a12c85e51a39d0573a5</md5file>
-<md5file name="project.class.php">18bd00516ee2375d3f386bdd51702cd2</md5file>
+<md5file name="projectstats.class.php">d241fcf2e17ab49c6796d45a3052e6e4</md5file>
+<md5file name="task.class.php">ccbe6e0b452cf45ab0d7a55d202e526e</md5file>
+<md5file name="project.class.php">f356a122f233ccec141286713d82afd0</md5file>
 </dir>
 <dir name="/projet" >
-<md5file name="contact.php">7f6e513f0fc74c218ab4df64a332711d</md5file>
+<md5file name="contact.php">c48bf12c8ab59a7e5288dec2171fc487</md5file>
 <md5file name="ganttview.php">766996c5832c22283f845d85c69050b6</md5file>
-<md5file name="index.php">ae28d9719776dc9b686b4dab073102ec</md5file>
-<md5file name="list.php">ca58a21c56883c3064dce79a50544cd3</md5file>
-<md5file name="element.php">e23724d4cdbc4a4910660ec1fca35d5c</md5file>
-<md5file name="tasks.php">64f80d29b20629fb63d1848925e4703d</md5file>
+<md5file name="index.php">b029262dc429f54b44eaac3bb3673fb2</md5file>
+<md5file name="list.php">1e681218409a48d49553a14b7805eb38</md5file>
+<md5file name="element.php">c4d4a5f3f8ade702f7a358be847bfd64</md5file>
+<md5file name="tasks.php">c78ec49a7b88cd2983dcd8473ed0c24f</md5file>
 <md5file name="jsgantt_language.js.php">43cc87a6b84afe612af178e9c0945279</md5file>
 </dir>
 <dir name="/compta/deplacement/stats" >
@@ -7561,7 +7566,7 @@
 </dir>
 <dir name="/compta/deplacement" >
 <md5file name="document.php">9d267f46db9b35ccdf464db22f7a8726</md5file>
-<md5file name="card.php">5d134bb02748bc2f74ac53b63382b089</md5file>
+<md5file name="card.php">195a075744dcd8b1bd58f0cfc5cde946</md5file>
 </dir>
 <dir name="/compta/deplacement/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7569,28 +7574,28 @@
 <md5file name="deplacementstats.class.php">ed84c415bafb8d11fbc3bd0dde0e5408</md5file>
 </dir>
 <dir name="/compta/deplacement" >
-<md5file name="index.php">b9825fdcf1aa4eb465d00b452acda080</md5file>
+<md5file name="index.php">81d7f7ae7f6178b08e71e8cf0033f0a8</md5file>
 <md5file name="info.php">1d8a8c14f623c3db37a02c7eccda33ec</md5file>
-<md5file name="list.php">b907ebcc9f13aa52a6089f8a3e27a8ef</md5file>
+<md5file name="list.php">d12c0159673d8d8114db46e34f6623e3</md5file>
 </dir>
 <dir name="/compta" >
 <md5file name="clients.php">602da82cec31cf5a062cedd8ffdb0d9d</md5file>
 </dir>
 <dir name="/compta/paiement" >
-<md5file name="avalider.php">17e25907696911e40f93dcbef8297b0e</md5file>
+<md5file name="avalider.php">83fa2b36decac5ac73128df2630dc60d</md5file>
 <md5file name="rapport.php">71eafd033fa192897bfee1000d8340b6</md5file>
 <md5file name="card.php">d160d6becd2eb7392c9c0383ef3d1970</md5file>
 </dir>
 <dir name="/compta/paiement/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paiement.class.php">733c572e7685bbe069d88a8d8f7c32b5</md5file>
+<md5file name="paiement.class.php">46412fc11293b45cf092e9ffaa6830c7</md5file>
 </dir>
 <dir name="/compta/paiement/cheque" >
-<md5file name="card.php">b7ecc9a60ee73e636c57d70af1f7b8b1</md5file>
+<md5file name="card.php">c775405731b51bed190be63b744e5df5</md5file>
 </dir>
 <dir name="/compta/paiement/cheque/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="remisecheque.class.php">f9669724ea9cdd52a44b3f4ec499302b</md5file>
+<md5file name="remisecheque.class.php">cc35496295df39931cb7598eb47c91df</md5file>
 </dir>
 <dir name="/compta/paiement/cheque" >
 <md5file name="index.php">105834a4e145cd3717f34d795ed01677</md5file>
@@ -7599,27 +7604,26 @@
 <dir name="/compta/paiement" >
 <md5file name="index.php">8c7c756f1961be336a5783d4c841145c</md5file>
 <md5file name="info.php">543fe99f0aeb0e9aa7241f30fddffb16</md5file>
-<md5file name="list.php">b9c7983231e9270dfa90767247b84983</md5file>
+<md5file name="list.php">a0bfc0d07ca987521e9e577adbb63dac</md5file>
 </dir>
 <dir name="/compta/prelevement" >
 <md5file name="demandes.php">6f745fb918c6b5d413a7de84c6e54521</md5file>
-<md5file name="card.php">9d27e844dabab1e0d53830dd89376244</md5file>
-<md5file name="factures.php">bde48870137975f1fc5bc2f00cd6b551</md5file>
+<md5file name="card.php">cde44cfa63f262dac6e46ce47dde1f90</md5file>
+<md5file name="factures.php">905d2ef1ad71447712edfe2c690a2a8f</md5file>
 </dir>
 <dir name="/compta/prelevement/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="rejetprelevement.class.php">44906e02759e18236973f16ff09d5ac6</md5file>
 <md5file name="ligneprelevement.class.php">259760d5653ed342f1dfeb8d24750b47</md5file>
-<md5file name="bonprelevement.class.php">568e5f8215b47ce62ea76603e8bac904</md5file>
+<md5file name="bonprelevement.class.php">d895e0426e095eec95294e0d89917c85</md5file>
 </dir>
 <dir name="/compta/prelevement" >
-<md5file name="bons.php">55cc97fa2026cc42b4771d975b45fedb</md5file>
-<md5file name="lignes.php">5917f7c3e28d25a68162575e72ee573b</md5file>
-<md5file name="rejets.php">4a23c4ca3dd9fed9e8b50377c8d477cc</md5file>
-<md5file name="index.php">e8cff83122ea60c1fdc4bbc9ece0ee19</md5file>
-<md5file name="create.php">4c1216c586a413cba81e46333c1cf23d</md5file>
+<md5file name="bons.php">465833cc227ccaddfe18697220f1c733</md5file>
+<md5file name="rejets.php">88460cb74a7b8cf8fb05a75432029df4</md5file>
+<md5file name="index.php">aca1b7c4b499be6cf7bd8821408814fe</md5file>
+<md5file name="create.php">d7eeeaf3fe46a5f427eb605b25802c56</md5file>
 <md5file name="stats.php">2a43f612f1f28c229bd6e9768baf8c27</md5file>
-<md5file name="list.php">373eccf484ec1172381be7110d0e277c</md5file>
+<md5file name="list.php">158a0a9e9986d162cec4819ffef6b000</md5file>
 <md5file name="fiche-stat.php">a1033167badb7ecff1c5e71c21e0b7b1</md5file>
 <md5file name="fiche-rejet.php">74c7d3f5175296a3a243b76a7e6c640a</md5file>
 <md5file name="ligne.php">d014f101c786925b6d34dbaed4953c83</md5file>
@@ -7637,26 +7641,26 @@
 <md5file name="paymentsocialcontribution.class.php">abde24cecf5f93f6d80bb41b9450c81f</md5file>
 </dir>
 <dir name="/compta/sociales" >
-<md5file name="index.php">2758f3882de560e1d11d208959c0627e</md5file>
+<md5file name="index.php">d04f79d8946d6b0168914e4f2d0cdf45</md5file>
 <md5file name="info.php">e40683c017da1b90fbef6b4df53a501a</md5file>
 <md5file name="charges.php">b7e085903e6af70ccb6fc14238411d9c</md5file>
 </dir>
 <dir name="/compta/stats" >
 <md5file name="cabyuser.php">737cea99171b10f164def53c9cac680c</md5file>
-<md5file name="cabyprodserv.php">f700c570087702abeb613205c73bbfb7</md5file>
+<md5file name="cabyprodserv.php">dca3cda5fc2c11c6ea4fe8b733407371</md5file>
 <md5file name="index.php">c04b240903598f5edf1df7f263c05116</md5file>
 <md5file name="casoc.php">f6cd6e4db0740ba9dcbc564de7e2dbc8</md5file>
 </dir>
 <dir name="/compta" >
 <md5file name="ajaxpayment.php">19ff8a52a9056fbaf0fcf50bd50ebe48</md5file>
-<md5file name="paiement.php">151fc2b7ae6e1fbd460e2eb33f9b899f</md5file>
+<md5file name="paiement.php">3fbaf85b4c2e449d3d15b159bc166105</md5file>
 </dir>
 <dir name="/compta/bank" >
 <md5file name="annuel.php">39c29f1dc8e0f1d52719e3e723bc5c30</md5file>
 <md5file name="treso.php">77a8e7f395a22f09a1b776c2386ade99</md5file>
 <md5file name="card.php">8b40772cb840450da12d1210c46e5c76</md5file>
 <md5file name="bilan.php">6fe5e34cc37004b4342377afa27fe78e</md5file>
-<md5file name="account.php">d85068d3621a3cef299e193d8bc1ae70</md5file>
+<md5file name="account.php">e951f789753af665bb12fbc97016fbdf</md5file>
 </dir>
 <dir name="/compta/bank/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7676,10 +7680,10 @@
 <md5file name="ligne.php">f350b85fbf9c7833b5c8b26c4628e885</md5file>
 </dir>
 <dir name="/compta" >
-<md5file name="paiement_charge.php">a079bfaecec2f2058244785d0258ff7c</md5file>
+<md5file name="paiement_charge.php">0e379c10da4f2f10c8a1346eec194124</md5file>
 </dir>
 <dir name="/compta/charges" >
-<md5file name="index.php">1149448d4763707530c230bd9aae1bc6</md5file>
+<md5file name="index.php">bc5a32fdeb7229783d866985956a8b28</md5file>
 </dir>
 <dir name="/compta/salaries" >
 <md5file name="document.php">66180b8db9d50d8536234822b057a8c6</md5file>
@@ -7690,19 +7694,19 @@
 <md5file name="paymentsalary.class.php">17c67e9726d6de85a41a97e89d5902c1</md5file>
 </dir>
 <dir name="/compta/salaries" >
-<md5file name="index.php">a891c48ca95a34783635143c4c8750a3</md5file>
+<md5file name="index.php">35812cd8069e2c67414138316e08f0ea</md5file>
 <md5file name="info.php">7b01b1026f28ec7458c2a4d48b261d26</md5file>
 </dir>
 <dir name="/compta/journal" >
 <md5file name="purchasesjournal.php">2cc99d72a8dbaa097c6e563b127bdad8</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="sellsjournal.php">76e6aec3a1262b7b199fd88ae651d049</md5file>
+<md5file name="sellsjournal.php">5f040bc52ef7de9c3c2d7468fffc6eff</md5file>
 </dir>
 <dir name="/compta" >
-<md5file name="hrm.php">337efc52471fabe8c6703dc31ff80213</md5file>
+<md5file name="hrm.php">f389a5de0a59952c533f0bdb9f79de9d</md5file>
 </dir>
 <dir name="/compta/facture" >
-<md5file name="prelevement.php">19e7c40af2c11cc90565af06b44d72e1</md5file>
+<md5file name="prelevement.php">24238dbdbf16729d45fe608f6494151a</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 </dir>
 <dir name="/compta/facture/tpl" >
@@ -7720,33 +7724,33 @@
 <dir name="/compta/facture" >
 <md5file name="document.php">a95d18dda6cd01128bc3a96edc463191</md5file>
 <md5file name="note.php">cf7beba0674c611eca3eb40103a9d56d</md5file>
-<md5file name="mergepdftool.php">a792bda8603a893a55b85f444531e224</md5file>
+<md5file name="mergepdftool.php">33ce05822fe1163a8ac5b2dd66a9c4e6</md5file>
 </dir>
 <dir name="/compta/facture/class" >
 <md5file name="paymentterm.class.php">be4909eb830f52517bb34572822210b6</md5file>
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="facture-rec.class.php">2a2702bd2167fd28271eb4eabca6363c</md5file>
-<md5file name="facture.class.php">1f463d48615c4536fcb43e71b42f5d4a</md5file>
+<md5file name="facture.class.php">ca47119b9fc59a74b514f8f858975d44</md5file>
 <md5file name="facturestats.class.php">bb29d8dd50b7570b5744da807dceab8a</md5file>
 <md5file name="api_invoice.class.php">26e616b72a49ae4b326a093bd0713303</md5file>
 </dir>
 <dir name="/compta/facture" >
-<md5file name="fiche-rec.php">15224708f9fef9c9e6225272169e5327</md5file>
+<md5file name="fiche-rec.php">0bb4a99eb4c6e288ff1bfd26c03b1442</md5file>
 <md5file name="contact.php">289aeb68be3c5ff2a4cdd57a64257b8e</md5file>
 <md5file name="info.php">31431bfb5d4f361b35887e63a0099655</md5file>
-<md5file name="list.php">5d80533881aecaaf42f40ac5919a94c2</md5file>
+<md5file name="list.php">a59315a3ff53510671eaef4b446b94b7</md5file>
 <md5file name="apercu.php">3e8c8ff5959ed24ad35c169286978b20</md5file>
 </dir>
 <dir name="/compta" >
 <md5file name="index.php">ab36de50d13642d7146b58755426e08f</md5file>
-<md5file name="recap-compta.php">4e5c475af112f0b40d51a7db229eeeef</md5file>
+<md5file name="recap-compta.php">14182aeabccd7c3a761d93d1564a27f4</md5file>
 </dir>
 <dir name="/compta/resultat" >
 <md5file name="clientfourn.php">765cd4b94afa52c8240a052967b4fcec</md5file>
 <md5file name="index.php">493333b47c15951dac1921145ef15c38</md5file>
 </dir>
 <dir name="/compta" >
-<md5file name="facture.php">578efe6534e14addf92d9cb9425354c9</md5file>
+<md5file name="facture.php">9daaf05396413d0b6ee96d7380021ff2</md5file>
 </dir>
 <dir name="/compta/ventilation" >
 <md5file name="card.php">d6d047f9389cde6f11b9175ffda432ac</md5file>
@@ -7759,7 +7763,7 @@
 <md5file name="list.php">cb26417ed98d172fa1fd331e1985d799</md5file>
 </dir>
 <dir name="/compta/tva" >
-<md5file name="clients.php">595e93e44d846e5411686b4a0e74cbfb</md5file>
+<md5file name="clients.php">669ff8dafc53ed14ef5b8cef64db442c</md5file>
 <md5file name="quadri_detail.php">946760ff06abcff5d8863b1e782893f5</md5file>
 <md5file name="card.php">164732927ed9412a51a8dd5d3d374dca</md5file>
 </dir>
@@ -7768,9 +7772,10 @@
 <md5file name="tva.class.php">9f6a9249929ab80249c9e9060158fdf3</md5file>
 </dir>
 <dir name="/compta/tva" >
-<md5file name="quadri.php">40fd56dcbfd9c50fa9735dbc0306e054</md5file>
+<md5file name="quadri.php">ea932a69d0162b3473db8257d8066569</md5file>
 <md5file name="index.php">077e5ba7b08bcccf15dd7278d4f86910</md5file>
-<md5file name="reglement.php">9d28e69977631bb47d6c67ffb111b1e4</md5file>
+<md5file name="reglement.php">ade6e0d03ed64be97ccca4bd40c5fa9b</md5file>
+<md5file name="quarter_report.php">b4e4f05f4d4693994409ef482b2f6fac</md5file>
 </dir>
 <dir name="/compta/localtax" >
 <md5file name="clients.php">793e1a0fa37a44aee8041f15d41f6bea</md5file>
@@ -7786,7 +7791,7 @@
 <md5file name="reglement.php">af528677086b2c26806ac47af95d9d9d</md5file>
 </dir>
 <dir name="" >
-<md5file name="main.inc.php">64416835d2256cb982adc3b1d67a6cf8</md5file>
+<md5file name="main.inc.php">475d6d2ce9f739ca2c30ac38b49cbf94</md5file>
 </dir>
 <dir name="/paybox" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7835,11 +7840,11 @@
 <md5file name="fournisseur.commande.dispatch.class.php">6c456bf952ac5c6889d0360ae3d327a1</md5file>
 <md5file name="fournisseur.commande.class.php">9f50b8882785311bf3e07ca18bf1df0e</md5file>
 <md5file name="fournisseur.product.class.php">80a28b7d54cfb242e531baebbb30e4fb</md5file>
-<md5file name="fournisseur.facture.class.php">c07f63874a6327c6efe4f17b2af0164e</md5file>
+<md5file name="fournisseur.facture.class.php">33b10f4a2f35375b1becd676a7dc52ad</md5file>
 </dir>
 <dir name="/fourn" >
 <md5file name="recap-fourn.php">fe62c00b682dd677dbca4764d5f0fe97</md5file>
-<md5file name="contact.php">bfe225a7a6f3dd1d398994dead8172eb</md5file>
+<md5file name="contact.php">646433b89ab65da2f538fb1333e3f21c</md5file>
 </dir>
 <dir name="/fourn/facture" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7850,17 +7855,17 @@
 </dir>
 <dir name="/fourn/facture" >
 <md5file name="document.php">b6fd5cc801d681b05256bf8b413c9786</md5file>
-<md5file name="card.php">e5eeacd52fb833b5b6a089889a84560f</md5file>
-<md5file name="paiement.php">55b46729bbc65c650d7422f462f50c6d</md5file>
+<md5file name="card.php">cad0d5655b3d25a8131fc4ed620779ce</md5file>
+<md5file name="paiement.php">0ffcb06a700db2a4795b2a1cad18ebe8</md5file>
 <md5file name="note.php">2b061d246bb5f2342b9867c346f3f1a7</md5file>
 <md5file name="contact.php">d592551b67e9dd797f7a36a1b257684b</md5file>
 <md5file name="info.php">204000f10fb031ceb45970d4b4996fca</md5file>
-<md5file name="list.php">39324c61ff7aebf323cd070cad8897d1</md5file>
+<md5file name="list.php">9e1b4ca0238b391cc244836cfa1110b2</md5file>
 <md5file name="impayees.php">2accac2e7486bca7a2d57f646974d54e</md5file>
 </dir>
 <dir name="/fourn" >
 <md5file name="index.php">e2605c19e2029efa999dc98306e5a834</md5file>
-<md5file name="list.php">0f3255289893fbc56e98f6ac1ab4ae63</md5file>
+<md5file name="list.php">a56305ab485005ec0df66969dc531d53</md5file>
 </dir>
 <dir name="/fourn/commande" >
 <md5file name="history.php">76698169fea8c817165cec07292a4d60</md5file>
@@ -7871,20 +7876,20 @@
 </dir>
 <dir name="/fourn/commande" >
 <md5file name="document.php">ea1a3bd45013d291cafdce135ebbd13c</md5file>
-<md5file name="card.php">593d9a38941e23e0261625313c50e64f</md5file>
+<md5file name="card.php">f5527ee85d64038fdf5f9d30c5b1b62e</md5file>
 <md5file name="note.php">221d0b581479c434f039e58da4718a8d</md5file>
 <md5file name="contact.php">a6f5b10b14e766e788351b506b6f6024</md5file>
 <md5file name="dispatch.php">4ac8bad5aec7558c0a274b89b723e8ef</md5file>
 <md5file name="index.php">727523f22aceabcb8ea2d063a298b4d5</md5file>
-<md5file name="orderstoinvoice.php">43a367f720a851b8ecf9411bc6682988</md5file>
-<md5file name="list.php">1af90d15f4f688afbd3bd702d9b2aae7</md5file>
+<md5file name="orderstoinvoice.php">f8c26b1e8ae7b951e13d55ae2352a472</md5file>
+<md5file name="list.php">b31ded35f3b4a18458c7233b20a5f0ab</md5file>
 </dir>
 <dir name="/margin" >
 <md5file name="agentMargins.php">79fb102cf00e5bf2a76cf1330fb51577</md5file>
 </dir>
 <dir name="/margin/admin" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="margin.php">70a58e45eb007290bdd308d2c8a945a9</md5file>
+<md5file name="margin.php">64ec5374de142092f30ca9a27ed48185</md5file>
 </dir>
 <dir name="/margin/tabs" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -7921,22 +7926,22 @@
 </dir>
 <dir name="/user" >
 <md5file name="logout.php">f47f735ec8627b7b3e9ce6a5e1643d4c</md5file>
-<md5file name="perms.php">476de8c581c516f92a8b075d6b6eb19e</md5file>
-<md5file name="document.php">4b0592a2d530a9a95419b7f639330cfd</md5file>
-<md5file name="card.php">240c2cfd7be8c9aad5e8ea3126863cce</md5file>
-<md5file name="note.php">38abfe73d5c0388d08ded7e3cf929b9f</md5file>
-<md5file name="ldap.php">6fafa114cb6534368dbcdc261a4e66d0</md5file>
+<md5file name="perms.php">0e5f310426e76f3aec574418499382ed</md5file>
+<md5file name="document.php">605bb5fb9f548a1cfb766c12c98aa303</md5file>
+<md5file name="card.php">76e247e045e8cfb94788396fd28f1815</md5file>
+<md5file name="note.php">0b0532af9e3f441fe8f2e530df0e8b60</md5file>
+<md5file name="ldap.php">61bcd0fc159ba4ac9b4ca405006a458e</md5file>
 </dir>
 <dir name="/user/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="usergroup.class.php">bcfa3b276dd79437d1d60139fe51de01</md5file>
-<md5file name="user.class.php">abd324e009433ed557a09758aa4ede95</md5file>
+<md5file name="user.class.php">f179368eae8626309eabd79e9ef099d0</md5file>
 </dir>
 <dir name="/user" >
-<md5file name="index.php">a3142216aa5ce25ca86c6f3ef5f6b812</md5file>
-<md5file name="param_ihm.php">5c5ab39c1842193949ee3cc0927104ff</md5file>
-<md5file name="info.php">313d825ee786bc7eb75711676e131dff</md5file>
-<md5file name="hierarchy.php">3b122944f8b0d8202724ea8721ae8559</md5file>
+<md5file name="index.php">e5e530b1cf01fe8afd2baaf50b41187f</md5file>
+<md5file name="param_ihm.php">2068f6bb040e517d593f0e5607b8724a</md5file>
+<md5file name="info.php">e9075781de163cf107fb3202edb3e002</md5file>
+<md5file name="hierarchy.php">0ef37e21d2e25895a090ad77e9605685</md5file>
 <md5file name="home.php">f3fd7998c7163322b634f6c456841929</md5file>
 <md5file name="clicktodial.php">9cac9f75f05ba54c2255f7c789a5ab0e</md5file>
 </dir>
@@ -7944,125 +7949,126 @@
 <md5file name="bills.lang">357849a83e3bd4b80b773283f4376a88</md5file>
 <md5file name="admin.lang">ff5a2f73aa7d542ce30baafe36da69b7</md5file>
 <md5file name="companies.lang">2dd355941009bb108ad48bfdc68955de</md5file>
-<md5file name="compta.lang">67c38478b7e6853b5dbad31a75f655ba</md5file>
+<md5file name="compta.lang">207233d73666cd6d8fe829eef44420fd</md5file>
 <md5file name="propal.lang">648f0070a72520023118ef9d7d26500e</md5file>
 <md5file name="main.lang">a6eeebb304bbe571ffbab0db1d030569</md5file>
 </dir>
 <dir name="/langs/fa_IR" >
-<md5file name="projects.lang">017dc119f8847b411ce502960fb93f00</md5file>
+<md5file name="projects.lang">feac96efae29e1978aca0f4d6563faaf</md5file>
 <md5file name="cashdesk.lang">9b88489c5cb23c01cb49c1a882b3e6b8</md5file>
-<md5file name="workflow.lang">af5b933e2c38b422e297b175feafbfe7</md5file>
-<md5file name="bills.lang">0ac4437e5258a2da2b4fbc05a96aa80c</md5file>
-<md5file name="orders.lang">eeaea40d5dd910f63997ec0329d85cc6</md5file>
+<md5file name="workflow.lang">ca8137cb50689abf0c3bebe34978dcf7</md5file>
+<md5file name="bills.lang">645c8938ef1339047a5b5a7565ee8cd7</md5file>
+<md5file name="orders.lang">9e4b5f538b4b011a677fc66fc8f92459</md5file>
 <md5file name="domains.lang">458d70e686a207a21618c43bb1b9779a</md5file>
-<md5file name="admin.lang">19f08b971b98de2f05a94f45926b5a51</md5file>
-<md5file name="withdrawals.lang">37e6c064751c71cd82a008eeaa428389</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c75af9b946f33abb8e34a4355fc95b08</md5file>
-<md5file name="members.lang">edc2555b237dbc9aae4679971b8b424b</md5file>
-<md5file name="ecm.lang">73ef86c6047194a43a152f48099642f1</md5file>
+<md5file name="admin.lang">3c9b570908c0681fec82f333cd1a027c</md5file>
+<md5file name="withdrawals.lang">59ddd81ed9bf99d543f6f3aecb613f99</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">23b68fe48b368fc328f5dadcd75fdfe1</md5file>
+<md5file name="members.lang">6b1640bc51b7f7eb47b7502f0aaf0d2c</md5file>
+<md5file name="ecm.lang">23f198c26ee64d43c1673947c8865329</md5file>
 <md5file name="link.lang">7a3a40afaa184399b3341c8d3752ec7f</md5file>
-<md5file name="stocks.lang">4f157166ff76d99e38fa7517b5f00f81</md5file>
-<md5file name="products.lang">ca17029bd39f352c236bf79970ee7414</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">0793851eeab3b5a53fbe26ed497e9479</md5file>
-<md5file name="agenda.lang">bb6b2043ee13967c84a94a1321fc20ed</md5file>
+<md5file name="stocks.lang">f2626a3ff4d0672a0fb8213d4302cd0a</md5file>
+<md5file name="products.lang">acc7fc39768c46ea2adae58cc684cc1b</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">9f46b068d8a5538ee2cf334ed7cc0576</md5file>
+<md5file name="agenda.lang">27565cf94f0dfef1562980e50e72e6f3</md5file>
 <md5file name="help.lang">d3328f22bef875e75fcc41b404ce8460</md5file>
-<md5file name="holiday.lang">0a5c40d34cc8023d7d32ead997fad057</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">cdec5d3c8776546b69853152fe04a661</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">201c34fc9d67674ba6d8cdf07de30e62</md5file>
+<md5file name="categories.lang">55d966cd00ddf06007c84332f2a978e8</md5file>
 <md5file name="paybox.lang">d64c67ad98d5cc3c5136298f715b13f4</md5file>
 <md5file name="ldap.lang">c3fb35dd0fefe93bbf0dfd8976709bb7</md5file>
-<md5file name="users.lang">e22f001a43b558ee15fc2bd56a3b1e26</md5file>
-<md5file name="companies.lang">a7d9e22d7ff36c1da81e13bbfa449cd2</md5file>
+<md5file name="users.lang">1ee548ff699369a2ef3328d8c3010048</md5file>
+<md5file name="companies.lang">0389160828889ac6e5ae3140bc55df9f</md5file>
 <md5file name="margins.lang">9d94a90161657e4a6a6cbe94c7c22e89</md5file>
 <md5file name="ftp.lang">459a9508eb6538bbf7fbdf224bcd4e3f</md5file>
 <md5file name="exports.lang">6ff052e55a1d1827e5d79b2899ed3057</md5file>
 <md5file name="paypal.lang">b7f38fe9df82f9bfdeb39d490bcf2273</md5file>
-<md5file name="cron.lang">7fc9eecbe2a31e4ad73ee56f65862f02</md5file>
+<md5file name="cron.lang">c5d8a435b760308bd0c43e3494dea231</md5file>
 <md5file name="interventions.lang">bd5ee5b58b2511b8fe23e96db9451902</md5file>
-<md5file name="errors.lang">38525dcb27fc42b2d8485f8a42e668dd</md5file>
-<md5file name="compta.lang">1ff59633773f6bfb4dfdcc413018166b</md5file>
-<md5file name="suppliers.lang">00515fe2f655251e70f109e77ea88998</md5file>
+<md5file name="errors.lang">586fec4bfe258b225c4aa784b04cd83a</md5file>
+<md5file name="compta.lang">c574aea97d2384095367bd8760e3c9da</md5file>
+<md5file name="suppliers.lang">79cac5469ff193b50a56bdeebdd0c2b1</md5file>
 <md5file name="opensurvey.lang">afab86bd75994dd422cde6c39712e684</md5file>
 <md5file name="donations.lang">3324c82b9c0e239b743efceb0b1ee4a1</md5file>
 <md5file name="contracts.lang">e5b065b4af6be3796a6569c47af06436</md5file>
 <md5file name="deliveries.lang">af2c055b31358dcfbcaff19b8f32d741</md5file>
 <md5file name="mailmanspip.lang">0b811b8a0f1113a872111a69e771d294</md5file>
-<md5file name="install.lang">b8f29f83a85b2753cbb11675117979a0</md5file>
-<md5file name="propal.lang">1194ae8b155ccc5d1bd3de39e4f02643</md5file>
-<md5file name="main.lang">8aa5beac7299afebefbdf6817d7e3a3b</md5file>
-<md5file name="languages.lang">3aad9f2326dadabbb17a4c898f55cb7a</md5file>
+<md5file name="install.lang">9f9793168de39c05c8f5e5c726db436a</md5file>
+<md5file name="propal.lang">e1514692701903c4fa8ab6f93685fe9a</md5file>
+<md5file name="main.lang">98d3dcd9a18653410dd580e6cf832ed8</md5file>
+<md5file name="languages.lang">20022fccb813dd698fa7c312bcb9265d</md5file>
 <md5file name="bookmarks.lang">aa3dd95196d0ec83718e74c22d0a0da3</md5file>
 <md5file name="sms.lang">e2e3cd92d8221808b6348ea0dce50716</md5file>
 <md5file name="dict.lang">2b89db2c940374d7c69527633eb17a27</md5file>
-<md5file name="mails.lang">e4adcd78659246808f7ecf08d2e957d0</md5file>
+<md5file name="mails.lang">186fcdda038c22d40f7457eb1381e256</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">e113889c8ca0692d1fb6cab759afc91a</md5file>
+<md5file name="other.lang">1a323c8a650df021abc1b586298f18ef</md5file>
 <md5file name="commercial.lang">9a975f655e28eecee96a51af5c076f6a</md5file>
-<md5file name="salaries.lang">ca0b565cff02fb2256e6fb2a450aa0e4</md5file>
-<md5file name="trips.lang">34e85f53003491eeadd2684e81aef022</md5file>
-<md5file name="sendings.lang">f5339f279bdb4bbca04f7e9ca6030bd3</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">55f29464b755eabef4cf655705d4e4fc</md5file>
+<md5file name="trips.lang">0741dbdbe862ad79e1ec51eea338a175</md5file>
+<md5file name="sendings.lang">3f32afd3c519619a563ad55c9cea4f8c</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">ed3b811dbf2f5f0da999aac45470a2eb</md5file>
 </dir>
 <dir name="/langs/ca_ES" >
-<md5file name="projects.lang">0671915faa649b024bf52e2848c2af91</md5file>
+<md5file name="projects.lang">5859c62b079b0a0480f4e0c6cc022dab</md5file>
 <md5file name="cashdesk.lang">36d8c10a2ce5713bc959bebc6b9bb3af</md5file>
-<md5file name="workflow.lang">8bb2d5e983479802e326b238be378beb</md5file>
-<md5file name="bills.lang">3cf7adfa0a3097d1b2600c8dc7f108f1</md5file>
-<md5file name="orders.lang">8f423b7506fba2ec7d885507dbda2525</md5file>
-<md5file name="admin.lang">a59a31be7e8c13c20e0400b9e367b329</md5file>
-<md5file name="withdrawals.lang">bc80a7a24c2b869aaa5dc2c6fbaf232d</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">d4593b4f93ecaa542e8aea5a384d92ca</md5file>
-<md5file name="members.lang">f73b1da5514876526feca98957b769a0</md5file>
-<md5file name="ecm.lang">8e49cc0daead5830960facb5ea2b5281</md5file>
+<md5file name="workflow.lang">55323f24685f41d39d6a5d297e3654db</md5file>
+<md5file name="bills.lang">fe29168a2d086b161f144a7a45f5228f</md5file>
+<md5file name="orders.lang">4659448c23672ee316d25165aee48d7e</md5file>
+<md5file name="admin.lang">d863faefbc4cd771cfacc25567b1bccd</md5file>
+<md5file name="withdrawals.lang">a338de2b2e184a6a79b27c41ef758527</md5file>
+<md5file name="incoterm.lang">c7e95ae701ec540f03a566203de781b3</md5file>
+<md5file name="loan.lang">d9a551b3b77910142a904b5bff66b447</md5file>
+<md5file name="boxes.lang">0c303345656e37fc1519da1964cddbde</md5file>
+<md5file name="members.lang">e75b11d818d994ef2df874ada88fedc5</md5file>
+<md5file name="ecm.lang">dd1173124be792e55578eeb469959fb5</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">332e14780e6915f7d324812e4d06ff73</md5file>
-<md5file name="products.lang">6209d14d51b22773aed9282402cafe9e</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">bd26f0d63ead849168790ee8537aa56d</md5file>
-<md5file name="agenda.lang">ded4bc89f92c2a8ec08f6445f001c1ac</md5file>
+<md5file name="stocks.lang">64f0fcdb25d2b153dfb96bbe34260a1d</md5file>
+<md5file name="products.lang">4d55616d4e68f533e5937097f4815524</md5file>
+<md5file name="printing.lang">012873909cbcf963a767fcee91fb30ba</md5file>
+<md5file name="banks.lang">5f40ef6a61be6422c0397cd9f948ff27</md5file>
+<md5file name="agenda.lang">d4824b1213b6f47de287edd62af43f24</md5file>
 <md5file name="help.lang">abdc5b264864f9054c2bd3582aa7f290</md5file>
-<md5file name="holiday.lang">ac102c9e5f34b16d5425da80c0cb8115</md5file>
-<md5file name="productbatch.lang">d2e67af797ae0a9679df561cd138cb6e</md5file>
+<md5file name="holiday.lang">fd8f27a9544628ef7744cc9e05f5b08e</md5file>
+<md5file name="productbatch.lang">d11b836dcf659c52b30c12fe751664c2</md5file>
 <md5file name="resource.lang">3b21f916c1cc442741493663d4d870f8</md5file>
-<md5file name="categories.lang">16ab73a14d87056562a501659f91ae7e</md5file>
+<md5file name="categories.lang">cd3d6839cc57965bb3ee4cc3aac301b2</md5file>
 <md5file name="paybox.lang">b2eec42b35ed8f4710d5db8413135f8a</md5file>
 <md5file name="ldap.lang">97af8c6ef82a0f244fc815e6e16ccf90</md5file>
-<md5file name="users.lang">b4c21e9d97d5618f76a2fb5e19dba11f</md5file>
-<md5file name="companies.lang">42d457fdac3acd77c0a324361820c298</md5file>
+<md5file name="users.lang">975a2947aca7feb0804787f73f8cfc86</md5file>
+<md5file name="companies.lang">bea386a8037a2cd97b6ee95d76ff733e</md5file>
 <md5file name="margins.lang">d1f2a13bac4f33e0dcee955a46ff5c34</md5file>
 <md5file name="ftp.lang">171adcd57eecc43d8ebea5bd3cff21dc</md5file>
 <md5file name="exports.lang">72250ac3aec56486761a3340d5c292de</md5file>
 <md5file name="paypal.lang">8ff03a197fb775293900b1652cbc2cae</md5file>
-<md5file name="cron.lang">1f4934ff9e76bf858d095de52625bad6</md5file>
+<md5file name="cron.lang">bbcc88993e093b880a682371243cc500</md5file>
 <md5file name="interventions.lang">28eb991ac8777246895a581c360a9daa</md5file>
-<md5file name="errors.lang">bc755dbaf8c030bc1ead71068fedc9b9</md5file>
-<md5file name="compta.lang">96b5be908430b8ba7373f6668996d236</md5file>
-<md5file name="suppliers.lang">afacad3b2411ed3e53bcaef08d0ca4f4</md5file>
+<md5file name="errors.lang">3ad384183daab6d4d0e97f2b1e90f4f6</md5file>
+<md5file name="compta.lang">282e6e83517c19dbf0d4f3502f6135e6</md5file>
+<md5file name="suppliers.lang">0aef838008e37c6fd20fcf5a2ddaa280</md5file>
 <md5file name="opensurvey.lang">72edeb3570c0c46201f53a9ecafea7cf</md5file>
-<md5file name="donations.lang">2d86a48e9c7237578885e4b57dd9a831</md5file>
+<md5file name="donations.lang">47f5032648762db635d3ac9e03848d6d</md5file>
 <md5file name="contracts.lang">e938b7fa60f5c5bfd3b55f97f171585a</md5file>
 <md5file name="deliveries.lang">c1da4b8a0934373f032daa2da245a23b</md5file>
 <md5file name="mailmanspip.lang">9bc9627697f6507eaac340ce462ea48f</md5file>
-<md5file name="install.lang">445ea215ab25553f1e6a02df51e7d1ad</md5file>
-<md5file name="propal.lang">c9d5cadd5b283418c5aa85203a74aa2b</md5file>
-<md5file name="main.lang">b57a6139370dc22b4c17a1298cc82d10</md5file>
-<md5file name="languages.lang">faa2995204f2d7fa690071468d5cca0b</md5file>
+<md5file name="install.lang">c76b111cb906703325c39c15944c9064</md5file>
+<md5file name="propal.lang">47b62e8cc7056a679fc3aace6fb6a863</md5file>
+<md5file name="main.lang">853319bae36bc360b2d2b1d6d8a1a55e</md5file>
+<md5file name="languages.lang">99755af181536cf8aeca04042a3dd43f</md5file>
 <md5file name="bookmarks.lang">4c3b11586abcc5df7e395609ee7131be</md5file>
 <md5file name="sms.lang">45bc4e783f1c8f3b4cc8887ff320ac8a</md5file>
 <md5file name="dict.lang">02140c8aab60d378c25d218f29d4fd51</md5file>
-<md5file name="mails.lang">0ea982c95baa64c1c6ff6bf3244a22cf</md5file>
+<md5file name="mails.lang">6a019476090e0d2e7e18ff0cb90d8244</md5file>
 <md5file name="printipp.lang">a9e2cc6d99ccff9c1f8944d41f09a4ec</md5file>
-<md5file name="other.lang">f34cd70153bfa122c367d2f0b39de7be</md5file>
+<md5file name="other.lang">d70a8a5f266915543907b6d590b761f1</md5file>
 <md5file name="commercial.lang">49da8f53a1dfdc990054ca31badb7022</md5file>
-<md5file name="salaries.lang">83a549638b11eb3ac436be023679a1e6</md5file>
-<md5file name="trips.lang">03a3724414f7c5307426ae32c5f8ed8d</md5file>
-<md5file name="sendings.lang">91f65c396771da2ba9f1e966e59e1d61</md5file>
+<md5file name="salaries.lang">5a39128e50a6a619cab4a84ed21fb5b0</md5file>
+<md5file name="trips.lang">ca70ffa5f51edd23efd578d0465c7fd2</md5file>
+<md5file name="sendings.lang">1c5ad3363958ff425ff6a026d893cb79</md5file>
 <md5file name="accountancy.lang">269b9f26ca2cc6ca3251d060b1913c8a</md5file>
 <md5file name="externalsite.lang">1fb6c4f678f781062defcb85377e1223</md5file>
 </dir>
@@ -8078,334 +8084,340 @@
 <md5file name="other.lang">dd8e45a37c5ef0fc6089df59605c284e</md5file>
 </dir>
 <dir name="/langs/sw_SW" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">a82f967793fd358a77f730c774934150</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">4865ab7e4d789a51075d4f780c3674ea</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">51a8ed92619d4857e0eaddd369a14b38</md5file>
-<md5file name="main.lang">1356f3061125fc78d9cba7834e9654c7</md5file>
-<md5file name="languages.lang">3751e31948805ae4d6ba83b30f4c1318</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">66f7a690f24f20c3ff9589a5114245d1</md5file>
+<md5file name="languages.lang">ca98add30a96c4c06769885f58d8f51a</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/sk_SK" >
-<md5file name="projects.lang">27dee531e3acadaa5b85ca2bc08beab4</md5file>
+<md5file name="projects.lang">b338aef2305a07f141065fae4ed59b38</md5file>
 <md5file name="cashdesk.lang">737685ba123e361bbd63da12001d1853</md5file>
-<md5file name="workflow.lang">261d2325e97f1947dfa1715cba5d739a</md5file>
-<md5file name="bills.lang">c531f5f8cf805d6986da6e3a848c59f5</md5file>
-<md5file name="orders.lang">e6c912f661e3eb232914b9737a9ecbdf</md5file>
-<md5file name="admin.lang">515b69b2e105d2940a7ddc3b7da3b4bb</md5file>
-<md5file name="withdrawals.lang">c3646e03f2df786dfa2ec31ee3ab80d2</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">9d182a5137b918a55f7e166da6dbd0aa</md5file>
-<md5file name="members.lang">8f06a045e1f9439c132eab7b0ec1013d</md5file>
-<md5file name="ecm.lang">fbb442be183b6171ba2aa760e37e2990</md5file>
+<md5file name="workflow.lang">ead226130a7b08a13a2aeabf710b3b7b</md5file>
+<md5file name="bills.lang">ed765f1f9c28cbcfb42f7257ef562c11</md5file>
+<md5file name="orders.lang">3da5e48b2a0b06504f61ea3682b61af6</md5file>
+<md5file name="admin.lang">6a1ec2429b53d57eacea33d50ab19270</md5file>
+<md5file name="withdrawals.lang">19c4c6055000b1d4fe6f5735d4c344c2</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">840f7c27d3d7920e11ef771581c42ea1</md5file>
+<md5file name="members.lang">255944687f37fefd684d3ec9d2fbb0d8</md5file>
+<md5file name="ecm.lang">9e6b10b82ff6650b119aebde1eb1e0da</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ef2bdbced2a101b48feba1206dd35409</md5file>
-<md5file name="products.lang">5930bebbf1488037e7fd44e1d08b3cce</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">83ecff62f5b3f243578574f5fa20f185</md5file>
-<md5file name="agenda.lang">395c966c6a0a8eb576242edc349e4c62</md5file>
+<md5file name="stocks.lang">756c24dd6470f259aae3c35b90d0f552</md5file>
+<md5file name="products.lang">71a1c6b3734ee7770addc6344b8cdde7</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">66c98507121e7ff77b3207ef4f4cfcce</md5file>
+<md5file name="agenda.lang">b2e355516d2e77ab229bc801d365d343</md5file>
 <md5file name="help.lang">30c6a2ac8f5dc2c78135a1d2d958c7d3</md5file>
-<md5file name="holiday.lang">2c3c0e44d963da70631ef5845245c361</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">45da21029e2ca87bdd2908b3904339bf</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">7838a46921db383788058907da22d174</md5file>
+<md5file name="categories.lang">ba579e53599e2345c7c5f2335aaea0aa</md5file>
 <md5file name="paybox.lang">6b5e849f3d43ef3fef1ac53d781febda</md5file>
 <md5file name="ldap.lang">a1314605a33f143e8730909f6688403c</md5file>
-<md5file name="users.lang">bd7dda2ad705ee94dcc12d717aceb6cc</md5file>
-<md5file name="companies.lang">fff1ba73b4826597cc3d95377e3b66d4</md5file>
+<md5file name="users.lang">eb84b44b99e2dab255db18f924ed970b</md5file>
+<md5file name="companies.lang">1b059dbb3542da940b1e44bce04b9f62</md5file>
 <md5file name="margins.lang">4155fad171a9e5ef17663b83b38b0400</md5file>
 <md5file name="ftp.lang">bbf6109af99a85f4492dd98a94a6f7b2</md5file>
 <md5file name="exports.lang">8619d6f678b5c35f529442dc6240d6f8</md5file>
 <md5file name="paypal.lang">d819c152ecb177c120f1e3c9eaabc2c6</md5file>
-<md5file name="cron.lang">957e50b7d7e8f48839d6667a25120fd6</md5file>
+<md5file name="cron.lang">cc6c17551a0b45c91fc5fc79f276258e</md5file>
 <md5file name="interventions.lang">500aff15daa34730554493980806940b</md5file>
-<md5file name="errors.lang">f3ea652651455004957878d68d149205</md5file>
-<md5file name="compta.lang">b64a703248595261d97b96416e8fe66b</md5file>
-<md5file name="suppliers.lang">a74e0a8b8adb285e5675ad8f22e7646a</md5file>
+<md5file name="errors.lang">474467722392f19fdb2b93c019de05bd</md5file>
+<md5file name="compta.lang">0090e787c26a2bb9cea419b6532859ca</md5file>
+<md5file name="suppliers.lang">740c53836bca82fb6b8cc1f41a702112</md5file>
 <md5file name="opensurvey.lang">31e4db724dddc41b42b165ed8c66f3a5</md5file>
 <md5file name="donations.lang">e80b6464c4a540b59ab03e8b66369968</md5file>
 <md5file name="contracts.lang">530f11786adad3d90bf451044a293797</md5file>
 <md5file name="deliveries.lang">c6aa5d300ad94789a9f2c4cabc6cd8de</md5file>
 <md5file name="mailmanspip.lang">f5e9da89cf45e535117232b359317405</md5file>
-<md5file name="install.lang">ae98325d92a5c7b204a6d29990e289a0</md5file>
-<md5file name="propal.lang">eff46a7ef7fe0f9948f9b1ccc306e52d</md5file>
-<md5file name="main.lang">fa73ce370b8dee43aedda441575d91ff</md5file>
-<md5file name="languages.lang">ff119103fc6e7bdf5f61ead86c4278cf</md5file>
+<md5file name="install.lang">eddb8320ad57c12cbbf210ab239d7747</md5file>
+<md5file name="propal.lang">4b57bd5427c18abceb5c20abd89f5ba9</md5file>
+<md5file name="main.lang">baf027cc1ad488f977fc711c1c8beb55</md5file>
+<md5file name="languages.lang">496505c51c16debb6236ee502b247908</md5file>
 <md5file name="bookmarks.lang">1d7a55d13ebc889af056ef71120d26ec</md5file>
 <md5file name="sms.lang">119d9afb003f18c3adbfa0f2cad74211</md5file>
 <md5file name="dict.lang">b99f23c57218db693329dea5e53bdaca</md5file>
-<md5file name="mails.lang">eb4345df6926e58a295919deded030bb</md5file>
+<md5file name="mails.lang">966183e32332c7b7dff8d49b850fadbb</md5file>
 <md5file name="printipp.lang">d7f5ec81233132fc3a20c1017759ef79</md5file>
-<md5file name="other.lang">fb42b13bd294d714d48a5ad8a18abada</md5file>
+<md5file name="other.lang">d783741a8e2aaf7c520dad108d7adb86</md5file>
 <md5file name="commercial.lang">a5cf2b653fe77070ce6cda3f3279f126</md5file>
-<md5file name="salaries.lang">803ceef46d178e9f8661c92d918157ac</md5file>
-<md5file name="trips.lang">ecf1064ba55bade50d6802eb4a1090d9</md5file>
-<md5file name="sendings.lang">41634db7bf734aeaa7b14ff98bd9faff</md5file>
-<md5file name="accountancy.lang">85a0d1b52e0c67b60087d2c3e5b30d04</md5file>
+<md5file name="salaries.lang">bd3718cc7fbf6dc1b46753b2a07892bf</md5file>
+<md5file name="trips.lang">bf7bfc020de96482bdaa90a9285838d0</md5file>
+<md5file name="sendings.lang">d6440dc14d6237e3336cf39a86019784</md5file>
+<md5file name="accountancy.lang">ca16f0c23c63668a32dea729cbb8fcd1</md5file>
 <md5file name="externalsite.lang">cdfa3838283c176556fd986e1d077a37</md5file>
 </dir>
 <dir name="/langs/lv_LV" >
-<md5file name="projects.lang">76b311f0c47f4d6fcbdc496f885cb210</md5file>
+<md5file name="projects.lang">c1fdff60a3c65ab923c21b214ad28fd6</md5file>
 <md5file name="cashdesk.lang">c9310d0a5a4f7e1f6b85201c0dc2fc5e</md5file>
-<md5file name="workflow.lang">7883b003313ff4acf806158e7821e206</md5file>
-<md5file name="bills.lang">3c435a743e3c104534888e7009aa186c</md5file>
-<md5file name="orders.lang">2280a3849504dad92642a115178e3208</md5file>
-<md5file name="admin.lang">4708c6c7d007528024fec04f160f0dfb</md5file>
-<md5file name="withdrawals.lang">83390246a5a15a70c0115927b6ce6392</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="workflow.lang">6e04edde5694fc8e6bbb47aa579d974f</md5file>
+<md5file name="bills.lang">55e66771b1d42948f2868f87b28ea19a</md5file>
+<md5file name="orders.lang">6292882f096cfcc3cc8d9ccb5c56fb9e</md5file>
+<md5file name="admin.lang">c84950d941ef1be164afeae83c2199ce</md5file>
+<md5file name="withdrawals.lang">74a51ee9815a4e81828f00e102f2b977</md5file>
+<md5file name="incoterm.lang">24c63cbdef9fee26ca73e39677998398</md5file>
+<md5file name="loan.lang">f4edcec9ef405af2798f27a4d7902e12</md5file>
 <md5file name="boxes.lang">b83c85c2ac7cc0c586dce2cffa73585c</md5file>
-<md5file name="members.lang">536d1e5fc0c0db495a44906b959abe87</md5file>
-<md5file name="ecm.lang">689b03714c6aca65c47031f4da01ab2d</md5file>
+<md5file name="members.lang">f5e8ae5dcbf8191e1830afe13c85f33d</md5file>
+<md5file name="ecm.lang">dc628590b54606da6a6d3510ea4c94d1</md5file>
 <md5file name="link.lang">86b10d96c3a969dbf3a625859ee245fe</md5file>
-<md5file name="stocks.lang">4ba8aa641f626577301fdcf710a89751</md5file>
-<md5file name="products.lang">a4c90fe44d7cf94c9b17e3fe7075a24b</md5file>
-<md5file name="printing.lang">9b4b3fa945a56f2b72dc0860b2e88c65</md5file>
-<md5file name="banks.lang">4ecaa57a07979ca208dedd934e934071</md5file>
-<md5file name="agenda.lang">43405e53a62aa8f029cb11361ef44e2d</md5file>
+<md5file name="stocks.lang">297b5f6244ea15d9798c5fb300256217</md5file>
+<md5file name="products.lang">6d53fa2cb74b9d556a8274e274b36f1e</md5file>
+<md5file name="printing.lang">70b6e1129901ac9b543fa66e73a27a24</md5file>
+<md5file name="banks.lang">1500dfc4960ff1066349a850d13a9ce3</md5file>
+<md5file name="agenda.lang">2f2a95181ab4bdb28484a18eb7888ab6</md5file>
 <md5file name="help.lang">f8e9d0e2f7ca86f855a1fe6a39eab4d1</md5file>
-<md5file name="holiday.lang">47f5569a8bf751eaa70fa105edd2293c</md5file>
-<md5file name="productbatch.lang">fdc094ad86494758496e191f32b578f3</md5file>
+<md5file name="holiday.lang">f8dd616c5a9a4702979b1104c3f0c4bb</md5file>
+<md5file name="productbatch.lang">1461952a71c3b0dab73956e09db90725</md5file>
 <md5file name="resource.lang">7a75cd5ac5590263657b0fe81c2e9686</md5file>
-<md5file name="categories.lang">78e8ba4079b98d950881c5512eebca99</md5file>
+<md5file name="categories.lang">0404a23c9fb69cbcd1610a9f45c97e31</md5file>
 <md5file name="paybox.lang">7b99c6b195af997027c07bd9348c7b1c</md5file>
 <md5file name="ldap.lang">4bfee5904f91bea7f89e69b65d84edef</md5file>
-<md5file name="users.lang">a2e1832c57b19513176a741530684c87</md5file>
-<md5file name="companies.lang">b862f2f6c8261be10f3c18faff22fd22</md5file>
+<md5file name="users.lang">41880d289bea521ebd8f24215e6d5f07</md5file>
+<md5file name="companies.lang">9f2f6d9e8172b0b83a0f8e337e25d1ec</md5file>
 <md5file name="margins.lang">1f80e739843212120c61324f88ac8b0b</md5file>
 <md5file name="ftp.lang">ece08cb7ed6810cdb3f0c1c917ec986c</md5file>
 <md5file name="exports.lang">415710f6d8f8caa5326a56688a20f3f3</md5file>
 <md5file name="paypal.lang">7f1cf10b121b601826c8160b97d9201a</md5file>
-<md5file name="cron.lang">012314e6cf340b2f1e1a5c59a85db7c0</md5file>
+<md5file name="cron.lang">519e04aa0c92c6e37e9008ed841bf930</md5file>
 <md5file name="interventions.lang">eb93565549b324f373ccb8ae14a9e82c</md5file>
-<md5file name="errors.lang">c48c1b680ff2d2be54be761b2ab7755a</md5file>
-<md5file name="compta.lang">2c8bcfd130f75c11098a1a143e256dc5</md5file>
-<md5file name="suppliers.lang">bd2928650dd66613ef518cb8b8e084fb</md5file>
+<md5file name="errors.lang">f2630711bed66f7758155f5d206866b2</md5file>
+<md5file name="compta.lang">5d855f7f703ad8e8c211ef360bee7012</md5file>
+<md5file name="suppliers.lang">985c5df53a530f1723fc45831f2a5869</md5file>
 <md5file name="opensurvey.lang">bf1409395306f2b2924a67beac05dd56</md5file>
 <md5file name="donations.lang">7ec990a748195e943c1d78619a7be987</md5file>
 <md5file name="contracts.lang">4de31a2c43986cdc7cb77c46af26708f</md5file>
 <md5file name="deliveries.lang">e0a2135bf8ba78d71c0162491021d9bb</md5file>
 <md5file name="mailmanspip.lang">ae2a39ed84e9a8b31e97d34efd50bf79</md5file>
-<md5file name="install.lang">40fe600abe111a3b94e46d9ff95cbf69</md5file>
-<md5file name="propal.lang">cac02982af1a016e225fba5f78dbaf9d</md5file>
-<md5file name="main.lang">76ceb30cc81b488e360edf4cd6b072bf</md5file>
-<md5file name="languages.lang">b057ed88c68f66ceb4fc3f7c4ad8e61e</md5file>
+<md5file name="install.lang">ca705fd29809958bc1eeb8b1f688fcca</md5file>
+<md5file name="propal.lang">95562f393025b7c7156e666cb8b45bc6</md5file>
+<md5file name="main.lang">2806faa3497471decf23eab6f2847804</md5file>
+<md5file name="languages.lang">760edd603d60db4f4a12ecc544ee37e7</md5file>
 <md5file name="bookmarks.lang">2ba914ba1f287a51e96117c8734d0370</md5file>
 <md5file name="sms.lang">98035fec612b1dea0f11fa299377d2bd</md5file>
 <md5file name="dict.lang">cc44d8f6611ef62af800332274ddf91d</md5file>
-<md5file name="mails.lang">1041d6ae63ba6aea3b58a9597411bb80</md5file>
+<md5file name="mails.lang">f84dfcb30b9046145c153fe1e44201da</md5file>
 <md5file name="printipp.lang">599dc37a15c362ea63096dfbf7f57bf1</md5file>
-<md5file name="other.lang">194741eacf166f7dd6fe934712886ee5</md5file>
+<md5file name="other.lang">6e89b691b2b736950d61f73d949326ff</md5file>
 <md5file name="commercial.lang">17e8da7051c1b9875f14fd6cc7021f70</md5file>
-<md5file name="salaries.lang">3e71d859df80186b7b28a84c96919be9</md5file>
-<md5file name="trips.lang">60daced713741cc7d341aafbd2e709b3</md5file>
-<md5file name="sendings.lang">da20e42fc14496869e80645566c3ba35</md5file>
-<md5file name="accountancy.lang">9c2bc251217eeabb0f596bc8eca72375</md5file>
+<md5file name="salaries.lang">1bb02f5007b998c89755a783129afce8</md5file>
+<md5file name="trips.lang">81d44faf21ef0c8c1518ca500c012986</md5file>
+<md5file name="sendings.lang">e4bc72dbc536892dc727d6dd94ccdbba</md5file>
+<md5file name="accountancy.lang">5d6f5ec85c4dd5a800ec17477c899ff9</md5file>
 <md5file name="externalsite.lang">98e1082970a865bf1264472c0367b2ea</md5file>
 </dir>
 <dir name="/langs/en_ZA" >
 <md5file name="main.lang">83d58d7245d7473a79ece8004d881b7c</md5file>
 </dir>
 <dir name="/langs/el_GR" >
-<md5file name="projects.lang">bb917ec06d14e40efb3300e05d0a0a10</md5file>
+<md5file name="projects.lang">e0e1286ae7cf7e4fd4617178ea8ac794</md5file>
 <md5file name="cashdesk.lang">c4000c3a5f961950001bdbf0eada3ea1</md5file>
-<md5file name="workflow.lang">88d5cb60dbe10ed6fa96e68b6edb6918</md5file>
-<md5file name="bills.lang">1d969100b86d4a540c27d3b81cba7135</md5file>
-<md5file name="orders.lang">bcd76502b4bae3df88413973e9190aba</md5file>
-<md5file name="admin.lang">1da5dbfd0992f79c052764d625e19710</md5file>
-<md5file name="withdrawals.lang">e7f895e3c9704e5bcbaba0dcde9a9cd9</md5file>
-<md5file name="incoterm.lang">beb56f819a1606e5f016fa8ece26cb3d</md5file>
+<md5file name="workflow.lang">7d36ebf391461a17289c2b5be7cf3e85</md5file>
+<md5file name="bills.lang">61f36816dad068ac0b4987961e2b2dc2</md5file>
+<md5file name="orders.lang">3ef36a586a1d9f9bfc2f4f1a6506256f</md5file>
+<md5file name="admin.lang">72cfa35de9852b41ec072fc51ff4dcf4</md5file>
+<md5file name="withdrawals.lang">f42193f1b045aa8b255d4c544bbfbffb</md5file>
+<md5file name="incoterm.lang">577770bc1b047e531d1c8915b91c1b3a</md5file>
 <md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">98d42795ea5d6603c5584fea226b4da1</md5file>
-<md5file name="members.lang">0bf4d5e2e2dc108c9d7bf4709c95c1c1</md5file>
-<md5file name="ecm.lang">8f4b79b39959181ea70b9c231bb9ddbe</md5file>
+<md5file name="boxes.lang">5bf30afb669fabbcaffa18890ff52efd</md5file>
+<md5file name="members.lang">86d9fd2f49c28d4a59ff0b17d911dcd9</md5file>
+<md5file name="ecm.lang">6305fa20d454ee2dd7790b5c758e6dbe</md5file>
 <md5file name="link.lang">a4f7de71fffb7fe66bbe1ead04e43890</md5file>
 <md5file name="commissions.lang">f8a9ee9349754eca7dd8fa4a3b30923c</md5file>
-<md5file name="stocks.lang">8d4e0500361675e1aa151b55474e52cc</md5file>
-<md5file name="products.lang">ff67d6d9f70665b79297741f31c34c8a</md5file>
-<md5file name="printing.lang">42c0f32004ad912b0cfd236b2793f4b7</md5file>
-<md5file name="banks.lang">84802bf3c4089efe535735c71c0a927f</md5file>
-<md5file name="agenda.lang">f1f9f34107c12b12db5e173ef69e5683</md5file>
+<md5file name="stocks.lang">a81cb54478c924568a05ebc8878cf1d7</md5file>
+<md5file name="products.lang">fdfdfd9e9b7b99ece66aa02480c3479f</md5file>
+<md5file name="printing.lang">4cfb7140abfc052ac0566a0afba34be3</md5file>
+<md5file name="banks.lang">8462998549e84858f0460e8716420f61</md5file>
+<md5file name="agenda.lang">43326de54d28c8ce6f8b420ad9ab7a6a</md5file>
 <md5file name="help.lang">426904859bbfa17b03832bb45bb04199</md5file>
-<md5file name="holiday.lang">19bdb34ebc6cb393aec07df216ff5065</md5file>
-<md5file name="productbatch.lang">0c5860b9d02cef8eb72402d8960dc8ed</md5file>
+<md5file name="holiday.lang">eef2e0c1ccd6acb7e0e1904ef3d059c2</md5file>
+<md5file name="productbatch.lang">c5c8e08bddcd4b099e4421c7b876d3ca</md5file>
 <md5file name="resource.lang">2bad6855dcaaf4b18c3c92f32d94893f</md5file>
-<md5file name="categories.lang">d7db8015e851aaf2e64cfc47f33f6951</md5file>
+<md5file name="categories.lang">32cfb42afb088d22c8ba0d4c07ee22fe</md5file>
 <md5file name="paybox.lang">20f45c49e3159e93486848672ee4650b</md5file>
 <md5file name="ldap.lang">d2eecb1e8e4fb988dda81bbeb97746c2</md5file>
-<md5file name="users.lang">506035c575faffff4df76ac0cbd0e672</md5file>
-<md5file name="companies.lang">d06039f65616165ceb95e9a140e017e8</md5file>
+<md5file name="users.lang">52023aef83703249417a5fa03ff0c02d</md5file>
+<md5file name="companies.lang">64dc7d44699c8daced4d8b636430c290</md5file>
 <md5file name="margins.lang">318fe97b75c67ca76a381dcb2fa8c235</md5file>
 <md5file name="ftp.lang">dba59ec36d373ca112d6392ad83b0006</md5file>
 <md5file name="exports.lang">5c10d604a0e4afa89950b5c8ea4e682f</md5file>
 <md5file name="paypal.lang">e9ad12e8ccc33746292e9e23f1b8f140</md5file>
-<md5file name="cron.lang">c7e22802737e5755508ff6fe2910578a</md5file>
+<md5file name="cron.lang">cba7b7e8e5181e09cfcc945401729cb6</md5file>
 <md5file name="interventions.lang">2ba0518b06449c1440e2b4e99f206b4a</md5file>
-<md5file name="errors.lang">b8106681e5571530b740c623316aacc2</md5file>
-<md5file name="compta.lang">356004b343737cb05194e021dcc61caa</md5file>
-<md5file name="suppliers.lang">11255ccbc8f315b9ac01162c5b3939a2</md5file>
+<md5file name="errors.lang">06115afadd552aef4060f01ea7141c72</md5file>
+<md5file name="compta.lang">a4c64504bed28d08850a343dfd673fb9</md5file>
+<md5file name="suppliers.lang">fc1001f527b67e54f57d665154d48fd9</md5file>
 <md5file name="opensurvey.lang">2a5e5c20e225efad5f6b841ad0847617</md5file>
 <md5file name="donations.lang">260a28780209a054543aeee4e3431afd</md5file>
 <md5file name="contracts.lang">1f4f2ca64df801881a31f2755eedfd0e</md5file>
 <md5file name="deliveries.lang">02117a18e23e6d3fa6af33209fb0e6b4</md5file>
 <md5file name="mailmanspip.lang">491fa67114d3c382ca11c8beda1d2481</md5file>
-<md5file name="install.lang">9e11cb0cf1fc7d8d0189e3b92781fc2a</md5file>
-<md5file name="propal.lang">348843a224b0ab55e3d51c0ef701c55b</md5file>
-<md5file name="main.lang">f8c38e046825577ad0a0492a54162458</md5file>
-<md5file name="languages.lang">f135465130fca1966eae06b57a3192d7</md5file>
+<md5file name="install.lang">55d16fcc90c6dcb0f8362620f0935725</md5file>
+<md5file name="propal.lang">fda71a80dc11279fb51ad436388c1256</md5file>
+<md5file name="main.lang">f1670f479e2cc13aa4b555953b6da9d4</md5file>
+<md5file name="languages.lang">b613f1ea1627319aabbb329d7004a2c4</md5file>
 <md5file name="bookmarks.lang">f0b4dcb4ff338aae365219b7c90568c9</md5file>
 <md5file name="sms.lang">0495a2ce04fae425dc6a1d880ceb1dbe</md5file>
 <md5file name="dict.lang">f7261490003c49efcba34cb82f632fa8</md5file>
-<md5file name="mails.lang">e00f3af08340988b3ad28a875762e6c1</md5file>
+<md5file name="mails.lang">51fbfe71f84cccf26bd128b1e071841b</md5file>
 <md5file name="printipp.lang">bd3097dcdf63e182214dda4005b47019</md5file>
-<md5file name="other.lang">a40977b321c62cae4e6201ecee51c564</md5file>
+<md5file name="other.lang">b61c770289917771f5126c772d406865</md5file>
 <md5file name="commercial.lang">7cae9dce924b9a3ad5fe6c7d42fb77df</md5file>
-<md5file name="salaries.lang">dab8f9faa695a459f51b0f97ba0d8fb7</md5file>
-<md5file name="trips.lang">825ab258d0c4e5758c0ee628fb42962c</md5file>
-<md5file name="sendings.lang">b6e74a35d4dfe8e05e08baf872ff1921</md5file>
-<md5file name="accountancy.lang">eabc62c20f3380e78359bf942b5657d1</md5file>
+<md5file name="salaries.lang">b3b43d5b59898b53c3438acc767d5fb3</md5file>
+<md5file name="trips.lang">0f4ead4db40d2bc3eaae96e97a16e8b7</md5file>
+<md5file name="sendings.lang">a198e573d00da68eeaaa67fb7dcdf0bc</md5file>
+<md5file name="accountancy.lang">c710c49a98192c273cf4de252a29d30e</md5file>
 <md5file name="externalsite.lang">381fda47b3c28be5e86909a54ecf6f72</md5file>
 </dir>
 <dir name="/langs/eu_ES" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">3a0718dbb49ccce931717f52787dc3dd</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">97e7bc2c31555a0afde1883b316cb5f1</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">e4eb75dc75f96afc6ad66fc134cae9ec</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">7d720be6034267952ae4cbf5483f06c8</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">544d1e567d9c598375d0b2d08cf632a1</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">ff5fa04ecd30b34eeb2f0d902a96c2d1</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">c46cb67879fb0a99227de612b360d96b</md5file>
 <md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">2557b24410d1fb00de290259c8102fd9</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">efd21f8e64a8c124f09844ea36c87208</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">7b66369f2447bf5361d9460cd162a092</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">88aa30e7fb6c99116c0c723f0556df80</md5file>
+<md5file name="cron.lang">453b10bf9feae2447a1e1a28d2d6ed05</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">8ad7dc8c62da0c98fdac28dfda1db0da</md5file>
-<md5file name="main.lang">8380add17705af4671274a34d735845b</md5file>
-<md5file name="languages.lang">906adc49584042461b20f130732ea9e8</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">0f97fb4722d6aa2cab80ebdd43e6d6b6</md5file>
+<md5file name="languages.lang">ec8d52cb56d080f636c0fcf4b3c0b23a</md5file>
 <md5file name="bookmarks.lang">3e3baa2a47af2ba7525ad71522d6ed85</md5file>
 <md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
 <md5file name="dict.lang">464e3cd1b9ccd7bb22bfdffb69ecf33b</md5file>
-<md5file name="mails.lang">ea85eab4477d7c17bbf4c0c0c5e5065a</md5file>
+<md5file name="mails.lang">ad5d0b141c1b1009144f9f984bfc6e72</md5file>
 <md5file name="printipp.lang">dbe76f9c3c57b312b0d6e217b9f2a1b5</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">39839e873ee2d30b40fbcfe3ae0271d6</md5file>
-<md5file name="salaries.lang">9404750cf791c1b2a44dba3b3f1c0a0d</md5file>
-<md5file name="trips.lang">f2abc75a4866e567d2c3dbdeac2b4227</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">678a224c72ab87f381b25228890f9eb6</md5file>
+<md5file name="trips.lang">9572654bbcc8ed3acd198b03b7c43b02</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/en_US" >
-<md5file name="projects.lang">4d33c178725bf85d6fed4a3463bf9376</md5file>
+<md5file name="projects.lang">f8bf05dea7d5762b4f12be0e7df4db72</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">a577c945e36ad6a5128ccd9b78ce95ac</md5file>
-<md5file name="bills.lang">558ea4e4e3093c204da98b939aab9427</md5file>
+<md5file name="workflow.lang">62922eb1ad1501e02b86da4f0c8f1126</md5file>
+<md5file name="bills.lang">9652aea864908b3b0a6be5444656d0a3</md5file>
 <md5file name="orders.lang">6d1a3bb5f8ad66eb1f311a24efe8441a</md5file>
-<md5file name="admin.lang">11fbd22f1f5df81e2eaec2a6c3c07ce7</md5file>
-<md5file name="withdrawals.lang">bb33ad0b8979fda3a2ce7333e06690d8</md5file>
+<md5file name="admin.lang">b244b45b0c9987856ec2b54681df8e3a</md5file>
+<md5file name="withdrawals.lang">e272b24123a940834eb7384c732c3c51</md5file>
 <md5file name="incoterm.lang">e696620abb33dd46cbcc1d87e8f0abca</md5file>
 <md5file name="loan.lang">7db2f1cdec58e462f71191b33e61c71c</md5file>
 <md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">bc8b10dd8cc1f841662dfdd87868197c</md5file>
-<md5file name="ecm.lang">311cb7d4bf06cb181cfffb6e44ed5826</md5file>
+<md5file name="members.lang">711b566364586ed91ad85af0fbe5f845</md5file>
+<md5file name="ecm.lang">806ea2c3f875c43ad984200eda43655a</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">00c975156f0f920a45183c3a23895978</md5file>
-<md5file name="products.lang">3317a2570c5f3e9a8796be39e1f391b4</md5file>
+<md5file name="stocks.lang">e1afc035424975ab294974582a0089d4</md5file>
+<md5file name="products.lang">3b04b4e2740c2eec581518e66db20ef9</md5file>
 <md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
-<md5file name="banks.lang">80280f8f617582983aeeb5a58517e332</md5file>
-<md5file name="agenda.lang">933801cade37a7cc6d719a5a06b61cec</md5file>
+<md5file name="banks.lang">2b2a2539bf08025ea2794371cb5d5edf</md5file>
+<md5file name="agenda.lang">aac64240dbb7c5de7b9515ee851f6e20</md5file>
 <md5file name="help.lang">d9472c4c816f496c95e5f408e8465767</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
+<md5file name="holiday.lang">874f3bcc70736ecd87c2fa36c885ffd7</md5file>
 <md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
+<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
 <md5file name="paybox.lang">4ec9196673fd4aebd525032a6b450584</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
 <md5file name="users.lang">28ef3589fb3b052ea0c95358a09f5198</md5file>
 <md5file name="companies.lang">fa10090809dad8acec5af3a377b6823d</md5file>
 <md5file name="margins.lang">3d3824b2934300c588713599638fbd53</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
-<md5file name="exports.lang">3ffecf278a6c726e6b1cef69940945ab</md5file>
+<md5file name="exports.lang">90982da369275d6cbb5483c2211c128d</md5file>
 <md5file name="paypal.lang">75fb4c310c4f0554d3ac9859d0c5b646</md5file>
-<md5file name="cron.lang">c4b6122a148725da969099eec43c9883</md5file>
+<md5file name="cron.lang">3314a3c5291bc6ae803c15e9bbf5198b</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">66d268c7122551e46f2973661ae0cf15</md5file>
-<md5file name="compta.lang">34be9245428cb84ae31c992eb21f33d3</md5file>
+<md5file name="errors.lang">12d0521c3aaf7d27aa8f50825159fd27</md5file>
+<md5file name="compta.lang">7e3f6d53f63519151ffe7550d3f456a3</md5file>
 <md5file name="suppliers.lang">434f0b89dace6fe057f1e0d8f49c70cc</md5file>
 <md5file name="opensurvey.lang">6f3b6f771da549d8e22263e795ddecaf</md5file>
 <md5file name="donations.lang">824683c2bba8c209bd757096e7b7e21a</md5file>
@@ -8414,195 +8426,197 @@
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
 <md5file name="install.lang">e5ffe4b8be92155bccb2d4fd38a060e8</md5file>
 <md5file name="propal.lang">d4962dbf14773e0e4e20fef6291149ff</md5file>
-<md5file name="main.lang">6be5863469b9058212b713e88f2c1bcb</md5file>
-<md5file name="languages.lang">7ce6e3f27f962ebc461ed5dc35b1b683</md5file>
+<md5file name="main.lang">e0b8cd891f67b381f2d3c24247054323</md5file>
+<md5file name="languages.lang">a5abc976cb9b5d81fbb06ae5bd057ec3</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
 <md5file name="mails.lang">6f2a62f976e213c77fc7b1e1cde5ec47</md5file>
 <md5file name="other.lang">cab808a7c9be3e83a0e4d9bd65692563</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="askpricesupplier.lang">392a9f304b21d0b034e72b49a8f43f7d</md5file>
+<md5file name="askpricesupplier.lang">d107b7336d609d8147c434d9f2e7ff92</md5file>
 <md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3667d997a630487de7f9a21d8cba3f10</md5file>
-<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
-<md5file name="accountancy.lang">d469c393f5afd6211eb51ce1ef05af85</md5file>
+<md5file name="trips.lang">ce8496f7c67d42451bfecc123c9ecd5f</md5file>
+<md5file name="sendings.lang">d6ccca2840c7230a4d36fb3d1b0d55e1</md5file>
+<md5file name="accountancy.lang">af92ba78b278c5f5463ead24dfe967e2</md5file>
 <md5file name="externalsite.lang">924c656e4301df08646901c0ff6971ed</md5file>
 </dir>
 <dir name="/langs/sq_AL" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">a82f967793fd358a77f730c774934150</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">f209f3bbc245afc75bf1fe1c2b74317f</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">4e186ea8084c33de3fec3182f57150ec</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">e355739b38707e595924a2aae63d78d0</md5file>
-<md5file name="main.lang">47268e5661ee7814b2a6a45e8f469ee5</md5file>
-<md5file name="languages.lang">5f5e1f71ef91392a3edee6cdf5e03408</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">b30f28e120ad7e17839d289689d47032</md5file>
+<md5file name="languages.lang">7ce6e3f27f962ebc461ed5dc35b1b683</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">c95d9dd5cdb6d9a6824a6bdbefb48531</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/tr_TR" >
-<md5file name="projects.lang">611b2c2a0b8f52640a360eb76918d9ba</md5file>
+<md5file name="projects.lang">67c7a62cac0ede8711a8b6f55fae12f2</md5file>
 <md5file name="cashdesk.lang">a8c0d300734b6d141fea36463cafb665</md5file>
-<md5file name="workflow.lang">f6efdae4466869ca2012be4bf1e11784</md5file>
-<md5file name="bills.lang">1286f4c2523a2551049e91eac2c9e0f9</md5file>
-<md5file name="orders.lang">58b3a9d1669f3ec09c993daf66c30351</md5file>
-<md5file name="admin.lang">0a3ced4bf688fbde3d7c45de73779fa5</md5file>
-<md5file name="withdrawals.lang">841d4baad5be8f3de6dd7c9051b40c34</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">19ec42d550e514ea36a8343729cac4ff</md5file>
-<md5file name="members.lang">6969d474da7d13c1434c89cf5c9c2838</md5file>
-<md5file name="ecm.lang">d3626e710c760f03bdc31e17888c3c9e</md5file>
+<md5file name="workflow.lang">9b62f0600a53298f6d41eb122a26e35e</md5file>
+<md5file name="bills.lang">d27999cc431804c16215cdafbce5c7d9</md5file>
+<md5file name="orders.lang">7fde735d55748e3071d697e0000d6f84</md5file>
+<md5file name="admin.lang">d3ce278fc8ca8d8e936ac9a33bc5429e</md5file>
+<md5file name="withdrawals.lang">222aa2f628603e20487ee742f68f0944</md5file>
+<md5file name="incoterm.lang">07bbf1314ee53209e4d8cf452881caca</md5file>
+<md5file name="loan.lang">a844ce312e01fb23c7007783d7e8444e</md5file>
+<md5file name="boxes.lang">06b09b671e4f3c2c4f6d6543f6d01e36</md5file>
+<md5file name="members.lang">6860a3f3b0469b68220888089b64141b</md5file>
+<md5file name="ecm.lang">248124043d0c210123ec3f1d16032efd</md5file>
 <md5file name="link.lang">39015974e9a1c6c4589591ae58a154d7</md5file>
 <md5file name="commissions.lang">817e3122945ecefbc4ce8abe613858b3</md5file>
-<md5file name="stocks.lang">aa08a41a0a9411f852d4366ff44a4fb3</md5file>
-<md5file name="products.lang">cd78600d723a6cea86826c45b679e275</md5file>
-<md5file name="printing.lang">2e7f653f8d100bc3f0bce016ff734faf</md5file>
-<md5file name="banks.lang">b6e844ff709cffc1329a4d246c82515a</md5file>
-<md5file name="agenda.lang">fe72519d98d7e217968b5f3316a43508</md5file>
+<md5file name="stocks.lang">7f91bd766b88ed82b373ae826cfbf609</md5file>
+<md5file name="products.lang">1caffda3961077e45651fd34b9ae5079</md5file>
+<md5file name="printing.lang">8a7d8cf777dc50fa3660627be69889b8</md5file>
+<md5file name="banks.lang">eace8a684eacbeb427e6b1aaf9df4f9d</md5file>
+<md5file name="agenda.lang">4d02abcce9b7d1943142883e1739c688</md5file>
 <md5file name="help.lang">0d0f009398a7487d59b485e07c6fbc73</md5file>
-<md5file name="holiday.lang">3ebba88a951b29597da0b2b617e9d9ed</md5file>
-<md5file name="productbatch.lang">a7f9d33a9a9ae39aefb1dc514f8d083e</md5file>
+<md5file name="holiday.lang">87eb84f17abca692f45a1f5cdce13a3e</md5file>
+<md5file name="productbatch.lang">e5f10f65ec52fdd1433f2a477b70e5ad</md5file>
 <md5file name="resource.lang">a5affc357e84c82d0cb507e7d977faad</md5file>
-<md5file name="categories.lang">92bee83d3bf572b69fc6cd579b776791</md5file>
+<md5file name="categories.lang">dc684f08563791675f92e2cc08417009</md5file>
 <md5file name="paybox.lang">2915a53bd07481deba02d6cd6f8b961c</md5file>
 <md5file name="ldap.lang">86c9af02e6afad6b682cab386e7ea8c9</md5file>
-<md5file name="users.lang">ae7f2cfcf48b08d701a1695e12fed9e8</md5file>
-<md5file name="companies.lang">9eff629c9f975527db03216c4c5a1094</md5file>
+<md5file name="users.lang">3edb04f22096528f3007755fdb835f19</md5file>
+<md5file name="companies.lang">475828b7d1f49a5af6b625e5255c1fa3</md5file>
 <md5file name="margins.lang">a67a58961b002806ad76c5ff2ce19178</md5file>
 <md5file name="ftp.lang">4c9a10303debb2b3c8bc16ac22e3eeb8</md5file>
 <md5file name="exports.lang">95c82eeb12acad89493612e7ea95be9c</md5file>
 <md5file name="paypal.lang">0fc0876df57f7f77cc4ea959f60cde11</md5file>
-<md5file name="cron.lang">971427e7113b6da1c82fac51343bff2b</md5file>
+<md5file name="cron.lang">d1ab67d976a562c7c5a9697d474671eb</md5file>
 <md5file name="interventions.lang">2b788321ab02b92fae511a41d908ee2a</md5file>
-<md5file name="errors.lang">8fd5898f0733c1d52af1bc48816a8d25</md5file>
-<md5file name="compta.lang">8e34c69c34f6f50c995df276b735ae4a</md5file>
-<md5file name="suppliers.lang">dd4c99e9e624c886b15ab4b2e38da858</md5file>
+<md5file name="errors.lang">46b741e6a93e7b78d29691488a24fc81</md5file>
+<md5file name="compta.lang">f78a2acdb7ad29177838b3d7e56b8885</md5file>
+<md5file name="suppliers.lang">ba97db0e79f3e75c45f84836edc73f7e</md5file>
 <md5file name="opensurvey.lang">686ec6633c3b45fa9982eb392deabb4e</md5file>
 <md5file name="donations.lang">71355302efbca5596c245b4f75b1a24a</md5file>
 <md5file name="contracts.lang">c7f24384d8884f7e84c1e62121174adb</md5file>
 <md5file name="deliveries.lang">49bb3d81ae611eb1f8b7868143b2c6e0</md5file>
 <md5file name="mailmanspip.lang">32e21134466b972be3ac1268599f9b5a</md5file>
-<md5file name="install.lang">b5f8cda5d4d59621b712660efecf6f86</md5file>
-<md5file name="propal.lang">821ff4cdab2f33e5905258f8d211479f</md5file>
-<md5file name="main.lang">c4653affd2eb000583e2c227a9605234</md5file>
-<md5file name="languages.lang">3ae0051d35a74c5cb5c85db03ceca6a4</md5file>
+<md5file name="install.lang">c765dfce4b06838518cac4f3dc5d121b</md5file>
+<md5file name="propal.lang">dbc7149f4d61e7d862146daa4f28d9c6</md5file>
+<md5file name="main.lang">88eb2b7c5f1680fc55d62b3c81a2a62a</md5file>
+<md5file name="languages.lang">cfa17279ad55586801effdf3f64cd6e1</md5file>
 <md5file name="bookmarks.lang">9cd23f8d97fddad9f3408b5d5152cdcf</md5file>
 <md5file name="sms.lang">578c7ef90ce4f50122f14d6630079c47</md5file>
 <md5file name="dict.lang">db18fa6d13acfd83d28575f83a3f395c</md5file>
-<md5file name="mails.lang">1a0802f6872bd1f94ad954d0a181f65b</md5file>
+<md5file name="mails.lang">889dd20c43597110b85a88bf6485ba60</md5file>
 <md5file name="printipp.lang">3226fe6588555150ef8772f1b2c1459b</md5file>
-<md5file name="other.lang">5ba2cdbbf9d5c7410a2e496856bd4261</md5file>
-<md5file name="commercial.lang">572347c188ec411decc454771568fd7b</md5file>
-<md5file name="salaries.lang">5e51849045eceefb36a7ba3d4b16a177</md5file>
-<md5file name="trips.lang">52202f7921412d6b4f219d39f76e5bbe</md5file>
-<md5file name="sendings.lang">daa35da21397a4c7ca6904a506a4ba42</md5file>
-<md5file name="accountancy.lang">17770bd58f80354c8c0f7ecba649b1d0</md5file>
+<md5file name="other.lang">f4b0c998c31f5889f65deebd633f7fe4</md5file>
+<md5file name="commercial.lang">a96e4c85bf7a1570c0b99cf91074e9f2</md5file>
+<md5file name="salaries.lang">c6f42df909428c4ac4a2a5a0d1020d2a</md5file>
+<md5file name="trips.lang">127409f2e88673d8c46c7aede7a85d29</md5file>
+<md5file name="sendings.lang">a322e0f61d97480930b7f84cf75d9be8</md5file>
+<md5file name="accountancy.lang">eb00e6446b8e7c4fc434d4a35e0ff606</md5file>
 <md5file name="externalsite.lang">ccd8e25db8a9a768172fcd2e45b95162</md5file>
 </dir>
 <dir name="/langs/bs_BA" >
-<md5file name="projects.lang">c3aa0807e1320ccdb1b060da1787bd58</md5file>
+<md5file name="projects.lang">08c9a29faf03edbc703018681a4be49a</md5file>
 <md5file name="cashdesk.lang">223494e86e72306be4f941b847db565a</md5file>
-<md5file name="workflow.lang">1c6130fed29864cb803e50a64f57e8c1</md5file>
-<md5file name="bills.lang">ccb48d7117a32357f00a95a076530f7d</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">b0d15966a0ba586b9ab54c6e768f3c31</md5file>
-<md5file name="withdrawals.lang">f5fa6dbb09ad1dd809a37ec0b63e8e75</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="workflow.lang">dfa97a9faf2ba1a451e553c77076d2a3</md5file>
+<md5file name="bills.lang">13da9ca0558c39a6bcc9a8ecf753eb6d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">beb2951afed8ed1dcf650a87e42062d3</md5file>
+<md5file name="withdrawals.lang">d4b33c76f50f3d94ad1af21601d68e7e</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
 <md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8168904665f2aaf2a9c9390b078190ee</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">53a2102f21d7bf43ebab081a73feeeef</md5file>
+<md5file name="boxes.lang">b23a1732f01a5c23da70dc85205c1bea</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">c09f84e25a1c8970c5572077805ac0fc</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">5822244a3d6d3cb7ba8aa033f147772c</md5file>
-<md5file name="products.lang">5ca7bb744280557341bf550daea335f3</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">125d1a6cbe50d93e9d7758106d139b90</md5file>
-<md5file name="agenda.lang">16fa46a6aa8ab0e3192b972fd09da7d0</md5file>
+<md5file name="stocks.lang">a80ba3fa05860e7ddcf62b6407c52258</md5file>
+<md5file name="products.lang">40b454a4000a0b17077c57e5a67aa0f8</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">3b87aa0e0e56e43c3432d8079e3d9438</md5file>
+<md5file name="agenda.lang">c2714f0d9729f6fcf52f5841ac95080f</md5file>
 <md5file name="help.lang">c0c0cda5b564e56624844d49d7592502</md5file>
-<md5file name="holiday.lang">734c487d6d93236287f3a0630d59e1d5</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">0f53b7c55ace47daf4513ae435be7c58</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">8675379f8ca355dbc753e3e3def58342</md5file>
+<md5file name="categories.lang">26e8b96b3429caa00f41575444759588</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">3d8ba71a2cf2af3c2a9e9bda1cba64e4</md5file>
-<md5file name="users.lang">2e409823b76afae887f0cd1ef103f36b</md5file>
-<md5file name="companies.lang">d0e18a85d792c8e18a7f4b26aa5b228c</md5file>
+<md5file name="users.lang">b1d534a15eb4b0b99bda0de853ae40d6</md5file>
+<md5file name="companies.lang">1dcc883d13a072bc6ff90e5035d48094</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">2fbda69e2a3f012225508714b51c0f89</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">8bee2cb15c82181a606d26ee42bb0051</md5file>
+<md5file name="cron.lang">5826378cfccf1f9dc0798b3357870fa9</md5file>
 <md5file name="interventions.lang">fe515bd6d1f29593b84f3d34109f039f</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">bf4ec112c5d4979259e78a1af923da05</md5file>
-<md5file name="suppliers.lang">56b849a00414276cb2c09385d8c7ccdf</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">b9f42718fc794db6c7d8effd7d4f9231</md5file>
+<md5file name="suppliers.lang">07ab30748ab21f8dfa29ba90a65cffc4</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">a5e8c5e7b6e275f6fc080d12bc66afb7</md5file>
 <md5file name="contracts.lang">2efe41406c0581b1be9b526319c7bdc1</md5file>
 <md5file name="deliveries.lang">262b3b0bc7533232290f81311955da86</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">40c351e5b7ca32e0a4e4dc2054a4803a</md5file>
-<md5file name="main.lang">39f824353ef81d328ce24dd660585a90</md5file>
-<md5file name="languages.lang">16e1ea08ccc5c0175fe35a45c19a08dc</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">49f5a91ffbc90b04607fbca87a866532</md5file>
+<md5file name="main.lang">c28dc47ca37419ef9176fec985194ddb</md5file>
+<md5file name="languages.lang">d6a3ea992397c1d3e85d65b80c543c52</md5file>
 <md5file name="bookmarks.lang">71976afc3ec5e0f9c2e3711d8261e0b4</md5file>
 <md5file name="sms.lang">5dc4c70ab6811882ea50d20e2c4ea6e5</md5file>
 <md5file name="dict.lang">f9f034777e38a444b4bde55bc7e37b1f</md5file>
-<md5file name="mails.lang">67c90ef94ec33cf09847a1d455ab62a7</md5file>
+<md5file name="mails.lang">9ab8faeac0f57da542c29bf3cfef097a</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">8f76140fe367ad2d06477059adb00582</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">44cb693a25c812ebbb974789ce3dba8e</md5file>
-<md5file name="sendings.lang">ba4a5255f03d27e3b7e43be878217024</md5file>
-<md5file name="accountancy.lang">4945ef66c3f2e96f728cf01953d25417</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">acddfc4bf9fee7d68cc8242e2f599708</md5file>
+<md5file name="sendings.lang">6813e8dcc13186353d2840ee1477d7e3</md5file>
+<md5file name="accountancy.lang">7a03a929f07b02bba80d990aa560feff</md5file>
 <md5file name="externalsite.lang">efb80873052a0acac270873400da3e43</md5file>
 </dir>
 <dir name="/langs/en_SA" >
@@ -8610,157 +8624,159 @@
 <md5file name="main.lang">cf387e494e1e47b7da074828e0994d78</md5file>
 </dir>
 <dir name="/langs/sl_SI" >
-<md5file name="projects.lang">4f250be8ca2e1516613ca7e06e271ae2</md5file>
+<md5file name="projects.lang">172591855489b1bc4974d04154061576</md5file>
 <md5file name="cashdesk.lang">ab07c46fbd99585cf69935bef969c5d5</md5file>
-<md5file name="workflow.lang">b2d52cba7611db338fc69eacb189eb0a</md5file>
-<md5file name="bills.lang">ff2443e5c6e3883bf3c79e88794ae4b9</md5file>
-<md5file name="orders.lang">1bbd5ffad65d348c36fa2af97b97c2c6</md5file>
-<md5file name="admin.lang">2cff516aafa8955d37b821f32733be45</md5file>
-<md5file name="withdrawals.lang">23831d8afc12a3f506580f107fbb5fa7</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">930ca2cade949bc1d96995a68fda8560</md5file>
-<md5file name="members.lang">358e6df85e70619ae0a3257138848d00</md5file>
-<md5file name="ecm.lang">e69ed83dc84f4e7731565b3c55fb2033</md5file>
+<md5file name="workflow.lang">0dd290bbca23f1341e63156248ae06a8</md5file>
+<md5file name="bills.lang">b703fd66a6e25ed610df494a3f6e3644</md5file>
+<md5file name="orders.lang">2b9dd79be7b4c13f52659d64d96b9ab9</md5file>
+<md5file name="admin.lang">ebeb138696f73180d710f6efd9c0d7c0</md5file>
+<md5file name="withdrawals.lang">d72639b10d0ea524ad308f364518272e</md5file>
+<md5file name="incoterm.lang">5f9bc55c61786609f6d57cc987d8f688</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">686a3bec088b8fb1d5bd8665721c7a3e</md5file>
+<md5file name="members.lang">1360b864b3aebe31b4a4538876f19544</md5file>
+<md5file name="ecm.lang">e29010764aec463d4bc1632af80094f0</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">a641790623ea38a4fc8a5732c4344faa</md5file>
-<md5file name="products.lang">a1ba7bb2e6d52fb8dad8cc95765ca690</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">a06b9ab2b6237ceae12891ee52ef5dc2</md5file>
-<md5file name="agenda.lang">6a41d89ffcc48022d97e2c124d43bb60</md5file>
+<md5file name="stocks.lang">bc707b4f4d697862d2cd987712d8840e</md5file>
+<md5file name="products.lang">685aeadf8e6fc8754c27f09115cea1ba</md5file>
+<md5file name="printing.lang">a4b4a542dba1edd6f5bb5d02dadfa408</md5file>
+<md5file name="banks.lang">ec20825d25c764d40c5b4b720c8afe9c</md5file>
+<md5file name="agenda.lang">8d9e0fe2130319376fbcd3e9e228b8b1</md5file>
 <md5file name="help.lang">593a0056ee80a54a01c01c0c266034d4</md5file>
-<md5file name="holiday.lang">6fc34f4a50e6686080d4f43e54c3d6d7</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">370af55511cdfa9b9a78506c663e4ef0</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">294f5ab0ad2abf6e2ef5a65d194fa2bc</md5file>
+<md5file name="categories.lang">56fa5e5f31475684a76ea25d3b3751c1</md5file>
 <md5file name="paybox.lang">0f4ab2ea10dbc7c437ae308fb67659e5</md5file>
 <md5file name="ldap.lang">8ed0c3b65f002cc1c9ee534820e5f961</md5file>
-<md5file name="users.lang">c760c229fd8d2a9edb3ccdbfb863ba6f</md5file>
-<md5file name="companies.lang">a95a4db66092f50a62cb2f9e6506d199</md5file>
+<md5file name="users.lang">fad23a4ab20b16749fef43bc181363b8</md5file>
+<md5file name="companies.lang">f0968762d19b79825774d09df04b7ca0</md5file>
 <md5file name="margins.lang">80e0314d294411bd1f20032ad7c5cb93</md5file>
 <md5file name="ftp.lang">b62ebea33a09fdfd3cd7eee4ced9187a</md5file>
 <md5file name="exports.lang">595efe5e7ba8ea24b54358923fab3354</md5file>
 <md5file name="paypal.lang">311ad06ab23f03ff3440597edf1da3fc</md5file>
-<md5file name="cron.lang">5188ea1c492a3921e9d8ddead20961b1</md5file>
+<md5file name="cron.lang">0edeb4fdfd326d018af56a8424a10428</md5file>
 <md5file name="interventions.lang">8fe0462446378e7cfbc4814a66437619</md5file>
-<md5file name="errors.lang">3fb468eac97b7f5b03de7ff42af153bf</md5file>
-<md5file name="compta.lang">5befcb1cd6a2a52be8381db21f458e25</md5file>
-<md5file name="suppliers.lang">4a65a7341e69f404af0198969c429224</md5file>
+<md5file name="errors.lang">bae53d55f5c412b531358f5077229fd4</md5file>
+<md5file name="compta.lang">e6b34790c49dc99315bd6945bad03886</md5file>
+<md5file name="suppliers.lang">c69cf93c1ee2b1908ed5fdf56f859100</md5file>
 <md5file name="opensurvey.lang">15558c69fd903afd9e88439226123622</md5file>
 <md5file name="donations.lang">768f3e2b92cc551d7136bbf830e93951</md5file>
 <md5file name="contracts.lang">562cbe59e4d2e7cbc06d80e2861e381e</md5file>
 <md5file name="deliveries.lang">6312dc067c98595bb72d77dfcc9344b4</md5file>
 <md5file name="mailmanspip.lang">95c15ca3dd5f1f6760ef60df52b6dac5</md5file>
-<md5file name="install.lang">faa72cc79f61789e1c0cd46565d876f6</md5file>
-<md5file name="propal.lang">6d96a2b57a9f870c1681dc84908e77ad</md5file>
-<md5file name="main.lang">8fe29fc0cf86fbb6db97611690009343</md5file>
-<md5file name="languages.lang">ea54f8ac9fb2daca1b5e77987af7df75</md5file>
+<md5file name="install.lang">d0c7f7c314658613d21c5ab29210abfc</md5file>
+<md5file name="propal.lang">76660e9880edbbb9ab9234291381f6cf</md5file>
+<md5file name="main.lang">7a10f331256dbc09dae03566a4ff382a</md5file>
+<md5file name="languages.lang">58d97b5e0ef297689b60fa08d8ea7c5b</md5file>
 <md5file name="bookmarks.lang">2c7e63fd6233af8fabc598cea968cd6b</md5file>
 <md5file name="sms.lang">16e0a85f28a66c9fe5ef46a42e9775cb</md5file>
 <md5file name="dict.lang">536398fa35f4c75fa3c3d65c98c37939</md5file>
-<md5file name="mails.lang">c1f7399d287f849108e4d2c30ff93074</md5file>
+<md5file name="mails.lang">daa0a75adb2029c5c92ee8775d387267</md5file>
 <md5file name="printipp.lang">169b60e8323c73a4dfe741da1df9fc10</md5file>
-<md5file name="other.lang">cf418fb311c020bdac6a803abca20c0b</md5file>
+<md5file name="other.lang">5f159348bdc57044a654467ed2bd757e</md5file>
 <md5file name="commercial.lang">bfd908b3b092b34c2df1d1516784353e</md5file>
-<md5file name="salaries.lang">c04bb47a37b72e4a0c2995b8eca969f6</md5file>
-<md5file name="trips.lang">a472793f7c4aa79d86908769cb376a32</md5file>
-<md5file name="sendings.lang">35099938113c8f64d6fca4c7a25a0b7a</md5file>
-<md5file name="accountancy.lang">92ced7bb9cd9b749d9e805f8976a7aca</md5file>
+<md5file name="salaries.lang">2704b5806da1e05736067e507803b5df</md5file>
+<md5file name="trips.lang">5af5913387da3dae3fa480e8a96cfc3a</md5file>
+<md5file name="sendings.lang">708e6e80701fc1a8df9127ce3a1f0d9f</md5file>
+<md5file name="accountancy.lang">23c8615a446954ad66e1211cced07f5b</md5file>
 <md5file name="externalsite.lang">db1b7476ea8ce223faa772b7f66621b8</md5file>
 </dir>
 <dir name="/langs/zh_TW" >
-<md5file name="projects.lang">a53b154ddd9d3445b4fd87d25fe68e7c</md5file>
+<md5file name="projects.lang">7ad623e339750bdd5d8744f212a3687b</md5file>
 <md5file name="cashdesk.lang">afaf8c79e4a90aa57382f99ed2d40f1c</md5file>
-<md5file name="workflow.lang">8349f371a2e2d9097bced4723a9eaf31</md5file>
-<md5file name="bills.lang">0bb73f7744dc0cf1fe31bfa80f9f0b70</md5file>
-<md5file name="orders.lang">5e9440cb868ce9ad5b487a8c0f739378</md5file>
-<md5file name="admin.lang">694d88043d6aeabf84314cd4daa5e9f6</md5file>
-<md5file name="withdrawals.lang">54c1893b5e27e3345d78bac145ba272f</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">6e73b2517a144da2a5fadf061bbe5ad0</md5file>
-<md5file name="members.lang">02bfe9c8f1744e69021e7f1e2ebaaf4c</md5file>
-<md5file name="ecm.lang">1a5852f4d4002925cb7fd54937bf3a20</md5file>
+<md5file name="workflow.lang">67ea5ed5ea373574dce57608e11f429d</md5file>
+<md5file name="bills.lang">d632293e7d88e518f8b7143d0494d86a</md5file>
+<md5file name="orders.lang">16db832816a2267e7f273f51eb241a9e</md5file>
+<md5file name="admin.lang">fbd396e2a442e94109144cde945d0ef4</md5file>
+<md5file name="withdrawals.lang">e5e7ed101e5fbf690c1f58d77b666720</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">66dbdb37fcb836537092935a31655cdd</md5file>
+<md5file name="members.lang">b1d0a182408ca65a6bba2eccf83f05f0</md5file>
+<md5file name="ecm.lang">16737b3e033c599ba1de2b1653ff5591</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">6762208d3c887f60e4e78fcb04d6cfde</md5file>
-<md5file name="products.lang">b88df07661cbca6bd050b4d4ba9f851f</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">4ce3663b6d8fcfc5179da2a9160842c6</md5file>
-<md5file name="agenda.lang">a4da854b2ce933d710b83acf5a7e9112</md5file>
+<md5file name="stocks.lang">b370fd1268decc39f9423c19af5a8c08</md5file>
+<md5file name="products.lang">aac5a713f725f7f00ee484de374552e2</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">e46f87836442f23ec087fc8103231d97</md5file>
+<md5file name="agenda.lang">bd2add5b682679f093e98adb0961e36b</md5file>
 <md5file name="help.lang">7e2ccffaf9bf9dffea7c800c687a3a6c</md5file>
-<md5file name="holiday.lang">e4534f9c018442d67ea08de411aac198</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">2adb456b84be57fa13971d2604f84b15</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">0972e70a6485f0e58deb3201bd22d771</md5file>
+<md5file name="categories.lang">ec4f7df97f343de8b9e930c0b930ab0c</md5file>
 <md5file name="paybox.lang">cc7ce504ebbf3f1c869b43e2a291ab49</md5file>
 <md5file name="ldap.lang">6373b95c48af4f71972938535912fc8a</md5file>
-<md5file name="users.lang">cb73a3a2e7e141686435b9b7ec22067a</md5file>
-<md5file name="companies.lang">0729ac12981fdf358948ea82e6c3cb2b</md5file>
+<md5file name="users.lang">367f6bfe53285d7880def87ab63b790a</md5file>
+<md5file name="companies.lang">b22c9273fb598ce61cf044d2c4d69eba</md5file>
 <md5file name="margins.lang">9e4be8088054e25f29fd9490486059c3</md5file>
 <md5file name="ftp.lang">1a5e128366cf4e045d2679f34f956be9</md5file>
 <md5file name="exports.lang">d50c405aee4bfe5af080cb061afd77c3</md5file>
 <md5file name="paypal.lang">69a140a13b73949262053829615d06ef</md5file>
-<md5file name="cron.lang">e78c02f39f229562f345472ce64960f1</md5file>
+<md5file name="cron.lang">02289e9b37a7aecba5c0fa022f167487</md5file>
 <md5file name="interventions.lang">6dc685615964d68b3ccb2f7d08058566</md5file>
-<md5file name="errors.lang">fdb851b6d3dad2eb284d159711cdf415</md5file>
-<md5file name="compta.lang">5150b8d59527ebc9e74ed87f3f46a237</md5file>
-<md5file name="suppliers.lang">22cd9218e38e489dc365ab3a3dd469c9</md5file>
+<md5file name="errors.lang">e0a6c367d4d31b147d672fc1dbe378c3</md5file>
+<md5file name="compta.lang">e9b22c350aaa95eb116318ad72643bb6</md5file>
+<md5file name="suppliers.lang">fcdfb65fc8a5423123b559c5d90024e4</md5file>
 <md5file name="opensurvey.lang">d35a21763c1765d888ce5e9f7192d161</md5file>
 <md5file name="donations.lang">b1ae2db4e6abd7b1b88a48e222cf37a5</md5file>
 <md5file name="contracts.lang">7ead428697e882bec8441e992451df12</md5file>
 <md5file name="deliveries.lang">2af14f6c4b858b8816b24c596aaa0888</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">44e085b5a2930cd9c774db60d4d290bd</md5file>
-<md5file name="propal.lang">b21434f3e86f7387b373697f21bacac4</md5file>
-<md5file name="main.lang">e314dc828bbc7cc13c1fbe883b04d42d</md5file>
-<md5file name="languages.lang">d3afd148684ee2162cd15d37ae73f583</md5file>
+<md5file name="install.lang">de6b867af243e2a1b183dc35bcb1da6a</md5file>
+<md5file name="propal.lang">f07e3aa557243cfef5ef06bdd8dba07d</md5file>
+<md5file name="main.lang">5acc85c476db4c787835dcd27868463d</md5file>
+<md5file name="languages.lang">dc46b8761cd86afca95615e33a9df9a5</md5file>
 <md5file name="bookmarks.lang">d9f11c2cc6a7b5929a915d7a998e925a</md5file>
 <md5file name="sms.lang">ef8d5f107a66b6aacb79a8a4f5d01757</md5file>
 <md5file name="dict.lang">9db68f434b6113836433bb3a671e71d0</md5file>
-<md5file name="mails.lang">e2679578008ef5bbc5adc18f92fc4204</md5file>
+<md5file name="mails.lang">7403f69899649448cd99496d1332e3cf</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">3aa9fe9003eb2812b9fbdc69b9d733f2</md5file>
+<md5file name="other.lang">152145bbdd3b66b8ba05238b8d6967d6</md5file>
 <md5file name="commercial.lang">44675713a8fd22932b6ef9836e8a2084</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">3af2b46c38bc8d74bd0a30b6d407f7f8</md5file>
-<md5file name="sendings.lang">1eb90235e887806d75bed36d8cde8b05</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">472d7b221dfa505a17f7e21d9473c922</md5file>
+<md5file name="sendings.lang">ba67d1ecac95ee4b51eabd30b116b6ff</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f249c5416780b6370b92514232af8da7</md5file>
 </dir>
 <dir name="/langs/de_DE" >
-<md5file name="projects.lang">7717354d1b104ae2bc406a605d0bd681</md5file>
+<md5file name="projects.lang">8d2bc747420988f61f5af80960e42d72</md5file>
 <md5file name="cashdesk.lang">c314184c4bb623a8192bbe69100906d1</md5file>
-<md5file name="workflow.lang">ea699f8f0279f25af3705045b2f83ad1</md5file>
-<md5file name="bills.lang">643ec8f375b7f27b378da96b071a574a</md5file>
+<md5file name="workflow.lang">4f37266e5e5e194de90d9792be4e5d8f</md5file>
+<md5file name="bills.lang">8096eb8eef91494ee0c2e2df1c184e5c</md5file>
 <md5file name="orders.lang">3f1703dfb7eefe8563e7968f506cb011</md5file>
-<md5file name="admin.lang">ea9118dc26998a201302d80c54e433ff</md5file>
-<md5file name="withdrawals.lang">ad6e4b4cd7aba1c84adb79422234da80</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="admin.lang">949ed51ba25a67d9e53bf48dd1c1a0e8</md5file>
+<md5file name="withdrawals.lang">b5ebcc42289a11a12e288072714348d2</md5file>
+<md5file name="incoterm.lang">5fd0cdbdc0238bc2f9c0fde2e1cec05c</md5file>
 <md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
 <md5file name="boxes.lang">f1692a540f104927a0aa7df0ea4eb1bc</md5file>
-<md5file name="members.lang">c2c0e0a263ad27e5cf7b1a0427229709</md5file>
-<md5file name="ecm.lang">38e6d5d27192ffd08204d729a643ec77</md5file>
+<md5file name="members.lang">b95b34f5ad6d8c77667fa5d249c5702e</md5file>
+<md5file name="ecm.lang">720f72ab3c3f11a6dd3eb3e044272ba8</md5file>
 <md5file name="link.lang">bcf50b7b8461f7737f70e507955a7832</md5file>
 <md5file name="stocks.lang">77194d34b1befb3d15c9985644a8328a</md5file>
-<md5file name="products.lang">47ac9ad0dd3725edc165005b7a91c7f8</md5file>
-<md5file name="printing.lang">918abfcba422389def5c0b8efb6d3d35</md5file>
-<md5file name="banks.lang">b7a2f2dd14b370c2f10b05e3bb8633b4</md5file>
-<md5file name="agenda.lang">19bd3c849139e8316b7a376fca100e0b</md5file>
+<md5file name="products.lang">70f8cd0cf2825046c52a0b8cc8454087</md5file>
+<md5file name="printing.lang">1a51f32468322c23497760ab4af19625</md5file>
+<md5file name="banks.lang">eb32141d91cee16b27a886214c80f5f7</md5file>
+<md5file name="agenda.lang">c3a21f2f6e4ea934e15507420938dd1d</md5file>
 <md5file name="help.lang">94bb9cad9889690d55670af89e832ee8</md5file>
-<md5file name="holiday.lang">79fef4ddb7e1d3734aa88ba7fb47d183</md5file>
-<md5file name="productbatch.lang">464982f1b5f698e7182a1bb21c2963ec</md5file>
+<md5file name="holiday.lang">6ff0b93637730a5279ea79204f311e4c</md5file>
+<md5file name="productbatch.lang">ba85836e90dbd7082ebeb2ca28a94a4c</md5file>
 <md5file name="resource.lang">c36fa900ef2e082506bccd1fa51eed31</md5file>
 <md5file name="categories.lang">fcbb23221c11f79ca5ad8d8bb9f98252</md5file>
 <md5file name="paybox.lang">d2ac1bf28717b56671bb0405d04f797d</md5file>
 <md5file name="ldap.lang">3080ff9fdb247eaf98b234710abdc34b</md5file>
-<md5file name="users.lang">c544a504a3bb2bf3a86f97d37d2ce3ed</md5file>
-<md5file name="companies.lang">63a48c5ffb37f966d0e971ceb37ffb22</md5file>
+<md5file name="users.lang">6129a068f7c76cccacec36db4774c94e</md5file>
+<md5file name="companies.lang">06983442dd1e0514f3779003d3af589e</md5file>
 <md5file name="margins.lang">8528fed3a7fc90688590a041ae575e71</md5file>
 <md5file name="ftp.lang">8b1f59559c969a8b8733993c72569c3f</md5file>
 <md5file name="exports.lang">f0f3a3c1e5269f4676c5c86303a33014</md5file>
 <md5file name="paypal.lang">64d4f3497d67b4e8da246b865501955a</md5file>
-<md5file name="cron.lang">c57c5ff0cccbb2bea6471bd7d519c119</md5file>
+<md5file name="cron.lang">e953ae52e4ccbb314a40dfb285653bb6</md5file>
 <md5file name="interventions.lang">07831ce10e9008053282872d7c82875d</md5file>
-<md5file name="errors.lang">cc933fbf46f06be7fa3fe3de55f76bb0</md5file>
-<md5file name="compta.lang">489828e1a2d1efd1e4682e51442d2428</md5file>
+<md5file name="errors.lang">5908ffa3d5c8b86b92a8223aae652455</md5file>
+<md5file name="compta.lang">6b810b8d82a50ca789eb413961d65379</md5file>
 <md5file name="suppliers.lang">bb32f55ab185faf130bff5d5633fd095</md5file>
 <md5file name="opensurvey.lang">a40157ef24e9a8c6ddfd3885dc186a96</md5file>
 <md5file name="donations.lang">ac5c655d8e83649b5b5531688024a9c4</md5file>
@@ -8769,153 +8785,144 @@
 <md5file name="mailmanspip.lang">cf24f0f04a6026a4d06cdaa7617586ac</md5file>
 <md5file name="install.lang">fb019da24ce0c795f3442947c4cddcb5</md5file>
 <md5file name="propal.lang">a31ceece83cc114f3b16884c7188754b</md5file>
-<md5file name="main.lang">ddabe53f798d853ad5e84ec5ebec18db</md5file>
-<md5file name="languages.lang">1abba570c4a2d4d1750d2b0b59b46d5e</md5file>
+<md5file name="main.lang">c9d7f4b17bdb1eaeb01cbc99bf130c8f</md5file>
+<md5file name="languages.lang">5ec8eeb19179f2506a6ff51d99ccfa68</md5file>
 <md5file name="bookmarks.lang">bbab00fb08ae238a1428f6b9332ff0d0</md5file>
 <md5file name="sms.lang">8f8b08ea0127e8dd80c06c9e79896a61</md5file>
 <md5file name="dict.lang">6f3ad06950f1c62f4bd86e51a7ddae95</md5file>
-<md5file name="mails.lang">7e51831debc4acac901fd192a7203535</md5file>
+<md5file name="mails.lang">8fc1befdec9064d5899c88d8fc0df170</md5file>
 <md5file name="printipp.lang">2d1ed344ed1f795dc8ca3acc51cfeaa8</md5file>
 <md5file name="other.lang">d65af57318ed01e09583666365475200</md5file>
 <md5file name="commercial.lang">c2c04caf0c370af71f656ffd5328c0f3</md5file>
-<md5file name="salaries.lang">79163f72039d49b2cb6464f834b2e914</md5file>
-<md5file name="trips.lang">32270defb0c7cb7a9aaacbf86f7e0f9f</md5file>
+<md5file name="salaries.lang">d5567e56aef334934897a39e0e8e6774</md5file>
+<md5file name="trips.lang">9ba22a36452e8ae26690d9c0e2e16209</md5file>
 <md5file name="sendings.lang">219c1fd4f9421c71635333d2bfe997e2</md5file>
-<md5file name="accountancy.lang">2c83746bf2373e3ffc749fefbc235940</md5file>
+<md5file name="accountancy.lang">bffe95d0d6a1b6d236a0faea7ebd7b3f</md5file>
 <md5file name="externalsite.lang">cbfc8102d5d4b206ce17095f41a08013</md5file>
 </dir>
 <dir name="/langs/es_MX" >
-<md5file name="bills.lang">1c7a52eaa3f79eeb613a3ac102221c09</md5file>
-<md5file name="orders.lang">53ec6699499cbeb76fdccaaad411c42a</md5file>
-<md5file name="admin.lang">9e1cc2e0458cd65a3b1d7b050b34aa82</md5file>
+<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
 <md5file name="stocks.lang">852586f6292a7299262a5c02aed69c73</md5file>
-<md5file name="banks.lang">180ce986d360152b36935d55ef8751f5</md5file>
-<md5file name="productbatch.lang">f27b729eb095667004ba2ffc02a62f9d</md5file>
 <md5file name="categories.lang">500287477a669f5b33637327cd578ca2</md5file>
-<md5file name="cron.lang">9510f7630832cc20baf17b78cfcd2aca</md5file>
-<md5file name="interventions.lang">d97d6901227f9a03e20ad415bcc48387</md5file>
-<md5file name="suppliers.lang">17b0c3da24b2dc572067a4c200c9051d</md5file>
 <md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
-<md5file name="mails.lang">28544d9e4d160a73aaed36c8547188f4</md5file>
-<md5file name="other.lang">dcad10e73f40317267b624bfdfb46180</md5file>
-<md5file name="commercial.lang">104b9301f7c376b0d1795795c06dd93d</md5file>
-<md5file name="trips.lang">a1bad06bbb9535472667f6de9e3b869c</md5file>
 <md5file name="sendings.lang">f0946038ef768d49f311ebe67db82e17</md5file>
 </dir>
 <dir name="/langs/he_IL" >
-<md5file name="projects.lang">f9d8ebcacafa4df8cbe84dcded810ee4</md5file>
+<md5file name="projects.lang">f1d951b6c812cebd6087a0947f3e68e4</md5file>
 <md5file name="cashdesk.lang">055d1c1ecd19be7fe0fc879d5b9e3920</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">042ae6a3a7ab20d0de7966a7877a533c</md5file>
-<md5file name="orders.lang">a7814f8a7c1f11d50045a74dd1106750</md5file>
-<md5file name="admin.lang">bdb1cd99648618fae3cf6fd9cbb40d3b</md5file>
-<md5file name="withdrawals.lang">fef14ea7e30b02f47e4558d6e763464f</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">9803ebdea3947715a6a9ff6a8f03185d</md5file>
-<md5file name="members.lang">38c1d984b6b2672beac82bf09ff21aad</md5file>
-<md5file name="ecm.lang">591333b057f19dbfd48b0dbe6f25b5f3</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">484a797ea217b0173ac0fc70c009420d</md5file>
+<md5file name="orders.lang">cf16646d3661278f50a0a86be255e143</md5file>
+<md5file name="admin.lang">ec2255dd57c3947b8e4100af1cd8431b</md5file>
+<md5file name="withdrawals.lang">4ed0fa2252887fdaad281c4fdd581138</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">5f236327d99c1d860357c98d6123b40c</md5file>
+<md5file name="members.lang">8105015382c2477cc7e91f83ef6c4e61</md5file>
+<md5file name="ecm.lang">5d687f7e28621e97af2a7b1290efc658</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">0b70c7226b001bb7256ea35f152d1527</md5file>
-<md5file name="products.lang">f819a1d2d7caa6c7fa0136b3008b7854</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">d5d416b181a75bdb8f0be12119cf7ba0</md5file>
-<md5file name="agenda.lang">7389affd082f12424f055e24679ccf39</md5file>
+<md5file name="stocks.lang">694d8d4c535675f4af607fa199ce066a</md5file>
+<md5file name="products.lang">f40bc539cfff4585df4225368c093826</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">abc149629985df5dc3aa5c2454f0d676</md5file>
+<md5file name="agenda.lang">842e1de48d9c44133f91bb5541d4f7df</md5file>
 <md5file name="help.lang">f6a494807c8bd81146bf7308b9e74507</md5file>
-<md5file name="holiday.lang">e7c6ee7a9cd603a016d8a95b082e7263</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">78a506fce32d1a895faaa5a83c7e77f7</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">1b94553ec0be2a1cda52f2a441da2937</md5file>
-<md5file name="companies.lang">b5ef631067ddb4adea1a7f883a8395ca</md5file>
+<md5file name="users.lang">4377ad93f7965f894e7d49f0972a144f</md5file>
+<md5file name="companies.lang">4748a4e1af10e13c31cef35cc266f9c1</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">7bc61a1f1daf334bc893dd1f0b05ca37</md5file>
 <md5file name="exports.lang">a0ff1824daa098e74d326f5327b938e0</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">d4a99aca1bbed73034c2d7580a0bd332</md5file>
+<md5file name="cron.lang">28e10eab33216fe841a693440d577e21</md5file>
 <md5file name="interventions.lang">b34ee3fcd8a6978cd33ce47539e8e5a1</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">5a2621103cb59d37db5658c1879b4766</md5file>
-<md5file name="suppliers.lang">288a3826f6f2875d29f2c619e2093edf</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">906c51c3b8d54649753b44f7d9a3957f</md5file>
+<md5file name="suppliers.lang">db8a2e7d6bba2b25224326bce8191911</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">e92ab1ec80639a8bcba78163e7f632aa</md5file>
 <md5file name="contracts.lang">d8d818fb4a1b2bff45b8872dc98beddb</md5file>
 <md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">14bc5a7f5562f97bf88eb74f1dcc9404</md5file>
-<md5file name="propal.lang">8ad7dc8c62da0c98fdac28dfda1db0da</md5file>
-<md5file name="main.lang">7a813199cc40656daba08ebedc2c3bad</md5file>
-<md5file name="languages.lang">7467850d8ccca1f266b0344f7619bf18</md5file>
+<md5file name="install.lang">536d2534960b60934f88f21cbc1a5055</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">54b6698fbe46b4e5d84dd4bb4f60a075</md5file>
+<md5file name="languages.lang">45218fbeadfa415aca1424acfbf64a80</md5file>
 <md5file name="bookmarks.lang">2b7b7694e9c574c9017760d04b71d385</md5file>
 <md5file name="sms.lang">336e659b54ee694568f9e17c14ba4a44</md5file>
 <md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">64a163a6b28b452a9cd56964329a7c52</md5file>
+<md5file name="mails.lang">06c01cb177f657b18706dc4856a0315b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">ea60bc9049f43d134cd9e8fcc07adcef</md5file>
+<md5file name="other.lang">7b90980dcbf4d232834606fb8b661045</md5file>
 <md5file name="commercial.lang">c89d1e2f93f7cf872c006ee7c9bf8856</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">c9e56b7c77eb9a5bcc27639d5d452171</md5file>
-<md5file name="sendings.lang">ee03bbb43d942e425a8ae467e3489c2b</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">73104ea4c01d75b885924077d9f2e6ba</md5file>
+<md5file name="sendings.lang">bc0841e4b394b69931441a25eff07de3</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/lo_LA" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">a82f967793fd358a77f730c774934150</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">6cb30ff2382cad4613f20a144735ecd6</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">ce389dc70e86fc01c22e560fcc19f5b2</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">858f50159695f3115570bf4b913273f3</md5file>
-<md5file name="companies.lang">4865ab7e4d789a51075d4f780c3674ea</md5file>
+<md5file name="users.lang">addb82a5473d88074f998158dcf6d184</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">51a8ed92619d4857e0eaddd369a14b38</md5file>
-<md5file name="main.lang">1356f3061125fc78d9cba7834e9654c7</md5file>
-<md5file name="languages.lang">5f5e1f71ef91392a3edee6cdf5e03408</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">66f7a690f24f20c3ff9589a5114245d1</md5file>
+<md5file name="languages.lang">7ce6e3f27f962ebc461ed5dc35b1b683</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">94a8ed12327fafc75e886e69d126dcb0</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">32ff21aa2c79dafac1cdf660b9af04a2</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/fr_NC" >
@@ -8924,136 +8931,136 @@
 <md5file name="compta.lang">bb86a43e02b27e96f1a1a5a4757aa567</md5file>
 <md5file name="main.lang">b72997707e75dd3fb9bb3344408f0fd8</md5file>
 </dir>
+<dir name="/langs/es_BO" >
+<md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
+</dir>
 <dir name="/langs/en_NZ" >
 <md5file name="companies.lang">fb46bbe6fd59edc488ae4cf9c9e59be7</md5file>
 <md5file name="compta.lang">129f1bba639c9fb1f3f5b196aff5f073</md5file>
 <md5file name="main.lang">64bfc7f928c8265b954a94f6ba47a472</md5file>
 </dir>
 <dir name="/langs/ro_RO" >
-<md5file name="projects.lang">a3eca1690b4c40d6c0e5c00642c1e383</md5file>
+<md5file name="projects.lang">541426136c25b79e2012ca35d38388c2</md5file>
 <md5file name="cashdesk.lang">cf956add0c79021627f8d296bd9c0bee</md5file>
-<md5file name="workflow.lang">e129c7b5a81529131075a2d8e723cce7</md5file>
-<md5file name="bills.lang">e654b0cb05e0120b47590b49c2173d85</md5file>
-<md5file name="orders.lang">8cace2af2731505457c4bb9a7ca33a98</md5file>
-<md5file name="admin.lang">f961749e7684816b7bdf5c6637cae8e0</md5file>
-<md5file name="withdrawals.lang">0ec28d1df3ee46d53bfbb49ebf6c8bf3</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">72ba4c108b6b9f4d21b97b5e584b4cfe</md5file>
-<md5file name="members.lang">bf0a23492645c5a983f7c71f63b786ef</md5file>
-<md5file name="ecm.lang">c3814a0c44395ccb7a7fa8bc1cc93abd</md5file>
+<md5file name="workflow.lang">3639365574f377b3d9192eed3012b81b</md5file>
+<md5file name="bills.lang">f2937299798d1182db0c181e75b40bc0</md5file>
+<md5file name="orders.lang">2a7206d5838c304a1bbfdff9e1b9bc50</md5file>
+<md5file name="admin.lang">132ad46b3bb39f0349300d4a379608ab</md5file>
+<md5file name="withdrawals.lang">3f97ab7226e1b96805f110c23a0a4e8c</md5file>
+<md5file name="incoterm.lang">91db205f032419631535b76600d49ef3</md5file>
+<md5file name="loan.lang">3ab8cb2ffce4a45ccc2bd36bf7188ba4</md5file>
+<md5file name="boxes.lang">3999a6c16fbac8f142b6ba5c83843135</md5file>
+<md5file name="members.lang">e66c5201b53aff421ab597e250adc59b</md5file>
+<md5file name="ecm.lang">a7f8b687d5627915cc22a52b0332af77</md5file>
 <md5file name="link.lang">2d07e3dc90596e3bf5815017b9fef1cd</md5file>
-<md5file name="stocks.lang">cc2101a6b13d9049bcf1fdb112aaf4d5</md5file>
-<md5file name="products.lang">e59316ba4b33ecd62af62a8fec16205a</md5file>
-<md5file name="printing.lang">8defd51d11ae29e596acaccac6c748dc</md5file>
-<md5file name="banks.lang">855cd25e4ddc8a2f9034fe0007adc87c</md5file>
-<md5file name="agenda.lang">f05297709492867fe95df661b3ff048b</md5file>
+<md5file name="stocks.lang">dc774dd0d7935e014f383db710a62a25</md5file>
+<md5file name="products.lang">0292c08a0ae84b531a1d955e5215583e</md5file>
+<md5file name="printing.lang">203c74887a2dc56e3fac9a652d82a3ec</md5file>
+<md5file name="banks.lang">c366b59b5c8322f5792165b590ad5b30</md5file>
+<md5file name="agenda.lang">1209927c2a17a08b229810bba96d4c7d</md5file>
 <md5file name="help.lang">0c3ea1ed6f3bef86e72457af9d477b22</md5file>
-<md5file name="holiday.lang">a920d82f372b341e3ce9b736ff9711cd</md5file>
-<md5file name="productbatch.lang">d8e06c52dd4c7cc78df3c5487bd95e9e</md5file>
+<md5file name="holiday.lang">2f82a200eb6bf0df2caef2982dd5a160</md5file>
+<md5file name="productbatch.lang">6bd7bd915222c47f064d3cfee5fc59c0</md5file>
 <md5file name="resource.lang">f10cedbccc9475f55d46269a683f0cf4</md5file>
-<md5file name="categories.lang">25589677d28b170a319b8d5338d17dde</md5file>
+<md5file name="categories.lang">0ead1b878e2b9ee9cd1c021f1b478e5e</md5file>
 <md5file name="paybox.lang">4f4d173435d76648a581bbc19df4a435</md5file>
 <md5file name="ldap.lang">8cd714c35a68b56c9190c03579baf70b</md5file>
-<md5file name="users.lang">8653d9e0bb13430d74e1ef13d4fbba93</md5file>
-<md5file name="companies.lang">7b1ec84ee854edb251afec2f1489d472</md5file>
+<md5file name="users.lang">e2073338990d8009a30b20f79c1e2658</md5file>
+<md5file name="companies.lang">4f102225d9c638985ae124942f0b3009</md5file>
 <md5file name="margins.lang">35d7a670fd58b89b1927a524bd74357d</md5file>
 <md5file name="ftp.lang">16ca8987db92c91d71d494e4b4721d5c</md5file>
 <md5file name="exports.lang">7114d694d059d0f7eb949d83012e4ec3</md5file>
 <md5file name="paypal.lang">5a6bb3c42b5a0bec8c86824f1975083c</md5file>
-<md5file name="cron.lang">2bd9480ef1aa86cda54add4220359240</md5file>
+<md5file name="cron.lang">87ca04b6f32ec9c86ff4a9496a7e2e83</md5file>
 <md5file name="interventions.lang">61056a28a359783cd881f127512996af</md5file>
-<md5file name="errors.lang">266897f8a4728b14b500c61d867b7bcc</md5file>
-<md5file name="compta.lang">5dbed69f4ab98790392bb2c85637d67c</md5file>
-<md5file name="suppliers.lang">1790de58850467576b9dcd4961b35af4</md5file>
+<md5file name="errors.lang">ea8fe09d308127db8e27c1217ce48d7c</md5file>
+<md5file name="compta.lang">5492deff69f33d0f7350ded3659632a4</md5file>
+<md5file name="suppliers.lang">34c0c729df897dabe8f83db9af7cf479</md5file>
 <md5file name="opensurvey.lang">abeec7cab968b8b816c16b0dea5dd6df</md5file>
 <md5file name="donations.lang">988b1fd1092a601c62d214658970a600</md5file>
 <md5file name="contracts.lang">41da086d1bd1d2bb3903847a841406e2</md5file>
 <md5file name="deliveries.lang">d9f0c52c0880cd2a167ea745276e7d34</md5file>
 <md5file name="mailmanspip.lang">f89420ea2cea158b44d851d13331691b</md5file>
-<md5file name="install.lang">691fb2000219bd63f2b1335d9801e3e9</md5file>
-<md5file name="propal.lang">88a03a09be0856616b2f86faa08aef5e</md5file>
-<md5file name="main.lang">200dd76cc468a149d383511118b8ab0f</md5file>
-<md5file name="languages.lang">0d971c6da4f292e6643171f96fdc9c11</md5file>
+<md5file name="install.lang">0a46744c61ed215699419ca649f6b6c8</md5file>
+<md5file name="propal.lang">6699eb3eef6a6a05645ff11dd7646491</md5file>
+<md5file name="main.lang">ab0931e6e211686b85bed12e849f98c1</md5file>
+<md5file name="languages.lang">fbfe43438f871a1d23c1b791cce40bb1</md5file>
 <md5file name="bookmarks.lang">354a01f32d385c5166d852822ad9d471</md5file>
 <md5file name="sms.lang">02e5e0d91e8cc1b008004845a60230d7</md5file>
 <md5file name="dict.lang">b86122de22bca131f7b1e591d0ad05d9</md5file>
-<md5file name="mails.lang">e339f2bb0ea886f249577eaba863fdaa</md5file>
+<md5file name="mails.lang">4b9ad2ca74ef4f33b05aafa6c8f5ee50</md5file>
 <md5file name="printipp.lang">1c203659d8fbe2117d8da349a757ad8e</md5file>
-<md5file name="other.lang">4a5a0c358945d5aa43a66e8258f0f8b1</md5file>
+<md5file name="other.lang">13de416181b3cdbebce2aedcba4778c6</md5file>
 <md5file name="commercial.lang">e15c0672977d1f47a68fedd029054f0a</md5file>
-<md5file name="salaries.lang">125eaa9536fe64f6b3067fd176e0741c</md5file>
-<md5file name="trips.lang">d5ecb495d560ef916a8b9ca6f8276c87</md5file>
-<md5file name="sendings.lang">749107e7542f8a69b6b28444cb85a32a</md5file>
-<md5file name="accountancy.lang">a2335b6d52059adb0365213a82258ee1</md5file>
+<md5file name="salaries.lang">198738d85a77c59567f81577a6235b7a</md5file>
+<md5file name="trips.lang">ee439c807e7abee4f528729d6a7ae74a</md5file>
+<md5file name="sendings.lang">ef2a1718ac53eab7b31f1e73b72dc8fd</md5file>
+<md5file name="accountancy.lang">788e203b0299421aae93c5a7fc56756f</md5file>
 <md5file name="externalsite.lang">fb318dd514da9a7e91e4835a22a8b317</md5file>
 </dir>
 <dir name="/langs/uz_UZ" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">a82f967793fd358a77f730c774934150</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">f209f3bbc245afc75bf1fe1c2b74317f</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">4e186ea8084c33de3fec3182f57150ec</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">e355739b38707e595924a2aae63d78d0</md5file>
-<md5file name="main.lang">a850eb3cc3893c1cf8c7581010ca0aa7</md5file>
-<md5file name="languages.lang">5f5e1f71ef91392a3edee6cdf5e03408</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">566afc1b00ae00debbfc1bac9c992e61</md5file>
+<md5file name="languages.lang">7ce6e3f27f962ebc461ed5dc35b1b683</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">c95d9dd5cdb6d9a6824a6bdbefb48531</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/en_GB" >
-<md5file name="bills.lang">1c7a52eaa3f79eeb613a3ac102221c09</md5file>
-<md5file name="orders.lang">53ec6699499cbeb76fdccaaad411c42a</md5file>
-<md5file name="admin.lang">4519c952b4e774fa2e75a1309eecbc6b</md5file>
-<md5file name="stocks.lang">852586f6292a7299262a5c02aed69c73</md5file>
-<md5file name="banks.lang">180ce986d360152b36935d55ef8751f5</md5file>
-<md5file name="productbatch.lang">f27b729eb095667004ba2ffc02a62f9d</md5file>
+<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
 <md5file name="categories.lang">500287477a669f5b33637327cd578ca2</md5file>
-<md5file name="interventions.lang">d97d6901227f9a03e20ad415bcc48387</md5file>
 <md5file name="main.lang">defd77128a4daa7471cd207350120cee</md5file>
-<md5file name="mails.lang">28544d9e4d160a73aaed36c8547188f4</md5file>
 <md5file name="sendings.lang">f0946038ef768d49f311ebe67db82e17</md5file>
 </dir>
 <dir name="/langs/es_PY" >
@@ -9061,203 +9068,196 @@
 <md5file name="main.lang">47e41f42a075152d70958fe89cbf8d37</md5file>
 </dir>
 <dir name="/langs/zh_CN" >
-<md5file name="projects.lang">4d5266c2475f4ff39c0a43ad74d8354c</md5file>
+<md5file name="projects.lang">da47c25f3f0d833f8ee6d9374da4c97d</md5file>
 <md5file name="cashdesk.lang">fd401a3ffaf6041c661604a3b8829433</md5file>
-<md5file name="workflow.lang">2ce348df9fbc81f316ebda901c673a2e</md5file>
-<md5file name="bills.lang">7188667619ca180efaf6d38983760258</md5file>
-<md5file name="orders.lang">a300d38f3176064b8ed880a0e339d05e</md5file>
-<md5file name="admin.lang">8ec25d510c34b967095a4604db94d929</md5file>
-<md5file name="withdrawals.lang">120f110346817209a75f91e2ad6768e1</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">e6eb1588c6002d1414a02ebee4d52ed0</md5file>
-<md5file name="members.lang">0bfe6d33ab9e711efeddb3dd96a1e82d</md5file>
-<md5file name="ecm.lang">be5d82281f411cbfa5dc10fe5ee4aa4f</md5file>
+<md5file name="workflow.lang">f42d1bee9041dfc962483f895dc51516</md5file>
+<md5file name="bills.lang">a0d645f9a5b4e8449630a5a373f432b7</md5file>
+<md5file name="orders.lang">5e97dc2b74baa208aa17089175b265e6</md5file>
+<md5file name="admin.lang">d62b63ca60e612fb81b485fe3cbf5008</md5file>
+<md5file name="withdrawals.lang">e75dd31e0976099cfc0d9e00f9381947</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">03979b34915083ba410a0007c328ad2f</md5file>
+<md5file name="members.lang">7ef7a01bb8bfaa1bcf2a56e60d5dd02a</md5file>
+<md5file name="ecm.lang">35d341887139a758d99d30648927ee09</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">512a0064134bff1cfb407fa4291470c9</md5file>
-<md5file name="products.lang">b84ec32505d6f0bcd2c497fc0ee27c1f</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">456760a85fa9cad6019f9dacc14386b1</md5file>
-<md5file name="agenda.lang">ed82801a76fcadd971fde3e91234e150</md5file>
+<md5file name="stocks.lang">2a09f39d55bb81af77c3efaf23e5880a</md5file>
+<md5file name="products.lang">f129e61b9b377849eeb1bb79fba94684</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">186c5ea8aec6edabe43613c3518a0e4e</md5file>
+<md5file name="agenda.lang">8105f3406037213b8edfaa8b657a2a0b</md5file>
 <md5file name="help.lang">9f8037a9a12a3775f77152459d1d56eb</md5file>
-<md5file name="holiday.lang">3e5b88253e668dadb7bb35266683719b</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">1d1cecf8358d1db2dfb4ea6565a4f75f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">0d9854420987f4e57f2b1f9d3c4aa726</md5file>
-<md5file name="categories.lang">c6acf7a47f3b620942ce280472b1b0a3</md5file>
+<md5file name="categories.lang">3414635da528cc3186d6c8854e5a4824</md5file>
 <md5file name="paybox.lang">b7c3fe1a140db57e8b81210c6e91c32b</md5file>
 <md5file name="ldap.lang">8533867c20217e5aeae7d0dac180cd11</md5file>
-<md5file name="users.lang">943a1c51b1f92a4263138c7d60ae79b4</md5file>
-<md5file name="companies.lang">3f0cb6ba394a86cf0336df967eb3c0c7</md5file>
+<md5file name="users.lang">580097c19dd53748b11f75fd6daa95d5</md5file>
+<md5file name="companies.lang">c291a4474ec20525c2b972131e67b0bd</md5file>
 <md5file name="margins.lang">0d2c31d7789e5bc07bd6603c70767da6</md5file>
 <md5file name="ftp.lang">edebaaf030b310580975751b4b7007e4</md5file>
 <md5file name="exports.lang">13a76289383f2cee91aa326ecb2d3e3a</md5file>
 <md5file name="paypal.lang">2c27edeee3a6e7883ed719fe44d6d145</md5file>
-<md5file name="cron.lang">a1d47f3bbfd367acf0ef70605977e7a7</md5file>
+<md5file name="cron.lang">8617166efb147696761492d83e9a1324</md5file>
 <md5file name="interventions.lang">43db758beb5f856b7e9b6baea10c3a50</md5file>
-<md5file name="errors.lang">94b1e759c0e61bcfa822942ced5d67b6</md5file>
-<md5file name="compta.lang">3e5963883aba5a640ef12cceb8c8ab02</md5file>
-<md5file name="suppliers.lang">ebb27de632c0f72fb15855549b017059</md5file>
+<md5file name="errors.lang">d93939a660f462b0cef527a8f9c83612</md5file>
+<md5file name="compta.lang">af11984d351cc405d4e942887908f05c</md5file>
+<md5file name="suppliers.lang">bb65035565af6276aa39c8f827e6b0dc</md5file>
 <md5file name="opensurvey.lang">791d08fbdcfe6f2029c0c400d4f3778f</md5file>
 <md5file name="donations.lang">af08cb31c426c69cee3d5be5dc8702c9</md5file>
 <md5file name="contracts.lang">13aebd4febca1bd7fb814b67a38374ea</md5file>
 <md5file name="deliveries.lang">1364b5c7f6f46e8a9d5fe21a4aa0b8fe</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">ed15642e8fd40c774bc8f4574e065a2b</md5file>
-<md5file name="propal.lang">21a16ad96278005dbdd81c4025a9eb01</md5file>
-<md5file name="main.lang">166f6dfded0bfa759c8363e55e48d7db</md5file>
-<md5file name="languages.lang">339f0a142477e11932a52309ef39132e</md5file>
+<md5file name="install.lang">d09b602672f89e93e60d09962cd80e35</md5file>
+<md5file name="propal.lang">095b99ae7775132e9700de77b2e6f898</md5file>
+<md5file name="main.lang">ab48dd57d11a2a38b04d243146696ab3</md5file>
+<md5file name="languages.lang">2b779403f7d6b7cf52d44c685688413f</md5file>
 <md5file name="bookmarks.lang">44090991e2c1fd2d2fa0df9a85dc239e</md5file>
 <md5file name="sms.lang">abfff4dbeb6fb2a25396303105f5642a</md5file>
 <md5file name="dict.lang">ecc8a0bde690b00e0836ea7764a2fb4c</md5file>
-<md5file name="mails.lang">b96713d712e8b86767899cc5022867eb</md5file>
+<md5file name="mails.lang">b8ba3ac8ef64a7f87b2ef55a8bbd2f88</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">4806d9882274d72a7ad941ef02c4c225</md5file>
+<md5file name="other.lang">1643632ef5c00e55e35976ce7946fd81</md5file>
 <md5file name="commercial.lang">8637e0e334d99fdf9fdbe48dffd62cca</md5file>
-<md5file name="salaries.lang">8a87a9e4988709460cdcd4836ed9d854</md5file>
-<md5file name="trips.lang">8c5c55cedf56af52e826c18ff4fd7a5f</md5file>
-<md5file name="sendings.lang">9b03346b518b155c32866460b156f706</md5file>
-<md5file name="accountancy.lang">71447d62d4cd620a20ad4781d6add66b</md5file>
+<md5file name="salaries.lang">7f54f89d0966306d4f60a669e23b402a</md5file>
+<md5file name="trips.lang">2eb2704e96cf8ba7baf43be21edbff95</md5file>
+<md5file name="sendings.lang">fbd2144691c02dbb76ba0e3651e3206c</md5file>
+<md5file name="accountancy.lang">042d664277fbb8dafa70ea020216baae</md5file>
 <md5file name="externalsite.lang">7e2d917c34973b82cd21c55635057d46</md5file>
 </dir>
 <dir name="/langs/pl_PL" >
-<md5file name="projects.lang">84004e9400d4ede5916b869cbb80a765</md5file>
+<md5file name="projects.lang">6b824fffc8d640fb892b169061cb940f</md5file>
 <md5file name="cashdesk.lang">15df5a3b4ebb165f9986273c4ebe8798</md5file>
-<md5file name="workflow.lang">f98dff6ea7e2e21b4bf2ced1d7ea14eb</md5file>
-<md5file name="bills.lang">024b8f5e9a5aca6d44fd18dbea653a8c</md5file>
-<md5file name="orders.lang">7e2e7653ff899ba4bd9fdd22fe95e5cf</md5file>
-<md5file name="admin.lang">910feedefdd0ce9185ce3f2f4534f31d</md5file>
-<md5file name="withdrawals.lang">703f94acd884ae9d02d305238c25dde2</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">2c15f885be36f81978ed2b65dcf896df</md5file>
-<md5file name="members.lang">8ad4c9a4920aaa5060785bff6a877c43</md5file>
-<md5file name="ecm.lang">50b00337669e66260654669c7c0778d6</md5file>
+<md5file name="workflow.lang">d91271f2eee42c07a5138547a0f6c091</md5file>
+<md5file name="bills.lang">5061b6388ce5d1332a4feb422a31ff04</md5file>
+<md5file name="orders.lang">10e0a9880540d3fd375abcbcc026f131</md5file>
+<md5file name="admin.lang">6491858747db18d731a3614d99744fd0</md5file>
+<md5file name="withdrawals.lang">e2f570e2e66df747bf8f6b3db227bdeb</md5file>
+<md5file name="incoterm.lang">642b1d3edd6abf2fdfaf30d3995d3f4d</md5file>
+<md5file name="loan.lang">a313c383e151fb72d0eaad1757188000</md5file>
+<md5file name="boxes.lang">7d8c8e9bc16ad8accad451a2a6c5a046</md5file>
+<md5file name="members.lang">716fac49d69b624c15ac9c91f370187c</md5file>
+<md5file name="ecm.lang">32ae8012fb080e21bffa6e556916d602</md5file>
 <md5file name="link.lang">a12cd5e8e20bf30fa844fbd106e7b0ca</md5file>
-<md5file name="stocks.lang">40551f73faf08ac4f110bbe2126034cb</md5file>
-<md5file name="products.lang">d8ea01a2f971376f9be75a1ea7fb7b0d</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">cbefc6620846414178b08a92aa04f5c1</md5file>
-<md5file name="agenda.lang">1847bc08815995e00a0ff48f00ea5736</md5file>
+<md5file name="stocks.lang">ee21340febd721b00fd8eeae5f6cc304</md5file>
+<md5file name="products.lang">c5e87643440181f638cccbc4fbd02341</md5file>
+<md5file name="printing.lang">aee95b81b3e5c5beb2b3550d21cddc37</md5file>
+<md5file name="banks.lang">c6f743a81e628e69766cdeac649a52f5</md5file>
+<md5file name="agenda.lang">3d4fe0a4a8348767ef92ca5464727048</md5file>
 <md5file name="help.lang">ebf4f23c07bb09dca7337a86991819fe</md5file>
-<md5file name="holiday.lang">172f8ec6aea7428f3f57fe29409a97af</md5file>
-<md5file name="productbatch.lang">1666d0aea7ca274714bbc036ef3eaf0a</md5file>
+<md5file name="holiday.lang">817d4431714d750898bb14f2c94c1dbe</md5file>
+<md5file name="productbatch.lang">1856c76dda9f60666256d04b1f964000</md5file>
 <md5file name="resource.lang">fffe909199241a85bd97495f34b80378</md5file>
-<md5file name="categories.lang">7927c9e591e6f73d95b3c2ecfdb02cac</md5file>
+<md5file name="categories.lang">991c96e467fc4803359e90337ff44e2f</md5file>
 <md5file name="paybox.lang">4b5a8183c6f4dda7468dc379d8997f93</md5file>
 <md5file name="ldap.lang">3ab7d54a87b3c68cb046ebb54eefd70c</md5file>
-<md5file name="users.lang">759a6f8be89168bb298836cc07557bfe</md5file>
-<md5file name="companies.lang">515e71735a035bf1683abeb0cd21262c</md5file>
+<md5file name="users.lang">a63ab8aee2fbc9a1107042a070b1716a</md5file>
+<md5file name="companies.lang">39f5c1ac86156cca3255e61e568d87e9</md5file>
 <md5file name="margins.lang">53131f617bde232e62ac746ff68be36b</md5file>
 <md5file name="ftp.lang">2d807ca607e492b30eafb3d8914b95cf</md5file>
 <md5file name="exports.lang">37ba1de38a77e2846d052884950d04fd</md5file>
 <md5file name="paypal.lang">817b0ca846a290585a5395b65a65d68f</md5file>
-<md5file name="cron.lang">67d92d2c10ee857e4945702e7929e34d</md5file>
+<md5file name="cron.lang">24216c82e991c6828e21333d95b808cf</md5file>
 <md5file name="interventions.lang">95e57c35a792c252a2e8b35861c61dd5</md5file>
-<md5file name="errors.lang">269956234abf03fa601bc04c87ca322b</md5file>
-<md5file name="compta.lang">f33017b0cd4ea29529f83d87d8dc6ffa</md5file>
-<md5file name="suppliers.lang">478cead721ae7c478b4aa4df891ac363</md5file>
+<md5file name="errors.lang">d305e780c66eb6f9474eb537793f911e</md5file>
+<md5file name="compta.lang">69fdc6383838c978b74a4b5c2aa026c1</md5file>
+<md5file name="suppliers.lang">d8a6c251c674a1ddb96158682987e8dc</md5file>
 <md5file name="opensurvey.lang">79da3afa1b6e18f33269de3e58e20500</md5file>
 <md5file name="donations.lang">3199b9e77ad97d719d306bfd9fe1f5bc</md5file>
 <md5file name="contracts.lang">90fb6da206bdb349f7ee3d3d2082ebcc</md5file>
 <md5file name="deliveries.lang">75025c0ce9c0230f5b2a777164d34624</md5file>
 <md5file name="mailmanspip.lang">78baf615e8d1c00a89cc8eda5229f342</md5file>
-<md5file name="install.lang">ae884d53de93ca113d91b541d70d6fb9</md5file>
-<md5file name="propal.lang">7dbf2ef076e54006d6bded5392c25c13</md5file>
-<md5file name="main.lang">cda8649beaf260b7f329537d64546fcf</md5file>
-<md5file name="languages.lang">67deda06dcc0a357834bf851cc6e6d48</md5file>
+<md5file name="install.lang">7eef38cc7a9ceb69a90fe8121d515e61</md5file>
+<md5file name="propal.lang">c6fa5046b17fc49c8763a64a2190559e</md5file>
+<md5file name="main.lang">97e7fd2d8de97ca4106e4df790179338</md5file>
+<md5file name="languages.lang">d7a43cf0f3a354a02d52ff84f48d6b8d</md5file>
 <md5file name="bookmarks.lang">70a872670c64c2f1bfba189669cf2899</md5file>
 <md5file name="sms.lang">441e0f2ccdbec200a6056f9fdc0c3c97</md5file>
 <md5file name="dict.lang">73eee42ab2bef0da14d9c3fa7e1f1e3e</md5file>
-<md5file name="mails.lang">eb9125d1979c677b8ad29abf21c3fe41</md5file>
+<md5file name="mails.lang">c22d4eec9dcae667969c076fb09665bd</md5file>
 <md5file name="printipp.lang">593e777ba5389aeaa04f7da136a016a8</md5file>
-<md5file name="other.lang">6f24af6b215590a2af4998bd0c053cd7</md5file>
+<md5file name="other.lang">d4d0f4abc5ee1340255a9eb0076cd961</md5file>
 <md5file name="commercial.lang">46a37343679f6da89b6dedded5b04fae</md5file>
-<md5file name="salaries.lang">4d750e4475d1233eb26a29da5ea5f563</md5file>
-<md5file name="trips.lang">5db553c95e557ad493a63268e8436861</md5file>
-<md5file name="sendings.lang">cf265c1dca92b126ccc719d38a06f5cd</md5file>
-<md5file name="accountancy.lang">44629eae71e9ea686c90cb5bf855c207</md5file>
+<md5file name="salaries.lang">e644544bcf0068e86a44d37c204ec963</md5file>
+<md5file name="trips.lang">4bba2a597c0617248d91935febf168c3</md5file>
+<md5file name="sendings.lang">bf4bd2afcf443aa6e14f45a1520fd56c</md5file>
+<md5file name="accountancy.lang">113cdcb178bdb4641653a4b28af20946</md5file>
 <md5file name="externalsite.lang">86d18225c3ec4d2ab47d5b96594e1d74</md5file>
 </dir>
 <dir name="/langs/es_CO" >
-<md5file name="orders.lang">53ec6699499cbeb76fdccaaad411c42a</md5file>
-<md5file name="admin.lang">4519c952b4e774fa2e75a1309eecbc6b</md5file>
-<md5file name="stocks.lang">852586f6292a7299262a5c02aed69c73</md5file>
-<md5file name="banks.lang">180ce986d360152b36935d55ef8751f5</md5file>
-<md5file name="productbatch.lang">f27b729eb095667004ba2ffc02a62f9d</md5file>
+<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
 <md5file name="categories.lang">500287477a669f5b33637327cd578ca2</md5file>
-<md5file name="companies.lang">039638f6c2a5e3e7e63cc7f12eb414d4</md5file>
-<md5file name="interventions.lang">d97d6901227f9a03e20ad415bcc48387</md5file>
-<md5file name="suppliers.lang">17b0c3da24b2dc572067a4c200c9051d</md5file>
-<md5file name="main.lang">041f6a41011c729455287acfb867d1ce</md5file>
-<md5file name="mails.lang">28544d9e4d160a73aaed36c8547188f4</md5file>
-<md5file name="other.lang">dcad10e73f40317267b624bfdfb46180</md5file>
-<md5file name="commercial.lang">104b9301f7c376b0d1795795c06dd93d</md5file>
-<md5file name="salaries.lang">34282a1205a49703c9856930ca6cb69b</md5file>
-<md5file name="trips.lang">a1bad06bbb9535472667f6de9e3b869c</md5file>
+<md5file name="companies.lang">4a73b1420652c433015ba38d07a82126</md5file>
+<md5file name="main.lang">09cd93b89ceaf280cdf4e3ed95113d5e</md5file>
+<md5file name="salaries.lang">9d0003b476b04cb18293d40e8e5f9e4b</md5file>
 <md5file name="sendings.lang">f0946038ef768d49f311ebe67db82e17</md5file>
 <md5file name="externalsite.lang">efdb5a6169890e8d2250eac7fffe7942</md5file>
 </dir>
 <dir name="/langs/kn_IN" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">a82f967793fd358a77f730c774934150</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">031505b661f7a7480f828aa5ee4169ac</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">b3a5a3f9f12289cad738e450c0f4cae5</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">51a8ed92619d4857e0eaddd369a14b38</md5file>
-<md5file name="main.lang">1356f3061125fc78d9cba7834e9654c7</md5file>
-<md5file name="languages.lang">5f5e1f71ef91392a3edee6cdf5e03408</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">66f7a690f24f20c3ff9589a5114245d1</md5file>
+<md5file name="languages.lang">7ce6e3f27f962ebc461ed5dc35b1b683</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/de_AT" >
 <md5file name="projects.lang">a9f78f42a95ffd7f394193e378a2f9ef</md5file>
 <md5file name="bills.lang">43f67ab455d8d7d37792adf1b07c5d9a</md5file>
 <md5file name="orders.lang">0f4cabd5c702824c0432a5b16dedf3ef</md5file>
-<md5file name="admin.lang">d72275d2b749daf5dab85f59bfb8374a</md5file>
+<md5file name="admin.lang">52342963e7d3376ec60497a7ede9e2bc</md5file>
 <md5file name="withdrawals.lang">e5be41a111cad12948b3c30fcd5a41c3</md5file>
 <md5file name="boxes.lang">f8c35e3878a1834751fd9ceaf8e6bb7d</md5file>
 <md5file name="members.lang">ed92d742de3415fde0de3efc2b84e990</md5file>
@@ -9293,537 +9293,547 @@
 <md5file name="sendings.lang">e5dabc12813a485062ab5b77b5426679</md5file>
 </dir>
 <dir name="/langs/is_IS" >
-<md5file name="projects.lang">6af635b21c18434206319fe6a4d613cb</md5file>
+<md5file name="projects.lang">2b2458d80cd30ca3f9ed66ab86340772</md5file>
 <md5file name="cashdesk.lang">632d62425fd80b2ae185fb09da005b35</md5file>
-<md5file name="workflow.lang">e0d0388f6ee033647320ede72dc63735</md5file>
-<md5file name="bills.lang">e49571a2414555bf682c4dc4b58caf63</md5file>
-<md5file name="orders.lang">b0e208b5d4bb63668d16b8f15f9cab2f</md5file>
-<md5file name="admin.lang">ed8e69a309c17608949470659e980d25</md5file>
-<md5file name="withdrawals.lang">f8357aebb6d24dfc870ddb4ef63d4fa1</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">73cd56875f2f57bdc80e9df224e016c9</md5file>
-<md5file name="members.lang">7099bf85294f531cbdb56a95961492c3</md5file>
-<md5file name="ecm.lang">d626f61d727893fdaf13395d3bf09e45</md5file>
+<md5file name="workflow.lang">41a82da1a38fdb0731f1af8f23e1b884</md5file>
+<md5file name="bills.lang">6f4d2185bd631376c2e0736b5cd50add</md5file>
+<md5file name="orders.lang">2ded13e425cf1aa891455e8edbc85f6e</md5file>
+<md5file name="admin.lang">76deb496421b6e714a18352a69ea93f1</md5file>
+<md5file name="withdrawals.lang">36526b8dab4e59d4f4ad236d6c90907e</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">a46e84e226776d1c036b5c45cf3bebc9</md5file>
+<md5file name="members.lang">f760a8a4dbcb446b2b9d4a57519b97a3</md5file>
+<md5file name="ecm.lang">8586f1e6313f1760b3c4b35d5446662e</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">005990b388c7ed1aecd1b5f0632a86d1</md5file>
-<md5file name="products.lang">248ba41a175aadc002d65c838681e04a</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">5a1018759c77f5dfdf75228bd4bf3447</md5file>
-<md5file name="agenda.lang">e46bd52acbf76b1e002e045804216ead</md5file>
+<md5file name="stocks.lang">d2abc04d590c9d7b6e67a44bd283347d</md5file>
+<md5file name="products.lang">8f3b1adecd66dcae6f34b6c5b6a3ecb9</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">f46d35a1aa688ef2e9b8baa1d439b509</md5file>
+<md5file name="agenda.lang">e10f0b3a9c62faab728ed82324c6c701</md5file>
 <md5file name="help.lang">49070aa4eba7e3e1b439d12caaee9952</md5file>
-<md5file name="holiday.lang">787b405c8c6d3946a464df04ba694797</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">4af6167a289ed2d227990fc96c9074fd</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">04199f7c691c765edcf68c552cb45580</md5file>
+<md5file name="categories.lang">8d679731c94a0e9afe606b59292eb85b</md5file>
 <md5file name="paybox.lang">23b283c2a11223316c1b2d99e13a03bd</md5file>
 <md5file name="ldap.lang">83fef6c66e36ad20cb4fe764f9f68e06</md5file>
-<md5file name="users.lang">ae1696c13871513322a5f7a37ef7d5cf</md5file>
-<md5file name="companies.lang">b7cbb01f27803c44288d26309ca45973</md5file>
+<md5file name="users.lang">a4171eccf1d40752d26b29b5153b11b2</md5file>
+<md5file name="companies.lang">e78893bdb16ac66542591c8fd74a9921</md5file>
 <md5file name="margins.lang">384edeff0560731bea7d71b6f7fee1a9</md5file>
 <md5file name="ftp.lang">effb241913bf2477516477291789d0d7</md5file>
 <md5file name="exports.lang">21ba353a9e2fafbe322df761ee7e3b0a</md5file>
 <md5file name="paypal.lang">a0057248da365d8652f6b193da290302</md5file>
-<md5file name="cron.lang">1bd83d7eccbbdcb930ef0639559af94b</md5file>
+<md5file name="cron.lang">c12cf1d469986ba2dc003196939d366d</md5file>
 <md5file name="interventions.lang">efb32b89df497db2be8b2b094f5184b3</md5file>
-<md5file name="errors.lang">4eef491d02291c7991ddb49299de3896</md5file>
-<md5file name="compta.lang">5225a59901d5398e50a3d02f04c7186c</md5file>
-<md5file name="suppliers.lang">2c7d227156747747bf7626157ee6c91a</md5file>
+<md5file name="errors.lang">50191b45b9217ea0be5f89fd514fed42</md5file>
+<md5file name="compta.lang">6ea9de9974a34d9c36dec6fe0d0dfa83</md5file>
+<md5file name="suppliers.lang">54a4bd6bec26ec5b823b44ad4178e951</md5file>
 <md5file name="opensurvey.lang">cd19eae6497fdab036c304d1de48166f</md5file>
 <md5file name="donations.lang">6a99d337f18961deee4388eb086941c2</md5file>
 <md5file name="contracts.lang">443c56156f3e9c243442f9c767c54dc2</md5file>
 <md5file name="deliveries.lang">306523293000765d47944a1d49176227</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">d87ee0e45209b0e49c05a9d8e5282ea5</md5file>
-<md5file name="propal.lang">4c3fe05f72b2d8c24f241ea8d3ad9731</md5file>
-<md5file name="main.lang">999c033ef31249a526377801ac1ec994</md5file>
-<md5file name="languages.lang">f40a6855e6a861fd2c7c004c9b290385</md5file>
+<md5file name="install.lang">4c7405ff8ba0acadfe827839d9def729</md5file>
+<md5file name="propal.lang">0266e81927355c5ace41047baab6f273</md5file>
+<md5file name="main.lang">0f070acc587f31c5cb23eba6fa44c41f</md5file>
+<md5file name="languages.lang">1dad0f0a85b2d5b9d2b377d0f25a66c8</md5file>
 <md5file name="bookmarks.lang">dd0c0d28fc4a2ed9db92b4ba84a9a561</md5file>
 <md5file name="sms.lang">62412b0b947b92addce88be9b0d465c1</md5file>
 <md5file name="dict.lang">e3a663c28cda435414f95b1683b36d3e</md5file>
-<md5file name="mails.lang">cf09b54edb1b4221d2107155b48923d3</md5file>
+<md5file name="mails.lang">7813b286e9266e76c7024ec1f4050afa</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">0b81d83b27c6bf8166417c8a9275dab0</md5file>
+<md5file name="other.lang">3fd95b45a7575151e66f338bed7928b2</md5file>
 <md5file name="commercial.lang">cbc78c0edf13a1bb87f202d6b0702546</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">0b13dfc18e957fce15b52fab6eabc440</md5file>
-<md5file name="sendings.lang">475a8d4fa5489126e38284cf9f94958f</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">17ceaf5d1a585085c33b4fac38139f2d</md5file>
+<md5file name="sendings.lang">33237c38baf8dc60a11c4f4d63b82be0</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">96c57fcb231c8ac82ea65c0892a50555</md5file>
 </dir>
 <dir name="/langs/hu_HU" >
-<md5file name="projects.lang">674aaac44170804508281fe458fdeb9d</md5file>
+<md5file name="projects.lang">2a856e37d533134725d83f9e2812f928</md5file>
 <md5file name="cashdesk.lang">150ef0a3188079477ca03d406201c48b</md5file>
-<md5file name="workflow.lang">3f0d25c580c941efa2d6554fd021fe96</md5file>
-<md5file name="bills.lang">afa75888821db01b2fb0b93bc8435959</md5file>
-<md5file name="orders.lang">df5ca2209b928beedc54f00f1922732f</md5file>
-<md5file name="admin.lang">37bca7f0fba24a923b93cc3ffdaa82f5</md5file>
-<md5file name="withdrawals.lang">ec8ce242fd76f4d419233b1e4c65b745</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">b54bf402e3f9b7d12df15ea6ccd46d5c</md5file>
-<md5file name="members.lang">ee353097d2121cc7e1f36e2402c4af90</md5file>
-<md5file name="ecm.lang">f81fffc1c919c91ec4fbd998ad571989</md5file>
+<md5file name="workflow.lang">046d11412aa0f261834b9ae1e91bac48</md5file>
+<md5file name="bills.lang">1fd5450abab6e1c87676f6392fcccfc2</md5file>
+<md5file name="orders.lang">43142560d0a3cc08b8f90d4cc864d30e</md5file>
+<md5file name="admin.lang">8ee999bf2f0639ffc4b2d18a63b3d72a</md5file>
+<md5file name="withdrawals.lang">3cb79c768f575725f294e75ef620f846</md5file>
+<md5file name="incoterm.lang">a4c048ac4494e32101da4774e4d56102</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">4fabc8a6936621fc03a2dd32a9ba7531</md5file>
+<md5file name="members.lang">5f8b1d14fad5cda81df0c2d95fb0b9a6</md5file>
+<md5file name="ecm.lang">302723b8a8150728e2868ef843784434</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">7f8bc751a4bc33d612ad19ebe27f79d2</md5file>
-<md5file name="products.lang">5ff1aa7093d0b9af43dbce3dc93672e8</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">e4033babdc71ff91d6229e41df21937a</md5file>
-<md5file name="agenda.lang">7b718a7fd13c302be1e18859c422474b</md5file>
+<md5file name="stocks.lang">c69c612cdaf7fc1f237d81ac541a7c20</md5file>
+<md5file name="products.lang">aecb561ce5d2f7deb849aba9008daf49</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">e44333c811094b00643363ee23de4398</md5file>
+<md5file name="agenda.lang">cdb52ad6bf8e42bef8d3fef0ce44ca5a</md5file>
 <md5file name="help.lang">54ee3269dc7dc1a5ad6b8e105b6d1c4a</md5file>
-<md5file name="holiday.lang">2b8fe3b9befd458de64b2be818fb038a</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">5b03fbd5ebb48c72ddfe8205be3a40b7</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">ea2de247f6cf2ecbf4da9c5bed755933</md5file>
+<md5file name="categories.lang">e3647584f172d1a0bb62eb51a47f6c03</md5file>
 <md5file name="paybox.lang">ff657da941a0ac497a561afdd1deb932</md5file>
 <md5file name="ldap.lang">d4a4ee924ffb170772d19d8fb868d8b5</md5file>
-<md5file name="users.lang">f521a4107e74b62b2d21e97ee0dafb1a</md5file>
-<md5file name="companies.lang">1976cf87682a67b3a453046f78f8d732</md5file>
+<md5file name="users.lang">6189a60e665e8910cf6e08c7b8cb34e4</md5file>
+<md5file name="companies.lang">7600ec5d17fdfbb99ca339ce7dd58898</md5file>
 <md5file name="margins.lang">0e382fcdcf4ffc8c497b6e40e4c98a61</md5file>
 <md5file name="ftp.lang">369a11697afc5fc08c9d9a119312befc</md5file>
 <md5file name="exports.lang">683506bfc5c86f0014878d8e904c73a2</md5file>
 <md5file name="paypal.lang">5f249fd236d741add5cd1989e73a179e</md5file>
-<md5file name="cron.lang">a868665f664158ff9e820a5aec4f9fbf</md5file>
+<md5file name="cron.lang">ba76df4a1a0806f87e68830f08b4c334</md5file>
 <md5file name="interventions.lang">4486ffd5730ec74acb7f165d032a354d</md5file>
-<md5file name="errors.lang">e41b1cf23747faa4e04f09a1267bc65d</md5file>
-<md5file name="compta.lang">39fc2d8ae07cc976e812b7d3b2b9c7ff</md5file>
-<md5file name="suppliers.lang">1c828f5e352025ed5f1694eed9f3b058</md5file>
+<md5file name="errors.lang">5a0594e7b1d1b474f1a9fa0c47cc04b3</md5file>
+<md5file name="compta.lang">89787ae77f17ef669a12212ceeed15f6</md5file>
+<md5file name="suppliers.lang">de41e51d30e6cf38e0b997032df5b437</md5file>
 <md5file name="opensurvey.lang">30af1f1daa6808bc69afab5eef6d8777</md5file>
 <md5file name="donations.lang">05295a96fc118adfbe34fed9ab5695cb</md5file>
-<md5file name="contracts.lang">83a70b63ecca7c5519226199566abfc7</md5file>
+<md5file name="contracts.lang">de2f2065e2ed807ea6b477b89c677cde</md5file>
 <md5file name="deliveries.lang">e2590b64c46acd99b18bf01068bda97f</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">3978d9e7b0fedd2b65dc4f9d01388596</md5file>
-<md5file name="propal.lang">62935f9a39e2525b3e434a981830f02a</md5file>
-<md5file name="main.lang">8c59fa5e30723e5f53081e16b1695d23</md5file>
-<md5file name="languages.lang">49575eaa463695e2b9d36d0d7178a896</md5file>
+<md5file name="install.lang">db841a2d324c6e07d22d6453332694cc</md5file>
+<md5file name="propal.lang">b62965af8cd454ed73aa42db77882ce8</md5file>
+<md5file name="main.lang">43eb5309ecee0222d71679d7efb884bc</md5file>
+<md5file name="languages.lang">e3d7d1ec2187ce373ba8e5a46d747906</md5file>
 <md5file name="bookmarks.lang">14de703774957e32462615ce075e168a</md5file>
 <md5file name="sms.lang">d7076d1ba0b16124aa157994fdb7ec3e</md5file>
-<md5file name="dict.lang">abffa393ae08d5867b30e2b23c686fae</md5file>
-<md5file name="mails.lang">42b5780cd2785e1d69fc5ad526684ee8</md5file>
+<md5file name="dict.lang">c16ead4fa40f9b157f7c4f0ec8afefd5</md5file>
+<md5file name="mails.lang">4174a4faff345145b6fe6ff3f2aa337c</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">0d384e2ca421f6cc41da25b31cf0b162</md5file>
+<md5file name="other.lang">a12d05ba9afa3e112f945becb6fb8a04</md5file>
 <md5file name="commercial.lang">eda2a8404604024707193386da984950</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">099c774e52597a817234b72ec7f845c8</md5file>
-<md5file name="sendings.lang">a0247397c2743666a421f8b39fd22889</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">8beeb55ea5ccd44750a5e2e2f62aef43</md5file>
+<md5file name="sendings.lang">7838e2bf0873160c9fd7650c648c094d</md5file>
+<md5file name="accountancy.lang">e266320eda9bb87828775146540fa69d</md5file>
 <md5file name="externalsite.lang">ef990f1dec41193b1367ff9ff985ca67</md5file>
 </dir>
 <dir name="/langs/de_CH" >
 <md5file name="main.lang">93fc25faef2e4a631602c033427fd12b</md5file>
 </dir>
 <dir name="/langs/id_ID" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">f638b5220c5da332ccca85473743525a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">2c0313151304fd545542ac26525ffe48</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">edd948e3ad8c56f1eec0754d9af7f849</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">ef0aeacd2108077b9627271d44b37b1f</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">3d553783df165b8fbf3ebee134c980dd</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">353567ab6a620f12c2acb03e228e7a9c</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">4a35b8d6a033b22b2d4b5a627f6aa69a</md5file>
 <md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">6347092f90b7e44ae61df59af8552bb1</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">52eb92f6d1e5e884041b69587acc0147</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">7bc61a1f1daf334bc893dd1f0b05ca37</md5file>
 <md5file name="exports.lang">86eba190302f1d2ffa2342cd0a181be0</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">4e7350bdf31ba4ffe524dceae6120be9</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">2fed135a75cbdfa6d1f747e9c05e2a75</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">a20948c465175ec3ce5da3692d7f521a</md5file>
-<md5file name="propal.lang">8ad7dc8c62da0c98fdac28dfda1db0da</md5file>
-<md5file name="main.lang">2a3c0ae8b32ee0e0e4ce6fc0cbded0b1</md5file>
-<md5file name="languages.lang">179eb7a9b3e9b67b01a36c8ffe84ce87</md5file>
+<md5file name="install.lang">d1b97c9f09167f4321bf14e9ec00ac52</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">be37bf7752478446a41389618cde8ca8</md5file>
+<md5file name="languages.lang">226eae9cf87ee982aed0763fa5c28ac5</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
 <md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">870b3b7a908cc3ce575aad44df32eb65</md5file>
+<md5file name="other.lang">34a1486eb36f6584c549680f7c8c5b65</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">bc55abb86e597439b24ca6c603878440</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">f18bae68f60655dd11f792066b6d45a7</md5file>
+<md5file name="salaries.lang">fb4a6f0b8120de5bf4484b514147bf27</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">df1f5abd77daf6131fe6fa2e4bae0f65</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/fr_BE" >
 <md5file name="bills.lang">7864745b6e16ddc5251920c7a15f4f14</md5file>
+<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
 <md5file name="main.lang">c86d9cd72187d66eca91c2d2671c3c7e</md5file>
 </dir>
 <dir name="/langs/pt_PT" >
-<md5file name="projects.lang">2d7f0af203740bc849c4b2a289254461</md5file>
+<md5file name="projects.lang">8089d9759d45fe39ce115d8d4a8dd353</md5file>
 <md5file name="cashdesk.lang">8a54b70546ddfb4c37311eed7fe97f37</md5file>
-<md5file name="workflow.lang">e79c6e7285b5106095a07e4cccbf406f</md5file>
-<md5file name="bills.lang">212abc278e51f1023a9b1b50c853306b</md5file>
-<md5file name="orders.lang">bc9d3c416101bf902206e10e5150071d</md5file>
-<md5file name="admin.lang">fabedc7ec556f150681d04046e3f6d78</md5file>
-<md5file name="withdrawals.lang">53c59830c0b8e21669bd450638a0aa24</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">b3d8073602d265d207f2542c1aca21f4</md5file>
-<md5file name="members.lang">ccd92d7fe7e97e7a33bada943b287470</md5file>
-<md5file name="ecm.lang">62c441d4458ff63d8e88d1ae56bdaf21</md5file>
+<md5file name="workflow.lang">5d4bc708b7463a1439b6e450ecfe14a4</md5file>
+<md5file name="bills.lang">a3ccbfc0c44d03ec27061fe0ef9c798d</md5file>
+<md5file name="orders.lang">51df0d5331498c634c3d11e776a7127e</md5file>
+<md5file name="admin.lang">038bab868644eae76dde69246e8886da</md5file>
+<md5file name="withdrawals.lang">14a61298c64c7c9be5640d0c4e4fb421</md5file>
+<md5file name="incoterm.lang">110e015c9a8e5ca0f74c16973fcfd6e6</md5file>
+<md5file name="loan.lang">fdec511a494d5027c2acfc28a9699401</md5file>
+<md5file name="boxes.lang">b724824ea94f4d3ab2ef94500dcfb952</md5file>
+<md5file name="members.lang">d2f5adfad0a886c9fd4f01bcd8e2b407</md5file>
+<md5file name="ecm.lang">4e5fa484c5e828a1850cdcc41c2e21ad</md5file>
 <md5file name="link.lang">299d941a9f02e17c8b02434fa9e8030f</md5file>
-<md5file name="stocks.lang">2dddcf552621e30b33634577edb46fbb</md5file>
-<md5file name="products.lang">4ac590ac148e6ca42b8f723f6dcbf9a1</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">035975519ce4bb44572f68097d85aa0a</md5file>
-<md5file name="agenda.lang">a591a462d9edf9c3a36fa3cb8b3bf6da</md5file>
+<md5file name="stocks.lang">7c1cd054e3b3ba06e3a855c6e1c87014</md5file>
+<md5file name="products.lang">ff0e25cb7e20b4d5036d435363d21375</md5file>
+<md5file name="printing.lang">ff17660e1c4f70e7dab67f8f6ce285f7</md5file>
+<md5file name="banks.lang">7321d7f8dbfa14a3a228f2684cc10a85</md5file>
+<md5file name="agenda.lang">cce2419ce2ae917f8e786d77c64ef2bf</md5file>
 <md5file name="help.lang">e131a7ffecf41104dee00ebbce281fab</md5file>
-<md5file name="holiday.lang">175c74b9bcf543299427a472a84e8803</md5file>
+<md5file name="holiday.lang">ad91faac2797c93a0b7ea63ec8a766d0</md5file>
 <md5file name="productbatch.lang">d5878227c86ff4802e669af1c7596a5f</md5file>
 <md5file name="resource.lang">a1b4f1a132ee1c2910d45a3ddf0b116d</md5file>
-<md5file name="categories.lang">8feb9a7d74b9ed0df15c88dd0910be33</md5file>
+<md5file name="categories.lang">2cf0095e60e8e59356d11fa7e5680d4a</md5file>
 <md5file name="paybox.lang">c4430027f89011992d470f7fc4ed1ba1</md5file>
 <md5file name="ldap.lang">184f8b89087e7c5bf304a8fb05056c81</md5file>
-<md5file name="users.lang">7d3f325b8304bddfc92dfc67d6b19f17</md5file>
-<md5file name="companies.lang">ef72a74ee0e4262f1064a0c1dd2251e4</md5file>
+<md5file name="users.lang">907459d92ccbbbeb7cedf07b093bab8d</md5file>
+<md5file name="companies.lang">1ade8c02170639d012f95904cc3826d5</md5file>
 <md5file name="margins.lang">d4bcb45cede4f90f42bce9cb382f4189</md5file>
 <md5file name="ftp.lang">ecc6587f01a3e2b2fbb938a01ed61ff6</md5file>
 <md5file name="exports.lang">827e24df22814a8944c48039c2731a91</md5file>
 <md5file name="paypal.lang">953b6481373f49567196fa44c135b46e</md5file>
-<md5file name="cron.lang">b33a068b9f0b3f4c05444854cbff4e50</md5file>
+<md5file name="cron.lang">c628021e320e7a63491f3bface328003</md5file>
 <md5file name="interventions.lang">67709582399a59b174d58d7de1362fb7</md5file>
-<md5file name="errors.lang">215c265a89ed9b9bf6d989b7aaf7c938</md5file>
-<md5file name="compta.lang">b3831805de3dcbe54c26cdd7e281d2f7</md5file>
-<md5file name="suppliers.lang">227dcad847149739a2a11f0c8fd1183b</md5file>
+<md5file name="errors.lang">0db71d2413cce70b8b7de3022aa9c9ce</md5file>
+<md5file name="compta.lang">2e3148ea9b2e1ac64d256083ec64abd7</md5file>
+<md5file name="suppliers.lang">608f8d97886b11e7b5bd4f747e917ad4</md5file>
 <md5file name="opensurvey.lang">ac2e49c27102ae56b3deed5e8d7c4175</md5file>
 <md5file name="donations.lang">44f79429dad38940b566f2f1537df733</md5file>
 <md5file name="contracts.lang">54a105ae97faa5d4dd444ea10fc32447</md5file>
 <md5file name="deliveries.lang">3a4777f67a135a1cfdf7a47069d350f0</md5file>
 <md5file name="mailmanspip.lang">1b7f4ed47e2733ed7daf1f068dc5a43a</md5file>
-<md5file name="install.lang">7edc9e0a97549aa2963e1c649b46167d</md5file>
-<md5file name="propal.lang">873b92d53e67d087fd795c9ae488d80f</md5file>
-<md5file name="main.lang">e366f3227a2bb0faa5c934d77328d0ab</md5file>
-<md5file name="languages.lang">919e37ccfccbfdff75d80f91092f8753</md5file>
+<md5file name="install.lang">7dbeb02ad9b8765d2441aec69d44efc4</md5file>
+<md5file name="propal.lang">dc01728427612699c305b8f285cd1262</md5file>
+<md5file name="main.lang">277fe818574cb424614d314215428174</md5file>
+<md5file name="languages.lang">cf09d63e670490d85b85756d0642794f</md5file>
 <md5file name="bookmarks.lang">87286fa247ed09647335fabb2a9ea2c8</md5file>
 <md5file name="sms.lang">0b44cc53b25de22d65ec652eb81f2709</md5file>
 <md5file name="dict.lang">f941b0dd2760b7fbc53b3ad0e10e50d7</md5file>
-<md5file name="mails.lang">5b9c63291cc109ccc0f9597d674f559a</md5file>
+<md5file name="mails.lang">8cc9786143f878d28bafc509c62ad272</md5file>
 <md5file name="printipp.lang">caff61b2f2d74c3b1224049158c71564</md5file>
-<md5file name="other.lang">f465e11a2bd3c815538a3a50c5895b67</md5file>
+<md5file name="other.lang">529c0788b30ce0d497eef4017945ce2f</md5file>
 <md5file name="commercial.lang">6aee023f1c7f0038f5f061ff0ef8d786</md5file>
-<md5file name="salaries.lang">46fcf7a14f3f3543907a3a4c0142179c</md5file>
-<md5file name="trips.lang">5ad8586c12ec6d6f7875ea5eb8f71cc2</md5file>
-<md5file name="sendings.lang">85ced37751ddc4709e34243fdb616ba5</md5file>
-<md5file name="accountancy.lang">f3d9b693dd62c347b2c6cbeef1f7d1ba</md5file>
+<md5file name="salaries.lang">b75222a8f89443a5fdd5270fd5cb15bf</md5file>
+<md5file name="trips.lang">426ac1cf7cdff0789a35eda363c7bc4a</md5file>
+<md5file name="sendings.lang">3da8023d66e7879b96bf4ab67965b035</md5file>
+<md5file name="accountancy.lang">234cec53c0254ddb172a102a90a83cb6</md5file>
 <md5file name="externalsite.lang">6ad1e01b6d442e0d1300992628e095fa</md5file>
 </dir>
 <dir name="/langs/th_TH" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">d18c812e64ad67fb8b962508d6f3ab7a</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
-<md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
-<md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">f209f3bbc245afc75bf1fe1c2b74317f</md5file>
-<md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
-<md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
-<md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
-<md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
-<md5file name="deliveries.lang">4e186ea8084c33de3fec3182f57150ec</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">e355739b38707e595924a2aae63d78d0</md5file>
-<md5file name="main.lang">7f1137401307450924a163bbb4e560ff</md5file>
-<md5file name="languages.lang">c359b646b2d4d943a311927b568d046a</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">c95d9dd5cdb6d9a6824a6bdbefb48531</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="projects.lang">ca760ad21988fd71e713aa64adbdf568</md5file>
+<md5file name="cashdesk.lang">40da036c3ed6060360c70640de106608</md5file>
+<md5file name="workflow.lang">e79dbc779c33fba7f5c1a7a2f7b57bf8</md5file>
+<md5file name="bills.lang">dbaf5776f87b2ec5bc1d0bff49e271d4</md5file>
+<md5file name="orders.lang">f6b3b33b810b1ad35eba8c7265330e0c</md5file>
+<md5file name="admin.lang">9c3dc17dd05e7e34682554d6331ea4df</md5file>
+<md5file name="withdrawals.lang">52427798b2a5dcb70d70d56d3e192716</md5file>
+<md5file name="incoterm.lang">1d053fd20fee7157bb530d6ed8656535</md5file>
+<md5file name="loan.lang">0b5a5f0f19db04cf9782504c32fde043</md5file>
+<md5file name="boxes.lang">bbd2e9eb5a38d949037f38c2b160f5e3</md5file>
+<md5file name="members.lang">ecfd8bb10368f489e38e4a6d70cf19f4</md5file>
+<md5file name="ecm.lang">14486d10d969cfb5063318a4d1fdf997</md5file>
+<md5file name="link.lang">60777f0319f1b3dae65db8ae22ac8b83</md5file>
+<md5file name="stocks.lang">a3c64d867dc8146af65ad0b2eac6ba9f</md5file>
+<md5file name="products.lang">4a06f5c64871913c856cc2938e749956</md5file>
+<md5file name="printing.lang">01165ea1dc7829adc240e60d37babb59</md5file>
+<md5file name="banks.lang">4b80a6681a24164d9ccc28ffe25fbf4f</md5file>
+<md5file name="agenda.lang">02c450f47e691128ef84cd7b337425ca</md5file>
+<md5file name="help.lang">690c87d366aca89d2768a17c445cb045</md5file>
+<md5file name="holiday.lang">79176d053fd252508db0f8333a6c7eda</md5file>
+<md5file name="productbatch.lang">0cd2d97cc04d767f61df46295f3689bf</md5file>
+<md5file name="resource.lang">b5685b4431db742c4d8e5eda463ac680</md5file>
+<md5file name="categories.lang">72d5098953826a9544325f21c98b11cd</md5file>
+<md5file name="paybox.lang">e6861840c79ceba32d273cb73b5e7611</md5file>
+<md5file name="ldap.lang">f286f5bb77bf7a5d6a3133d47ca2def2</md5file>
+<md5file name="users.lang">4e48782ba5e3db06fe07b7a077ec5639</md5file>
+<md5file name="companies.lang">45f6585d50544d14294454c2956a50e9</md5file>
+<md5file name="margins.lang">a0e56bee0e15bc8fcfcafcd0b00a760a</md5file>
+<md5file name="ftp.lang">b536e6b3720ab1a0bd19d0cff38bc56c</md5file>
+<md5file name="exports.lang">c6e2a8d4866880253253c17a48997560</md5file>
+<md5file name="paypal.lang">819885d528aca06ddc71e73fc4f53c60</md5file>
+<md5file name="cron.lang">d95092bbd49344e2a07606621b38780f</md5file>
+<md5file name="interventions.lang">019c8545f027aa2de1002d8f97911304</md5file>
+<md5file name="errors.lang">099dc5d8a06790a5c32c53fbeaad04d6</md5file>
+<md5file name="compta.lang">1b57caafbe8608f2870c401b41ba4755</md5file>
+<md5file name="suppliers.lang">8f01e210427455b58853c3fd1b98e483</md5file>
+<md5file name="opensurvey.lang">6c350cab97cc78a5355817fefdde8d1f</md5file>
+<md5file name="donations.lang">0102a1534d2964a0ff588ae23e2effb2</md5file>
+<md5file name="contracts.lang">aab616a3279ef407751fd50527093a83</md5file>
+<md5file name="deliveries.lang">984ac2a148088665cbda36e3c2d1e226</md5file>
+<md5file name="mailmanspip.lang">84d22376b36901d38526d6ebe0e10281</md5file>
+<md5file name="install.lang">1cf7196acc19fd5cb74b8dc06d1ef13f</md5file>
+<md5file name="propal.lang">65e9e1b5f51015b08fd5e36ee6766fe6</md5file>
+<md5file name="main.lang">027c29347d8fd7ae5326be8f7d187671</md5file>
+<md5file name="languages.lang">eb0d6c6e3c058b63004572b456aff534</md5file>
+<md5file name="bookmarks.lang">89da70a234eae57c52a2c2c94993f02a</md5file>
+<md5file name="sms.lang">fc98abd696e8be5f5f266fc5a88e952c</md5file>
+<md5file name="dict.lang">ab4ecb5d3233c1e528042934ce93a740</md5file>
+<md5file name="mails.lang">0c0077efd9abc2c364cf48b04bd80bba</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
-<md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
+<md5file name="other.lang">f4cf25203748b46f4380bb892d8e2075</md5file>
+<md5file name="commercial.lang">05d026db2a123c366032f46f3a12d923</md5file>
+<md5file name="salaries.lang">76fd170989412fcfb3cc9f0019c0f184</md5file>
+<md5file name="trips.lang">ed9cd05cd2515abe3bfbc7c0e875db53</md5file>
+<md5file name="sendings.lang">9b7e3b6fdf8916f9fcc9113d448f1a13</md5file>
+<md5file name="accountancy.lang">fb454aa359bc9ebe235e754ce4de9f9d</md5file>
+<md5file name="externalsite.lang">7457fe1789a9f0f07205824fb97aee9d</md5file>
 </dir>
 <dir name="/langs/ja_JP" >
-<md5file name="projects.lang">c8b3d962781a3d13211d6782044fec24</md5file>
+<md5file name="projects.lang">a0a34b1cb0cef4c60652545046e738ab</md5file>
 <md5file name="cashdesk.lang">8c05bca341db9c1e806bf122cd6129b0</md5file>
-<md5file name="workflow.lang">2f4e5771aeefb03f098258626384e271</md5file>
-<md5file name="bills.lang">4496897bc40b3ebd8c9f8ec6f2689fa2</md5file>
-<md5file name="orders.lang">9155444f5303180bf11078316e5c32e7</md5file>
-<md5file name="admin.lang">5c86f10a23b80bc6e4e9f6f18686a9c7</md5file>
-<md5file name="withdrawals.lang">67fc891278e84c3bd8803c1d161d684c</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">54eeed38db0367792e731801659aaf45</md5file>
-<md5file name="members.lang">3481a3a227684c9cd2d321458baafc73</md5file>
-<md5file name="ecm.lang">cf0a24b1fee3f3ef9ecd61f56f4f21d7</md5file>
+<md5file name="workflow.lang">f8f7a172a28516637112bfb05e9b0bbc</md5file>
+<md5file name="bills.lang">491bbb4843c8b0e8a45a151a57a061c2</md5file>
+<md5file name="orders.lang">518626da0834e91daaa2d4df845f87f9</md5file>
+<md5file name="admin.lang">344b1b0bc9a907160bc9dc39778640d5</md5file>
+<md5file name="withdrawals.lang">4a9dd02753c248d33d39dea3efa7acd2</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">425da8d00f099c5e145c34080a297f90</md5file>
+<md5file name="members.lang">a4122ffd8f45e924d0008ac3b433753a</md5file>
+<md5file name="ecm.lang">be6f11bef46d99c22eb5966366c90559</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">fb9be112c1bd82f164947ebc81f3bce1</md5file>
-<md5file name="products.lang">cae834f9bae36373ce8d1c512f3b30bb</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">93ecdf43433a6c36c96ad39376929612</md5file>
-<md5file name="agenda.lang">fe9be7c19f7bdbb5cf16446c35b9f481</md5file>
+<md5file name="stocks.lang">3c5414e45fe9b0890019f7438c2f42df</md5file>
+<md5file name="products.lang">5439d34e432e2c97a517688979148e90</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">55dfa8b4a9b686341988720b4d08e364</md5file>
+<md5file name="agenda.lang">4fe978ed57ee1e330bbcefcf2783a413</md5file>
 <md5file name="help.lang">f5b0214673d66b795a0b2384d50a0f6e</md5file>
-<md5file name="holiday.lang">611c53b005e2081bb40a50c0ac2084d8</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">0d250123629417a61666e352ba88a9fb</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">20524fc5cb0c95fe3a4f76b45f2450b6</md5file>
+<md5file name="categories.lang">94f15de5ab08f7e0f0568b33a3d138d7</md5file>
 <md5file name="paybox.lang">6c5774bc0f316d2b8901b910f5459018</md5file>
 <md5file name="ldap.lang">912352c3ea040bb64208b06524d3e69f</md5file>
-<md5file name="users.lang">513a6655ae8ef9a386422f71201e6ee1</md5file>
-<md5file name="companies.lang">f26120090328cb48d121cbb4ec62debd</md5file>
+<md5file name="users.lang">59e6bc72bc79cb2058f3a3142ddbf65a</md5file>
+<md5file name="companies.lang">ebea8f8853c73dcc8f07309166ea148e</md5file>
 <md5file name="margins.lang">932eb3439b371046ae7416e11a02bf35</md5file>
 <md5file name="ftp.lang">cb9aeac6d97c3f64441c933400ac7c5e</md5file>
 <md5file name="exports.lang">66474773f8488932cd33af56d5a33091</md5file>
 <md5file name="paypal.lang">29274ab30398ff24199850dd8f263b78</md5file>
-<md5file name="cron.lang">ef4e3207a41e914246eac224d0c48814</md5file>
+<md5file name="cron.lang">91d7a4a1383f1b0fc2d3e378d46415fb</md5file>
 <md5file name="interventions.lang">a58164e67d27a30b24604c0a0b1bb162</md5file>
-<md5file name="errors.lang">ffb4239e42c43e7c3741ee06497bfb11</md5file>
-<md5file name="compta.lang">44aba6f4b9ee45637603fe1fd407a260</md5file>
-<md5file name="suppliers.lang">ca612eeb86362867d04cdc74b9c13fb2</md5file>
+<md5file name="errors.lang">1891484104f1c9e7139a346ee7e36267</md5file>
+<md5file name="compta.lang">71942b664cdf11aa235a56ef87b558f6</md5file>
+<md5file name="suppliers.lang">a0d5104c39577fd6ee77cb30cf1d1464</md5file>
 <md5file name="opensurvey.lang">4c37f0937bc0bdf3829712cb5d05255c</md5file>
 <md5file name="donations.lang">096f70f880dc63e09b098ab89df0e483</md5file>
 <md5file name="contracts.lang">1f81bad77ae46b79435bfc1ca964dcbd</md5file>
 <md5file name="deliveries.lang">fa985871fb4d0f74795b3c61bf129d8d</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">033a017ec393597c2eac5f93962e3626</md5file>
-<md5file name="propal.lang">be3e102f28f8c0079efed49eedc41453</md5file>
-<md5file name="main.lang">104ba6aec127a22b776b4488b83b5242</md5file>
-<md5file name="languages.lang">fe687c0b5ae1311388e7d6b676e8f3cf</md5file>
+<md5file name="install.lang">5c938049e9f1a6afe22425ed4174c990</md5file>
+<md5file name="propal.lang">0df5c94ca0fefe23e45d64cfb4e3a943</md5file>
+<md5file name="main.lang">700c64e6e70f6f6cd2ca25b66a2e64d7</md5file>
+<md5file name="languages.lang">ce1906a2e6728ee576796a99d1d3f37d</md5file>
 <md5file name="bookmarks.lang">c734b464a1378316c70ab63dd8a36e34</md5file>
 <md5file name="sms.lang">46f4fd2960c180e57bf42a4003b95789</md5file>
 <md5file name="dict.lang">d855926b2e6609fa7bce6078ee3fc9bf</md5file>
-<md5file name="mails.lang">d88fb01344dee1aca41b5587bc2270e5</md5file>
+<md5file name="mails.lang">d1926848c8d8c6315adce6f8ede4503a</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">0b95a536574243ffff466b766b5e688e</md5file>
+<md5file name="other.lang">f19eeee36029346ed958761cb617ed43</md5file>
 <md5file name="commercial.lang">e23a5e28dbd437a901e678e0974c379c</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">1ca63c95c5794f2045daae928d16e63a</md5file>
-<md5file name="sendings.lang">432df56aa8882b59b9c700bbae460dba</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">22d4c12e2c5cfde95a702d3e2272066a</md5file>
+<md5file name="sendings.lang">bec7bc8354aeb3236f6b8c3a70cb0fd2</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">e4fc2e43ec963c474b2f6f9ecccf3ea1</md5file>
 </dir>
 <dir name="/langs/ka_GE" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">a82f967793fd358a77f730c774934150</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">4865ab7e4d789a51075d4f780c3674ea</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">51a8ed92619d4857e0eaddd369a14b38</md5file>
-<md5file name="main.lang">1356f3061125fc78d9cba7834e9654c7</md5file>
-<md5file name="languages.lang">5f5e1f71ef91392a3edee6cdf5e03408</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">66f7a690f24f20c3ff9589a5114245d1</md5file>
+<md5file name="languages.lang">7ce6e3f27f962ebc461ed5dc35b1b683</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/mk_MK" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">a82f967793fd358a77f730c774934150</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">e8296008ddd844614e63ba594061ca0e</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">f209f3bbc245afc75bf1fe1c2b74317f</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">7bc61a1f1daf334bc893dd1f0b05ca37</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">8ad7dc8c62da0c98fdac28dfda1db0da</md5file>
-<md5file name="main.lang">2a3c0ae8b32ee0e0e4ce6fc0cbded0b1</md5file>
-<md5file name="languages.lang">941286dec9631202d8c809fa73c4bac9</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">be37bf7752478446a41389618cde8ca8</md5file>
+<md5file name="languages.lang">c5797fe794bd1be4f3cc1e03fb8f2cd8</md5file>
 <md5file name="bookmarks.lang">0ad67108567f99662f7dabc9585331da</md5file>
 <md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
 <md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/vi_VN" >
-<md5file name="projects.lang">8c6a037da0144f6475c7c468d1e36cf4</md5file>
+<md5file name="projects.lang">92e507bfe466397ff7472ae56b453a55</md5file>
 <md5file name="cashdesk.lang">4f3dd930710082c606d630d8399cb483</md5file>
-<md5file name="workflow.lang">80367c46ce620b58d334413d636a36ca</md5file>
-<md5file name="bills.lang">99384cff70777696a5e391b1d46abd65</md5file>
-<md5file name="orders.lang">10af4b2b3689e7ceb70c0255c02a8d44</md5file>
-<md5file name="admin.lang">0b9534cb5e53b90f541269f76c91969e</md5file>
-<md5file name="withdrawals.lang">9eb49225cba65d82e1b2aa104167e426</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">75c0b2684921a9924e60c1664a7359ee</md5file>
-<md5file name="members.lang">94e84e28b4c116e41d0f7e5e60cde90a</md5file>
-<md5file name="ecm.lang">99c4c0feaf3b82b3f60802f3f8bbd0e1</md5file>
+<md5file name="workflow.lang">fe0cac1dcd26398b7af88d0463c11bf0</md5file>
+<md5file name="bills.lang">6e0ce4d9effa4c88fa41800c9ff78ded</md5file>
+<md5file name="orders.lang">2ab0faa9c775fa5b6299265024900ee8</md5file>
+<md5file name="admin.lang">fa7e54c6636468079bd8af9e68b7baf6</md5file>
+<md5file name="withdrawals.lang">24a463840569e7c31797c226dbca70d8</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">25e1ba7efdf7ca4514b81e86f1b0434e</md5file>
+<md5file name="boxes.lang">6830bc73f64c593602b0621587983a53</md5file>
+<md5file name="members.lang">f45ee6f7e075dc07091427a65d80bc3d</md5file>
+<md5file name="ecm.lang">de802721fcfbac64dba34c4e57db1d77</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">7be0009cc61ca9516cb1e1a5cc4f3c50</md5file>
-<md5file name="products.lang">3dfb23bb3cdd68813e9c7dba6714ec60</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">d74c0eb5c32ddda2ee07d04e4ac48f5a</md5file>
-<md5file name="agenda.lang">9098fa0ae900be451b9887d9d41752c2</md5file>
+<md5file name="stocks.lang">e47f15bcf40baeee5f5c49162515a1db</md5file>
+<md5file name="products.lang">9b0728229a612da45d18613100e7ccce</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">7f73b33efd0ceb4dd759f192efa2aad7</md5file>
+<md5file name="agenda.lang">7685ac3aef89ec6ad89edd15b4c45623</md5file>
 <md5file name="help.lang">63a1a0c3dc2beff496d15938130fbc1e</md5file>
-<md5file name="holiday.lang">d5cd6a3e9331d4b83a543a3d9ebf53b9</md5file>
-<md5file name="productbatch.lang">5464e8595c438228158cc99e8b198836</md5file>
+<md5file name="holiday.lang">7643c523c6d7a8b7140389afa3ea6853</md5file>
+<md5file name="productbatch.lang">2364fb2d06a0eb002e0053bbd30989b9</md5file>
 <md5file name="resource.lang">1b07213c7405612a72c82628826d7d5b</md5file>
-<md5file name="categories.lang">95a9d30bf67d5386ca36dad3908c2a18</md5file>
+<md5file name="categories.lang">2e12a320e049d64b73b4b31aa4d97439</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">6b2bd775e06aa7cbd2f7a8848f5aba67</md5file>
-<md5file name="users.lang">c59be2301744f1cd357428c790f79662</md5file>
-<md5file name="companies.lang">e79aaa6cc385c7784592aac3da94edd3</md5file>
+<md5file name="users.lang">992fdd617035a1127aba5caa02e9bf7b</md5file>
+<md5file name="companies.lang">ba8df4d2d0c25f416050ecd3dc798409</md5file>
 <md5file name="margins.lang">f84f647cacfc125a7b455fea94443ded</md5file>
 <md5file name="ftp.lang">10da288c55fecaa85ef7af08f041e3f6</md5file>
 <md5file name="exports.lang">2f7e43b805cd2e5d2936e2303aac1a99</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">bb53537dda3c203b074e05d1b3d6fe90</md5file>
+<md5file name="cron.lang">ecbbb1603ab59fbe960202b3470413c5</md5file>
 <md5file name="interventions.lang">893511fb018dffe28b1f0c479ba7bdcd</md5file>
-<md5file name="errors.lang">2b47f56755ffe1f308336b287531419d</md5file>
-<md5file name="compta.lang">710a87ec6e72c49ca1d5c3c03198820e</md5file>
-<md5file name="suppliers.lang">7904b696375cd62b36aeb4a9d321ad9f</md5file>
+<md5file name="errors.lang">54f159d6f7dcce22759543b16d5f2c40</md5file>
+<md5file name="compta.lang">30f86a0ebfd9aeff2bc3aaa2b258094d</md5file>
+<md5file name="suppliers.lang">699d61d2899c013704e106fb8a88bf93</md5file>
 <md5file name="opensurvey.lang">aa04bdeb89f5b4ddbd80395ebe09c29a</md5file>
 <md5file name="donations.lang">7560df62010de03bd1597143b8909d9c</md5file>
 <md5file name="contracts.lang">454cf17c323de40f201e625391d747d7</md5file>
 <md5file name="deliveries.lang">2bb94b0f66048dd210f0b149544f69a3</md5file>
 <md5file name="mailmanspip.lang">999992f3bf87ecc74a951085c24ab54c</md5file>
-<md5file name="install.lang">c431017d82c32a286926af0828f47d7e</md5file>
-<md5file name="propal.lang">db47d43b3c383eb5f4186af710508be5</md5file>
-<md5file name="main.lang">1fb41fb6e55fb3928b7bc6992bc87a5f</md5file>
-<md5file name="languages.lang">59da6ad26f081ee9ff063897d4fc8df7</md5file>
+<md5file name="install.lang">310615a1dc98ee6993f7591a9feb4012</md5file>
+<md5file name="propal.lang">967f6c4724c7c5a3807ac81fd7d42d57</md5file>
+<md5file name="main.lang">e989e609f80cb048e4742a0ad50b19db</md5file>
+<md5file name="languages.lang">37a204f2131c9d99a15adbdc62ef7088</md5file>
 <md5file name="bookmarks.lang">3bdff0ea3ff709e917be270c3e96a1e9</md5file>
 <md5file name="sms.lang">c0ce2218241f69e739b177fd5c140033</md5file>
 <md5file name="dict.lang">9768913e4af639ec2118c264a5ca3583</md5file>
-<md5file name="mails.lang">8283f0251af1faa973050ca5e9146112</md5file>
+<md5file name="mails.lang">0cb72b50f31e68c155adeb9c292092a9</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">8c53ff420a9c62b1c30bab5819846bf1</md5file>
+<md5file name="other.lang">42ae9991ee0b7209a3795196ab36c475</md5file>
 <md5file name="commercial.lang">e903ab15804325c79982ef838bfa020b</md5file>
-<md5file name="salaries.lang">482f4e6746c336068190fd6f65b1e9d2</md5file>
-<md5file name="trips.lang">2aebb1b246f8dad0b5486b21ffb31df9</md5file>
-<md5file name="sendings.lang">6136b609aa15662565ea9a221a8aecb9</md5file>
-<md5file name="accountancy.lang">73f5dd568c4bcf1dcba365992bdc54b4</md5file>
+<md5file name="salaries.lang">1130ef43c1a7437b844db1579e3c434f</md5file>
+<md5file name="trips.lang">d662abd0bfed1295bce2ea2128273f3b</md5file>
+<md5file name="sendings.lang">9a75c11639945926ac2293306d582713</md5file>
+<md5file name="accountancy.lang">776dbe3cd372b955fd00adb200d6f0d0</md5file>
 <md5file name="externalsite.lang">e77cfae1b2c9124ddd567cc6f0bcd7a9</md5file>
 </dir>
 <dir name="/langs/es_CL" >
 <md5file name="projects.lang">d04237165096c4ab4aae777ac08a63c1</md5file>
-<md5file name="workflow.lang">4dfa6647ff090d27a5074f63c10a1b07</md5file>
+<md5file name="workflow.lang">d644237a73e898a62393491905b4ed87</md5file>
 <md5file name="bills.lang">857cfdee8d1a70d9357f829ff7465ec3</md5file>
 <md5file name="orders.lang">b39c038e6e8b0628c90d5114271dc50e</md5file>
 <md5file name="admin.lang">ce271454fbf695e17607161d1cc8dca5</md5file>
@@ -9841,20 +9851,9 @@
 <md5file name="commercial.lang">a946d614786a829d9964c0e27d143e0c</md5file>
 </dir>
 <dir name="/langs/fr_CA" >
-<md5file name="bills.lang">1c7a52eaa3f79eeb613a3ac102221c09</md5file>
-<md5file name="orders.lang">53ec6699499cbeb76fdccaaad411c42a</md5file>
-<md5file name="admin.lang">9e1cc2e0458cd65a3b1d7b050b34aa82</md5file>
-<md5file name="banks.lang">180ce986d360152b36935d55ef8751f5</md5file>
-<md5file name="productbatch.lang">f27b729eb095667004ba2ffc02a62f9d</md5file>
+<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
 <md5file name="categories.lang">500287477a669f5b33637327cd578ca2</md5file>
-<md5file name="cron.lang">9510f7630832cc20baf17b78cfcd2aca</md5file>
-<md5file name="interventions.lang">d97d6901227f9a03e20ad415bcc48387</md5file>
-<md5file name="suppliers.lang">17b0c3da24b2dc572067a4c200c9051d</md5file>
 <md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
-<md5file name="mails.lang">28544d9e4d160a73aaed36c8547188f4</md5file>
-<md5file name="other.lang">dcad10e73f40317267b624bfdfb46180</md5file>
-<md5file name="commercial.lang">104b9301f7c376b0d1795795c06dd93d</md5file>
-<md5file name="trips.lang">a1bad06bbb9535472667f6de9e3b869c</md5file>
 <md5file name="sendings.lang">f0946038ef768d49f311ebe67db82e17</md5file>
 </dir>
 <dir name="/langs/ru_UA" >
@@ -9875,119 +9874,121 @@
 <md5file name="other.lang">c2d7742f87130bde6c3b91332f04c837</md5file>
 </dir>
 <dir name="/langs/it_IT" >
-<md5file name="projects.lang">ef32c3256dc9ff89e5c363104daafaec</md5file>
+<md5file name="projects.lang">c2c40b8d8acb8e1758f80ddb1de32ccc</md5file>
 <md5file name="cashdesk.lang">76391c0def140fedc6931ffbf18ab295</md5file>
-<md5file name="workflow.lang">4974d28e6f34f8981804235d8609d362</md5file>
-<md5file name="bills.lang">20afc0254636be0d0a5c4d1b230312ee</md5file>
+<md5file name="workflow.lang">8dda4f67e1ef4530fad19bc55ab2b851</md5file>
+<md5file name="bills.lang">c9a306fcf06f1e95c0ee624c5949ce93</md5file>
 <md5file name="orders.lang">d74254d8f1ca125b0cae24d1cec39580</md5file>
-<md5file name="admin.lang">bc949338210988f61d51bbbefa17cfc3</md5file>
-<md5file name="withdrawals.lang">bc2b70b940bc312acc65a02f2c1c638d</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">75066c3c87f3840882316f6e5fbed242</md5file>
-<md5file name="members.lang">5796a30331540a30c2fb33cae793ebb0</md5file>
-<md5file name="ecm.lang">72876009c4914fef9e7dd0de01a389ec</md5file>
+<md5file name="admin.lang">f8cdb8bc4041c5f5bd0b592226a17c1e</md5file>
+<md5file name="withdrawals.lang">93f3338fc21f2da47f79c1446f3f5da0</md5file>
+<md5file name="incoterm.lang">9a61b8f01d920877ac43574d7a89d139</md5file>
+<md5file name="loan.lang">0a27701667ce4d505e2ddbd6a16b8cc5</md5file>
+<md5file name="boxes.lang">8361914c0ee551857cc25cc0fdf97fe9</md5file>
+<md5file name="members.lang">d0aab202d384152857a67a5910d74da1</md5file>
+<md5file name="ecm.lang">7dd6c7b2a261d29947a77e876c528bb7</md5file>
 <md5file name="link.lang">978c57249da23e3f3d93de87b2c135fb</md5file>
-<md5file name="stocks.lang">9bf4cea05700fb98f9bd3076379d29a3</md5file>
-<md5file name="products.lang">6709e0a52fd75d913faab0c02c834890</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">1caa5231691c66fe232c80158fca1f96</md5file>
-<md5file name="agenda.lang">a9f54bc4d25db876b31fce29e466574d</md5file>
+<md5file name="stocks.lang">06bf2c9232baf36bf163f30d668a1857</md5file>
+<md5file name="products.lang">bae750d5b95a5e9c773309a5e0e509ff</md5file>
+<md5file name="printing.lang">3453ad38a18f31a0811f59cbeb5d0fc1</md5file>
+<md5file name="banks.lang">69143f63b08b0d9c050eb4c3c7b8acd7</md5file>
+<md5file name="agenda.lang">e8d783f55b3fa7e98d3ebcfe30442d6f</md5file>
 <md5file name="help.lang">31f372c93f03315c680f0ccf7d1df897</md5file>
-<md5file name="holiday.lang">e88ed127337ee404580fb0800352c21e</md5file>
-<md5file name="productbatch.lang">357d5f772c6c7e492afb4eeaca6cb47c</md5file>
+<md5file name="holiday.lang">cf8001f54c2c1ef7780e6579d4b6dabc</md5file>
+<md5file name="productbatch.lang">254cc450c35f98ddf34271255f4eb6d9</md5file>
 <md5file name="resource.lang">22ec38a9e1c8d0a8ade2b378df4dfd5e</md5file>
 <md5file name="categories.lang">a7e869c9ede34e2e88718d501d45cd34</md5file>
 <md5file name="paybox.lang">1cfb457b21fb0cf994e6bbc661ff6ade</md5file>
 <md5file name="ldap.lang">e296aa7dae0e0d5d91a2a7cab148a042</md5file>
-<md5file name="users.lang">3d18d9d5de47c96913bf37bcfa969a46</md5file>
-<md5file name="companies.lang">fc357b2047442442ce84d3f1904556ab</md5file>
+<md5file name="users.lang">1c9f2e419e96a7abf36d46c2cde71e7a</md5file>
+<md5file name="companies.lang">5b226aa8c528f786a7cde55dbcb30afa</md5file>
 <md5file name="margins.lang">71863f8e300608d03620e94c27fc1c9e</md5file>
 <md5file name="ftp.lang">68bdddeadf40d3061dd009fe77eec5d2</md5file>
 <md5file name="exports.lang">e6480ef4d95c891a7b1bd330e7cd8098</md5file>
 <md5file name="paypal.lang">bfdffc1cf6e42979f52384d3125b72ad</md5file>
-<md5file name="cron.lang">39527fe8816974c28a38d0d36164517c</md5file>
+<md5file name="cron.lang">e2e0d56d7a9126019e91b05281dc523b</md5file>
 <md5file name="interventions.lang">8028b9965a200c62fd4a16eee39c0e19</md5file>
-<md5file name="errors.lang">3ecceb80bb6d973ad4e8a695a4ceac59</md5file>
-<md5file name="compta.lang">70b34e253b55713b85f8b2e0e46030a0</md5file>
-<md5file name="suppliers.lang">e61fd3731b461032372f186e540fba9c</md5file>
+<md5file name="errors.lang">6e4d6421043afaf6bb66f2095bb9bbe9</md5file>
+<md5file name="compta.lang">d177b1dc16fd937330fea6b39fa46310</md5file>
+<md5file name="suppliers.lang">e7980d55db673f04ae333d04133db31b</md5file>
 <md5file name="opensurvey.lang">c7e70b20d22458e1c7625cde28fd7c3a</md5file>
 <md5file name="donations.lang">8847fd5eb933c577a1a58d65274df4fc</md5file>
 <md5file name="contracts.lang">6e400b24ba14608bf7e6531277de7a44</md5file>
 <md5file name="deliveries.lang">ce9447e5187596bbbc50d0906cac35fb</md5file>
 <md5file name="mailmanspip.lang">c35de5bd5cec0c5e363104a2e2e4bef7</md5file>
-<md5file name="install.lang">37a37ac0b49acf07ca9f08f915b45a62</md5file>
-<md5file name="propal.lang">34e9b8c9933f92c532b9cf91942762f6</md5file>
-<md5file name="main.lang">87c91e6d734870da50b9f9beeaef0f5e</md5file>
-<md5file name="languages.lang">356c26c05e97adf172ff24e3acdc5e91</md5file>
+<md5file name="install.lang">ab075e8656a7c6e4c9d7c29680a8ea32</md5file>
+<md5file name="propal.lang">9af1f73d600a2a75987f983e3cfa6d1d</md5file>
+<md5file name="main.lang">1aa311571e1f0a1ac5f870f5a5b4eccb</md5file>
+<md5file name="languages.lang">6bcccd5839a9d03fcd2fc134e475b27d</md5file>
 <md5file name="bookmarks.lang">17835e9b0f75e2f6dcc0345f888cdf4b</md5file>
 <md5file name="sms.lang">5d8da5928c310fe821026ff6eb52477f</md5file>
 <md5file name="dict.lang">50aa8753f776052cdf34c558afff98e3</md5file>
-<md5file name="mails.lang">65d2bf6cdd25c98ee3716eab33914459</md5file>
+<md5file name="mails.lang">a33b1202d3e3a42aedb57715dc2adc42</md5file>
 <md5file name="google.lang">8d5faf8e36b5e4b4da158ff2d6bd97e9</md5file>
 <md5file name="printipp.lang">208be53574c8852b95a50db6c755b89e</md5file>
 <md5file name="other.lang">578df63bdcf934610c0bbdb4f1c3f94c</md5file>
 <md5file name="commercial.lang">a45c7e397ca831b0891360ade3522414</md5file>
-<md5file name="salaries.lang">17e2556c9734e8ecdda99eb1cb0e025e</md5file>
-<md5file name="trips.lang">d3ea0be62662649cc6dd6552e9217682</md5file>
-<md5file name="sendings.lang">c467c284226ad9dac84e0fbd64ac5225</md5file>
+<md5file name="salaries.lang">737511d96be3c80851cdd4018b27fd21</md5file>
+<md5file name="trips.lang">80b2a43c712a6e0e7de483418c463911</md5file>
+<md5file name="sendings.lang">bb304ae5824be84004cbcd344d3ddd9f</md5file>
 <md5file name="accountancy.lang">29025ab36371e258be6ed2e1368fc0c3</md5file>
 <md5file name="externalsite.lang">3afb85eee792fc054a42df621767b520</md5file>
 </dir>
 <dir name="/langs/et_EE" >
-<md5file name="projects.lang">67d3a0780a55b336524a94b9a40e3795</md5file>
+<md5file name="projects.lang">8914da42d07efc56af23878ab7a4ae6d</md5file>
 <md5file name="cashdesk.lang">7cec430ac1104bd3b19e5890319c7fa9</md5file>
-<md5file name="workflow.lang">17cce633ece3d815462391f998080acd</md5file>
-<md5file name="bills.lang">a237752b8010d17e558a3886b5f738ed</md5file>
-<md5file name="orders.lang">9ab13d70420f12305a4b1f49fdb6755f</md5file>
-<md5file name="admin.lang">56ed527dd02f42369a2bcc424203f2ac</md5file>
-<md5file name="withdrawals.lang">acaaa13e10f6147efb78c7b55d53c4a6</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c172b41f0bba4e95375cfef229eab865</md5file>
-<md5file name="members.lang">1c902208e32692968de5c26908ee0dd9</md5file>
-<md5file name="ecm.lang">6cbd781ebecac429afc832daa0c14539</md5file>
+<md5file name="workflow.lang">fdafaf7353ac65d8c09de8af2a8f3d02</md5file>
+<md5file name="bills.lang">c7127fe1dc6e60c589c53cf9ffabf09d</md5file>
+<md5file name="orders.lang">064d54e4dbed1843030d3efc91ba5119</md5file>
+<md5file name="admin.lang">b27d4a5c84481339ccc179b130c9e28d</md5file>
+<md5file name="withdrawals.lang">38e0e2f17c3b5559b77b0f2406a3be1d</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">6b0bd777843664a8aa07dc3ff7c4e056</md5file>
+<md5file name="members.lang">af10bf1c20c1f623bbc427dffcf8d85d</md5file>
+<md5file name="ecm.lang">5d81b77669a8e33aedfb22e0a89257f3</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ba300670b982d41fd366053541b6b3dd</md5file>
-<md5file name="products.lang">ef5bbd1c53fe715fd80bd3617406ab68</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">80daf5196b9f2333d6ffc7b160992360</md5file>
-<md5file name="agenda.lang">2d64d1bfa7bcda13680cf96e8662aa50</md5file>
+<md5file name="stocks.lang">4f6b19f4ecc5166f966eaa1ef597f8ce</md5file>
+<md5file name="products.lang">6211210cae1a5c3a7f821246bcba7e70</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">20961563d32e598992a31c7fef6890f7</md5file>
+<md5file name="agenda.lang">8868fa7153cf04feed212a5e11daf479</md5file>
 <md5file name="help.lang">db6c98d5d67b4033e5b2c0669a0defcb</md5file>
-<md5file name="holiday.lang">2a22928cc7f56983d441f117b4960e91</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">f09971bd98ac8e508f84d66b479ca5e3</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">c6846e08392e311f9f0249628f8fe864</md5file>
+<md5file name="categories.lang">efeabcf69715df870d4a3bcd6e66e438</md5file>
 <md5file name="paybox.lang">48f08d8f3d2ead8c5083d39370b1aeda</md5file>
 <md5file name="ldap.lang">8568e4d03cdcc1874f6f39e21f994007</md5file>
-<md5file name="users.lang">368454fa3e073fa35b2e9345d79bff0d</md5file>
-<md5file name="companies.lang">8e134e75742dde3a7fce451131268618</md5file>
+<md5file name="users.lang">70b002fd1a16e5e9f19e1ca9c51797ba</md5file>
+<md5file name="companies.lang">faa4c84795f1e11f7869d30b58a31b56</md5file>
 <md5file name="margins.lang">191c0d03a039f0d36aa55ad2efc4dc19</md5file>
 <md5file name="ftp.lang">418be20b4d4d50ff450dfb18734e4722</md5file>
 <md5file name="exports.lang">f7f4807d9ee50d2e1146fe48b88eaca7</md5file>
 <md5file name="paypal.lang">c101b90fd10577eafb85a1e9adb6c0a5</md5file>
-<md5file name="cron.lang">4f614a1bf33a99c52e41d50b6c745acc</md5file>
+<md5file name="cron.lang">8c3a12722573cf513d5435feb7f71adf</md5file>
 <md5file name="interventions.lang">54e9748ff0d518f522fb93e68804396c</md5file>
-<md5file name="errors.lang">5664fa9f9379b4402594f954b1a697c5</md5file>
-<md5file name="compta.lang">af99bf138a27d60144895c6230c31c13</md5file>
-<md5file name="suppliers.lang">89c6528dab9e2fe45e0989655e4ac234</md5file>
+<md5file name="errors.lang">e5cfeaf9ab57962427af808ca2d1e467</md5file>
+<md5file name="compta.lang">8a7137ad996fa371686a89c4f8c89945</md5file>
+<md5file name="suppliers.lang">390fa6f38990031017a3243a9ca7e10e</md5file>
 <md5file name="opensurvey.lang">976e6f39654ffd979a1633da2107011e</md5file>
 <md5file name="donations.lang">7e73be5f5ef1f54d09eae743625e6e72</md5file>
 <md5file name="contracts.lang">fe49e8c18551d1b553e5541e4c329661</md5file>
 <md5file name="deliveries.lang">2b39e01ef2d55c7b3a24671fcd570e59</md5file>
 <md5file name="mailmanspip.lang">0b5290b5856769452f96d8557ae4af4f</md5file>
 <md5file name="install.lang">00b29ab44003385e92095d6182d5d1e7</md5file>
-<md5file name="propal.lang">7bd380b51bf2a243c136730220c3a2fc</md5file>
-<md5file name="main.lang">308fee5febaf8f1e0ceac68e14b1983c</md5file>
-<md5file name="languages.lang">0fbebde407a51315a2d98cac08ab312c</md5file>
+<md5file name="propal.lang">4de88dd01e059e9f95fa2110ae7f8009</md5file>
+<md5file name="main.lang">60316883890998bb4ecc97a6ae00aef5</md5file>
+<md5file name="languages.lang">b8c938532bd262456333675aa58d7bf1</md5file>
 <md5file name="bookmarks.lang">eed8a78914dc69097046ef05aaefbc39</md5file>
 <md5file name="sms.lang">1f1976a8a42bad235f1ed009fbc606ff</md5file>
 <md5file name="dict.lang">4404ecf29a07974f4cf843216d86641c</md5file>
-<md5file name="mails.lang">0171f2cdcce81574105c11c4f18c5f1d</md5file>
+<md5file name="mails.lang">493c788205c2f5743e9ba7d6e084f9c8</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">1e702e222729aeafc3470774be5ce7fc</md5file>
+<md5file name="other.lang">1c6a361487dcc57e627543fb69cf58b1</md5file>
 <md5file name="commercial.lang">6ed6c3d38ad0e783eb457f4f06cba3d7</md5file>
-<md5file name="salaries.lang">1e715cf0deecb0c7b567f9852c7a548a</md5file>
-<md5file name="trips.lang">c2e6c10e5101aefdd367f8c28ece08ce</md5file>
-<md5file name="sendings.lang">27b21482a6db0c9273be006306222aa4</md5file>
+<md5file name="salaries.lang">d0739d358ed00196d99144e88cdd7f7a</md5file>
+<md5file name="trips.lang">810c3f318e11112d3dbfb6f64919531c</md5file>
+<md5file name="sendings.lang">93b9f906cbb8d8cb5025583b65b025fe</md5file>
 <md5file name="accountancy.lang">e8b83ac334cec3caad61bd0c3fe46bb7</md5file>
 <md5file name="externalsite.lang">1e261eaa004ceeffa908ff6569fc2119</md5file>
 </dir>
@@ -9997,41 +9998,41 @@
 <md5file name="main.lang">cf97318c23bd26d18d237b60384ddc66</md5file>
 </dir>
 <dir name="/langs/cs_CZ" >
-<md5file name="projects.lang">ad7f319220fcb2c319da9d4b6f1d873a</md5file>
+<md5file name="projects.lang">299cd091b1232afa2c569e4f4aeb581f</md5file>
 <md5file name="cashdesk.lang">5d320d584645765ff1a2708f271845f8</md5file>
-<md5file name="workflow.lang">8cf34347882313e0427556933f5ed7e7</md5file>
-<md5file name="bills.lang">da2565ffdd56ec4554cca7ddac240e31</md5file>
+<md5file name="workflow.lang">2660b72b66426a56722e0907c756ae68</md5file>
+<md5file name="bills.lang">8ab54785fdf0b4043a3dc8fb9482c897</md5file>
 <md5file name="orders.lang">a60af6c47538583447f6e6fc85a68d89</md5file>
-<md5file name="admin.lang">b5e596823324dceaa96444e5b2428077</md5file>
-<md5file name="withdrawals.lang">f8c12142419e5bc97d74c047b5dd2e65</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="admin.lang">ec982f236d6fb95bb64173558ead1a5a</md5file>
+<md5file name="withdrawals.lang">bbd623fc654d0934ff37ed00c28de1a8</md5file>
+<md5file name="incoterm.lang">e25797bc9974d0b299076b48287420c6</md5file>
+<md5file name="loan.lang">771dd023b76d580a4e7da4a064ba3d0f</md5file>
 <md5file name="boxes.lang">fc033883d6d13c24d580e557ef1717ec</md5file>
-<md5file name="members.lang">4f4326d61f48fca9ece148e741ab4573</md5file>
-<md5file name="ecm.lang">ae6260d161a21beb5b2e66b79da4c0c4</md5file>
+<md5file name="members.lang">ca07f1bf74a5f4a2b92039d15a99c224</md5file>
+<md5file name="ecm.lang">d08b34780ab4980ce0bb45d9130b6a7b</md5file>
 <md5file name="link.lang">6a62458b8fea7eb058c3a932d6ce7a0d</md5file>
 <md5file name="stocks.lang">06c5f1fd45d34612c9f3a73e45e9a0a4</md5file>
-<md5file name="products.lang">d93e929d4134464c058f366ebd0cb20a</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">b72a59235f9b10c358491bc8216802ea</md5file>
-<md5file name="agenda.lang">0a8ed19ed372be66dd96ee927e382634</md5file>
+<md5file name="products.lang">bb3a9e59ca3c60d7a7a0d3afeade85d3</md5file>
+<md5file name="printing.lang">f1e39a94ee06e05be4009d812f57e148</md5file>
+<md5file name="banks.lang">c3698d8c5822f9a64930e9e1c1a3d82b</md5file>
+<md5file name="agenda.lang">1648a20a4fb4934b7401289c0bc90358</md5file>
 <md5file name="help.lang">ef3b8f2d379827209d56fbacb1dd0292</md5file>
-<md5file name="holiday.lang">bb12cbf8871c31cbf5290a00167b9df1</md5file>
+<md5file name="holiday.lang">e4523f9ec87ddbf8ecfa5a72938012bc</md5file>
 <md5file name="productbatch.lang">ba1cf48d1f6d031d8adf51752f179275</md5file>
 <md5file name="resource.lang">3646fd310e96bcd7ad15253c92d3d083</md5file>
 <md5file name="categories.lang">e9dd2ddd93c34344c56ad22d2da0caf3</md5file>
 <md5file name="paybox.lang">ce4d12c3832019bebf72e251cb05d51f</md5file>
 <md5file name="ldap.lang">db53803710393c0486f2e99c7029bfca</md5file>
-<md5file name="users.lang">3969eafa99ea8e5622e2942d2f2b3b87</md5file>
-<md5file name="companies.lang">079f333dabf26b60e44fd7644d53835a</md5file>
+<md5file name="users.lang">390875fe099502f31e29c8772af30ef1</md5file>
+<md5file name="companies.lang">fccba9c0634c04b49eeb6e5c2f9f0663</md5file>
 <md5file name="margins.lang">3f90ac8762498402ab926f80228efc0e</md5file>
 <md5file name="ftp.lang">5ffb6a54b7cb00a3b3094b84c0d76053</md5file>
-<md5file name="exports.lang">64ef3f97f9d75128dda5890fbcdd8447</md5file>
+<md5file name="exports.lang">8b6a219cf3eb3343550e3ac3414175d2</md5file>
 <md5file name="paypal.lang">0eff879e0e50e8ce01972f38551cf1ea</md5file>
-<md5file name="cron.lang">6ac5f7b5e954ca8e67109077d41f355e</md5file>
+<md5file name="cron.lang">6a52787b07ef94e8737e8d822bb0ecf1</md5file>
 <md5file name="interventions.lang">acc831f5d2aa1117c678b0a8f74b32a4</md5file>
-<md5file name="errors.lang">7e51fc4f108c2a4692919a0a4691c4f5</md5file>
-<md5file name="compta.lang">2630655ba6b0ba5cd6fb194eb52ade74</md5file>
+<md5file name="errors.lang">2162ac0135bcdc42f789f314463bcf0b</md5file>
+<md5file name="compta.lang">e8ebe4dde33aca929e579b861d6d21b1</md5file>
 <md5file name="suppliers.lang">f27697039dd767b81b5c85e8a8f85057</md5file>
 <md5file name="opensurvey.lang">4663e58b350137c5a7d311f08ab90d09</md5file>
 <md5file name="donations.lang">794c2d9924dbe3f2fe7679c7069eb5c8</md5file>
@@ -10040,36 +10041,25 @@
 <md5file name="mailmanspip.lang">3f924c148e0c0f512570e1a1c65d81bf</md5file>
 <md5file name="install.lang">1d791641a769f9bf5856327317f87011</md5file>
 <md5file name="propal.lang">2d2a97a666b366adedfcae6b76159247</md5file>
-<md5file name="main.lang">cfd08aaac2c0b0563c05ee806a400f16</md5file>
-<md5file name="languages.lang">2912347c545357bb281ca0e213eddc11</md5file>
+<md5file name="main.lang">d1fba3b35f17bb4560bbf3b85086c29c</md5file>
+<md5file name="languages.lang">de4940e9bfcf6aedc09dd313324c8955</md5file>
 <md5file name="bookmarks.lang">4d96011de54501b073ca0dc8543778ff</md5file>
 <md5file name="sms.lang">0e1a650c3666abf86528bfd3562aa763</md5file>
-<md5file name="dict.lang">00c1fa26858fa3699d6e0e6d0d2d0c4a</md5file>
-<md5file name="mails.lang">ebbe802ac75fd488bec98cb43d8540a3</md5file>
+<md5file name="dict.lang">14497fd6edd5c6ff712f50e79dfc66d5</md5file>
+<md5file name="mails.lang">fbcc7e7e674e5af587e6dcbf42edfd1b</md5file>
 <md5file name="printipp.lang">c810c446eca7956f538556ac7ff10caa</md5file>
 <md5file name="other.lang">828d5c7956b6e0c17755342e38163ecb</md5file>
 <md5file name="commercial.lang">ffec15bee73a0007c62e090da2e7dece</md5file>
-<md5file name="salaries.lang">8a456880f43f5cda26203e5b3a26d6f3</md5file>
-<md5file name="trips.lang">0e32ee4cbe3d64d631d43dbf54755679</md5file>
+<md5file name="salaries.lang">062c2a7a4996394f673ca9d98ef3bf7f</md5file>
+<md5file name="trips.lang">827c6ba7ec4e9175de60e45b9ed5f9bd</md5file>
 <md5file name="sendings.lang">50c3b06599793f8ae658738ac62d7a08</md5file>
 <md5file name="accountancy.lang">3d0c85c054eaa144ab9020f3fe5abf61</md5file>
 <md5file name="externalsite.lang">69e863de65c7c11b4d4359dd33933737</md5file>
 </dir>
 <dir name="/langs/es_AR" >
-<md5file name="orders.lang">53ec6699499cbeb76fdccaaad411c42a</md5file>
-<md5file name="admin.lang">4519c952b4e774fa2e75a1309eecbc6b</md5file>
-<md5file name="stocks.lang">852586f6292a7299262a5c02aed69c73</md5file>
-<md5file name="banks.lang">180ce986d360152b36935d55ef8751f5</md5file>
-<md5file name="productbatch.lang">f27b729eb095667004ba2ffc02a62f9d</md5file>
+<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
 <md5file name="categories.lang">500287477a669f5b33637327cd578ca2</md5file>
-<md5file name="companies.lang">253e6c972fd0d707afd6477f0b0e5618</md5file>
-<md5file name="interventions.lang">d97d6901227f9a03e20ad415bcc48387</md5file>
-<md5file name="suppliers.lang">17b0c3da24b2dc572067a4c200c9051d</md5file>
 <md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
-<md5file name="mails.lang">28544d9e4d160a73aaed36c8547188f4</md5file>
-<md5file name="other.lang">dcad10e73f40317267b624bfdfb46180</md5file>
-<md5file name="commercial.lang">104b9301f7c376b0d1795795c06dd93d</md5file>
-<md5file name="trips.lang">a1bad06bbb9535472667f6de9e3b869c</md5file>
 <md5file name="sendings.lang">f0946038ef768d49f311ebe67db82e17</md5file>
 </dir>
 <dir name="/langs/en_AU" >
@@ -10080,278 +10070,283 @@
 <md5file name="main.lang">8ab4c0f7a4f25798679178adbbdba292</md5file>
 </dir>
 <dir name="/langs/sv_SE" >
-<md5file name="projects.lang">ae44e30070db25d13af32d0ac6512ddd</md5file>
+<md5file name="projects.lang">88ee5f745f1167b0f8fda5e61e8b8c4a</md5file>
 <md5file name="cashdesk.lang">ac16b396be4bae4e72ddb087f590c2e2</md5file>
-<md5file name="workflow.lang">ee7735e7c0f9c4af5679fb5b0c31a01a</md5file>
-<md5file name="bills.lang">d1c8250c5008b359095a814a54ad9acd</md5file>
-<md5file name="orders.lang">c10c9de1d52766eb9cbe0722606b69c9</md5file>
-<md5file name="admin.lang">519133e7736b73756ea8d386cbb4cc9d</md5file>
-<md5file name="withdrawals.lang">a35cebcf0750de35d260ceade3e510c9</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">59ca1c1437940342a47f4708b8e1fb21</md5file>
-<md5file name="members.lang">49f825806b792e6d4c75ab71f8d2fe11</md5file>
-<md5file name="ecm.lang">8e6653d4f1b43f31292f3acc34301950</md5file>
+<md5file name="workflow.lang">7634fa5841088e340e78dd026a207001</md5file>
+<md5file name="bills.lang">38abd2dbae406631a08e9033e3e92b7a</md5file>
+<md5file name="orders.lang">5f8a07a57c522f84e4649751f29f6383</md5file>
+<md5file name="admin.lang">fd08e4081175bb4579daed035f4cae59</md5file>
+<md5file name="withdrawals.lang">f0bdb95e6126f2d5e550583f455f55d9</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">eef423b5c9410bec537cf0b8eaf84d33</md5file>
+<md5file name="members.lang">bf78ef45d31ebca84115e960baf244e7</md5file>
+<md5file name="ecm.lang">adf891c20d96e4184023d04552078088</md5file>
 <md5file name="link.lang">b4dc1d5d3383cd97553fd3ba3df420b5</md5file>
-<md5file name="stocks.lang">d2fcd07de3a069f4e7b6dac7c8ddda67</md5file>
-<md5file name="products.lang">fafefa11018b608a9a7732e92e75302c</md5file>
-<md5file name="printing.lang">4a20ef602f3e9a62b7b3e27ac4ea3f19</md5file>
-<md5file name="banks.lang">0802217e6b1c235fcbb2a21a960ad665</md5file>
-<md5file name="agenda.lang">a7c6de00c8109aa59f00643269c253ca</md5file>
+<md5file name="stocks.lang">a37e4121096a5d4ec2cd19834941ea9c</md5file>
+<md5file name="products.lang">bf59a263f5438901103a2feed92fc79c</md5file>
+<md5file name="printing.lang">c7c9bede9b70c869b29a42f61cb3c435</md5file>
+<md5file name="banks.lang">170d659aa688d9e11f5c1fe693e6e506</md5file>
+<md5file name="agenda.lang">4a600c1205e3742c15bc85355051ad3c</md5file>
 <md5file name="help.lang">007da2b3bc701f7be0efb50a99d72e98</md5file>
-<md5file name="holiday.lang">3dd9452258ee6d6db29a4d653e502c0e</md5file>
-<md5file name="productbatch.lang">96b0d3066fef77e150ad1331cdd38ab1</md5file>
+<md5file name="holiday.lang">b376d15f1f841ea112e25028f7cc538c</md5file>
+<md5file name="productbatch.lang">97cf9622d28bae2a510eda4aecbe0319</md5file>
 <md5file name="resource.lang">d3988891f5f080e84de28bbfde083477</md5file>
-<md5file name="categories.lang">eb53c01c0c23e1c036a51a58a88bb63a</md5file>
+<md5file name="categories.lang">48160a8ee51dc03cdf8b534fa92c4f78</md5file>
 <md5file name="paybox.lang">5bf202e3d88a7efec5e540ed70ad384a</md5file>
 <md5file name="ldap.lang">9f887891e44e6ccd4160a5863c49cc26</md5file>
-<md5file name="users.lang">5ad579a54f61113cb76d3a2c98c58eea</md5file>
-<md5file name="companies.lang">58c44a16d972b5b1687fdcaa0c7ccdf6</md5file>
+<md5file name="users.lang">9ef6d1074b9e0752a3622a84e8905b34</md5file>
+<md5file name="companies.lang">8c90d6a71340a0174a6764d027ce6016</md5file>
 <md5file name="margins.lang">6c8c352a8cce688009449a8997549f73</md5file>
 <md5file name="ftp.lang">bcb7d212efff9d2f016db69793c8fa33</md5file>
 <md5file name="exports.lang">90f285e93cc4545f6ec0b882b6d16876</md5file>
 <md5file name="paypal.lang">1099de7c892403a38bcb3f388002b114</md5file>
-<md5file name="cron.lang">36673d1fe2f143655860ea2610eaebd8</md5file>
+<md5file name="cron.lang">a9bd45c8e4c6e67f48f99a56ef46b676</md5file>
 <md5file name="interventions.lang">d7ba26d13af730189bc501d13559e132</md5file>
-<md5file name="errors.lang">0d65c76e33b181eaefbaeeae6d7cf2c7</md5file>
-<md5file name="compta.lang">3119e3236ced67b35485204fab3f3edb</md5file>
-<md5file name="suppliers.lang">457dda7f1afbb770af96302a5155f079</md5file>
+<md5file name="errors.lang">4d310cc2e4e0b435ea809089583b75fc</md5file>
+<md5file name="compta.lang">827ae293d081031e409101f4736d373e</md5file>
+<md5file name="suppliers.lang">8d5fdc8aca951de3404531602e2916f2</md5file>
 <md5file name="opensurvey.lang">0bd9d42b67a73a9b4df222e4245a5fcc</md5file>
 <md5file name="donations.lang">6ecb7391c7998ccbeca8f1209166c7e7</md5file>
 <md5file name="contracts.lang">150f1e19a0db5fa98394530c8411e9c7</md5file>
 <md5file name="deliveries.lang">3caeaa1071c0c238662aa44dd4e6ba7b</md5file>
 <md5file name="mailmanspip.lang">df6baaf86ed9f3d0e4b94c391d77f33f</md5file>
-<md5file name="install.lang">7a8ec8463743d3c4afa2223e5a3598bb</md5file>
-<md5file name="propal.lang">05baaeb7f6a9a1a00e3ad00bbdd9bbfa</md5file>
-<md5file name="main.lang">114f3b731ef454ca549a9f5771165302</md5file>
-<md5file name="languages.lang">f7ba4fd8e631b676604cb8aeb4908d96</md5file>
-<md5file name="bookmarks.lang">641f630490eb384acbc5e03e4cac55ae</md5file>
+<md5file name="install.lang">f47ff765b4915a44c54faa3d163bd2b2</md5file>
+<md5file name="propal.lang">a33b50027d330ad44adcd5e9e827bd42</md5file>
+<md5file name="main.lang">0519cd55612a605e5311cdc64ec0f537</md5file>
+<md5file name="languages.lang">42e63aa0177642ebcbb995aa3ae7181b</md5file>
+<md5file name="bookmarks.lang">fc56bc62abebd400b8f4ab3cc87f8720</md5file>
 <md5file name="sms.lang">a14311660639a521042796c468a23b1d</md5file>
 <md5file name="dict.lang">17645bfcf4473c061cffa6613cc4626f</md5file>
-<md5file name="mails.lang">75bc0af6c9818b3214f2bf2c3dc420ca</md5file>
+<md5file name="mails.lang">c85233e4f43ab8c971ffb9282bc4c4d3</md5file>
 <md5file name="printipp.lang">ceba8c6ff078ab8eb79134c5fbdf1ecf</md5file>
-<md5file name="other.lang">bee567e9de0f33d73aa7ce4f3688224d</md5file>
+<md5file name="other.lang">1cbabb1cf5ee731c28753634cc3dc7c6</md5file>
 <md5file name="commercial.lang">38042afe91c94d42f469b8e5e36c8a0f</md5file>
-<md5file name="salaries.lang">66412c1b8251cb5b302f357f2052f4d0</md5file>
-<md5file name="trips.lang">6bc19d2a5a3377272f37a5ddd8b95928</md5file>
-<md5file name="sendings.lang">51489cd7cc9d1162d42485c4336281e3</md5file>
-<md5file name="accountancy.lang">ab8d9cc07e195feb9e74e1e49bc3fe15</md5file>
+<md5file name="salaries.lang">182eb0be249cd128f6aa5be40849afc0</md5file>
+<md5file name="trips.lang">85f5b624aa82a3d3a956adb90a719d5d</md5file>
+<md5file name="sendings.lang">22b99034a5088b856f63b416a0b3e2f5</md5file>
+<md5file name="accountancy.lang">c780dd1e49d43b23518f62fcf7a49216</md5file>
 <md5file name="externalsite.lang">2a02d65f7ee53f1a006212dd415343c4</md5file>
 </dir>
 <dir name="/langs/pt_BR" >
-<md5file name="projects.lang">fed89f94e620cde98ddf966b24d9252d</md5file>
+<md5file name="projects.lang">57b0d5644469d813e0c9f1a542ea576d</md5file>
 <md5file name="cashdesk.lang">dc2cd95b6531d5b5cc7d52251523506a</md5file>
-<md5file name="workflow.lang">0c08693c6ce2186b75584fee2171386f</md5file>
-<md5file name="bills.lang">a824edeac0c40dea5495a9ee32b91885</md5file>
-<md5file name="orders.lang">f438fdf57c3a9567ec2e47f74cfe5193</md5file>
-<md5file name="admin.lang">151e8265b96e8c3d21329bd7768046d7</md5file>
-<md5file name="withdrawals.lang">0cf33d809c902aa5c3987b2aa4993937</md5file>
-<md5file name="boxes.lang">c5c8756185232a010f4ec6853be29f21</md5file>
-<md5file name="members.lang">e689397c7bd0392010be3d854efeaacb</md5file>
+<md5file name="workflow.lang">2d1b3ce75c32e4fdca08807559bf39ed</md5file>
+<md5file name="bills.lang">1c027637975ce612b37d9dc41f05baa2</md5file>
+<md5file name="orders.lang">ebe5932635440bd465546c556456aaef</md5file>
+<md5file name="admin.lang">75c631457eb6d9724bae458c3aff0701</md5file>
+<md5file name="withdrawals.lang">498af46001b1ab4e628c6eef1cb485d8</md5file>
+<md5file name="incoterm.lang">3e5ce3b248f7dda5c1eb88b75a642f5f</md5file>
+<md5file name="loan.lang">8cf7c3c364c5233dec5cfc51423abcf1</md5file>
+<md5file name="boxes.lang">c709b8fa6c5b39830e4e04919b52e4e9</md5file>
+<md5file name="members.lang">df71ed0db3f1a628dfe50ba392aea608</md5file>
 <md5file name="ecm.lang">fd3f5dd332cd760bb1df32a34e1da355</md5file>
 <md5file name="link.lang">910620b9e594d851f1f8a1f286890aec</md5file>
-<md5file name="stocks.lang">dd3ce022dcaae82f8d1cb4ecb28946a3</md5file>
-<md5file name="products.lang">3548a0e133ebe7be798d8f06d69c9c51</md5file>
-<md5file name="printing.lang">3ec7242611820561b06c23eac38816b4</md5file>
-<md5file name="banks.lang">6c1dc4c1635463e4afdf799ecc6e8fbc</md5file>
-<md5file name="agenda.lang">c0aabed52568241a4a135b8e1a1ec292</md5file>
+<md5file name="stocks.lang">acba7961d6e1947ea0466582a15b4b15</md5file>
+<md5file name="products.lang">ba97a3ca0a0e301c43154b8bce168ee5</md5file>
+<md5file name="printing.lang">6b93db41124ee6e53e738d483b6f87ad</md5file>
+<md5file name="banks.lang">a5d7c7dbcf64d647067c082a5c09c43c</md5file>
+<md5file name="agenda.lang">746437b08e69036d30424cc98324e4ea</md5file>
 <md5file name="help.lang">3509f62c9752bbac4f9bde2df2c7c8f0</md5file>
-<md5file name="holiday.lang">f85b374edb6a0ebdcc4605f600dfb8a8</md5file>
-<md5file name="productbatch.lang">c97770babbd0eded263f0f6ec5d951c0</md5file>
+<md5file name="holiday.lang">7833243dc0fd1901968b9292a55a956c</md5file>
+<md5file name="productbatch.lang">20422b3e39bd1f7a977afcc1b14f3103</md5file>
 <md5file name="resource.lang">0a0f23a2b23ab6686de48bbba96bc1ce</md5file>
-<md5file name="categories.lang">2540d81fa099a1da5b6a9d966e8613cd</md5file>
+<md5file name="categories.lang">f9b4f6b04cf1f421749dda18eeb91e25</md5file>
 <md5file name="paybox.lang">d7054e46baeb846c67f554fbaded072a</md5file>
 <md5file name="ldap.lang">3aeb0bb955d966af8406506605547e1c</md5file>
-<md5file name="users.lang">6b7b9c70638debf2ab9c88ea10b3a405</md5file>
-<md5file name="companies.lang">f2a0e2b89f0b07bd49cb2c6bd52d5129</md5file>
+<md5file name="users.lang">e7ac3efa7156fac7b187b4e2d3aa6b32</md5file>
+<md5file name="companies.lang">4e8e5c431c3c2e0f163a18bb8a1aa7b9</md5file>
 <md5file name="margins.lang">90c202b94dcd09173f067e8bf5164b77</md5file>
 <md5file name="ftp.lang">4b3416e5ad27f1623f5c9222cf93f491</md5file>
 <md5file name="exports.lang">428551007cc9ab91422c48ad16e14c71</md5file>
 <md5file name="paypal.lang">6f11fdfa4b04669635edc07ca6efeca4</md5file>
-<md5file name="cron.lang">52c55647bf9b7ed6723dba9205c3b9a4</md5file>
-<md5file name="interventions.lang">1064137432886e8edcabcc00eeafeb9c</md5file>
-<md5file name="errors.lang">50611af389d7d865ddb906a2f960aeb0</md5file>
-<md5file name="compta.lang">c7643b3d129318b85db8b66b2ed80561</md5file>
-<md5file name="suppliers.lang">8c603558106e3e18b5238cc1cfb66989</md5file>
+<md5file name="cron.lang">6b12dc2135862781ae48c2c14a09c9e5</md5file>
+<md5file name="interventions.lang">5c3ad5663f3d6527148247ff7312b385</md5file>
+<md5file name="errors.lang">d051cc2645a3e158aab69056ef70684b</md5file>
+<md5file name="compta.lang">8b0d53470b12da7b1df43639fae7aac4</md5file>
+<md5file name="suppliers.lang">e215b43b88af268760867eb2ec99b361</md5file>
 <md5file name="opensurvey.lang">838ea08d95f65f9a06957a7d066f0891</md5file>
-<md5file name="donations.lang">d2e49afe1b2af0851436994702a36fba</md5file>
-<md5file name="contracts.lang">661f921ba2c8cb8e7a4b05cafa818e8d</md5file>
+<md5file name="donations.lang">925e7c28144a75b7e0fbc57715f523f8</md5file>
+<md5file name="contracts.lang">1025f4364ac908d77f2f3ae4c592c601</md5file>
 <md5file name="deliveries.lang">1db9e49d446f770d60dd8d133b654b4c</md5file>
 <md5file name="mailmanspip.lang">4941939fc3ea3906cfe30989e3c07431</md5file>
-<md5file name="install.lang">715023b14011102898643d2e972f1c7c</md5file>
-<md5file name="propal.lang">d0a8291ffda1ebe1c347e110b1b4124a</md5file>
-<md5file name="main.lang">78daba3e61faea84a32432065ca93928</md5file>
-<md5file name="languages.lang">f79c4bbf4e3080b179d0fad4f2a4d0eb</md5file>
+<md5file name="install.lang">f804018f508887af815f81d054905620</md5file>
+<md5file name="propal.lang">0653a89483aacfa3ba2896c048ef4cbc</md5file>
+<md5file name="main.lang">15c5d075ecb33b6b33f69f8f0277c05f</md5file>
+<md5file name="languages.lang">12245c819a6236adba92400b7d3f909c</md5file>
 <md5file name="bookmarks.lang">285145b8adf6d1d7e53a1c102b25c177</md5file>
 <md5file name="sms.lang">673f3e0c4062e13cdef27b581fb66461</md5file>
 <md5file name="dict.lang">d74248250355b90443c5340490731dcf</md5file>
-<md5file name="mails.lang">e2194cdcc55f82aec088c9d8f1774bab</md5file>
+<md5file name="mails.lang">be7c526706c7f8d9c8e68d5e4507c5be</md5file>
 <md5file name="printipp.lang">c554a1d2923d04978f3fe5cd245bba9a</md5file>
-<md5file name="other.lang">5e1cb32db3236d50c6e383b6d8f69c76</md5file>
-<md5file name="commercial.lang">ba5af89a74c2a2be90284132ecb6f121</md5file>
-<md5file name="salaries.lang">7f9d327e8cb8f127023ae65d32ccce9c</md5file>
-<md5file name="trips.lang">cbd49c548be2d8616d501a793b00ce6f</md5file>
-<md5file name="sendings.lang">7c061f8e21ddb2918ad0ee445512c927</md5file>
-<md5file name="accountancy.lang">20c047dbe46ae335262e45fb6ad71410</md5file>
+<md5file name="other.lang">3e39957bf13181d405e59e8233960846</md5file>
+<md5file name="commercial.lang">2705a1a9758e5ae96c36f42eede064b8</md5file>
+<md5file name="salaries.lang">e0f4c93906c140661ee859581b1a168f</md5file>
+<md5file name="trips.lang">a0ba6c62bb8492f31362538df835a9ed</md5file>
+<md5file name="sendings.lang">1e24cba68608e44d8c8758d83fb67cbe</md5file>
+<md5file name="accountancy.lang">aca604ecb1fac5b63a0ac36d262218c6</md5file>
 <md5file name="externalsite.lang">e17ab7d7f81ddef4dc5e5ff071a5152c</md5file>
 </dir>
 <dir name="/langs/es_DO" >
 <md5file name="admin.lang">eb817e74623a93b44a0e314f343191e7</md5file>
 <md5file name="companies.lang">34d945b6146abfe53578f2faa6b04824</md5file>
-<md5file name="compta.lang">bac36b2c6a8b82e1b658b0a7add3fea2</md5file>
+<md5file name="compta.lang">bfc965716299cab7aeb9679e7178e593</md5file>
 <md5file name="main.lang">f7541eaf19ebaee13fdbd909921fc82c</md5file>
 </dir>
 <dir name="/langs/da_DK" >
-<md5file name="projects.lang">54c529bd1da0a893104d543f8ab88de1</md5file>
+<md5file name="projects.lang">16c3a2d4095be0ce2df290df83a4b5a9</md5file>
 <md5file name="cashdesk.lang">2da9b931d17ade2a435827c23455e872</md5file>
-<md5file name="workflow.lang">612ad9adca6f0639bcebc44b4d7bd123</md5file>
-<md5file name="bills.lang">88158d3fe54b91ff96f879ef3ecbf56e</md5file>
-<md5file name="orders.lang">f5304e6f45e7f8b4247d472c627d4e0c</md5file>
-<md5file name="admin.lang">1e81a371083f381f7aed8041a904463a</md5file>
-<md5file name="withdrawals.lang">cbb75070c31c07f654d25ba0762f1c61</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="workflow.lang">54f046768f3455e3fb35867c5b0f1ed7</md5file>
+<md5file name="bills.lang">82a0907561ffff3979ffe2a001c0ef1f</md5file>
+<md5file name="orders.lang">e0f7acc7edad603e290a7a6e1bdaea4f</md5file>
+<md5file name="admin.lang">4e9fd5750417e3d50d53967386f14456</md5file>
+<md5file name="withdrawals.lang">c7888707a258ca1950680b39e80cd6eb</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
 <md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">12748a537ccb00a27a2cf60555b92d30</md5file>
-<md5file name="members.lang">bd32d62609178e9424f26a7abe08da79</md5file>
-<md5file name="ecm.lang">54f03c6e63643662e133293007fcc8d1</md5file>
+<md5file name="boxes.lang">cd8e0a63a6201e157c9382e9ed179a09</md5file>
+<md5file name="members.lang">0c2770f61da58d89d7a3e470abcbde21</md5file>
+<md5file name="ecm.lang">56f667c49490cffec8ff2af43be01505</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">7fbd896a8de5f59930c89640183877da</md5file>
-<md5file name="products.lang">c8c9340b57438cf2172981a1658ef6f5</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">31b7099bfb6f74e4e45619875fce5a47</md5file>
-<md5file name="agenda.lang">ce9e7cc71336fb258b06d45cb8966d31</md5file>
+<md5file name="stocks.lang">26f0040205c1932d71a6c9c23ed1ae6b</md5file>
+<md5file name="products.lang">3c16b1c7f8adee654028b9d1ad5b3f37</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">0f13b59404729f9f566cd5acd6845084</md5file>
+<md5file name="agenda.lang">57bfbe5803a10ea2c91a8a16b76e6e67</md5file>
 <md5file name="help.lang">79089255158765aeec5fcef88335c136</md5file>
-<md5file name="holiday.lang">2908d9dfd261bf97f63ca0c4f431f1dd</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">52ff000346dec8bbca28d2c86fc4c971</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">dcca72202b169592f095fe8baf63fce3</md5file>
+<md5file name="categories.lang">5895ae63bb94238e9381b777e2069854</md5file>
 <md5file name="paybox.lang">3d23b4ffe1b853309ecd0b759eed52d9</md5file>
 <md5file name="ldap.lang">7b38146af31c9a2d81c95b41efd3855a</md5file>
-<md5file name="users.lang">1a53e9a039d23bc5a129653bd03a7778</md5file>
-<md5file name="companies.lang">e00d04017034fd4c9c002a32436be092</md5file>
+<md5file name="users.lang">8eb7f101d38e1a354b316641fe4ad6e7</md5file>
+<md5file name="companies.lang">78420eacfb9c595f6a6528f14d67255f</md5file>
 <md5file name="margins.lang">bebf878f911b09b2b84a359406ff23fd</md5file>
 <md5file name="ftp.lang">a7fa3d4ce82fda303db4c0e92a25ff8f</md5file>
 <md5file name="exports.lang">bfaf1fbd860ad549188d71cd85e982ae</md5file>
 <md5file name="paypal.lang">19e47714f4bbb927bde7107edc730d9f</md5file>
-<md5file name="cron.lang">02d6d4bf5a9763bb17fedbc52727e668</md5file>
+<md5file name="cron.lang">09fcf901f0bc76651c15015c36971ba6</md5file>
 <md5file name="interventions.lang">22ed1ea1d7eee7eb18438d47888a926a</md5file>
-<md5file name="errors.lang">e7670cde3d31e0ace89fe9a8b25d4c57</md5file>
-<md5file name="compta.lang">b1e823b7426e0e0982ebe3467edb9440</md5file>
-<md5file name="suppliers.lang">d4d741a26b96abaa6c4ee1831b820748</md5file>
+<md5file name="errors.lang">8f25a6bb14f44555b963eea95dd3109b</md5file>
+<md5file name="compta.lang">3310cafa7b5002127dfd87d4feb02c2c</md5file>
+<md5file name="suppliers.lang">f433bd5b0cd0f62bd8fb6779aa2bf038</md5file>
 <md5file name="opensurvey.lang">15587334eaa9a54668859526ef2a173d</md5file>
 <md5file name="donations.lang">ae0b2989e0a8a56c8b4a3b9a77429586</md5file>
 <md5file name="contracts.lang">489ed0b7efeeeba5a0495f151c2a976c</md5file>
 <md5file name="deliveries.lang">5c3fca1a0fe9b4eb6ffe3c9d9f8f7062</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">342efa2b9173ffc69219aa7332ca0b02</md5file>
-<md5file name="propal.lang">c3a184cc20b828b91a1a10eec15d9f1f</md5file>
-<md5file name="main.lang">9f0d35c8ea0a09b2305af6cab76cc0e1</md5file>
-<md5file name="languages.lang">eb42c1cc4e30c00a4b3fc8008341536c</md5file>
+<md5file name="install.lang">581f0b6ff7eb581d8e752d242798486a</md5file>
+<md5file name="propal.lang">06d2f80c85c95fe57a57f846f411bae6</md5file>
+<md5file name="main.lang">976e4fedc2668ce671ea2d50fb2e2382</md5file>
+<md5file name="languages.lang">bad38d5d4e9f9c9d1ecffdb2fe2c399f</md5file>
 <md5file name="bookmarks.lang">2be4d4a4c067b0e7d6abb9364ac01a7f</md5file>
 <md5file name="sms.lang">64d8c175fbdf22de3a58f0fe7a5d568d</md5file>
 <md5file name="dict.lang">64cbf57e30411b123cad22aecdec8857</md5file>
-<md5file name="mails.lang">7ac6f37cd3e7a8ab3a0eed3862bfe321</md5file>
+<md5file name="mails.lang">d891e2b01301a0a48b054d06ec3fc777</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">f63f58fd1a8585c95212b37cff8c9c83</md5file>
+<md5file name="other.lang">b98b610f0ade06b2961c31ff32f6a5a0</md5file>
 <md5file name="commercial.lang">f11283233d2847d9f36518366cedf04b</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">f6a890a9d6190224ccf102d2388b618e</md5file>
-<md5file name="sendings.lang">2f004716de1b88cb161f2784f8280ca2</md5file>
-<md5file name="accountancy.lang">13ad60b128af08f990d4de64967f413f</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">244b702e0384c549864fb6e18eb70bf5</md5file>
+<md5file name="sendings.lang">14d0749d067c6ad320f464873b93a3aa</md5file>
+<md5file name="accountancy.lang">3185fb4cab85fd6354f09c3d6722f2c2</md5file>
 <md5file name="externalsite.lang">aae9d37af7193f531dd6b5ad8adadd3f</md5file>
 </dir>
 <dir name="/langs/nb_NO" >
-<md5file name="projects.lang">ac569cba1581870485cb25c300a7a3fa</md5file>
-<md5file name="cashdesk.lang">647fdaab83c32836a3419a4948b33701</md5file>
-<md5file name="workflow.lang">88d275ae3123e0caae031524e549486c</md5file>
-<md5file name="bills.lang">c3c0ec89b8ae90b17dda57a58b0799e7</md5file>
-<md5file name="orders.lang">e2b6b87485ef6d89b4196e984fc372af</md5file>
-<md5file name="admin.lang">bf3f62625e7a10b55489d917d6b33ca9</md5file>
-<md5file name="withdrawals.lang">cbce7ddc8f712d5cdc633b218088e0e9</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">8eb23540f7cd465420c2d560425e7b12</md5file>
-<md5file name="members.lang">4f35b4efaea2857d66755b9f424c308a</md5file>
-<md5file name="ecm.lang">c2db6705a7227c99b57e4af0ccaf1298</md5file>
-<md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">6828c23b02134b479dc621654178c8b1</md5file>
-<md5file name="products.lang">6506c553e59fee67b5c22555373ae697</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">236856f4889120fed8e5d7918ab059c5</md5file>
-<md5file name="agenda.lang">61c6a605667d50876a3cc4a9de4e92b8</md5file>
-<md5file name="help.lang">e8de10e869e6f8f1f6d78e14b2ba169e</md5file>
-<md5file name="holiday.lang">f8c93ce8c3fa1efb737d70304751ab72</md5file>
-<md5file name="productbatch.lang">2e88e819dfec8e669881e94b74c26f63</md5file>
+<md5file name="projects.lang">133b45e93003538bebd7723183479094</md5file>
+<md5file name="cashdesk.lang">654d0f96f1f9080d0e68af5be0820160</md5file>
+<md5file name="workflow.lang">eab69fb2035665be0d1a792c15829bec</md5file>
+<md5file name="bills.lang">1d1a56a3a80e607813160b7329e2b94c</md5file>
+<md5file name="orders.lang">2f7a0f5e641f65b1609fddb08503116a</md5file>
+<md5file name="admin.lang">d1bc2f5ddb7cde162ed196c4b4255a6f</md5file>
+<md5file name="withdrawals.lang">cd56dd18e26f7c9f813a99219b236f14</md5file>
+<md5file name="incoterm.lang">d90e588833456a9940a42f86e8542454</md5file>
+<md5file name="loan.lang">d52c7d2657535ea3b294a12cabdf39f5</md5file>
+<md5file name="boxes.lang">9a0d9dd121a0bccb33e4928ea6f5c04b</md5file>
+<md5file name="members.lang">b2f260475b4803e6fe4844cf5b9408aa</md5file>
+<md5file name="ecm.lang">f2aff6a51a5f3b1e5070d8296c0461bf</md5file>
+<md5file name="link.lang">266192aec98a0387a8023d984029ff76</md5file>
+<md5file name="stocks.lang">f5f6f8998bfc6d330a56479b7def4e17</md5file>
+<md5file name="products.lang">1631e4a1047a90029dd34d5601baf231</md5file>
+<md5file name="printing.lang">fb57bd90f112240d375332cfdf7e0da5</md5file>
+<md5file name="banks.lang">3c1010fbdc3c01b61079a607643538c8</md5file>
+<md5file name="agenda.lang">85bce856cd9f454349d412db6c9a9983</md5file>
+<md5file name="help.lang">2eda9af82d13ef3affd1c4942fd3472f</md5file>
+<md5file name="holiday.lang">d97c71dd8fe48bc0eed3c1ad9622a614</md5file>
+<md5file name="productbatch.lang">765bb7cd6ac5f4a20b68e8027c9b3885</md5file>
 <md5file name="resource.lang">f8f96ff7d44cbfc3936eb112c11a2462</md5file>
-<md5file name="categories.lang">2703656a0d4766d8cf8481d683467029</md5file>
-<md5file name="paybox.lang">e84b5e1984f705f673821ccea796c0dd</md5file>
+<md5file name="categories.lang">acf0cf4ceb315522c85bfa4c719c82d2</md5file>
+<md5file name="paybox.lang">8a2ec77d6efdcebf1d64719c6dec856f</md5file>
 <md5file name="ldap.lang">3e3f45be57bcb65cafc6165966deafcf</md5file>
-<md5file name="users.lang">f3688fbb4fa58a9e6c16046e41bf57c5</md5file>
-<md5file name="companies.lang">379fecac08a78fa87b8114a2b6315307</md5file>
-<md5file name="margins.lang">2d76dd786b831b6e2876a467fbeb84f5</md5file>
-<md5file name="ftp.lang">4041f76e2fefcbe27def47ad7d3b8d9f</md5file>
-<md5file name="exports.lang">60e431172a3368d8372405212ea4079e</md5file>
-<md5file name="paypal.lang">6fba8e10504ada973f491364821733cd</md5file>
-<md5file name="cron.lang">a5a3290f313b187acaa6cc5944fa5a36</md5file>
-<md5file name="interventions.lang">064e34c1a69e8b9c5337e8d25f9267cc</md5file>
-<md5file name="errors.lang">d16693dce192a6ad5be512519e86d25a</md5file>
-<md5file name="compta.lang">7f93088127b98cafd60d4759df22511b</md5file>
-<md5file name="suppliers.lang">33610477526c0247edf2f44d293f6230</md5file>
-<md5file name="opensurvey.lang">f079338c585ead7158f86206848a796d</md5file>
-<md5file name="donations.lang">b37dfd15f57cd4a18e5bb98859de9551</md5file>
-<md5file name="contracts.lang">ba65e8aecb6378ea112d15004ec4a13d</md5file>
-<md5file name="deliveries.lang">021da084cfba0dafa3a51895607d6ecc</md5file>
-<md5file name="mailmanspip.lang">15dd5c2c298a89561e8f37c7827a720b</md5file>
-<md5file name="install.lang">7b8ec1616d98ca1bb4a29b2f51da21bf</md5file>
-<md5file name="propal.lang">d90727a9ce2a1785a0a57fae1502a278</md5file>
-<md5file name="main.lang">bd71928b9535c1795b9c16d600b4cdb3</md5file>
-<md5file name="languages.lang">5546f1e1e62dd772f223e58b4873583b</md5file>
+<md5file name="users.lang">2f0c554b1fcccb674030231f28554b29</md5file>
+<md5file name="companies.lang">ab382c6e5ea8ea3929361c86e3e9e671</md5file>
+<md5file name="margins.lang">753b6db2f3ca8903937835943d3c4018</md5file>
+<md5file name="ftp.lang">f071d8490f9dcfb84809ae212b48ba8e</md5file>
+<md5file name="exports.lang">2fec0411f90ad14fcf7cbc231fb30440</md5file>
+<md5file name="paypal.lang">02d605d8edf28de0d16ea863656a65db</md5file>
+<md5file name="cron.lang">371a05c7fd519e92e711b412705409ae</md5file>
+<md5file name="interventions.lang">74d1fa4fde5edbf44b0c31187d32780a</md5file>
+<md5file name="errors.lang">0cfd936c1c0d6b3eb5b28505f7ac1204</md5file>
+<md5file name="compta.lang">a317b5dc9452099178e365ce1fec83f3</md5file>
+<md5file name="suppliers.lang">9bca73dae22ee162474c080ddd901cb1</md5file>
+<md5file name="opensurvey.lang">e7a5b910b574a29bc09a1396d1567d38</md5file>
+<md5file name="donations.lang">a6cb6f452563d756b01b256916a59348</md5file>
+<md5file name="contracts.lang">d2dfc6cbde46d561c69180558b0d7b71</md5file>
+<md5file name="deliveries.lang">de4fc74e022f46aaf85ea0ffbb360a25</md5file>
+<md5file name="mailmanspip.lang">540b636ced7493d4b7ead20e7c43962e</md5file>
+<md5file name="install.lang">852449090fe73af027f28de1c34a110e</md5file>
+<md5file name="propal.lang">0d9a2bb9d65f21b755512afff479d8bc</md5file>
+<md5file name="main.lang">708ce880fab6042d6f011d805cc207ff</md5file>
+<md5file name="languages.lang">61c1132e4bea14852bf8b518ed08bd06</md5file>
 <md5file name="bookmarks.lang">13c5ddf75492c68962c91afab763ab5d</md5file>
-<md5file name="sms.lang">dd058ec36bc52e02067790a0ea65b47e</md5file>
-<md5file name="dict.lang">48fe291591d6ec39ba47ad755a85894b</md5file>
-<md5file name="mails.lang">fe4009f69b835cee99d1c558fe1eaab1</md5file>
+<md5file name="sms.lang">ab399d53ef38c91f15f5b8401f1919b2</md5file>
+<md5file name="dict.lang">a689703dd139e008aecf034d64453f97</md5file>
+<md5file name="mails.lang">0dfde11ebd195d3a5459ef3d8097e3aa</md5file>
 <md5file name="printipp.lang">414e0494ccd20f84c7fe6e6a1717a9d3</md5file>
-<md5file name="other.lang">6b16a5805de3d3d95606866e71645ed5</md5file>
+<md5file name="other.lang">ba6fc083761cde2a2ff643e4553d9e5a</md5file>
 <md5file name="commercial.lang">634b377bc3a75830eabfc209e229e7b8</md5file>
-<md5file name="salaries.lang">1a8d5f63f41c9595f160d29d3256c86f</md5file>
-<md5file name="trips.lang">7712a6ce3d806c80f2f5b0431583369a</md5file>
-<md5file name="sendings.lang">510fc15563fa9cbcf8d2774d97635db9</md5file>
-<md5file name="accountancy.lang">36c0c9a9f2a666ccc7bd01403a7bbdae</md5file>
-<md5file name="externalsite.lang">be05aa1b12e3b558de747e470b5731c8</md5file>
+<md5file name="salaries.lang">9b0594e3a334ebd57337950e1374b48e</md5file>
+<md5file name="trips.lang">1b242afd07387835cf7499c5db4c1dc7</md5file>
+<md5file name="sendings.lang">5ec6736688fe7a2e08704bac90274fd1</md5file>
+<md5file name="accountancy.lang">5cc8c1d3db75062dcfd64780f49826a0</md5file>
+<md5file name="externalsite.lang">61d7d9b8502d45fb6dae1a0889effd14</md5file>
 </dir>
 <dir name="/langs/es_ES" >
-<md5file name="projects.lang">4443befe655a986754818cf89da13964</md5file>
+<md5file name="projects.lang">3e03af1007c026ac57242f09904e54e5</md5file>
 <md5file name="cashdesk.lang">3262db34410c13ae4d777e263d779217</md5file>
-<md5file name="workflow.lang">97af3c06de8fcf9955b0d09d7d2c7397</md5file>
-<md5file name="bills.lang">5c62849892d595a745222d968d8b486a</md5file>
+<md5file name="workflow.lang">9abac767478f6375f423e8c729283807</md5file>
+<md5file name="bills.lang">f603c43fac8dc38113eaa6b6bd84a67d</md5file>
 <md5file name="orders.lang">3a912c03e32d3634dde18e639054bdf1</md5file>
-<md5file name="admin.lang">1eb6e2f00797500675769907555aae8f</md5file>
-<md5file name="withdrawals.lang">385be3b28799de9f80d0ef46508efbdc</md5file>
+<md5file name="admin.lang">5017444cedeaf72a15081f7f22d66b74</md5file>
+<md5file name="withdrawals.lang">a145360341644fd5a23ca3c9cc5d7764</md5file>
 <md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="loan.lang">5a302a8547e9d98cab90f51dc839a878</md5file>
 <md5file name="boxes.lang">151c5afe182c4e64644b1489449515a9</md5file>
-<md5file name="members.lang">b7c27239e68ce6f51296820da50bfffa</md5file>
-<md5file name="ecm.lang">60d670dc85d029ed1c3f63693d0d4288</md5file>
+<md5file name="members.lang">02f0091eef58245c034ebc692cc7d42e</md5file>
+<md5file name="ecm.lang">ed65df42b1263393944dd836c1da5068</md5file>
 <md5file name="link.lang">186dbbf4b11a9684557157006bf2a232</md5file>
 <md5file name="stocks.lang">fb5083185098d54503b5764599cf758b</md5file>
-<md5file name="products.lang">3cdc9a90f6a602ad91128ec3539833c9</md5file>
+<md5file name="products.lang">14f2822a60bc72e231b7564702e6ac38</md5file>
 <md5file name="printing.lang">ac76855ef253277d8cd5e78ed5594005</md5file>
-<md5file name="banks.lang">28e8e751f630435703aef1a77ebcea67</md5file>
-<md5file name="agenda.lang">d5221b7dd6a7b09656d16781a24a43c4</md5file>
+<md5file name="banks.lang">7678d6600f307f531af4c57c5f0d2027</md5file>
+<md5file name="agenda.lang">a120b4ed51faaed65e56beee621bf857</md5file>
 <md5file name="help.lang">f5f165bb15c6391fc12ebac3e0a0f3e6</md5file>
-<md5file name="holiday.lang">555145f760c70cf34b190b7214e3b5cc</md5file>
+<md5file name="holiday.lang">4ffbeca056a11421239794217ac2d158</md5file>
 <md5file name="productbatch.lang">40f20ba0e389d91edb8b29b71da6c2b2</md5file>
 <md5file name="resource.lang">7508982db7d5e9e5c7fec3f096de32b0</md5file>
 <md5file name="categories.lang">f973d3dddcb8be35123d3e8a3217f10a</md5file>
 <md5file name="paybox.lang">c56f3ea358f24bb4e820768e948b416b</md5file>
 <md5file name="ldap.lang">769fa149d74c5645c53a89575a1cea0b</md5file>
 <md5file name="users.lang">dc02836368ba0678cfc7289e18edc4f3</md5file>
-<md5file name="companies.lang">a3d82ffdba8ca363be0353137e8523b1</md5file>
+<md5file name="companies.lang">d679593ecfd98c8bb37f99017b183109</md5file>
 <md5file name="margins.lang">f586fbc887f107945bcfb960fa82cec8</md5file>
 <md5file name="ftp.lang">2da0a1995db50d0752d2e509a3bca37f</md5file>
 <md5file name="exports.lang">78f2edd4512d3859d13e1c90618932ff</md5file>
 <md5file name="paypal.lang">10c2dcc555137e38039193ccedfc0cd3</md5file>
-<md5file name="cron.lang">4ff7e32efafd96d2fa9aa52ea764790c</md5file>
+<md5file name="cron.lang">46504ac77d73061233f9cbec79efb664</md5file>
 <md5file name="interventions.lang">15be1fe8f10c081149a3003de6ec6921</md5file>
-<md5file name="errors.lang">c4ae8956e68916e7bd3672ae425a4463</md5file>
-<md5file name="compta.lang">d01ee19b9b423b0378dfb48c8a20b021</md5file>
+<md5file name="errors.lang">5eda5159462c0dd961f145477d52092f</md5file>
+<md5file name="compta.lang">755fe70dca030b76c3a54047dbcda4ed</md5file>
 <md5file name="suppliers.lang">b40e1202a1db6bbe323530e5ee4b840f</md5file>
 <md5file name="opensurvey.lang">199dcc4ae427c0d0e5fbde6c0d2d2f99</md5file>
 <md5file name="donations.lang">1be19aee93ff0725138722e0b534e207</md5file>
@@ -10360,564 +10355,569 @@
 <md5file name="mailmanspip.lang">db71e7656127c95fb902fc19efa94945</md5file>
 <md5file name="install.lang">8bc149131c8a22ac8a25612b037b2d50</md5file>
 <md5file name="propal.lang">b19954c856288b7fba6053c64471aebe</md5file>
-<md5file name="main.lang">49fbfbeb2abff84d9824c2889b796b31</md5file>
+<md5file name="main.lang">9f359f7a4823f3e6cf6412d2c4280c70</md5file>
 <md5file name="languages.lang">b5084a3059667bdcb2a5b9a591f0f708</md5file>
 <md5file name="bookmarks.lang">a475fb087b707ca8fa0d87a0a7e38dbd</md5file>
 <md5file name="sms.lang">7c8a83bee9be22e875c81d9fd80097f5</md5file>
 <md5file name="dict.lang">5146388b914ad2a67ff419d124e12748</md5file>
-<md5file name="mails.lang">17c9aade3788553f960b6cce22a348c1</md5file>
+<md5file name="mails.lang">9e0f4f58e39bfe509fae57821f57468a</md5file>
 <md5file name="printipp.lang">c52a3fd956687b01a7767977926a155d</md5file>
 <md5file name="other.lang">148af0f1428d264b2c1b5bb22da8708b</md5file>
 <md5file name="commercial.lang">a9e4f6b80c676973b9552135ce858a07</md5file>
 <md5file name="salaries.lang">739dcbdb1af7be20fde77fdb159f53a3</md5file>
-<md5file name="trips.lang">2d978cda0368bfd71738f186568becfa</md5file>
+<md5file name="trips.lang">effdedc371da3aad55eb75d1e4a71251</md5file>
 <md5file name="sendings.lang">4cefbaab6188d263652f5d704e616e3f</md5file>
 <md5file name="accountancy.lang">8dcd21c1d37a27cc9a9f227a2b283388</md5file>
 <md5file name="externalsite.lang">87eae3bfbea127d8e90970cf3fe8a9a1</md5file>
 </dir>
 <dir name="/langs/fi_FI" >
-<md5file name="projects.lang">926c0474a0347184116f2f251d114cbf</md5file>
+<md5file name="projects.lang">2be5b44d081280c6db34a17d309669c4</md5file>
 <md5file name="cashdesk.lang">2495aaa5b99df2676b6409c322d2d2ef</md5file>
-<md5file name="workflow.lang">b9b944c5fded79cc87f06ff3307a3a45</md5file>
-<md5file name="bills.lang">3ce0175921f5281f7d96cf06511fd948</md5file>
-<md5file name="orders.lang">a8918878177cc6e23e814133fbab8d64</md5file>
-<md5file name="admin.lang">8eaf0af2467aa774e30487611405a6bf</md5file>
-<md5file name="withdrawals.lang">a13e5351588fd0b2d5131b9e0631c95a</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">53c23127dc67704e549edf6074169448</md5file>
-<md5file name="members.lang">318fd1d6e2f4e4e92ecdfd5a0f74afe4</md5file>
-<md5file name="ecm.lang">7b4aaae21fba67db24184bafcc6011a4</md5file>
+<md5file name="workflow.lang">dc3e7510d95a4e41c33aaea7347f7cf2</md5file>
+<md5file name="bills.lang">32f977864eef576e4a13ef5a9d92f6d5</md5file>
+<md5file name="orders.lang">4b18991316ef0a4f0c04bfdf87f3fdcb</md5file>
+<md5file name="admin.lang">15dad65f496bfa8d5fd55973d7eebe81</md5file>
+<md5file name="withdrawals.lang">0221d29ac695e320aa365ec04ae2985c</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">0184a33f9c3389b35fcde8600ff95417</md5file>
+<md5file name="members.lang">8ff0acf9aba961d05e0715ccbbf04736</md5file>
+<md5file name="ecm.lang">dcae4e329492e2d99f0578f6e6c9397f</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">5eb30463f3055a82411ff5a1c329b9e3</md5file>
-<md5file name="products.lang">754c0baadf873ce27c8b91d15c3fdecd</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">5ef423d4dc0ce16605c143eed7b523c9</md5file>
-<md5file name="agenda.lang">e68d870ea726f5805bc6c95c5b2a02e4</md5file>
+<md5file name="stocks.lang">fe7a3135ad7898bdb4c46429b1f52e35</md5file>
+<md5file name="products.lang">48aa0cfe2599de54203eb56d665c5599</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d31200690c3ae599e77fe503ab3a2677</md5file>
+<md5file name="agenda.lang">3c5246adc07f1c422efe17ed19c11282</md5file>
 <md5file name="help.lang">606ec4e8caaa77b3b8428f6d048ebdd8</md5file>
-<md5file name="holiday.lang">9898461912d2a91f2b09a7b73c95149c</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">0ada29167ca0d2f8b9a389fb1085c655</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">37747e995473959100af0f7da194a50c</md5file>
+<md5file name="categories.lang">b17a2ef99fd904962dcaacf967e00444</md5file>
 <md5file name="paybox.lang">322b601af964bf5049308e5df90bf47c</md5file>
 <md5file name="ldap.lang">7709eb325cb2fc85c78639890ebd925c</md5file>
-<md5file name="users.lang">bac516372dd955ad48d9e6a2ef967add</md5file>
-<md5file name="companies.lang">4e33e94d09e7661b999f45ab106a0a45</md5file>
+<md5file name="users.lang">c668be265797094334ea182a0824494b</md5file>
+<md5file name="companies.lang">ea8b04bff0e2bf024592a8f9fe439087</md5file>
 <md5file name="margins.lang">9e1c0d69b311264fb17b28f1048547ef</md5file>
 <md5file name="ftp.lang">4ce126e3a1d64bf191bcc3a693a4d1e8</md5file>
 <md5file name="exports.lang">ffba322e346c235095f51cc2308f349b</md5file>
 <md5file name="paypal.lang">9af8cb14d88c4c8e0c58571545917dc1</md5file>
-<md5file name="cron.lang">e593e2f06a4eccc574f100ad9154a47c</md5file>
+<md5file name="cron.lang">a3be14202734967e6859f61f03850e47</md5file>
 <md5file name="interventions.lang">7d479610d62b7c06e474a7cae6565d60</md5file>
-<md5file name="errors.lang">0c4d7983e48f55632ecf2a6e0074fe1d</md5file>
-<md5file name="compta.lang">a200377ed90d8ed7c4ca3aa60d0fedec</md5file>
-<md5file name="suppliers.lang">e019531835f39c60f5e66a2b4b2fb550</md5file>
+<md5file name="errors.lang">b9698105dba5e8772a542c7fe0ec9d49</md5file>
+<md5file name="compta.lang">a2257c4ea6a6face262b4b3d4ac39465</md5file>
+<md5file name="suppliers.lang">889c80f5e6e068734dbe8884ebbf835c</md5file>
 <md5file name="opensurvey.lang">ee23c6c8670ec36d43be842613bf1516</md5file>
 <md5file name="donations.lang">986d6c4908854449bc9ac2b008e75a7f</md5file>
 <md5file name="contracts.lang">7f0ad68769fea1fe5c78967b4afd1f55</md5file>
 <md5file name="deliveries.lang">62f9203650557bc104780fcc7d9af944</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">fa5c6350f939bf54ca202cc91f964007</md5file>
-<md5file name="propal.lang">8cc43a706519260732cf1a54826113bd</md5file>
-<md5file name="main.lang">3e9791b8ac2a036771560fd1c86d4ffc</md5file>
-<md5file name="languages.lang">1a5d6cf6291c237bd0438f41efb8a0ef</md5file>
+<md5file name="install.lang">44cef3b90f16b1645fbc2a42b9739e75</md5file>
+<md5file name="propal.lang">65cd279199c6ec5e320dedd7544c7a08</md5file>
+<md5file name="main.lang">c0a1c4feaf16b577cc3d375c351d38d3</md5file>
+<md5file name="languages.lang">43ed729d87c2ecfe4e7ec0bffded1c9d</md5file>
 <md5file name="bookmarks.lang">dee392760d4c24a3c7f6a9a218422148</md5file>
 <md5file name="sms.lang">4f3b5893f55d2462354b05f22afeeecc</md5file>
 <md5file name="dict.lang">74ca1c6583f0481aeafc21696c6df0b2</md5file>
-<md5file name="mails.lang">680d8a841407d66922669def655cba97</md5file>
+<md5file name="mails.lang">8acc527e4a123b7ff5e2cf88f55140c8</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">a843098ea22cee4d42a4a2b1d8924424</md5file>
+<md5file name="other.lang">f894671ece4cd6cf3692362891a132f3</md5file>
 <md5file name="commercial.lang">45c82c809e99ef5a6ebb238d21fa8349</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">c89359f4e2033964445e2c7372142d27</md5file>
-<md5file name="sendings.lang">290866f1c8eeb886ddeaecce29f3b4b7</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">d08d5e469370edb8a97397dfbf9ed404</md5file>
+<md5file name="sendings.lang">0dc64ebe1d1c7ecf566cc749f29df935</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">8670dccfd7a31fa4c44bc8fffd978739</md5file>
 </dir>
 <dir name="/langs/es_PE" >
 <md5file name="bills.lang">36d54cc80744708ba9ec226b550c8daf</md5file>
 <md5file name="admin.lang">d8bac44ffbc63b84898da2e07698c598</md5file>
 <md5file name="companies.lang">921ab7227ed3abcda2db9bf141411751</md5file>
-<md5file name="compta.lang">6b49045d463ffd65cfbe47e988a2cb24</md5file>
+<md5file name="compta.lang">2172e11a30b062324fc2a90d1f6de9b2</md5file>
 <md5file name="propal.lang">34ea25003f05ded5624df898f2c1ac4b</md5file>
 <md5file name="main.lang">7210212c531b08cb22055f395769fec4</md5file>
 </dir>
 <dir name="/langs/ar_SA" >
-<md5file name="projects.lang">b8613d272dc2362f1546044e72339cd8</md5file>
+<md5file name="projects.lang">a08731abd050d8efa45c0b17aae6f3e7</md5file>
 <md5file name="cashdesk.lang">dd301d88f6d45a5b41cc61fd0398013d</md5file>
-<md5file name="workflow.lang">afe888f46d9e8711233391303a42eb9f</md5file>
-<md5file name="bills.lang">5d98d433ac6dc9d87f9d528e10ce519a</md5file>
-<md5file name="orders.lang">21a018c5c190f1ec004158a3d3f57042</md5file>
-<md5file name="admin.lang">61aef2e1fe3680e522fe624470cf819b</md5file>
-<md5file name="withdrawals.lang">c04da19922e5ebb8357694d46076ce33</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="workflow.lang">707db11ae318f0427fb4de517d7e73ec</md5file>
+<md5file name="bills.lang">aaa07900577524ed37aefc82a0a21f3e</md5file>
+<md5file name="orders.lang">4cfb9de9dd3667806fb0d2acf505102e</md5file>
+<md5file name="admin.lang">936ae9427ac0a6761e43a86c8d261114</md5file>
+<md5file name="withdrawals.lang">e88891dab9672d1abf2a93d6083e18b6</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
 <md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">a22ddb0fae643ab20eb0ddc263ef2187</md5file>
-<md5file name="members.lang">adbb0c69548505681300e379ea664422</md5file>
-<md5file name="ecm.lang">c61faf2b4ec45328f71288d22f340d6f</md5file>
+<md5file name="boxes.lang">f979dd15c52b991d1b7f7bebaf1904a9</md5file>
+<md5file name="members.lang">136b84df355623b8cde74d6e8f46a98d</md5file>
+<md5file name="ecm.lang">2b9513da76017124bddcbe355cde8b1b</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">2d7249a306cb3ff86315da0c6f7cd238</md5file>
-<md5file name="products.lang">c6cb7cbf4bd10dfe3e41df0a69d043ea</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2ea7c4ea796f2b2e2f5d930c7b981cb1</md5file>
-<md5file name="agenda.lang">b75a94f1aa0ac55a061d71d1393cde03</md5file>
+<md5file name="stocks.lang">2ea633c5c5217fa46d9748dcfb60232c</md5file>
+<md5file name="products.lang">3a03e5a7bbe347c3b5dc17655214f038</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">af4dfc5144dca651767797a2f4723f8e</md5file>
+<md5file name="agenda.lang">e030b68053c34606ad122427e47d28ed</md5file>
 <md5file name="help.lang">a53138e64ad08cc1eeccebf36b7ee960</md5file>
-<md5file name="holiday.lang">fd52f852f1086a7384d9146e496ee8eb</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">2c05961df2e4e0126903dc74f22be8b7</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">8f1250e110603010f85f946227bd1094</md5file>
+<md5file name="categories.lang">8cdade89ac608ed30a609c9653072f86</md5file>
 <md5file name="paybox.lang">3fae4559bed375ac2e814fa2396a420a</md5file>
 <md5file name="ldap.lang">c3fb35dd0fefe93bbf0dfd8976709bb7</md5file>
-<md5file name="users.lang">0e0413328da3b3b09b35e539f87d42d0</md5file>
-<md5file name="companies.lang">02cc01e83f4461c0b39f3d38ecc03738</md5file>
+<md5file name="users.lang">0f24e3f9b662529afcd2611dc32f47f7</md5file>
+<md5file name="companies.lang">c73394d35180f83d2e5c08bdf7c3aced</md5file>
 <md5file name="margins.lang">13f0930aa714c460e67353b84b9c9440</md5file>
 <md5file name="ftp.lang">3e2cfc1dbeef169bb2bec99537ba3acf</md5file>
 <md5file name="exports.lang">c2cbf29a3bf5761e1fe9cc203e6354e9</md5file>
 <md5file name="paypal.lang">3d9f9e874cfd7dc5eb4cb48ce2767545</md5file>
-<md5file name="cron.lang">965585828fc04c4ccd3932496a1506ef</md5file>
+<md5file name="cron.lang">ec324a67cb8145820e9ea896a36b29f9</md5file>
 <md5file name="interventions.lang">bd0bfc8b701484438eb51ca355c9e2b4</md5file>
-<md5file name="errors.lang">0d427b8e596a9195629faec3d519a4f6</md5file>
-<md5file name="compta.lang">126f5f108a9486ee8e5e0855ebf0f7ca</md5file>
-<md5file name="suppliers.lang">159b8b2dcc1008b7f9e909593c1fa712</md5file>
+<md5file name="errors.lang">312fd9dbc1366d6ca6a8d79eb1d54c72</md5file>
+<md5file name="compta.lang">89c38939d5346b23a293e5a1a42ca994</md5file>
+<md5file name="suppliers.lang">0dedf22b8b15e90bb4df6b4060f435e4</md5file>
 <md5file name="opensurvey.lang">ba65eb70925e2e80ec40306484253483</md5file>
 <md5file name="donations.lang">eb7629f4b3e417ac96b46ea2457ff477</md5file>
 <md5file name="contracts.lang">9c8550ca60a52725675b3cfab2fa5b2b</md5file>
 <md5file name="deliveries.lang">4b0317bacbf44db749d81e899c0d0540</md5file>
 <md5file name="mailmanspip.lang">1bc2c11dc61564329b6e8db3603fe42d</md5file>
 <md5file name="install.lang">3a6ac0b6837aa7ea03adc33fc1755d43</md5file>
-<md5file name="propal.lang">4684b7959bc8bd0f06824995d2b58ac2</md5file>
-<md5file name="main.lang">da8688389f5683068c17a36b78e1bb5c</md5file>
-<md5file name="languages.lang">97ac713fe88d2fa27d66324b7c8624d7</md5file>
+<md5file name="propal.lang">0aa68b2277a2af4acfa5e470260c4e0d</md5file>
+<md5file name="main.lang">531b74cda42d826165db9ef6c4dcba0e</md5file>
+<md5file name="languages.lang">f7006c0e50415fb141ed54622d19af7d</md5file>
 <md5file name="bookmarks.lang">aa3dd95196d0ec83718e74c22d0a0da3</md5file>
 <md5file name="sms.lang">7b3cd67f5f1c421536def5926d137a9d</md5file>
 <md5file name="dict.lang">ed7a4a7839b90c6a2abc4bda4006def1</md5file>
-<md5file name="mails.lang">c1addd1316a6432c226bff498391fe4e</md5file>
+<md5file name="mails.lang">b21bc1d1fa771c7e3e886c352fd73fb3</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">3698102c641194d453324b60993a7071</md5file>
+<md5file name="other.lang">91325e5cb13290a437e5732dd7bd3bd1</md5file>
 <md5file name="commercial.lang">58803092778874155fa75ffa9c4c1be0</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">4d7945ac7f3f9599627d1c3df4ca6370</md5file>
-<md5file name="sendings.lang">dc60659a50892e116ffc8ad65dae5466</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">85f8f8e114ab493b5340e6f124e3289e</md5file>
+<md5file name="sendings.lang">5040a984c82c622c7d4efc6efafcba0a</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">9e65675700f44cd62f5ce4c4f3aa8226</md5file>
 </dir>
 <dir name="/langs/ru_RU" >
-<md5file name="projects.lang">2a8264b1366e4777f71e4bc600a6b40a</md5file>
+<md5file name="projects.lang">639df1366f64a56703dca6a392debdaf</md5file>
 <md5file name="cashdesk.lang">09e6a05a8cfe5f1533fe8144beb1d05b</md5file>
-<md5file name="workflow.lang">32fa141f1a5d0a34cc8a8260db93f268</md5file>
-<md5file name="bills.lang">ca2bf6ff69dbbe04d85c157fe2422656</md5file>
-<md5file name="orders.lang">08636f4b410c815d866a525d4f3b3650</md5file>
-<md5file name="admin.lang">b0157201eb19196ae90053495bee963b</md5file>
-<md5file name="withdrawals.lang">dd0afbf4c53cf21be3fcd506eb857562</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">bda75ba4acec2477c62fdffc779dd3dc</md5file>
-<md5file name="members.lang">5a5f1a2bdb441ca21d75fb5bd37551eb</md5file>
-<md5file name="ecm.lang">6a7ac587419175c0a2033675fc11527c</md5file>
+<md5file name="workflow.lang">f423a14d136e03186e7f43e2df7c3744</md5file>
+<md5file name="bills.lang">c59a78ce0dae505cb398fd904759ed70</md5file>
+<md5file name="orders.lang">0876e233190cd085e0fb0d20b270225f</md5file>
+<md5file name="admin.lang">008121191127eeb02165d77809455c49</md5file>
+<md5file name="withdrawals.lang">30f79908815a64fd943b8085d018e472</md5file>
+<md5file name="incoterm.lang">56abeea9ab436058834bac282558fd24</md5file>
+<md5file name="loan.lang">8fa599046396625428fddf3cccdc1bba</md5file>
+<md5file name="boxes.lang">fe22473d89990b28abe768719a9309d5</md5file>
+<md5file name="members.lang">16fb90752c058fa355caed219a1db6f4</md5file>
+<md5file name="ecm.lang">92f2d8f8299919cd0d2fe2ee8ddf6594</md5file>
 <md5file name="link.lang">3096e6efc0f60e8072255213788ecab9</md5file>
-<md5file name="stocks.lang">23fe714aa36ff8581b70f4bb59167637</md5file>
-<md5file name="products.lang">2dc9553b68cf454f688a7a38db0546d1</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">25a77ef08fc9fb7476ccfd243c388d60</md5file>
-<md5file name="agenda.lang">daa39f0ecf83d8269dd2af275334c6d8</md5file>
+<md5file name="stocks.lang">f73617ce5a35ab7557e07b9e96874a34</md5file>
+<md5file name="products.lang">0d832ae7b8640b04b0a9ed4ca92a5226</md5file>
+<md5file name="printing.lang">92adf70d7998062351c5c13e53995ca6</md5file>
+<md5file name="banks.lang">c4c5a4ff2bb2c06051ddc35bef718ccb</md5file>
+<md5file name="agenda.lang">56476493ac42ce527792e6834478201c</md5file>
 <md5file name="help.lang">d99b7ed121c50b6b1cb0d9ccbc65bbc8</md5file>
-<md5file name="holiday.lang">6fbf8602f6b49dc149d770266cc94f41</md5file>
-<md5file name="productbatch.lang">7c8065dec90800e1b8361d3b0c64616e</md5file>
+<md5file name="holiday.lang">eac6bfd3571c27b247a84e10c1a6a7c8</md5file>
+<md5file name="productbatch.lang">f5f46d2641ac2af573c70801a388a5b3</md5file>
 <md5file name="resource.lang">c5ffae12b8dbf993f93b82f81e07b7dc</md5file>
-<md5file name="categories.lang">51e9c75015e55de8a88c9de834b0639f</md5file>
+<md5file name="categories.lang">2bcd6755620cc12551e4aa62e820c5b5</md5file>
 <md5file name="paybox.lang">e572334c02a469b8237572f3ec6a4782</md5file>
 <md5file name="ldap.lang">0314cfeae04a5fe2c53b979688e15fe2</md5file>
-<md5file name="users.lang">4aeedaaec02e54760ccf1519d3f30dd2</md5file>
-<md5file name="companies.lang">d0b0ff5f5560dc8d02a2944650a6c5e6</md5file>
+<md5file name="users.lang">dfb1bc2fafa4eef62911dae18a41f28c</md5file>
+<md5file name="companies.lang">8bf728593e3f139e91e3aa545ad0d14a</md5file>
 <md5file name="margins.lang">57423a6b1c2fd31c494e71163359bac1</md5file>
 <md5file name="ftp.lang">56e80512ad1d9bf5e1ea6baa776aa748</md5file>
 <md5file name="exports.lang">a22a93a3e58f857320a6fcd78d52a4c9</md5file>
 <md5file name="paypal.lang">a3ec4dfec292f3fd441f5e5d3010c20f</md5file>
-<md5file name="cron.lang">0cb9fbea1110c78d79e8befb5f1b45a3</md5file>
+<md5file name="cron.lang">c26a8142ff296d988cfe13332fb14bfc</md5file>
 <md5file name="interventions.lang">ab305cce806b6aede7aacb7b0804fecb</md5file>
-<md5file name="errors.lang">ae94d9dc6725f24d33c383da433613a2</md5file>
-<md5file name="compta.lang">794445ab33b644f1bfa5a691af9d8331</md5file>
-<md5file name="suppliers.lang">4dad208fc2ff602ff149273dfe95e78d</md5file>
+<md5file name="errors.lang">8840474ad6606605bb382bd60cf8f509</md5file>
+<md5file name="compta.lang">80bd8d8b9b30ef36e9688ccb7535bb08</md5file>
+<md5file name="suppliers.lang">cc0b54fa4668262449f6afa94eb98f5e</md5file>
 <md5file name="opensurvey.lang">55d24007a85eb0d6649e589f8b7c2a69</md5file>
 <md5file name="donations.lang">351d775a3d652783a5d015060c47a446</md5file>
 <md5file name="contracts.lang">37c9aa38ccb6ae697a5d526de4a43a67</md5file>
 <md5file name="deliveries.lang">7ddff73aac78b8badf4bdba11cd541d2</md5file>
 <md5file name="mailmanspip.lang">7cbeff2cf852ffd059a2371bf23ec176</md5file>
-<md5file name="install.lang">223b5e00515e96cde5185000ee3cc5a7</md5file>
-<md5file name="propal.lang">7ff639d9de39210c5b6118e2f6a7baa9</md5file>
-<md5file name="main.lang">0ba534b9ec7a7411f1e7efb7157e77c1</md5file>
-<md5file name="languages.lang">b2e9d41010f8834fc649d5527d163eea</md5file>
+<md5file name="install.lang">c135b745344ecb53ab7237594c5af169</md5file>
+<md5file name="propal.lang">b6600bbd673dc1a967e3d613935b691b</md5file>
+<md5file name="main.lang">c5538c2dc0afd566b704c6cdc5c45674</md5file>
+<md5file name="languages.lang">3d3037c2b91d32a3d99dc55d3db0d160</md5file>
 <md5file name="bookmarks.lang">116c07ff8a67e2cdc94c62376e4290aa</md5file>
 <md5file name="sms.lang">da0fb653b20f60acb1b32e763c94ee84</md5file>
 <md5file name="dict.lang">8079141a1827f5d200d3df625684982d</md5file>
-<md5file name="mails.lang">ee3edbbc30ebd96a8bd9e7d4c59c99dd</md5file>
+<md5file name="mails.lang">edeab20ff1445be1465996f1a7541559</md5file>
 <md5file name="printipp.lang">4c5eea2a8145b886a2e8af4c13fdd8ec</md5file>
-<md5file name="other.lang">5799781d26d2b94a82d6c07167aab46c</md5file>
+<md5file name="other.lang">dba90846f4c60dad7507f8eb0a8c12b2</md5file>
 <md5file name="commercial.lang">3bb559af5543e74bf9e04f2f627b1760</md5file>
-<md5file name="salaries.lang">8597cbfef5ae718dce17a17033a4fa5c</md5file>
-<md5file name="trips.lang">4578de64df060db5a7cc1aad048332d5</md5file>
-<md5file name="sendings.lang">952d3c5c892648e1c154e1478e9af8b3</md5file>
-<md5file name="accountancy.lang">972c96c63b41fed42190c3e34bf5214f</md5file>
+<md5file name="salaries.lang">fab7ad4774c8821b32f59a87368821de</md5file>
+<md5file name="trips.lang">c1b237bd06178fefb04628d7612fe4c6</md5file>
+<md5file name="sendings.lang">457a10327ce02478675f4c47e88f4877</md5file>
+<md5file name="accountancy.lang">a9408a301ca5bd8c36331bbb0f0cb9a7</md5file>
 <md5file name="externalsite.lang">338d9c56e6653c910dac441e3a519d25</md5file>
 </dir>
 <dir name="/langs/bn_BD" >
-<md5file name="projects.lang">3bc4ca1483a408601b085a49cda1e89f</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">d19ea9ea04b6bf8f838b4a8ea437e35d</md5file>
-<md5file name="orders.lang">28745fd59d30a0c7cb455fbf83b7be31</md5file>
-<md5file name="admin.lang">2ede14c8d84ee0293dc3f137fd27a7ba</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">8358330af0d3400bb103e7a923896c3b</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
 <md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">ef12ff29adae2685e120e58aa04e23bc</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">3fa08a8ff81b01657649dd14b2e9e48b</md5file>
-<md5file name="products.lang">360c31b0f4f92e255eea8c428030cd03</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">c710e46b08ef99b41b5167db96309c81</md5file>
-<md5file name="agenda.lang">e06f49e34ab23b7a238092f0949959f4</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">296d78d30d58a8015debc81276583097</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">8d6f552cc37b4deadd43afb4fe774baf</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">3cff0fca31b6bc15881e15137184a92e</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">4865ab7e4d789a51075d4f780c3674ea</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">09e2b987a2b610c139c8b65adc5e03eb</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">de30767cf0a5d454269ab9986fce13c0</md5file>
-<md5file name="errors.lang">ea148187895a6c11e69aca83b8ca2d00</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">52842be1a9cfc2f6ce04a40d65b0d44a</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">74f49c52ba746096316a8fabfdd197cb</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">51a8ed92619d4857e0eaddd369a14b38</md5file>
-<md5file name="main.lang">77438ef8422f702a9dacc88390b496c2</md5file>
-<md5file name="languages.lang">5f5e1f71ef91392a3edee6cdf5e03408</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">66f7a690f24f20c3ff9589a5114245d1</md5file>
+<md5file name="languages.lang">7ce6e3f27f962ebc461ed5dc35b1b683</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
 <md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">4ddf34ed8a507480b8e987e8a56a18b3</md5file>
-<md5file name="other.lang">9c57d740f807037098e230801782ee62</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">2ce0e1829364c919a6f2d646929fd01c</md5file>
-<md5file name="sendings.lang">1a6980f79392b14b3a7e00db58f915ff</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/bg_BG" >
-<md5file name="projects.lang">d9b88d546b524937a9b74e3807637ce5</md5file>
+<md5file name="projects.lang">071e4bfed3aef1352775b9bc45243822</md5file>
 <md5file name="cashdesk.lang">cec5dc207fc9e4399548607def63b953</md5file>
-<md5file name="workflow.lang">2753a6b04e03bbe0d90253a41ca328de</md5file>
-<md5file name="bills.lang">eb704b68708e8297fc3b56d195202445</md5file>
-<md5file name="orders.lang">54da5f1e649534b54ad0902ab989681e</md5file>
-<md5file name="admin.lang">cfd58dc6e04fa7f45e8809065e048b34</md5file>
-<md5file name="withdrawals.lang">4d3cee00481c7ae0bb359e0350ae9998</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
+<md5file name="workflow.lang">481d05b63d8ecea12b14c26156a6f286</md5file>
+<md5file name="bills.lang">9a2f50ccd349d7544a532a4562cf7c1b</md5file>
+<md5file name="orders.lang">b81188718eb0e6d0be21944da85e5225</md5file>
+<md5file name="admin.lang">1e820858667b2283b4ddf1c9a06bf8e2</md5file>
+<md5file name="withdrawals.lang">41cb1b4912e7e63055cc42cd34501683</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
 <md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">84852327656c117e12eb295e7e805d65</md5file>
-<md5file name="members.lang">df70da4e6b594d272466009a0805c781</md5file>
-<md5file name="ecm.lang">111adfb91bfad1aff8452398fa4d94c3</md5file>
+<md5file name="boxes.lang">7ad74748bcdbfa3f6d5fade21ad3abaf</md5file>
+<md5file name="members.lang">c97628c3391c9fa7f0628260d579799b</md5file>
+<md5file name="ecm.lang">32469a0fb52c4ff01ae369e67964bd6d</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">fa38e89076356c74ed44f063a89eb054</md5file>
-<md5file name="products.lang">e46bd62bc1ccc56a4b2f6e15129a0474</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">f2057479de277dee7b6356bd8f2129d6</md5file>
-<md5file name="agenda.lang">45b114d6b35ad8f29d8ff71c923a3857</md5file>
+<md5file name="stocks.lang">2b8b4e200e051a5dd6aa75f9a8fb165c</md5file>
+<md5file name="products.lang">ddf205fef7d8943a36148d1e3607756f</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">224fc53ca646a4d90d1fc0d43f254a8c</md5file>
+<md5file name="agenda.lang">3471900c4cf93f1d15bae1dfe56af882</md5file>
 <md5file name="help.lang">9a09d0e39657eaa250296b8b7e11a986</md5file>
-<md5file name="holiday.lang">9431dac878f7cbd1faa44c7b1e9df9c5</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">cc7ff7ff9398f8173931a58bbf926287</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">386fea83882b0b3c027ee0d93f5fb4bc</md5file>
+<md5file name="categories.lang">1ae50a2a368e1a81f61c0e13163f3d4b</md5file>
 <md5file name="paybox.lang">6416c58b52a9d2a2ef47e7d43aa655f9</md5file>
 <md5file name="ldap.lang">b5ac41b2d7993ff82acb9a8358a17202</md5file>
-<md5file name="users.lang">7d1e66b229465c0a5803e21b89c588ad</md5file>
-<md5file name="companies.lang">763d1564abc8ab1b6b92e2aa92293b11</md5file>
+<md5file name="users.lang">6177e3c17c2beae1066e42d26b0a921b</md5file>
+<md5file name="companies.lang">3e1b5e2fe25733a18b8fc1f597ddfcc3</md5file>
 <md5file name="margins.lang">0f98b1f68cb968ba79071becaae05ac0</md5file>
 <md5file name="ftp.lang">c3666f4bf323f11ef7117f2952a0d6dd</md5file>
 <md5file name="exports.lang">74e40bd84a91dca58cd3254eae209778</md5file>
 <md5file name="paypal.lang">57160d6901b4fe33370e429c4cb06aac</md5file>
-<md5file name="cron.lang">a849d34872f74c621dda9cf0019ca30a</md5file>
+<md5file name="cron.lang">04b5877b7648ce36557698aa48eab05e</md5file>
 <md5file name="interventions.lang">053842730e380dfddffb45bf4684d34f</md5file>
-<md5file name="errors.lang">d28239644ec3f0b604f61cbeacdc1ee9</md5file>
-<md5file name="compta.lang">a451f2d5998e70bfdb9701c10e88787c</md5file>
-<md5file name="suppliers.lang">4691c940c45879e2a103b8472233c46d</md5file>
+<md5file name="errors.lang">daae1811faf73c5be0128df9c1c10394</md5file>
+<md5file name="compta.lang">172917646b816ceff1235a749ccd2c4d</md5file>
+<md5file name="suppliers.lang">aab39797ad85bf3422d70b3af0bb8d13</md5file>
 <md5file name="opensurvey.lang">1f2dfe32a45c0cc407b1e41483875c6d</md5file>
 <md5file name="donations.lang">a98de374f9de52276ae9d48093d0a373</md5file>
 <md5file name="contracts.lang">789e4f2509810e4b26a406200b624f54</md5file>
 <md5file name="deliveries.lang">0b2ff41b32ddac3abfdd5615b520392d</md5file>
 <md5file name="mailmanspip.lang">4a64102233f5cc6a326d74c738ed1333</md5file>
-<md5file name="install.lang">e977ac0a2542f42e4d060db83cd537fd</md5file>
-<md5file name="propal.lang">4665d1a3d64f9139e3baaf973d5a69bf</md5file>
-<md5file name="main.lang">8663dd198787f0762548246d2a5dd310</md5file>
-<md5file name="languages.lang">cc72f40a56021a8dfb917af798a0f053</md5file>
+<md5file name="install.lang">32426519dfc03553cf9b9d314b9c019b</md5file>
+<md5file name="propal.lang">b0056be7d136075c92352bb09ba6db76</md5file>
+<md5file name="main.lang">8de92e126dfd7e562822c67af8b0fdbd</md5file>
+<md5file name="languages.lang">9437227d5a7f542279fe43959d47f32f</md5file>
 <md5file name="bookmarks.lang">a2176e70d49f029e4ef345e258cabcd2</md5file>
 <md5file name="sms.lang">1ec82f780ad10ccf1017f53ad0a982fb</md5file>
 <md5file name="dict.lang">9a2353991fa9c9eb24f8a542ac8bd396</md5file>
-<md5file name="mails.lang">21b0bd2ef22918bfb0a8a05a34676c7a</md5file>
+<md5file name="mails.lang">ade1ed2ca0e9fbd669f2e93bf489ace2</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">21dd02596bfe3e291ae9bb41ab82918f</md5file>
+<md5file name="other.lang">29b63a9f892720cd883ad2e1936fcc87</md5file>
 <md5file name="commercial.lang">62cd0e0591bffc4eef4f49910d7e086f</md5file>
-<md5file name="salaries.lang">8ac836a9545e2a87eaf00f16b601be09</md5file>
-<md5file name="trips.lang">729e729fd6ec8b1769eadadf0d149063</md5file>
-<md5file name="sendings.lang">f02b09b00e6ae84e88569fa74cf359ad</md5file>
-<md5file name="accountancy.lang">6f4a8eac062a712115422039b36c0fa6</md5file>
+<md5file name="salaries.lang">4468f3a8b5d7713027614c35c4edb4ba</md5file>
+<md5file name="trips.lang">d6d70afea661f45f3a82e66191f870d2</md5file>
+<md5file name="sendings.lang">29dabe35e0da7517b9c6c46874a3d6ec</md5file>
+<md5file name="accountancy.lang">5e2588e7fac9ba6ee9b2eb723851aeb4</md5file>
 <md5file name="externalsite.lang">ad72b32fa88b149015f6e9e0f8fd9411</md5file>
 </dir>
 <dir name="/langs/nl_NL" >
-<md5file name="projects.lang">dd3cb02fbec0ad908d150ee6e9412eb2</md5file>
+<md5file name="projects.lang">f1e54f243769aba97aa02b1b63d68b15</md5file>
 <md5file name="cashdesk.lang">59c457c3403be06b525dd7b8c427701b</md5file>
-<md5file name="workflow.lang">15979925d25e913d34e8396647a38b9d</md5file>
-<md5file name="bills.lang">37bec8349d704a929fba2cd8aa330090</md5file>
-<md5file name="orders.lang">b5a1069869bb7e5ccf61eeb6b0cf2ac4</md5file>
-<md5file name="admin.lang">9e87ae8d0d2b12d4b38a09c3b98c30b0</md5file>
-<md5file name="withdrawals.lang">e2e02df3d70ee069610c91c01b58f9fd</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">1ee2f686d3bc03456a6101e3eec02395</md5file>
-<md5file name="members.lang">6200232eb997d2423b448f01886b2cd6</md5file>
-<md5file name="ecm.lang">9e0fd557446e6cf02be7faa52174d7ac</md5file>
+<md5file name="workflow.lang">d68cfe7e1c70fc21a50eab0606fb7ea5</md5file>
+<md5file name="bills.lang">5d10af7a52d112ea64e951155678bb83</md5file>
+<md5file name="orders.lang">56ac01bdf95a58095b336f7c91ff68fb</md5file>
+<md5file name="admin.lang">3e3b18e0d97c239aaae64487154edf8b</md5file>
+<md5file name="withdrawals.lang">2ac1903fa962c3d3b928b911581cf300</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">644d4340e8a233b2490f8f399a60bb16</md5file>
+<md5file name="members.lang">cbe4722c302b0de603f0a6786b191b85</md5file>
+<md5file name="ecm.lang">36b265e2c6ae9a266426658b4646578d</md5file>
 <md5file name="link.lang">3418d50e2adfabf40c3272735e88bb53</md5file>
-<md5file name="stocks.lang">cf13e806a1ed58bd4efc8111be57d06d</md5file>
-<md5file name="products.lang">86b9064f380889af1d7c5062220e4073</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">692f2d927e87cea3d5396f540ce9ef6a</md5file>
-<md5file name="agenda.lang">6a1e9719e3824e9e6983fae6730d3f08</md5file>
+<md5file name="stocks.lang">f2deed596bd43054f748d8cb1a5c0b43</md5file>
+<md5file name="products.lang">c87560a6e2fb23b7a4d18e41656fffac</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">f62eb0d1de8ed101b921ce03566cda59</md5file>
+<md5file name="agenda.lang">a09f9dbf7ed24fea41e624c258176c53</md5file>
 <md5file name="help.lang">17eae49005c9eb8ec8aacd15dcf38b6b</md5file>
-<md5file name="holiday.lang">4e84d5946737440c459dda7fb3de8cd1</md5file>
-<md5file name="productbatch.lang">feff078e505f04fd855711d3c53f77f0</md5file>
+<md5file name="holiday.lang">51c181882921c992e28ab0c9e424dc93</md5file>
+<md5file name="productbatch.lang">8fd7ce4aeaf2b3be11f39bf9b2be332b</md5file>
 <md5file name="resource.lang">28de826c00f8408c18c1060cacc44808</md5file>
-<md5file name="categories.lang">14f9e928a110db635df64441fa479ad0</md5file>
+<md5file name="categories.lang">f766c15120816c8cb2e12faa407c6fc0</md5file>
 <md5file name="paybox.lang">047c5ce175245236274011b316991875</md5file>
 <md5file name="ldap.lang">5bb64010fefff4ea7f80e1ab6a6e0122</md5file>
-<md5file name="users.lang">88cace04ba32542fdcfd0080e3e0d940</md5file>
-<md5file name="companies.lang">5ce847dc8ece30f4a02d510170c7fe9a</md5file>
+<md5file name="users.lang">e6d541551ff358ea366fa5705aa03f33</md5file>
+<md5file name="companies.lang">086620c521e81dfb948a769df7c4cb3a</md5file>
 <md5file name="margins.lang">0572222374db3336fcf8529652d528ac</md5file>
 <md5file name="ftp.lang">7952397f4d6f94f800d8c6d06b4067e7</md5file>
 <md5file name="exports.lang">b443ee0e4bc98550da8ea3c78a8c9484</md5file>
 <md5file name="paypal.lang">fc591b6dcf00663001336aeb2459e123</md5file>
-<md5file name="cron.lang">021c04f45d344468af57e8101fec4c19</md5file>
+<md5file name="cron.lang">539a0357c179e6ed2094b7ca1ebbc344</md5file>
 <md5file name="interventions.lang">ad0d58fc24b771522ca045e1ac65f943</md5file>
-<md5file name="errors.lang">4375e80d49cc7f1a28a872efa51224e3</md5file>
-<md5file name="compta.lang">65773501474e0c40fc1e4c1a8403d24f</md5file>
-<md5file name="suppliers.lang">0cb07969cced68f6d308cb421ac90640</md5file>
+<md5file name="errors.lang">c5ccee1868b8e0bac3e481ec05915df7</md5file>
+<md5file name="compta.lang">1806619c193b5af50b09822199f3acc3</md5file>
+<md5file name="suppliers.lang">0a1971986061c1723db06f2ce10a6774</md5file>
 <md5file name="opensurvey.lang">0f18fd5af1f9ce788f5053e652842feb</md5file>
 <md5file name="donations.lang">bb7be4d52dba41ff906024591864300e</md5file>
 <md5file name="contracts.lang">6f7cdeaa94521a24696f30e100fe06b1</md5file>
 <md5file name="deliveries.lang">1d998745c1680fa335fed152b242cca5</md5file>
 <md5file name="mailmanspip.lang">a72a089766a7cf669f6b68270ce8f5ab</md5file>
-<md5file name="install.lang">85468423349dbd76212c37e99deeb46e</md5file>
-<md5file name="propal.lang">cf2fa2d3f69a152f019253db88a2bb06</md5file>
-<md5file name="main.lang">7495e7a7629421065ad637017ae7bcb8</md5file>
-<md5file name="languages.lang">8ec539dbfeb7b754da341e69f9d4de1f</md5file>
+<md5file name="install.lang">ca4037021285d0de1307a991e46afcd4</md5file>
+<md5file name="propal.lang">4146dd4f46253b59caf76dc6970cfb61</md5file>
+<md5file name="main.lang">88903ec047e3b7e54ee38058f26b22fe</md5file>
+<md5file name="languages.lang">220b1e708f18f5740a7958eacba8b828</md5file>
 <md5file name="bookmarks.lang">4900f43900b2677888e3f7ec9a376c99</md5file>
 <md5file name="sms.lang">9c8629c3110dac7a00b21c554e869282</md5file>
 <md5file name="dict.lang">607e87ee590ab6b6e3c1f2017f310bb9</md5file>
-<md5file name="mails.lang">3a20800f2b0f6f5300b0df72391a7103</md5file>
+<md5file name="mails.lang">0c509a1ff62dd144392973d21f6f4c1f</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">112fb357ad4687d89b2d1de1d2bd259a</md5file>
+<md5file name="other.lang">d9e0fbc5efc7f435681219020f74d619</md5file>
 <md5file name="commercial.lang">4c38173d84a0db180e3d45d34b374e1f</md5file>
-<md5file name="salaries.lang">a1e87c2c89c946346513eec69daad7bb</md5file>
-<md5file name="trips.lang">f65cbb18687a4af2dcff788684d4298d</md5file>
-<md5file name="sendings.lang">1211e93daabd871b48bf93ed10408e90</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">b6786821a9641b2e90eb60d1cf955593</md5file>
+<md5file name="trips.lang">559855fcbc0de9a0e0a3e0b100dec408</md5file>
+<md5file name="sendings.lang">de01a7e57ec260e867ed8858fad127a2</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">1be24d68eebff59f8a3d55d1d248cdfb</md5file>
 </dir>
 <dir name="/langs/ko_KR" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">bd8be9fccb19a6f298c916d3427cd65a</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">c9e2294601dda182cf2102079e28f4ff</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c0160997de9c25bd276df7650d94da14</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">cb28a04e0c5427c7b3aef15674a67e8d</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">e1ce971f8e83a3905e65bd1a5e035478</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">003cdf81025074b07c06546b4a77b11c</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">a39cdf4bba745ce84e6009c9201fd7ee</md5file>
+<md5file name="stocks.lang">6272fc929dd3e35dbb1ab2bc7334083e</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">df0c7f31d5994dec9c1f79f2016412f5</md5file>
 <md5file name="help.lang">baf38b4ec10a43d12a333a1c2a28224f</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">f209f3bbc245afc75bf1fe1c2b74317f</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">7bc61a1f1daf334bc893dd1f0b05ca37</md5file>
 <md5file name="exports.lang">68d377f9e5f75e719df27def2d880fd5</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">c6baf993b90085cc0aeeceaad538af30</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">2ea7b94487a1b45f4624bc9b10de8dd4</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">8aa4caee4a691d363c99a32fb49ea5bb</md5file>
-<md5file name="propal.lang">8ad7dc8c62da0c98fdac28dfda1db0da</md5file>
-<md5file name="main.lang">b7eed1eb50d69f0d4325a55a6d56003a</md5file>
-<md5file name="languages.lang">b013fe1cb4509ffe516d6a7d1aefb30e</md5file>
+<md5file name="install.lang">5f159cb90408adc70e38433de187cc99</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">0b6aded40b9d1f82208536c43bb09558</md5file>
+<md5file name="languages.lang">50e6e01a5781360beb862e1b6c321487</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">d32aa2e1c7b5bd07001c90bc13dc7b50</md5file>
 <md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">649dd7a27f1a42f38af059f94115cc2a</md5file>
+<md5file name="mails.lang">5ef140466400c96d5e5cbbdc7cacee28</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">8a0716b48966b2f8730f0f549636c069</md5file>
+<md5file name="other.lang">a2b48c147b497f22bc9816616ca4cbd5</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/fr_FR" >
-<md5file name="projects.lang">bb91e797fdf8296943baa9ee084e176b</md5file>
+<md5file name="projects.lang">99eb0cd07b5a85ef5d6a1db99d6901e8</md5file>
 <md5file name="cashdesk.lang">a7a17bad11811e39b0164573964f3c18</md5file>
-<md5file name="workflow.lang">9ff187bdce93767cf2f24dbb5b0a34c5</md5file>
-<md5file name="bills.lang">65fa73136220e72cee67bb1ac9274c94</md5file>
-<md5file name="orders.lang">5920088fc20a0e4c9f154d744a56d703</md5file>
-<md5file name="admin.lang">43ffad7dd4b8e629d34ac88f97be223f</md5file>
-<md5file name="withdrawals.lang">9d95d44e6045f242b1ad717ed35f195b</md5file>
-<md5file name="incoterm.lang">7999379fa4ccf4f59d82e03b7aa2b805</md5file>
-<md5file name="loan.lang">9f7852cef378ee276866cb3158c8a632</md5file>
-<md5file name="boxes.lang">6e6dbe792e185cafbf43aeb5d4cf1c39</md5file>
-<md5file name="members.lang">0d30641b4bc5c34207d4b9aa6c045308</md5file>
-<md5file name="ecm.lang">349416524f35254fa72144bc7e08f9a6</md5file>
+<md5file name="workflow.lang">bc3d8e0038b9ef9b4540ac2f8908e884</md5file>
+<md5file name="bills.lang">85a962497b12d28c256707445455359d</md5file>
+<md5file name="orders.lang">414c6b81e62d76f84238870493a91898</md5file>
+<md5file name="admin.lang">7397c29870bc946af74264984d7a239e</md5file>
+<md5file name="withdrawals.lang">fbe934f4e66b6670a77f8d8f584f8a96</md5file>
+<md5file name="incoterm.lang">d85c3718dd925b2f2749a6293f5cb8a6</md5file>
+<md5file name="loan.lang">6695161fa12ab87cae6b1c5372e07f21</md5file>
+<md5file name="boxes.lang">3da2d86b46b9f04a99b688e4341d9750</md5file>
+<md5file name="members.lang">ece89536278c0d4ac3caa1d4c6fab6bf</md5file>
+<md5file name="ecm.lang">a5ee91f1f0b5f6cd4de22ae0dbcb78c1</md5file>
 <md5file name="link.lang">8c6845892177aee173dbaa73e8cd8ddd</md5file>
-<md5file name="stocks.lang">97edf2e5e81074f05d79d7cc50442433</md5file>
-<md5file name="products.lang">ff3c842ea8939c12ad29129390c4de04</md5file>
-<md5file name="printing.lang">9b3f0809e82e201172e7ccebb9d63ee2</md5file>
-<md5file name="banks.lang">adb43efb53b42824b60f9728c9aa5246</md5file>
-<md5file name="agenda.lang">e520e5ef79f3263ca5fd9289bff95e64</md5file>
+<md5file name="stocks.lang">4bd95f818a654607f9c518833f93ad44</md5file>
+<md5file name="products.lang">7d97ba5947dcdc0b7a6598e4bfbaf03c</md5file>
+<md5file name="printing.lang">d2a680c1b206859db7d6db0e2cd1bc8c</md5file>
+<md5file name="banks.lang">db7e003fef5756bbe6e5ec2a2fb5eb5b</md5file>
+<md5file name="agenda.lang">a9edef2ef783163b7945ba4ec21b2b64</md5file>
 <md5file name="help.lang">b80c70a4104afbcdddb55fea9a09f703</md5file>
-<md5file name="holiday.lang">fa8e0f7bba38c31294493c647e897ee1</md5file>
-<md5file name="productbatch.lang">7923248a950a9bf0341c088233da87d8</md5file>
+<md5file name="holiday.lang">3750bf7fdd0870f27fc14c1c18d9c3c4</md5file>
+<md5file name="productbatch.lang">1f454c455358e56662f3ddf5e1832a39</md5file>
 <md5file name="resource.lang">c336f582881f9f5ee8c96bbc8eaced3d</md5file>
-<md5file name="categories.lang">57d3f0cc46a5de22f4faba74c46e4060</md5file>
+<md5file name="categories.lang">96c21b9b7e87e2fdf7be5ba5b56a8f70</md5file>
 <md5file name="paybox.lang">df962d37596dbd1a3142fae9eb418bdc</md5file>
 <md5file name="ldap.lang">70e166ce8c734b2c4b6215bef0875c3d</md5file>
-<md5file name="users.lang">3085719cf550230628a2323239f90058</md5file>
-<md5file name="companies.lang">7f2dcae6379cb8365aaedf68c60e5720</md5file>
+<md5file name="users.lang">93350f7c0359f3cff6c242f2e5924e3c</md5file>
+<md5file name="companies.lang">dab0eaee22f7348c8e905f65ea7f242c</md5file>
 <md5file name="margins.lang">9f7dc7764ae8426026aabe1dea8b4271</md5file>
 <md5file name="ftp.lang">e7e60217406bf671e98ae7124f69e8f4</md5file>
 <md5file name="exports.lang">371f6e022e8e7739b420adbeb946143f</md5file>
 <md5file name="paypal.lang">bcaf0ee7ee4ede4c0b11d33262e06913</md5file>
-<md5file name="cron.lang">806a4b316dafa5ba9583487d049da128</md5file>
+<md5file name="cron.lang">a2d35b9468b6a277477bb6c8b0765dba</md5file>
 <md5file name="interventions.lang">624f8ffd5c36af2b87a06aee63b17bb0</md5file>
-<md5file name="errors.lang">36864784a3221a5f5b7593471f2d00bc</md5file>
-<md5file name="compta.lang">2f011fe992145e5f6a0afb59bcd99abe</md5file>
-<md5file name="suppliers.lang">bc9f0eea09de02a1128b4e1e4cdf846c</md5file>
+<md5file name="errors.lang">1d9c74af26cc75c6b570b766e01da286</md5file>
+<md5file name="compta.lang">7ceffccc13d7e9e92e57be64e020aad1</md5file>
+<md5file name="suppliers.lang">f85f9f7565a8a0f1a3f28336ad8ab6e5</md5file>
 <md5file name="opensurvey.lang">bee0636e455ad5d9a8dcc288ac2abb4c</md5file>
 <md5file name="donations.lang">9875bc160f395b95a197ffbb4ac22190</md5file>
 <md5file name="contracts.lang">9c1e23da81dc4a63a31957d58854c6fe</md5file>
 <md5file name="deliveries.lang">77def64e09174fe0ebc597e0e0f643da</md5file>
 <md5file name="mailmanspip.lang">7b075b656401153b43a2fe09321bcdf1</md5file>
-<md5file name="install.lang">88fb5f42cb4644fbe55f092dfbdf4e3a</md5file>
-<md5file name="propal.lang">e4e03fc7d82d2da0126d8445f09f61c2</md5file>
-<md5file name="main.lang">31d319cf80656df6a29f9a43562c4f67</md5file>
-<md5file name="languages.lang">fab14e1ece001f18e03308c4abd5d7b6</md5file>
+<md5file name="install.lang">a20b3b4d6be0dbbd0fad50781b826d0c</md5file>
+<md5file name="propal.lang">fe7b10789faa1e33034ed5bea8a9520d</md5file>
+<md5file name="main.lang">6c02acf732fd038e6ecfef8e22a46aab</md5file>
+<md5file name="languages.lang">4a2b10a53fa7843952a959871346a500</md5file>
 <md5file name="bookmarks.lang">2bac51be88c59c5ee21511836859e221</md5file>
 <md5file name="sms.lang">0889424a15f7ae4d5147e680d379e3c0</md5file>
 <md5file name="dict.lang">1da322fd765395f75d1bbd0857995779</md5file>
-<md5file name="mails.lang">50d8861319aec635c4cc80f065582801</md5file>
+<md5file name="mails.lang">9c8bb9c88c4fa51547bcbe2c937f18d0</md5file>
 <md5file name="printipp.lang">a1fe9c904ea0bd6d6ea490b977432ffc</md5file>
-<md5file name="other.lang">f777ead43fb28bb340fe06a788a2d457</md5file>
+<md5file name="other.lang">78c3ad1c535be023623d3560b843afcb</md5file>
 <md5file name="commercial.lang">671dc875906387ccb5d0e3a50f5690da</md5file>
 <md5file name="askpricesupplier.lang">89b6756ccb0d05b4191b704aafaf5803</md5file>
-<md5file name="salaries.lang">1207dc44db6f145aee928f583ec7ea8e</md5file>
-<md5file name="trips.lang">a908c63d1eecaca1d477bb0991de5087</md5file>
-<md5file name="sendings.lang">4ee68fc493c70cf503da15a368b7d648</md5file>
-<md5file name="accountancy.lang">6af88a3cd85b0751c497965c297bca33</md5file>
+<md5file name="salaries.lang">b7f2728b68fb7e9ad0b2c0c4d2a15c6b</md5file>
+<md5file name="trips.lang">5d8cf1947627e307ffba3aa3dcaabced</md5file>
+<md5file name="sendings.lang">aad9353a8f1638cd1b4140bcaf02d8b4</md5file>
+<md5file name="accountancy.lang">64ac0995ec70eff92dca7e63943fe054</md5file>
 <md5file name="externalsite.lang">af1f4c3b96562f5bf2f6a74c89f86c30</md5file>
 </dir>
 <dir name="/langs/lt_LT" >
-<md5file name="projects.lang">f800636514bc8e054160e04cb94ad204</md5file>
+<md5file name="projects.lang">3ceddab089de8ef332c408030d420cfc</md5file>
 <md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">accb0ffe1f4fee0ce0ac289bcb00ec93</md5file>
-<md5file name="bills.lang">78fe59a86a953f63ea5f4dffba881a22</md5file>
-<md5file name="orders.lang">dea0ac480cbf46ca1974941c6548db97</md5file>
-<md5file name="admin.lang">d44bbb94d090627b94dc78e665032c87</md5file>
-<md5file name="withdrawals.lang">c3d3b38d560058ba9c78c57ec4da351e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">6450d2b022251d8f7fa5383164921b53</md5file>
-<md5file name="members.lang">2a5e3e774f7490495dcbea756166e2df</md5file>
-<md5file name="ecm.lang">4352d3f57e45dbfb577c394a4b0d404a</md5file>
+<md5file name="workflow.lang">6d53c83d0c2f41f894615f0efd6c8cc9</md5file>
+<md5file name="bills.lang">a3c386c3bd9bcc6f7df031124e65f4bb</md5file>
+<md5file name="orders.lang">e50905daa3528b9182a1d886e9f13f54</md5file>
+<md5file name="admin.lang">5ee73ca0f97aa5bd34608f485ea143ab</md5file>
+<md5file name="withdrawals.lang">7519e01ebfaf184e31451303d0fc5faa</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">70ba2538054b4121e9e5869a5a611933</md5file>
+<md5file name="boxes.lang">5091bcab97706bf0b5ad791622590c58</md5file>
+<md5file name="members.lang">25ad1618cb45d3588c3e0f8e6944c4da</md5file>
+<md5file name="ecm.lang">5048c5e51454ca4696b60c9602346380</md5file>
 <md5file name="link.lang">54e556dc87e7e004fc79a780d8a15b5f</md5file>
-<md5file name="stocks.lang">300fcd3f12433b1def316a728c1e0373</md5file>
-<md5file name="products.lang">5c62974796a8513ab4b3b0dae9d2fdb2</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">030d81b17f76f51003c6d04b700f5427</md5file>
-<md5file name="agenda.lang">159b33f1267f8d57f7acebe32b106629</md5file>
+<md5file name="stocks.lang">1d080bd2550f8dccbad6bdcd24824e74</md5file>
+<md5file name="products.lang">bc66b87a75b357345fb8e27c2ec9639a</md5file>
+<md5file name="printing.lang">5a917224ff01128938882ae8b9dbdcb1</md5file>
+<md5file name="banks.lang">f3f8b520f2ecb975a05b41cc030868ef</md5file>
+<md5file name="agenda.lang">1c4473f154d11c32fddfe9d7c3f4f5a0</md5file>
 <md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">5f3ca3d85366612c464715c1c1622b69</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">c2d079629f96115a9d0f1b502a2fb071</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">74acfae0cf773d1140832af7e5667186</md5file>
-<md5file name="categories.lang">f3a92ef0bf47c3096387fe1cf0629485</md5file>
+<md5file name="categories.lang">0a79914a7c116137d96e4e26afef06fa</md5file>
 <md5file name="paybox.lang">9f8adf4e7324896d5212987036e78551</md5file>
 <md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">0a421fd5e158ae5f955fc13a7714e4ed</md5file>
-<md5file name="companies.lang">a20ab8c3eecac5fb751b175593f50ff0</md5file>
+<md5file name="users.lang">2e649b660a18eb203a07078ca6f0ddb0</md5file>
+<md5file name="companies.lang">df6367de07ed9215bdc536aad78d7e35</md5file>
 <md5file name="margins.lang">3e595b3b8b480b30a357aeccb6de8615</md5file>
 <md5file name="ftp.lang">7bc61a1f1daf334bc893dd1f0b05ca37</md5file>
 <md5file name="exports.lang">d33da07ecdc0f5f519ac9430f03acff5</md5file>
 <md5file name="paypal.lang">5b4959ed0c32ed6a409144c78c8b9fb4</md5file>
-<md5file name="cron.lang">a56f71ccfc03d9eb4d53f11e974bde44</md5file>
+<md5file name="cron.lang">54ce90907c5b76dfccd2b3ce0eb7bcbc</md5file>
 <md5file name="interventions.lang">deb9e5e980af806b4cdb486e1f6dc295</md5file>
-<md5file name="errors.lang">4076b250140ebbdecd04f204e5d3ec34</md5file>
-<md5file name="compta.lang">6d144a8da6b325f43d751859f74df622</md5file>
-<md5file name="suppliers.lang">16721b848b7b390230f8d2e31ae681f2</md5file>
+<md5file name="errors.lang">8fe669f9b9f4a26980f29dfa656a17c3</md5file>
+<md5file name="compta.lang">2b570635846a4bb4b2efa02f3c622be5</md5file>
+<md5file name="suppliers.lang">7ae4039739f877e3effecc657d4001bb</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">a114ac6eecd4701929fe3fd8f172dee5</md5file>
 <md5file name="contracts.lang">6c82b555404859d9e7c77be66b7a668b</md5file>
 <md5file name="deliveries.lang">a7af99484311ff510f4378fe059ed4b5</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">5e5819f5d74803aa89e89167fe231b1d</md5file>
-<md5file name="propal.lang">78ccdecfb2a996cac3be37b3c846460b</md5file>
-<md5file name="main.lang">58e3ab24fa852f350c4ed45dadbf5b2d</md5file>
-<md5file name="languages.lang">4b5cef6e62a55c9d6052852ee6902202</md5file>
+<md5file name="install.lang">a1edfdd1546848af612b1f4b25cfb92c</md5file>
+<md5file name="propal.lang">45045a9eec7c672c032ec3f2697cf63c</md5file>
+<md5file name="main.lang">c83c214edc1b2f71416af4034732b9a7</md5file>
+<md5file name="languages.lang">84531b706ea855e47571616f0c9be494</md5file>
 <md5file name="bookmarks.lang">0ad67108567f99662f7dabc9585331da</md5file>
 <md5file name="sms.lang">9e73e48da807bd19ea533c4e65a2e6c7</md5file>
 <md5file name="dict.lang">31b983b50ce8d8e45c4d311797756dce</md5file>
-<md5file name="mails.lang">01694b850c6b0e1197380ceaecbe5d95</md5file>
+<md5file name="mails.lang">bd993bfecb71e53562fe2f11ff3ec37c</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">3a8fd3a58b5e4053e39248a3b7fdab1f</md5file>
+<md5file name="other.lang">f663087045123171ae4ef4a5b282c7b9</md5file>
 <md5file name="commercial.lang">afc24fdcfb5cf0fabd1ed60f71006753</md5file>
-<md5file name="salaries.lang">b92a87438d9445e2a919a9be66619418</md5file>
-<md5file name="trips.lang">47dc75121c7698e7377db4430dd4c061</md5file>
-<md5file name="sendings.lang">6f0113699548f5a4df82d88f510a738b</md5file>
-<md5file name="accountancy.lang">95ca33614eca20769127f878090f877b</md5file>
+<md5file name="salaries.lang">1c69f14e9f4dfa446476883fe9faf925</md5file>
+<md5file name="trips.lang">1d992f67557dc20ffd7209982beb3928</md5file>
+<md5file name="sendings.lang">b3ef9554504f7f41f49fe2daf132cae3</md5file>
+<md5file name="accountancy.lang">1a12efc8bc0061aaf16af444d814c5ca</md5file>
 <md5file name="externalsite.lang">56d8a0b2df579f5cead684b83fdef191</md5file>
 </dir>
 <dir name="/langs/fr_CH" >
-<md5file name="bills.lang">bc71e5fc00ccb87cfcca91e37872be45</md5file>
-<md5file name="main.lang">0566dfb09b5353275b60a803bc959d3f</md5file>
+<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
+<md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
 </dir>
 <dir name="/langs/es_HN" >
 <md5file name="bills.lang">eb0d31b8fe30bfb4b4a2cac24e104c61</md5file>
 <md5file name="admin.lang">9fd4d804edecddba37f21602c6cf2728</md5file>
 <md5file name="companies.lang">954e3a894921531b3a0501372855a38f</md5file>
-<md5file name="compta.lang">3c2bce01b0c68a1550c9805ce689e3e2</md5file>
+<md5file name="compta.lang">9c12fd584bce3751c45e6ceaf38f94ed</md5file>
 <md5file name="propal.lang">28dad238042abf98d2a4b40648effc46</md5file>
 <md5file name="main.lang">e70e0c0be5993759f867484624b7270f</md5file>
 </dir>
@@ -10956,119 +10956,121 @@
 <md5file name="sendings.lang">2b30da3ff0c32ac08a5c37f4321027d4</md5file>
 </dir>
 <dir name="/langs/uk_UA" >
-<md5file name="projects.lang">19db7d40b75d732ef2885a7ff654633d</md5file>
+<md5file name="projects.lang">6bbb995f3265c3a35308734aafb062de</md5file>
 <md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">10e4e6ccc2ca7adf3dbf27ee7b05f32b</md5file>
-<md5file name="orders.lang">c487cf0c63de6081575110f79fedef28</md5file>
-<md5file name="admin.lang">f4b08a8d8d6c427cadc1d7a67c2276b6</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">c482e3b1536573f8a063973836e1148a</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">3a8c4db1499b8dbf5a8677e33dfe86f5</md5file>
+<md5file name="orders.lang">d28769c3031a9a73e168480bcd47d9db</md5file>
+<md5file name="admin.lang">cb0fda6ea29d35c4a018e7d10a0b0679</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">55b226d18eb7824edad5050c3090b348</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">8d1907797bd91325a05612826030dbc4</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">2d28a42c82552f1758861a58d4bd2b26</md5file>
-<md5file name="agenda.lang">7874cc585c8e37b22d9031e8ab3899f7</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">a2b6e89eddc24adab309af192ebc3507</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">d37570c4224761896669e79a4177a8af</md5file>
+<md5file name="agenda.lang">259aed47bdfd4c96aa5fc7b502cc7a2d</md5file>
 <md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">512699b0027618a3031685da1faf9210</md5file>
-<md5file name="companies.lang">f209f3bbc245afc75bf1fe1c2b74317f</md5file>
+<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
+<md5file name="companies.lang">444f355fcfe5ebe9cb62709118629c20</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">01ce0b50fc1287f059584597f867285e</md5file>
 <md5file name="deliveries.lang">4e186ea8084c33de3fec3182f57150ec</md5file>
 <md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">8ad7dc8c62da0c98fdac28dfda1db0da</md5file>
-<md5file name="main.lang">37d7d6ab85f24ac3215d41ef03447944</md5file>
-<md5file name="languages.lang">bf4755dcad4fa5a295dd87944ea59531</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
+<md5file name="main.lang">9e6eb58bed905de3bbed692610cebf9b</md5file>
+<md5file name="languages.lang">c46ee226e5d4b78092981a6c43427b29</md5file>
 <md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
 <md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
 <md5file name="dict.lang">c95d9dd5cdb6d9a6824a6bdbefb48531</md5file>
-<md5file name="mails.lang">69aec14d2ee1fc4fd90610eee0f7173f</md5file>
+<md5file name="mails.lang">fe15c711278cda92b6fe60ad0bd4a4a1</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">d01fdb1e6043fb26b049108da5e4df60</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">99761aca53ed66d60bc8ec62245576a6</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">88f64e53214f36b398d9fa597abfa5be</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
 </dir>
 <dir name="/langs/hr_HR" >
-<md5file name="projects.lang">28965e19f2bb88d381c61bb97db6533f</md5file>
+<md5file name="projects.lang">d9121b8f2a7a04e2495f011b2cb8d454</md5file>
 <md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">af56ae8f3240a1cb51bf1a10154a81ab</md5file>
-<md5file name="bills.lang">00f9869e366fc0a9965de88d1361fc7e</md5file>
-<md5file name="orders.lang">35755533a2bc6e47a49d01043b8b99cf</md5file>
-<md5file name="admin.lang">51082ca268f30148a3f42348979c9b42</md5file>
-<md5file name="withdrawals.lang">0178ccd0294eac78322bcfb837883e9e</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="boxes.lang">429d46249b517771803c091f1527c2f2</md5file>
-<md5file name="members.lang">fbd7c6eb7947061e1cdb26596aa97f7e</md5file>
-<md5file name="ecm.lang">e078e6e155aeadfdbd41beaddcb80abe</md5file>
+<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
+<md5file name="bills.lang">a8ee9767266e3e45825fcc67fd8fbbff</md5file>
+<md5file name="orders.lang">db1fcb36377c49e6f8f36666a97115b9</md5file>
+<md5file name="admin.lang">fc2ef0c2b6eb211b14d64c11689a4911</md5file>
+<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
+<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
+<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
+<md5file name="boxes.lang">d1a443d8f9c8f096368d1d3871ad69e2</md5file>
+<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
+<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
 <md5file name="link.lang">e1161971bb06488cabe9066c8e827741</md5file>
-<md5file name="stocks.lang">ed059ed40afcee883cd95bec8e58a0f1</md5file>
-<md5file name="products.lang">737e57e0eb83f302cf4a259dffaf0c78</md5file>
-<md5file name="printing.lang">3222e8667905ffdb07a756fa25a26bd9</md5file>
-<md5file name="banks.lang">8a4381fa1d63884fb8d2e8a92e7eaa74</md5file>
-<md5file name="agenda.lang">fda5718a7827fc8919bb36ee1b330553</md5file>
+<md5file name="stocks.lang">ff1181bad18030da7ee00eabb765af19</md5file>
+<md5file name="products.lang">092e5c0f2e74b289f70f64d308637971</md5file>
+<md5file name="printing.lang">cce523f0de9f4c45020b92648a06a6cd</md5file>
+<md5file name="banks.lang">c6507a174a20308492f4b708bafc85bb</md5file>
+<md5file name="agenda.lang">e291f74dfce73641087c68ca305000a7</md5file>
 <md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">4b2f37e2efbc07cb96a3c17df7f132b4</md5file>
-<md5file name="productbatch.lang">03d36f77b7302ca1c4e11c5a3297221d</md5file>
+<md5file name="holiday.lang">29a827977393113d68b31afa85a40c2f</md5file>
+<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
 <md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">49d7184c39c600520d2524c8e604b647</md5file>
+<md5file name="categories.lang">9f720e8f9ab9842fc420a250f7fe9ddd</md5file>
 <md5file name="paybox.lang">14284138d5f94467eb25db3495ebd96d</md5file>
 <md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">c631e13dca383449727f5406a9840e3f</md5file>
-<md5file name="companies.lang">b9d6e13e227b0cd7b338e5fc10d8e605</md5file>
+<md5file name="users.lang">6debf0d0e4964cc8c9e574386a87e036</md5file>
+<md5file name="companies.lang">6a5859d6dda64e7c0bd05feb901e6cfd</md5file>
 <md5file name="margins.lang">d9e5975cb7abbf8cc23b9ae0909c1291</md5file>
 <md5file name="ftp.lang">7bc61a1f1daf334bc893dd1f0b05ca37</md5file>
 <md5file name="exports.lang">8d43131041f3d3667982ff5fa6227d1d</md5file>
 <md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">1f2f0cba219e3d68c9a1034d55c27631</md5file>
+<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
 <md5file name="interventions.lang">7ac550b131a480505f0160feb1984344</md5file>
-<md5file name="errors.lang">f103431908884f274534932b873fa44d</md5file>
-<md5file name="compta.lang">96580781af2e64271588ef6d49f05d89</md5file>
-<md5file name="suppliers.lang">8e981e40a6eecd6cffd39f0bc1847198</md5file>
+<md5file name="errors.lang">141de4f48178e8725a9204557647137b</md5file>
+<md5file name="compta.lang">450b1fb702198c066ee083672788e698</md5file>
+<md5file name="suppliers.lang">e8d593dd57a0aff92da5c21487cbd68b</md5file>
 <md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
 <md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
 <md5file name="contracts.lang">040b1884027518b0d658b646838e6e1e</md5file>
 <md5file name="deliveries.lang">309215b54637ec841c73ad9cb60c92c2</md5file>
 <md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">c1ec8fa6489acbe79cc1214e8130231b</md5file>
-<md5file name="propal.lang">4d321f312bd44b67152064696a58ad8d</md5file>
-<md5file name="main.lang">286259d054a2f33a053a79700a9cdef7</md5file>
-<md5file name="languages.lang">a7f24d33406ebc61b7639babb8619186</md5file>
+<md5file name="install.lang">29ed06655458ba047af7a30f78db3bc2</md5file>
+<md5file name="propal.lang">e0ba51b98a7560425f1296e931803c92</md5file>
+<md5file name="main.lang">ed02898d575b7f3adf91eca343ab527d</md5file>
+<md5file name="languages.lang">8a8be4b6fff7d6f4d66a34d44c50a93e</md5file>
 <md5file name="bookmarks.lang">3c262e53abae368513df941815512cac</md5file>
 <md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
 <md5file name="dict.lang">5b30fbe3329f2544372a731e50272392</md5file>
-<md5file name="mails.lang">68d654bb2efb93c89598b94621880c02</md5file>
+<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
 <md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">39e7381312f22a2cad63224d6a5869c3</md5file>
+<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
 <md5file name="commercial.lang">0af0952421efa93236413ced8d20e2d0</md5file>
-<md5file name="salaries.lang">4b6ac010cd85f7991579132109be609f</md5file>
-<md5file name="trips.lang">e9d3e6e7cefb4889c0f92ade40de2036</md5file>
-<md5file name="sendings.lang">189335b8919b9cf252062847b705d41b</md5file>
-<md5file name="accountancy.lang">e9e437b0e54d0b0f215555a8a0aa3691</md5file>
+<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
+<md5file name="trips.lang">586404ec33258a5d54f6e6f9c350191d</md5file>
+<md5file name="sendings.lang">d569bb0f6366111ac3419c8e8236605d</md5file>
+<md5file name="accountancy.lang">6b5323c683de6a8782cdef752b7382c3</md5file>
 <md5file name="externalsite.lang">5e857db1c2b2f3c5b49fd68ef1fbad23</md5file>
 </dir>
 <dir name="/api/admin" >
@@ -11087,7 +11089,7 @@
 <md5file name="cidlookup.php">adf4d0f538de7decd6b3e4c5140c159a</md5file>
 </dir>
 <dir name="" >
-<md5file name="filefunc.inc.php">d24ffcce3002b3ce6f2795074dbfe8b4</md5file>
+<md5file name="filefunc.inc.php">f5f367fb300805531da4489c7d3a6505</md5file>
 </dir>
 <dir name="/fichinter" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -11103,7 +11105,7 @@
 </dir>
 <dir name="/fichinter" >
 <md5file name="document.php">78ef28597da219fe5d2942477759b539</md5file>
-<md5file name="card.php">450db56d13d99996ef3ee92735c6bde8</md5file>
+<md5file name="card.php">22822e90dc0735fe3a378baa35922868</md5file>
 <md5file name="note.php">8326aa93734dd8035a04c12062e68ce4</md5file>
 </dir>
 <dir name="/fichinter/class" >
@@ -11113,12 +11115,12 @@
 <dir name="/fichinter" >
 <md5file name="contact.php">099f9b1f56cae48a1b679ed282e3766d</md5file>
 <md5file name="info.php">4f6660f6709655f539d4e56721fc702f</md5file>
-<md5file name="list.php">503dd7a88bff4050b4fe510fcbb2dc94</md5file>
+<md5file name="list.php">cb9c4c953a1350de8d779500f2d4f30c</md5file>
 <md5file name="apercu.php">7c588d92e0178284a33300bcd72fc3c5</md5file>
 </dir>
 <dir name="/theme/amarok" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">5b0e96cbf9eb0890df3497705e6e1ce5</md5file>
+<md5file name="style.css.php">170e38a1cefb8b8ddb43d563dcf06f9f</md5file>
 </dir>
 <dir name="/theme/amarok/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -11747,7 +11749,7 @@
 </dir>
 <dir name="/theme/bureau2crea" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">696b56e4b1019b6cd81e5223a06f5076</md5file>
+<md5file name="style.css.php">05f5994a4740a525f681f2da3778400e</md5file>
 </dir>
 <dir name="/theme/bureau2crea/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -12014,7 +12016,7 @@
 </dir>
 <dir name="/theme/cameleo" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">85ead30f673db82ff554f0b9e9ad3785</md5file>
+<md5file name="style.css.php">6079976684703359a26c4544f46ea8c4</md5file>
 </dir>
 <dir name="/theme/cameleo/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -12288,7 +12290,7 @@
 </dir>
 <dir name="/theme/auguria" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">d7b0170abaff4628a0a543125ea7f1fd</md5file>
+<md5file name="style.css.php">068fcbee3df8f8886aadbd76bdf937af</md5file>
 </dir>
 <dir name="/theme/auguria/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -12518,7 +12520,7 @@
 </dir>
 <dir name="/theme/md_exp" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">a8fd9553cafbe9044f8e05785a9518c9</md5file>
+<md5file name="style.css.php">3aa223159053ef2a8312da151a350b9b</md5file>
 </dir>
 <dir name="/theme/md_exp/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -12762,7 +12764,7 @@
 </dir>
 <dir name="/theme/eldy" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">918643c64d3d79ccd52915c33e37aaa5</md5file>
+<md5file name="style.css.php">3740db76bc000bc884f9828c0c2109d2</md5file>
 </dir>
 <dir name="/theme/eldy/tpl" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -12914,12 +12916,14 @@
 <md5file name="1leftarrow_selected.png">e5f6f03a4edf8b78cb561640dd021ef9</md5file>
 <md5file name="grip.png">6ca183f901d31980b285e187778a82c1</md5file>
 <md5file name="object_printer.png">e7e7279bf3b7845d60813383267bfa37</md5file>
+<md5file name="title_hrm.png">a5e086a23801dcfce3db1c2771a93a95</md5file>
 <md5file name="object_address.png">8038e4775316d36b154b2d20f8eca0ae</md5file>
 <md5file name="high.png">f2930d262bbe944d1a7850e4a18a2e50</md5file>
 <md5file name="object_category.png">665abcd595667e221eb5bf99589f8a05</md5file>
 <md5file name="1downarrow.png">c2664fbfabe5322a1a136ef9e6ec28db</md5file>
 </dir>
 <dir name="/theme/eldy/img/menus_black" >
+<md5file name="holiday.png">a5e086a23801dcfce3db1c2771a93a95</md5file>
 <md5file name="company.png">7d10d6dbc1f9f2c0c829547ae9dac5ce</md5file>
 <md5file name="generic4.png">ee824cf6776480f19eafb0e66bc37fab</md5file>
 <md5file name="bank.png">64c990e913582ce96567f2a33b77e5cc</md5file>
@@ -12956,7 +12960,7 @@
 <md5file name="money_over.png">a5dec0e545fbe51ccd8ee88a04b765ad</md5file>
 <md5file name="generic2_over.png">f42f66c04cc8694fc96c6429f01e92ce</md5file>
 <md5file name="externalsite_over.png">cb68b41ee9ba56e19b1fcd031dc392cb</md5file>
-<md5file name="globe.png">bc05da2ad2e4e02d2fc2282eac9f6d8e</md5file>
+<md5file name="globe.png">946f91cec0c8f171bb8f5825a800bedc</md5file>
 <md5file name="commercial_over.png">af5bd4a063b464bc5f02f40eae30d3bc</md5file>
 <md5file name="shop.png">0d2f6939e820e7e2a8110ebcf41215b0</md5file>
 <md5file name="commercial.png">5883ede99edc85cf16b80a9c0cf0feb4</md5file>
@@ -13065,15 +13069,15 @@
 <md5file name="cron.php">94db7d62efd46fd1069e2fdc796ec48b</md5file>
 </dir>
 <dir name="/cron" >
-<md5file name="card.php">caa8c3b187f1e35b7b2d51df7fc74ebb</md5file>
+<md5file name="card.php">169bd07ae16fbd983f38b6d19e7e3ff5</md5file>
 </dir>
 <dir name="/cron/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cronjob.class.php">b7ac1e65cfb2226f71c4c585b87ef36d</md5file>
+<md5file name="cronjob.class.php">3490105a0c0d7976ccb8ac93c595262b</md5file>
 </dir>
 <dir name="/cron" >
 <md5file name="info.php">016d324c588d6ce78db3c6625c5b86fc</md5file>
-<md5file name="list.php">18eea1a9fed07e8b5e41209b563b5868</md5file>
+<md5file name="list.php">669ddf571cce48dd60b0323fed7379d1</md5file>
 </dir>
 <dir name="/commande" >
 <md5file name="customer.php">c1d33938283415cd00527289b0d7c3f6</md5file>
@@ -13087,7 +13091,7 @@
 </dir>
 <dir name="/commande" >
 <md5file name="document.php">11689e5722e4204b9d01e5e4483b92ef</md5file>
-<md5file name="card.php">9cdfe4c597d2fd07968326697a8e20b3</md5file>
+<md5file name="card.php">b6d2a6ed26ecc42a384b790b25ba1b00</md5file>
 <md5file name="note.php">a20a84fb09238e216ab80d91674426b1</md5file>
 </dir>
 <dir name="/commande/class" >
@@ -13101,7 +13105,7 @@
 <md5file name="index.php">408905fde09ef57f089ae9217427d720</md5file>
 <md5file name="orderstoinvoice.php">69f3cf8423a9ec5a21c8972ff3a8754d</md5file>
 <md5file name="info.php">5e1aea18f899b4a763a0291dcf1f2b90</md5file>
-<md5file name="list.php">294cf24f3826253a7afd87457cf24bb6</md5file>
+<md5file name="list.php">b2c7012ed8f4226c6fda016a3ea1aff3</md5file>
 <md5file name="apercu.php">9dd4c109f77db954d5afcb20d5af9e4c</md5file>
 </dir>
 <dir name="/contrat/tpl" >
@@ -13115,7 +13119,7 @@
 </dir>
 <dir name="/contrat" >
 <md5file name="document.php">24b8f65ab4a24ff8241b8af469928f75</md5file>
-<md5file name="card.php">40ed9ceb0cb5b753b93111c383985ee0</md5file>
+<md5file name="card.php">4554ae7c2d7cce013ce08ad1860281d5</md5file>
 <md5file name="note.php">7770e9e8e3fb4b98bc149059c5bc9633</md5file>
 </dir>
 <dir name="/contrat/class" >
@@ -13124,7 +13128,7 @@
 </dir>
 <dir name="/contrat" >
 <md5file name="contact.php">7b7cde9c324feeed6e94f50e1655ba40</md5file>
-<md5file name="services.php">8b30301133b37436c3e3701360c8a73b</md5file>
+<md5file name="services.php">cd59d5a20209a1d240927af651d3046e</md5file>
 <md5file name="index.php">984c0b75c89d9ef9fef1fb68dd727448</md5file>
 <md5file name="info.php">966129fc8b4d82883741779cf87ea57a</md5file>
 <md5file name="list.php">4291524b8a1b72ba1dddf8210dd394a7</md5file>
@@ -13138,7 +13142,7 @@
 </dir>
 <dir name="/expensereport" >
 <md5file name="document.php">0b959ec99ed9ee63f065c7d40454b9ec</md5file>
-<md5file name="card.php">c3f215c18eaa4b1dac4479f8ee921f2e</md5file>
+<md5file name="card.php">c0fec37f73b97ea319e04174f6ef8d8b</md5file>
 </dir>
 <dir name="/expensereport/ajax" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -13152,15 +13156,15 @@
 <dir name="/expensereport/class" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
 <md5file name="paymentexpensereport.class.php">0cc2f33a00cd70ef8ea012c994a9e133</md5file>
-<md5file name="expensereport.class.php">113e932b27b96b01608f1a8a181abf31</md5file>
+<md5file name="expensereport.class.php">603bb73652f0fe28c3031797c06be2fc</md5file>
 <md5file name="expensereportstats.class.php">419a141c971f0a5edd4c8d19ac6f9741</md5file>
 </dir>
 <dir name="/expensereport" >
-<md5file name="export_csv.php">a425e58ee7e93eea47ec61a8bb53d69b</md5file>
-<md5file name="index.php">493832723b0cc017019c0c924534e932</md5file>
+<md5file name="export_csv.php">1f014c58fdf956eabae16c7b8774b02a</md5file>
+<md5file name="index.php">0784a811dfbafe7e2752726466ac231d</md5file>
 <md5file name="info.php">7a38db77d9e3e48f9ddd737f776a49c5</md5file>
-<md5file name="list.php">d137ca28501752423f54d56fc8af8c07</md5file>
-<md5file name="synchro_compta.php">96d8a5bbc6b778eef6059334788ad675</md5file>
+<md5file name="list.php">40ae9a268dbdeba2453c69258545d4db</md5file>
+<md5file name="synchro_compta.php">66b616b872ef80968c8525b6b14f62fa</md5file>
 </dir>
 <dir name="/bookmarks" >
 <md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
@@ -13178,7 +13182,7 @@
 <md5file name="bookmark.class.php">172fde67b2620ef8febd816161712c8f</md5file>
 </dir>
 <dir name="/bookmarks" >
-<md5file name="list.php">202330d32d90de7f96cbca4fb432928b</md5file>
+<md5file name="list.php">c8794336eba88e9ce0af56f8b5cded4d</md5file>
 </dir>
 </dolibarr_root_dir>
 </checksum_list>
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index bac0ffe6eda..36d12421055 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -375,13 +375,13 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='')
 
     print '<!-- Includes CSS for JQuery -->'."\n";
     if ($jQueryUiCustomPath) print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
-    else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+    else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui.custom.css" />'."\n";    // JQuery
 
     print '<!-- Includes JS for JQuery -->'."\n";
     if ($jQueryCustomPath) print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
-    else print '<script type="text/javascript" src="../includes/jquery/js/jquery-latest.min.js"></script>'."\n";
+    else print '<script type="text/javascript" src="../includes/jquery/js/jquery.min.js"></script>'."\n";
     if ($jQueryUiCustomPath) print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
-    else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui-latest.custom.min.js"></script>'."\n";
+    else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui.custom.min.js"></script>'."\n";
 
     print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
     print '</head>'."\n";
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index 4508a266b08..9b0ac71931b 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -28,8 +28,7 @@ include_once '../core/class/html.formadmin.class.php';
 
 $err = 0;
 
-// Si fichier conf existe deja et rempli, on est pas sur une premiere install,
-// on ne passe donc pas par la page de choix de langue
+// If the config file exists and is filled, we're not on first install so we skip the language selection page
 if (file_exists($conffile) && isset($dolibarr_main_url_root))
 {
     header("Location: check.php?testget=ok");
@@ -45,7 +44,7 @@ $langs->load("admin");
 
 $formadmin=new FormAdmin('');	// Note: $db does not exist yet but we don't need it, so we put ''.
 
-pHeader("", "check");   // Etape suivante = check
+pHeader("", "check");   // Next step = check
 
 
 // Ask installation language
@@ -62,6 +61,6 @@ print '</table></div>';
 
 print '<br><br>'.$langs->trans("SomeTranslationAreUncomplete");
 
-// Si pas d'erreur, on affiche le bouton pour passer a l'etape suivante
+// If there's no error, we display the next step button
 if ($err == 0) pFooter(0);
 
diff --git a/htdocs/install/mysql/data/llx_c_holiday_type.sql b/htdocs/install/mysql/data/llx_c_holiday_type.sql
index a0ee0b065b7..87eb67be131 100644
--- a/htdocs/install/mysql/data/llx_c_holiday_type.sql
+++ b/htdocs/install/mysql/data/llx_c_holiday_type.sql
@@ -24,10 +24,13 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country) values ('LEAVE_PAID', 'Paid vacation', 1, 7, 0,    NULL);
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country) values ('LEAVE_SICK', 'Sick leave',    0, 0, 0,    NULL);
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country) values ('LEAVE_OTHER','Other leave',   0, 0, 0,    NULL);
+-- Generic to all countries
+insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_SICK',    'Sick leave',    0, 0, 0,    NULL, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_OTHER',   'Other leave',   0, 0, 0,    NULL, 1);
+
+-- Not enabled by default, we prefer to have an entrey dedicated to country
+insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_PAID',    'Paid vacation', 1, 7, 0,    NULL, 0);
 
 -- Leaves specific to France
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country) values ('LEAVE_RTT',  'RTT'          , 1, 7, 0.83, 1);
-
+insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_RTT_FR',  'RTT'          , 1,  7, 0.83,    1, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_PAID_FR', 'Paid vacation', 1, 30, 2.08334, 1, 1);
diff --git a/htdocs/install/mysql/data/llx_c_lead_status.sql b/htdocs/install/mysql/data/llx_c_lead_status.sql
new file mode 100644
index 00000000000..82450a9c4e1
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_lead_status.sql
@@ -0,0 +1,31 @@
+-- Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+-- Opportunities status
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (1,'PROSP'  ,'Prospection',  10, 0,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (2,'QUAL'   ,'Qualification',20, 20,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (3,'PROPO'  ,'Proposal',     30, 40,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (4,'NEGO'   ,'Negotiation',  40, 60,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (5,'PENDING','Pending',      50, 50,0);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (6,'WON'    ,'Won',          60, 100,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (7,'LOST'   ,'Lost',         70, 0,1);
+
diff --git a/htdocs/install/mysql/data/llx_holiday_config.sql b/htdocs/install/mysql/data/llx_holiday_config.sql
index 7dd964a7ace..a55842e76c7 100644
--- a/htdocs/install/mysql/data/llx_holiday_config.sql
+++ b/htdocs/install/mysql/data/llx_holiday_config.sql
@@ -1,8 +1 @@
-INSERT INTO llx_holiday_config (name ,value) VALUES ('userGroup', NULL);
 INSERT INTO llx_holiday_config (name ,value) VALUES ('lastUpdate', NULL);
-INSERT INTO llx_holiday_config (name ,value) VALUES ('nbUser', NULL);
-INSERT INTO llx_holiday_config (name ,value) VALUES ('delayForRequest', '31');
-INSERT INTO llx_holiday_config (name ,value) VALUES ('AlertValidatorDelay', '0');
-INSERT INTO llx_holiday_config (name ,value) VALUES ('AlertValidatorSolde', '0');
-INSERT INTO llx_holiday_config (name ,value) VALUES ('nbHolidayDeducted', '1');
-INSERT INTO llx_holiday_config (name ,value) VALUES ('nbHolidayEveryMonth', '2.08334');
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index f9853ab773c..3bd8c282c38 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -231,7 +231,6 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  date_paiement 	datetime,
   tms 		 		timestamp,
   fk_user_author 	integer NOT NULL,
   fk_user_modif 	integer DEFAULT NULL,
@@ -240,7 +239,6 @@ CREATE TABLE llx_expensereport (
   fk_user_approve   integer DEFAULT NULL,
   fk_user_refuse 	integer DEFAULT NULL,
   fk_user_cancel 	integer DEFAULT NULL,
-  fk_user_paid 		integer DEFAULT NULL,
   fk_statut			integer NOT NULL,		-- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
   fk_c_paiement 	integer DEFAULT NULL,
   paid 				smallint default 0 NOT NULL,
@@ -260,17 +258,16 @@ CREATE TABLE llx_expensereport_det
    fk_expensereport integer NOT NULL,
    fk_c_type_fees integer NOT NULL,
    fk_projet integer,
-   fk_c_tva integer,
    comments text NOT NULL,
    product_type integer DEFAULT -1,
    qty real NOT NULL,
    value_unit real NOT NULL,
    remise_percent real,
-   tva_tx						double(6,3),						    -- Vat rat
-   localtax1_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax1 rate
-   localtax1_type			 	varchar(10)	  	 NULL, 				 	-- localtax1 type
-   localtax2_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax2 rate
-   localtax2_type			 	varchar(10)	  	 NULL, 				 	-- localtax2 type
+   tva_tx						double(6,3),					-- Vat rat
+   localtax1_tx               	double(6,3)  DEFAULT 0,    		-- localtax1 rate
+   localtax1_type			 	varchar(10)	  	 NULL, 			-- localtax1 type
+   localtax2_tx               	double(6,3)  DEFAULT 0,    		-- localtax2 rate
+   localtax2_type			 	varchar(10)	  	 NULL, 			-- localtax2 type
    total_ht double(24,8) DEFAULT 0 NOT NULL,
    total_tva double(24,8) DEFAULT 0 NOT NULL,
    total_localtax1				double(24,8)  	DEFAULT 0,		-- Total LocalTax1 for total quantity of line
@@ -338,7 +335,8 @@ ALTER TABLE llx_commande_fournisseurdet ADD COLUMN fk_parent_line integer NULL a
 
 ALTER TABLE llx_projet ADD COLUMN date_close datetime DEFAULT NULL;
 ALTER TABLE llx_projet ADD COLUMN fk_user_close integer DEFAULT NULL;
-
+ALTER TABLE llx_projet ADD COLUMN fk_opp_status integer DEFAULT NULL after fk_statut;
+ALTER TABLE llx_projet ADD COLUMN opp_amount double(24,8) DEFAULT NULL;
 
 
 -- Module AskPriceSupplier --
@@ -706,4 +704,28 @@ ALTER TABLE llx_holiday_logs ADD COLUMN fk_type integer NOT NULL DEFAULT 1;
 UPDATE llx_holiday_users SET fk_type = 1 WHERE fk_type IS NULL;
 UPDATE llx_holiday_logs SET fk_type = 1 WHERE fk_type IS NULL;
 
+UPDATE llx_const SET name = __ENCRYPT('ACCOUNTING_VAT_SOLD_ACCOUNT')__ WHERE __DECRYPT('name')__ = 'ACCOUNTING_VAT_ACCOUNT';
+
+create table llx_c_lead_status
+(
+  rowid       integer AUTO_INCREMENT PRIMARY KEY,
+  code 		  varchar(10),
+  label       varchar(50),
+  position    integer,
+  percent     double(5,2),
+  active      tinyint DEFAULT 1 NOT NULL
+)ENGINE=innodb;
+
+-- Opportunities status
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (1,'PROSP'  ,'Prospection',  10, 0,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (2,'QUAL'   ,'Qualification',20, 20,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (3,'PROPO'  ,'Proposal',     30, 40,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (4,'NEGO'   ,'Negotiation',  40, 60,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (5,'PENDING','Pending',      50, 50,0);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (6,'WIN'    ,'Won',          60, 100,1);
+INSERT INTO llx_c_lead_status(rowid,code,label,position,percent,active) VALUES (7,'LOST'   ,'Lost',         70, 0,1);
+
+
+DELETE FROM llx_c_action_trigger where code = 'PROPAL_CLASSIFYBILLED';
+DELETE FROM llx_c_action_trigger where code = 'FICHINTER_CLASSIFYBILLED';
 
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 98fba06950d..22d441d70a5 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -227,3 +227,6 @@ update llx_facturedet set product_type = 1 where product_type = 2;
 delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or fk_commandefourndet IS NULL;
 
 
+delete from llx_menu where menu_handler = 'smartphone';
+
+
diff --git a/htdocs/install/mysql/tables/llx_c_lead_status.key.sql b/htdocs/install/mysql/tables/llx_c_lead_status.key.sql
new file mode 100644
index 00000000000..c6a273c0e1c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_lead_status.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2012 	   Florian Henry  <florian.henry@open-concept.pro>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_lead_status ADD UNIQUE INDEX uk_c_lead_status_code(code);
diff --git a/htdocs/install/mysql/tables/llx_c_lead_status.sql b/htdocs/install/mysql/tables/llx_c_lead_status.sql
new file mode 100644
index 00000000000..ef23ab48261
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_lead_status.sql
@@ -0,0 +1,26 @@
+-- Manage Lead
+-- Copyright (C) 2014  Florian HENRY <florian.henry@open-concept.pro>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+create table llx_c_lead_status
+(
+  rowid       integer AUTO_INCREMENT PRIMARY KEY,
+  code 		  varchar(10),
+  label       varchar(50),
+  position    integer,
+  percent     double(5,2),
+  active      tinyint DEFAULT 1 NOT NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
index 879623b6b7e..2e7e3911f99 100755
--- a/htdocs/install/mysql/tables/llx_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.sql
@@ -34,7 +34,6 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  date_paiement 	datetime,
   tms 		 		timestamp,
   fk_user_author 	integer NOT NULL,
   fk_user_modif 	integer DEFAULT NULL,
@@ -43,7 +42,6 @@ CREATE TABLE llx_expensereport (
   fk_user_approve   integer DEFAULT NULL,
   fk_user_refuse 	integer DEFAULT NULL,
   fk_user_cancel 	integer DEFAULT NULL,
-  fk_user_paid 		integer DEFAULT NULL,
   fk_statut			integer NOT NULL,		-- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
   fk_c_paiement 	integer DEFAULT NULL,
   paid              smallint default 0 NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
index ef9f03b9bbb..c5333c4fca5 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_det.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql
@@ -22,17 +22,16 @@ CREATE TABLE llx_expensereport_det
    fk_expensereport integer NOT NULL,
    fk_c_type_fees integer NOT NULL,
    fk_projet integer,
-   fk_c_tva integer NOT NULL,
    comments text NOT NULL,
    product_type integer DEFAULT -1,
    qty real NOT NULL,
    value_unit real NOT NULL,
    remise_percent real,
-   tva_tx						double(6,3),						    -- Vat rate
-   localtax1_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax1 rate
-   localtax1_type			 	varchar(10)	  	 NULL, 				 	-- localtax1 type
-   localtax2_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax2 rate
-   localtax2_type			 	varchar(10)	  	 NULL, 				 	-- localtax2 type
+   tva_tx						double(6,3),					-- Vat rate
+   localtax1_tx               	double(6,3)  DEFAULT 0,    		-- localtax1 rate
+   localtax1_type			 	varchar(10)	  	 NULL, 			-- localtax1 type
+   localtax2_tx               	double(6,3)  DEFAULT 0,    		-- localtax2 rate
+   localtax2_type			 	varchar(10)	  	 NULL, 			-- localtax2 type
    total_ht double(24,8) DEFAULT 0 NOT NULL,
    total_tva double(24,8) DEFAULT 0 NOT NULL,
    total_localtax1				double(24,8)  	DEFAULT 0,		-- Total LocalTax1 for total quantity of line
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index d9192c191ba..635a135b764 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -31,12 +31,14 @@ create table llx_projet
   description      text,
   fk_user_creat    integer NOT NULL,			-- createur du projet
   public           integer,						-- project is public or not
-  fk_statut        smallint DEFAULT 0 NOT NULL,
+  fk_statut        integer DEFAULT 0 NOT NULL,	-- open or close
+  fk_opp_status    integer DEFAULT NULL,	        -- if project is used to manage opportunities
   date_close       datetime DEFAULT NULL,    
   fk_user_close    integer DEFAULT NULL,
   note_private     text,
   note_public      text,
   --budget_days      real,                      -- budget in days is sum of field planned_workload of tasks
+  opp_amount       double(24,8),
   budget_amount    double(24,8),				
   model_pdf        varchar(255)
 )ENGINE=innodb;
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 786a8efb430..c8a77e9d8e7 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
  */
 
 /**
- *		\file       htdocs/install/repair.php
+ *      \file       htdocs/install/repair.php
  *      \brief      Run repair script
  */
 
@@ -29,7 +30,7 @@ require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
 require_once 'lib/repair.lib.php';
 
 $grant_query='';
-$etape = 2;
+$step = 2;
 $ok = 0;
 
 
@@ -54,8 +55,8 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
 if ($dolibarr_main_db_type == "mssql") $choix=3;
 
 
-dolibarr_install_syslog("repair: Entering upgrade.php page");
-if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- repair: entering upgrade.php page");
+if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initialized", LOG_ERR);
 
 
 /*
@@ -105,13 +106,13 @@ if ($db->connected)
 {
     print '<tr><td class="nowrap">';
     print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
-    dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+    dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerConnection") . ": " . $dolibarr_main_db_host . $langs->transnoentities("OK"));
     $ok = 1;
 }
 else
 {
     print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>";
-    dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+    dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
     $ok = 0;
 }
 
@@ -121,13 +122,13 @@ if ($ok)
     {
         print '<tr><td class="nowrap">';
         print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
-        dolibarr_install_syslog("repair: Database connection successfull : $dolibarr_main_db_name");
+        dolibarr_install_syslog("repair: database connection successful: " . $dolibarr_main_db_name);
         $ok=1;
     }
     else
     {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
-        dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+        dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok=0;
     }
 }
@@ -139,7 +140,7 @@ if ($ok)
     $versionarray=$db->getVersionArray();
     print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
     print '<td align="right">'.$version.'</td></tr>';
-    dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerVersion")." : $version");
+    dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerVersion") . ": " . $version);
     //print '<td align="right">'.join('.',$versionarray).'</td></tr>';
 }
 
@@ -514,6 +515,7 @@ print '<div class="center"><a href="../index.php?mainmenu=home'.(isset($_POST["l
 print $langs->trans("GoToDolibarr");
 print '</a></div>';
 
+dolibarr_install_syslog("--- repair: end");
 pFooter(1,$setuplang);
 
 if ($db->connected) $db->close();
diff --git a/htdocs/install/etape1.php b/htdocs/install/step1.php
similarity index 92%
rename from htdocs/install/etape1.php
rename to htdocs/install/step1.php
index 5817af81e9b..d1eca1211ba 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/step1.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
  */
 
 /**
- *		\file       htdocs/install/etape1.php
+ *		\file       htdocs/install/step1.php
  *		\ingroup	install
  *		\brief      Build conf file on disk
  */
@@ -64,7 +65,7 @@ $forcedfile="./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
 if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
 
-dolibarr_install_syslog("--- etape1: Entering etape1.php page");
+dolibarr_install_syslog("--- step1: entering step1.php page");
 
 $error = 0;
 
@@ -74,7 +75,7 @@ $error = 0;
  */
 
 
-pHeader($langs->trans("ConfigurationFile"),"etape2");
+pHeader($langs->trans("ConfigurationFile"),"step2");
 
 // Test if we can run a first install process
 if (! is_writable($conffile))
@@ -185,7 +186,7 @@ if (! $error)
 
             $db=getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
 
-            dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
+            dol_syslog("databasefortest=" . $databasefortest . " connected=" . $db->connected . " database_selected=" . $db->database_selected, LOG_DEBUG);
             //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
 
             if (empty($_POST["db_create_database"]) && $db->connected && ! $db->database_selected)
@@ -276,7 +277,7 @@ if (! $error && $db->connected)
     print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
     $db_character_set=$defaultCharacterSet;
     $db_collation=$defaultDBSortingCollation;
-    dolibarr_install_syslog("db_character_set=".$db_character_set." db_collation=".$db_collation);
+    dolibarr_install_syslog("step1: db_character_set=" . $db_character_set . " db_collation=" . $db_collation);
 }
 
 
@@ -286,8 +287,9 @@ if (! $error && $db->connected && $action == "set")
     umask(0);
     foreach($_POST as $key => $value)
     {
-        if (! preg_match('/^db_pass/i', $key))
-        	dolibarr_install_syslog("Choice for ".$key." = ".$value);
+        if (! preg_match('/^db_pass/i', $key)) {
+			dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);
+		}
     }
 
     // Show title of step
@@ -299,7 +301,7 @@ if (! $error && $db->connected && $action == "set")
     {
         if (! is_dir($main_dir))
         {
-            dolibarr_install_syslog("etape1: Repertoire '".$main_dir."' inexistant ou non accessible");
+            dolibarr_install_syslog("step1: directory '" . $main_dir . "' is unavailable or can't be accessed");
 
             print "<tr><td>";
             print $langs->trans("ErrorDirDoesNotExists",$main_dir).'<br>';
@@ -314,7 +316,7 @@ if (! $error && $db->connected && $action == "set")
 
     if (! $error)
     {
-        dolibarr_install_syslog("etape1: Directory '".$main_dir."' exists");
+        dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists");
     }
 
 
@@ -343,7 +345,7 @@ if (! $error && $db->connected && $action == "set")
             $pathhtaccess=$main_data_dir.'/.htaccess';
             if (! file_exists($pathhtaccess))
             {
-                dolibarr_install_syslog("etape1: .htaccess file does not exists, we create it in '".$main_data_dir."'");
+                dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $main_data_dir . "'");
                 $handlehtaccess=@fopen($pathhtaccess,'w');
                 if ($handlehtaccess)
                 {
@@ -351,7 +353,7 @@ if (! $error && $db->connected && $action == "set")
                     fwrite($handlehtaccess,'Deny from all'."\n");
 
                     fclose($handlehtaccess);
-                    dolibarr_install_syslog("etape1: .htaccess file created");
+                    dolibarr_install_syslog("step1: .htaccess file created");
                 }
             }
 
@@ -372,7 +374,7 @@ if (! $error && $db->connected && $action == "set")
             {
                 if (is_dir($dir[$i]))
                 {
-                    dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' exists");
+                    dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");
                 }
                 else
                 {
@@ -387,7 +389,7 @@ if (! $error && $db->connected && $action == "set")
                     }
                     else
                     {
-                        dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' created");
+                        dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");
                     }
                 }
             }
@@ -475,7 +477,7 @@ if (! $error && $db->connected && $action == "set")
         // Si creation utilisateur admin demandee, on le cree
         if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on")
         {
-            dolibarr_install_syslog("etape1: Create database user: ".$dolibarr_main_db_user);
+            dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user);
 
             //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
             $databasefortest=$conf->db->name;
@@ -523,7 +525,7 @@ if (! $error && $db->connected && $action == "set")
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
                         {
-                            dolibarr_install_syslog("etape1: User already exists");
+                            dolibarr_install_syslog("step1: user already exists");
                             print '<tr><td>';
                             print $langs->trans("UserCreation").' : ';
                             print $dolibarr_main_db_user;
@@ -532,7 +534,7 @@ if (! $error && $db->connected && $action == "set")
                         }
                         else
                         {
-                            dolibarr_install_syslog("etape1: Failed to create user");
+                            dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
                             print '<tr><td>';
                             print $langs->trans("UserCreation").' : ';
                             print $dolibarr_main_db_user;
@@ -569,7 +571,7 @@ if (! $error && $db->connected && $action == "set")
         // If database creation is asked, we create it
         if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on"))
         {
-        	dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user, LOG_DEBUG);
+            dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);
         	$newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
             //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
 
@@ -587,11 +589,11 @@ if (! $error && $db->connected && $action == "set")
 
                     $check1=$newdb->getDefaultCharacterSetDatabase();
                     $check2=$newdb->getDefaultCollationDatabase();
-                    dolibarr_install_syslog('etape1: Note that default server was charset='.$check1.' collation='.$check2, LOG_DEBUG);
+                    dolibarr_install_syslog('step1: note that default server was charset=' . $check1 . ' collation=' . $check2);
 
                     // If values differs, we save conf file again
-                    //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('etape1: Value for character_set is not the one asked for database creation', LOG_WARNING);
-                    //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('etape1: Value for collation is not the one asked for database creation', LOG_WARNING);
+                    //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
+                    //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
                 }
                 else
                 {
@@ -603,7 +605,7 @@ if (! $error && $db->connected && $action == "set")
                     print '<br>';
                     print '</td></tr>';
 
-                    dolibarr_install_syslog('etape1: Failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
+                    dolibarr_install_syslog('step1: failed to create database ' . $dolibarr_main_db_name . ' ' . $newdb->lasterrno() . ' ' . $newdb->lasterror(), LOG_ERR);
                     $error++;
                 }
                 $newdb->close();
@@ -632,14 +634,14 @@ if (! $error && $db->connected && $action == "set")
         // We test access with dolibarr database user (not admin)
         if (! $error)
         {
-            dolibarr_install_syslog("etape1: connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name, LOG_DEBUG);
+            dolibarr_install_syslog("step1: connection type=" . $conf->db->type . " on host=" . $conf->db->host . " port=" . $conf->db->port . " user=" . $conf->db->user . " name=" . $conf->db->name);
             //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
 
             $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
             if ($db->connected)
             {
-                dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
+                dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " ok");
                 print "<tr><td>";
                 print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
                 print $dolibarr_main_db_host;
@@ -650,7 +652,7 @@ if (! $error && $db->connected && $action == "set")
                 // si acces serveur ok et acces base ok, tout est ok, on ne va pas plus loin, on a meme pas utilise le compte root.
                 if ($db->database_selected)
                 {
-                    dolibarr_install_syslog("etape1: connexion to database : ".$conf->db->name.", by user : ".$conf->db->user." is ok", LOG_DEBUG);
+                    dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " ok");
                     print "<tr><td>";
                     print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
                     print $dolibarr_main_db_name;
@@ -662,7 +664,7 @@ if (! $error && $db->connected && $action == "set")
                 }
                 else
                 {
-                    dolibarr_install_syslog("etape1: connexion to database ".$conf->db->name.", by user : ".$conf->db->user." has failed", LOG_ERR);
+                    dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " failed", LOG_ERR);
                     print "<tr><td>";
                     print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
                     print $dolibarr_main_db_name;
@@ -682,7 +684,7 @@ if (! $error && $db->connected && $action == "set")
             }
             else
             {
-                dolibarr_install_syslog("etape1: la connexion au serveur par le user ".$conf->db->user." est rate");
+                dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " failed", LOG_ERR);
                 print "<tr><td>";
                 print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
                 print $dolibarr_main_db_host;
@@ -723,7 +725,7 @@ function jsinfo()
 
 <?php
 
-dolibarr_install_syslog("--- install/etape1.php end", LOG_INFO);
+dolibarr_install_syslog("--- step1: end");
 
 pFooter($error,$setuplang,'jsinfo',1);
 
@@ -744,7 +746,6 @@ function write_main_file($mainfile,$main_dir)
         fputs($fp, '<?php'."\n");
         fputs($fp, "// Wrapper to include main into htdocs\n");
         fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
-        fputs($fp, '?>');
         fclose($fp);
     }
 }
@@ -766,7 +767,6 @@ function write_master_file($masterfile,$main_dir)
         fputs($fp, '<?php'."\n");
         fputs($fp, "// Wrapper to include master into htdocs\n");
         fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
-        fputs($fp, '?>');
         fclose($fp);
     }
 }
@@ -928,7 +928,6 @@ function write_conf_file($conffile)
         fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
         fputs($fp,"\n");
 
-		fputs($fp, '?>');
 		fclose($fp);
 
 		if (file_exists("$conffile"))
diff --git a/htdocs/install/etape2.php b/htdocs/install/step2.php
similarity index 91%
rename from htdocs/install/etape2.php
rename to htdocs/install/step2.php
index 8de44812222..8f27aa53767 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/step2.php
@@ -1,7 +1,8 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2015       Cedric GROSS            <c.gross@kreiz-it.fr>
+ * Copyright (C) 2015      Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +19,8 @@
  */
 
 /**
- *      \file       htdocs/install/etape2.php
- *		\ingroup	install
+ *      \file       htdocs/install/step2.php
+ *      \ingroup    install
  *      \brief      Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
  */
 
@@ -27,7 +28,7 @@ include 'inc.php';
 require_once $dolibarr_main_document_root.'/core/class/conf.class.php';
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
-$etape = 2;
+$step = 2;
 $ok = 0;
 
 
@@ -54,7 +55,7 @@ if ($dolibarr_main_db_type == "mssql")  $choix=3;
 if ($dolibarr_main_db_type == "sqlite")  $choix=4;
 if ($dolibarr_main_db_type == "sqlite3")  $choix=5;
 
-//if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into etape2.php page');
+//if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into step2.php page');
 
 // Now we load forced value from install.forced.php file.
 $useforcedwizard=false;
@@ -62,14 +63,14 @@ $forcedfile="./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
 if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
 
-dolibarr_install_syslog("--- etape2: Entering etape2.php page");
+dolibarr_install_syslog("--- step2: entering step2.php page");
 
 
 /*
  *	View
  */
 
-pHeader($langs->trans("CreateDatabaseObjects"),"etape4");
+pHeader($langs->trans("CreateDatabaseObjects"),"step4");
 
 // Test if we can run a first install process
 if (! is_writable($conffile))
@@ -103,11 +104,11 @@ if ($action == "set")
     {
         if($db->database_selected)
         {
-            dolibarr_install_syslog("etape2: Connexion successful to database : ".$conf->db->name);
+            dolibarr_install_syslog("step2: successful connection to database: " . $conf->db->name);
         }
         else
         {
-            dolibarr_install_syslog("etape2: Connexion failed to database : ".$conf->db->name);
+            dolibarr_install_syslog("step2: failed connection to database :" . $conf->db->name, LOG_ERR);
             print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             $ok = 0 ;
         }
@@ -131,7 +132,7 @@ if ($action == "set")
     $requestnb=0;
 
     // To disable some code, so you can call step2 with url like
-    // http://localhost/dolibarrnew/install/etape2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
+    // http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
     $createtables=isset($_GET['createtables'])?GETPOST('createtables'):1;
     $createkeys=isset($_GET['createkeys'])?GETPOST('createkeys'):1;
     $createfunctions=isset($_GET['createfunctions'])?GETPOST('createfunction'):1;
@@ -155,7 +156,7 @@ if ($action == "set")
 
         $ok = 0;
         $handle=opendir($dir);
-        dolibarr_install_syslog("Open tables directory ".$dir." handle=".$handle,LOG_DEBUG);
+        dolibarr_install_syslog("step2: open tables directory " . $dir . " handle=" . $handle);
         $tablefound = 0;
         $tabledata=array();
         if (is_resource($handle))
@@ -211,7 +212,7 @@ if ($action == "set")
                 //print "<tr><td>Creation de la table $name/td>";
                 $requestnb++;
 
-                dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+                dolibarr_install_syslog("step2: request: " . $buffer);
                 $resql=$db->query($buffer,0,'dml');
                 if ($resql)
                 {
@@ -241,7 +242,7 @@ if ($action == "set")
                 print "</td>";
                 print '<td><font class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</td></tr>';
                 $error++;
-                dolibarr_install_syslog("Failed to open file ".$dir.$file,LOG_ERR);
+                dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
             }
         }
 
@@ -257,7 +258,7 @@ if ($action == "set")
         else
         {
             print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles",$dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-            dolibarr_install_syslog("Failed to find files to create database in directory ".$dir,LOG_ERR);
+            dolibarr_install_syslog("step2: failed to find files to create database in directory " . $dir, LOG_ERR);
         }
     }
 
@@ -275,7 +276,7 @@ if ($action == "set")
 
         $okkeys = 0;
         $handle=opendir($dir);
-        dolibarr_install_syslog("Open keys directory ".$dir." handle=".$handle,LOG_DEBUG);
+        dolibarr_install_syslog("step2: open keys directory " . $dir . " handle=" . $handle);
         $tablefound = 0;
         $tabledata=array();
         if (is_resource($handle))
@@ -354,7 +355,7 @@ if ($action == "set")
                         //print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
                         $requestnb++;
 
-                        dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+                        dolibarr_install_syslog("step2: request: " . $buffer);
                         $resql=$db->query($buffer,0,'dml');
                         if ($resql)
                         {
@@ -390,7 +391,7 @@ if ($action == "set")
                 print "</td>";
                 print '<td><font class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</font></td></tr>";
                 $error++;
-                dolibarr_install_syslog("Failed to open file ".$dir.$file,LOG_ERR);
+                dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
             }
         }
 
@@ -421,7 +422,7 @@ if ($action == "set")
         if (file_exists($dir.$file))
         {
             $fp = fopen($dir.$file,"r");
-            dolibarr_install_syslog("Open function file ".$dir.$file." handle=".$fp,LOG_DEBUG);
+            dolibarr_install_syslog("step2: open function file " . $dir . $file . " handle=" . $fp);
             if ($fp)
             {
                 $buffer='';
@@ -444,7 +445,7 @@ if ($action == "set")
                 $buffer=trim($buffer);
                 if ($buffer)
                 {
-                    dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+                    dolibarr_install_syslog("step2: request: " . $buffer);
                     print "<!-- Insert line : ".$buffer."<br>-->\n";
                     $resql=$db->query($buffer,0,'dml');
                     if ($resql)
@@ -500,7 +501,7 @@ if ($action == "set")
 
         // Insert data
         $handle=opendir($dir);
-        dolibarr_install_syslog("Open directory data ".$dir." handle=".$handle,LOG_DEBUG);
+        dolibarr_install_syslog("step2: open directory data " . $dir . " handle=" . $handle);
         $tablefound = 0;
         $tabledata=array();
         if (is_resource($handle))
@@ -526,7 +527,7 @@ if ($action == "set")
         {
             $name = substr($file, 0, dol_strlen($file) - 4);
             $fp = fopen($dir.$file,"r");
-            dolibarr_install_syslog("Open data file ".$dir.$file." handle=".$fp,LOG_DEBUG);
+            dolibarr_install_syslog("step2: open data file " . $dir . $file . " handle=" . $fp);
             if ($fp)
             {
                 $arrayofrequests=array();
@@ -555,7 +556,7 @@ if ($action == "set")
                 }
                 fclose($fp);
 
-                dolibarr_install_syslog("Found ".$linefound." records, defined ".count($arrayofrequests)." group(s).",LOG_DEBUG);
+                dolibarr_install_syslog("step2: found " . $linefound . " records, defined " . count($arrayofrequests) . " group(s).");
 
                 $okallfile=1;
                 $db->begin();
@@ -569,7 +570,7 @@ if ($action == "set")
                 		$buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
                 	}
 
-                    //dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+                    //dolibarr_install_syslog("step2: request: " . $buffer);
                     $resql=$db->query($buffer,1);
                     if ($resql)
                     {
@@ -613,7 +614,7 @@ else
     print 'Parameter action=set not defined';
 }
 
-dolibarr_install_syslog("--- install/etape2.php end", LOG_INFO);
+dolibarr_install_syslog("--- step2: end");
 
 pFooter(!$ok,$setuplang);
 
diff --git a/htdocs/install/etape4.php b/htdocs/install/step4.php
similarity index 92%
rename from htdocs/install/etape4.php
rename to htdocs/install/step4.php
index fc4f47f4611..5952080f475 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/step4.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien DiCintio   <sdicintio@ressource-toi.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/install/etape4.php
+ *	\file       htdocs/install/step4.php
  *	\ingroup	install
  *	\brief      Ask login and password of Dolibarr admin user
  */
@@ -42,7 +43,7 @@ $forcedfile="./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
 if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
 
-dolibarr_install_syslog("--- etape4: Entering etape4.php page");
+dolibarr_install_syslog("--- step4: entering step4.php page");
 
 $err=0;
 $ok = 0;
@@ -53,7 +54,7 @@ $ok = 0;
  *	View
  */
 
-pHeader($langs->trans("AdminAccountCreation"),"etape5");
+pHeader($langs->trans("AdminAccountCreation"),"step5");
 
 // Test if we can run a first install process
 if (! is_writable($conffile))
@@ -106,7 +107,7 @@ if ($db->ok)
 
 }
 
-dolibarr_install_syslog("--- install/etape4.php end", LOG_INFO);
+dolibarr_install_syslog("--- step4: end");
 
 pFooter($err,$setuplang);
 
diff --git a/htdocs/install/etape5.php b/htdocs/install/step5.php
similarity index 86%
rename from htdocs/install/etape5.php
rename to htdocs/install/step5.php
index da871508176..2651c45c05c 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/step5.php
@@ -1,9 +1,10 @@
 <?php
-/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
- * Copyright (C) 2004		Sebastien DiCintio		<sdicintio@ressource-toi.org>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2004       Sebastien DiCintio      <sdicintio@ressource-toi.org>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,8 +21,8 @@
  */
 
 /**
- *       \file      htdocs/install/etape5.php
- *	 	 \ingroup	install
+ *       \file      htdocs/install/step5.php
+ *       \ingroup   install
  *       \brief     Last page of upgrade or install process
  */
 
@@ -68,7 +69,7 @@ $forcedfile="./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
 if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
 
-dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO);
+dolibarr_install_syslog("--- step5: entering step5.php page");
 
 
 /*
@@ -80,19 +81,19 @@ if ($action == "set")
 {
     if ($_POST["pass"] <> $_POST["pass_verif"])
     {
-        header("Location: etape4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+        header("Location: step4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
         exit;
     }
 
     if (dol_strlen(trim($_POST["pass"])) == 0)
     {
-        header("Location: etape4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+        header("Location: step4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
         exit;
     }
 
     if (dol_strlen(trim($_POST["login"])) == 0)
     {
-        header("Location: etape4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+        header("Location: step4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
         exit;
     }
 }
@@ -102,7 +103,7 @@ if ($action == "set")
  *	View
  */
 
-pHeader($langs->trans("SetupEnd"),"etape5");
+pHeader($langs->trans("SetupEnd"),"step5");
 print '<br>';
 
 // Test if we can run a first install process
@@ -153,7 +154,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
         // Active module user
         $modName='modUser';
         $file = $modName . ".class.php";
-        dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/core/modules/".$file, LOG_INFO);
+        dolibarr_install_syslog('step5: load module user ' . DOL_DOCUMENT_ROOT . "/core/modules/" . $file, LOG_INFO);
         include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file;
         $objMod = new $modName($db);
         $result=$objMod->init();
@@ -188,13 +189,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
             {
                 if ($newuser->error == 'ErrorLoginAlreadyExists')
                 {
-                    dolibarr_install_syslog('install/etape5.php AdminLoginAlreadyExists', LOG_WARNING);
+                    dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
                     print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."</div><br>";
                     $success = 1;
                 }
                 else
                 {
-                    dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
+                    dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR);
                     print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
                 }
             }
@@ -203,7 +204,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
             {
                 $db->begin();
 
-                dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);
+                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
                 $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
                 if (! $resql) dol_print_error($db,'Error in setup program');
                 $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)");
@@ -212,7 +213,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 
                 if ($useforcedwizard)
                 {
-                    dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
+                    dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
                     $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
                     if (! $resql) dol_print_error($db,'Error in setup program');
                     $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING',1).",".$db->encrypt(1,1).",'chaine',1,'Disable install warnings',0)");
@@ -232,7 +233,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
                         print $langs->trans("ActivateModule",$modtoactivatenew).'<br>';
 
                         $file=$modtoactivatenew.'.class.php';
-                        dolibarr_install_syslog('install/etape5.php Activate module file='.$file);
+                        dolibarr_install_syslog('step5: activate module file=' . $file);
                         $res=dol_include_once("/core/modules/".$file);
 
                         $res=activateModule($modtoactivatenew,1);
@@ -240,7 +241,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
                     }
                 }
 
-                dolibarr_install_syslog('install/etape5.php Remove MAIN_NOT_INSTALLED const', LOG_DEBUG);
+                dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');
                 $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
                 if (! $resql) dol_print_error($db,'Error in setup program');
 
@@ -271,7 +272,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 
             if ($tagdatabase)
             {
-                dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion, LOG_DEBUG);
+                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion);
                 $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
                 if (! $resql) dol_print_error($db,'Error in setup program');
                 $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version for last upgrade',0)");
@@ -280,7 +281,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
             }
             else
             {
-                dolibarr_install_syslog('install/etape5.php We run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.', LOG_DEBUG);
+                dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
             }
         }
         else
@@ -290,7 +291,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
     }
     else
     {
-        dol_print_error('','install/etape5.php Unknown choice of action');
+        dol_print_error('','step5.php: unknown choice of action');
     }
 
     // May fail if parameter already defined
@@ -404,7 +405,7 @@ elseif (empty($action) || preg_match('/upgrade/i',$action))
 }
 else
 {
-    dol_print_error('','install/etape5.php Unknown choice of action');
+    dol_print_error('','step5.php: unknown choice of action');
 }
 
 
@@ -413,6 +414,6 @@ else
 clearstatcache();
 
 
-dolibarr_install_syslog("--- install/etape5.php Dolibarr setup finished", LOG_INFO);
+dolibarr_install_syslog("--- step5: Dolibarr setup finished");
 
 pFooter(1,$setuplang);
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 9c2832f3623..7c9cc7fd325 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +42,7 @@ require_once $conffile; if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_t
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
 $grant_query='';
-$etape = 2;
+$step = 2;
 $ok = 0;
 
 
@@ -70,8 +71,8 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
 if ($dolibarr_main_db_type == "mssql") $choix=3;
 
 
-dolibarr_install_syslog("upgrade: Entering upgrade.php page");
-if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- upgrade: Entering upgrade.php page");
+if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
 
 
 /*
@@ -145,13 +146,13 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
     {
         print '<tr><td class="nowrap">';
         print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+        dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerConnection") . ": $dolibarr_main_db_host " . $langs->transnoentities("OK"));
         $ok = 1;
     }
     else
     {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+        dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
     }
 
@@ -161,13 +162,13 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         {
             print '<tr><td class="nowrap">';
             print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
-            dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name");
+            dolibarr_install_syslog("upgrade: Database connection successful: " . $dolibarr_main_db_name);
             $ok=1;
         }
         else
         {
             print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
-            dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+            dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
             $ok=0;
         }
     }
@@ -179,7 +180,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         $versionarray=$db->getVersionArray();
         print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
         print '<td align="right">'.$version.'</td></tr>';
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion")." : $version");
+        dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
 
         // Test database version requirement
         $versionmindb=$db::VERSIONMIN;
@@ -189,7 +190,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         {
         	// Warning: database version too low.
         	print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb))."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
-        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb)));
+        	dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
         	$ok=0;
         }
 
@@ -216,7 +217,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 		        {
 		        	// Warning: database version too low.
 		        	print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)."</div></td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
-		        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion));
+		        	dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
 		        	$ok=0;
 		        	break;
 		        }
@@ -246,7 +247,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 			    $filles=array();
 			    $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
 			    $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
-			    dolibarr_install_syslog("upgrade: search duplicate", LOG_DEBUG);
+			    dolibarr_install_syslog("upgrade: search duplicate");
 			    $resql = $db->query($sql);
 			    if ($resql)
 			    {
@@ -263,7 +264,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 			            }
 			        }
 
-			        dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
+			        dolibarr_install_syslog("upgrade: result is num=" . $num . " count(couples)=" . count($couples));
 
 			        // If there is duplicates couples or child with two parents
 			        if (count($couples) > 0 && $num > count($couples))
@@ -274,7 +275,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 
 			            // We delete all
 			            $sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
-			            dolibarr_install_syslog("upgrade: delete association", LOG_DEBUG);
+			            dolibarr_install_syslog("upgrade: delete association");
 			            $resqld=$db->query($sql);
 			            if ($resqld)
 			            {
@@ -283,7 +284,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 			                {
 			                    $sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
 			                    $sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
-			                    dolibarr_install_syslog("upgrade: insert association", LOG_DEBUG);
+			                    dolibarr_install_syslog("upgrade: insert association");
 			                    $resqli=$db->query($sql);
 			                    if (! $resqli) $error++;
 			                }
@@ -481,6 +482,7 @@ $ret=0;
 if (! $ok && isset($argv[1])) $ret=1;
 dol_syslog("Exit ".$ret);
 
+dolibarr_install_syslog("--- upgrade: end");
 pFooter(((! $ok && empty($_GET["ignoreerrors"])) || $dirmodule),$setuplang);
 
 if ($db->connected) $db->close();
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 6f14791f6b4..214a6c54fbf 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2010      Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2015      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +48,7 @@ require_once $dolibarr_main_document_root . '/core/class/menubase.class.php';
 require_once $dolibarr_main_document_root . '/core/lib/files.lib.php';
 
 $grant_query='';
-$etape = 2;
+$step = 2;
 $error = 0;
 
 
@@ -74,8 +75,8 @@ if ($dolibarr_main_db_type == 'pgsql')  $choix=2;
 if ($dolibarr_main_db_type == 'mssql')  $choix=3;
 
 
-dolibarr_install_syslog("upgrade2: Entering upgrade2.php page");
-if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- upgrade2: entering upgrade2.php page");
+if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
 
 
 
@@ -98,7 +99,7 @@ if (! $versionfrom && ! $versionto)
 	exit;
 }
 
-pHeader('','etape5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('','step5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 
 if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
@@ -137,7 +138,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
     if (!$db->connected)
     {
         print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).'</td><td align="right">'.$langs->trans('Error').'</td></tr>';
-        dolibarr_install_syslog('upgrade2: Failed to connect to database : '.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
+        dolibarr_install_syslog('upgrade2: failed to connect to database :' . $conf->db->name . ' on ' . $conf->db->host . ' for user ' . $conf->db->user, LOG_ERR);
         $error++;
     }
 
@@ -145,7 +146,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
     {
         if($db->database_selected)
         {
-            dolibarr_install_syslog('upgrade2: Database connection successfull : '.$dolibarr_main_db_name);
+            dolibarr_install_syslog('upgrade2: database connection successful :' . $dolibarr_main_db_name);
         }
         else
         {
@@ -364,7 +365,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         {
        	    migrate_event_assignement($db,$langs,$conf);
         }
-        
+
         // Scripts for lat version
         $afterversionarray=explode('.','3.7.9');
         $beforeversionarray=explode('.','3.8.9');
@@ -381,6 +382,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 				    	'MAIN_MODULE_ECM',
 				    	'MAIN_MODULE_FACTURE',
 				    	'MAIN_MODULE_FOURNISSEUR',
+						'MAIN_MODULE_HOLIDAY',
 						'MAIN_MODULE_OPENSURVEY',
 						'MAIN_MODULE_PAYBOX',
 						'MAIN_MODULE_PRODUIT',
@@ -420,6 +422,7 @@ $ret=0;
 if ($error && isset($argv[1])) $ret=1;
 dol_syslog("Exit ".$ret);
 
+dolibarr_install_syslog("--- upgrade2: end");
 pFooter($error,$setuplang);
 
 if ($db->connected) $db->close();
@@ -454,7 +457,7 @@ function migrate_paiements($db,$langs,$conf)
 
         $resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements", LOG_DEBUG);
+        dolibarr_install_syslog("upgrade2::migrate_paiements");
         if ($resql)
         {
             $i = 0;
@@ -554,7 +557,7 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
 
         $resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1", LOG_DEBUG);
+        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1");
         $row = array();
         if ($resql)
         {
@@ -680,7 +683,7 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
 
         $resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2", LOG_DEBUG);
+        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2");
         $row = array();
         if ($resql)
         {
@@ -820,7 +823,7 @@ function migrate_contracts_det($db,$langs,$conf)
     $sql.= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
     $resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_det", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_det");
     if ($resql)
     {
         $i = 0;
@@ -916,7 +919,7 @@ function migrate_links_transfert($db,$langs,$conf)
     $sql.= " AND bu.fk_bank IS NULL";
     $resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_links_transfert", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_links_transfert");
     if ($resql)
     {
         $i = 0;
@@ -940,7 +943,7 @@ function migrate_links_transfert($db,$langs,$conf)
                 $sql.= ")";
 
                 print $sql.'<br>';
-                dolibarr_install_syslog("migrate_links_transfert", LOG_DEBUG);
+                dolibarr_install_syslog("migrate_links_transfert");
 
                 if (! $db->query($sql))
                 {
@@ -991,7 +994,7 @@ function migrate_contracts_date1($db,$langs,$conf)
     print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
 
     $sql="update llx_contrat set date_contrat=tms where date_contrat is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
@@ -1000,7 +1003,7 @@ function migrate_contracts_date1($db,$langs,$conf)
     print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
 
     $sql="update llx_contrat set datec=tms where datec is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
@@ -1030,7 +1033,7 @@ function migrate_contracts_date2($db,$langs,$conf)
     $sql.= " GROUP BY c.rowid, c.date_contrat";
     $resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date2", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date2");
     if ($resql)
     {
         $i = 0;
@@ -1091,7 +1094,7 @@ function migrate_contracts_date3($db,$langs,$conf)
     print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
 
     $sql="update llx_contrat set datec=date_contrat where datec is null or datec > date_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date3", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
@@ -1119,7 +1122,7 @@ function migrate_contracts_open($db,$langs,$conf)
 
     $sql = "SELECT c.rowid as cref FROM llx_contrat as c, llx_contratdet as cd";
     $sql.= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_open", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_open");
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0) {
@@ -1189,7 +1192,7 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf)
         $select_sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
         $select_sql.= ' WHERE fk_facture_fourn IS NOT NULL';
 
-        dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn", LOG_DEBUG);
+        dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn");
         $select_resql = $db->query($select_sql);
         if ($select_resql)
         {
@@ -1305,7 +1308,7 @@ function migrate_price_facture($db,$langs,$conf)
     $sql.= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
     //print $sql;
 
-    dolibarr_install_syslog("upgrade2::migrate_price_facture", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_price_facture");
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1339,7 +1342,7 @@ function migrate_price_facture($db,$langs,$conf)
                 $facligne->total_tva = $total_tva;
                 $facligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line $rowid: facid=$obj->facid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+                dolibarr_install_syslog("upgrade2: line " . $rowid . ": facid=" . $obj->facid . " pu=" . $pu ." qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
                 print ". ";
                 $facligne->update_total();
 
@@ -1418,7 +1421,7 @@ function migrate_price_propal($db,$langs,$conf)
     $sql.= " WHERE pd.fk_propal = p.rowid";
     $sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_propal", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_price_propal");
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1451,7 +1454,7 @@ function migrate_price_propal($db,$langs,$conf)
                 $propalligne->total_tva = $total_tva;
                 $propalligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line $rowid: propalid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+                dolibarr_install_syslog("upgrade2: Line " . $rowid . ": propalid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva. ", " . $total_ttc);
                 print ". ";
                 $propalligne->update_total();
 
@@ -1527,7 +1530,7 @@ function migrate_price_contrat($db,$langs,$conf)
     $sql.= " WHERE cd.fk_contrat = c.rowid";
     $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_contrat", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_price_contrat");
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1560,7 +1563,7 @@ function migrate_price_contrat($db,$langs,$conf)
                 $contratligne->total_tva = $total_tva;
                 $contratligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line $rowid: contratdetid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent -> $total_ht, $total_tva, $total_ttc");
+                dolibarr_install_syslog("upgrade2: Line " . $rowid . ": contratdetid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent. "  -> " . $total_ht . ", " . $total_tva. " , " . $total_ttc);
                 print ". ";
                 $contratligne->update_total();
 
@@ -1612,7 +1615,7 @@ function migrate_price_commande($db,$langs,$conf)
     $sql.= " WHERE cd.fk_commande = c.rowid";
     $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_price_commande");
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1645,7 +1648,7 @@ function migrate_price_commande($db,$langs,$conf)
                 $commandeligne->total_tva = $total_tva;
                 $commandeligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+                dolibarr_install_syslog("upgrade2: Line " . $rowid . " : commandeid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global. "  -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
                 print ". ";
                 $commandeligne->update_total();
 
@@ -1726,7 +1729,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
     $sql.= " WHERE cd.fk_commande = c.rowid";
     $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur");
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1759,7 +1762,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
                 $commandeligne->total_tva = $total_tva;
                 $commandeligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+                dolibarr_install_syslog("upgrade2: Line " . $rowid . ": commandeid=" . $obj->rowid . " pu=" . $pu . "  qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
                 print ". ";
                 $commandeligne->update_total();
 
@@ -2447,7 +2450,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
     $sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
     $sql.= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 1", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1");
     $resql = $db->query($sql);
     if ($resql)
     {
@@ -2513,7 +2516,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
     $sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
     $sql.= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 2", LOG_DEBUG);
+    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2");
     $resql = $db->query($sql);
     if ($resql)
     {
@@ -2778,7 +2781,7 @@ function migrate_relationship_tables($db,$langs,$conf,$table,$fk_source,$sourcet
 
     if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table))
     {
-        dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table);
+        dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = " . MAIN_DB_PREFIX . $table);
 
         $db->begin();
 
@@ -3303,7 +3306,7 @@ function migrate_actioncomm_element($db,$langs,$conf)
 		$obj = $db->fetch_object($result);
 		if ($obj)
 		{
-			dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=".$field);
+			dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=" . $field);
 
 			$db->begin();
 
@@ -3366,7 +3369,7 @@ function migrate_mode_reglement($db,$langs,$conf)
 	{
 		$error=0;
 
-		dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=".$elements['code'][$key]);
+		dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=" . $elements['code'][$key]);
 
 		$sqlSelect = "SELECT id";
 		$sqlSelect.= " FROM ".MAIN_DB_PREFIX."c_paiement";
@@ -3623,7 +3626,7 @@ function migrate_directories($db,$langs,$conf,$oldname,$newname)
 
     if (is_dir(DOL_DATA_ROOT.$oldname) && ! file_exists(DOL_DATA_ROOT.$newname))
     {
-        dolibarr_install_syslog("upgrade2::migrate_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname);
+        dolibarr_install_syslog("upgrade2::migrate_directories move " . DOL_DATA_ROOT . $oldname . ' into ' . DOL_DATA_ROOT . $newname);
         @rename(DOL_DATA_ROOT.$oldname,DOL_DATA_ROOT.$newname);
     }
 }
@@ -3773,7 +3776,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 
 	    if ($moduletoreload == 'MAIN_MODULE_AGENDA')
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Agenda module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
 	        if ($res) {
 	            $mod=new modAgenda($db);
@@ -3783,7 +3786,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
         if ($moduletoreload == 'MAIN_MODULE_BARCODE')
     	{
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Barcode");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
 	        if ($res) {
 	            $mod=new modBarcode($db);
@@ -3793,7 +3796,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_CRON')
     	{
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Cron");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
 	        if ($res) {
 	            $mod=new modCron($db);
@@ -3803,7 +3806,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_SOCIETE')
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
 	        if ($res) {
 	            $mod=new modSociete($db);
@@ -3813,7 +3816,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
 	        if ($res) {
 	            $mod=new modProduct($db);
@@ -3823,8 +3826,8 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
-	        
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
+
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
 	        if ($res) {
 	            $mod=new modService($db);
@@ -3834,8 +3837,8 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
-	        
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
+
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
 	        if ($res) {
 	            $mod=new modCommande($db);
@@ -3845,7 +3848,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
 	        if ($res) {
 	            $mod=new modFacture($db);
@@ -3855,7 +3858,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
 	        if ($res) {
 	            $mod=new modFournisseur($db);
@@ -3865,7 +3868,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
 	        if ($res) {
 	            $mod=new modDeplacement($db);
@@ -3875,7 +3878,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
 	        if ($res) {
 	            $mod=new modDon($db);
@@ -3885,7 +3888,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
 	        if ($res) {
 	            $mod=new modECM($db);
@@ -3895,7 +3898,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
 	    if ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
 	        if ($res) {
 	            $mod=new modPaybox($db);
@@ -3905,7 +3908,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
     	if ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
 	        if ($res) {
 	            $mod=new modOpenSurvey($db);
@@ -3915,7 +3918,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	    }
     	if ($moduletoreload == 'MAIN_MODULE_USER')    // Permission has changed into 3.0
 	    {
-	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User");
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate User module");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
 	        if ($res) {
 	            $mod=new modUser($db);
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index f4954f84fc2..cb0e441d672 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -1,175 +1,174 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=جمعية
-Version=إصدار
-VersionProgram=إصدار البرنامج
+Foundation=أساس
+Version=النسخة
+VersionProgram=نسخة البرنامج
 VersionLastInstall=تثبيت الإصدار الأولي
-VersionLastUpgrade=آخر تحديث لهذا الإصدار
-VersionExperimental=إصدار تجريبي
-VersionDevelopment=إصدارتطويري
-VersionUnknown=إصدار غير معروف
-VersionRecommanded=إصدار موصى به
-FileCheck=تكامل الملفات
-FilesMissing=الملفات المفقودة
-FilesUpdated=الملفات المحدثة
-FileCheckDolibarr=التحقق من تكامل الملفات
-XmlNotFound= لم يتم العثور على الملف اكس أمال لدوليبار 
-SessionId=معرف الجلسة
-SessionSaveHandler=مدير لحفظ الجلسات
-SessionSavePath= موقع حفظ الجلسات
-PurgeSessions=إزالة الجلسات
-ConfirmPurgeSessions=هل تريد حقا تطهير جميع الجلسات؟ وهذا بفصل كل مستخدم (باستثناء نفسك).
-NoSessionListWithThisHandler=مدير حفظ الجلسة المهيأ في لغة البي إتش بي لا يسمح بسرد كل الجلسات الجارية
+VersionLastUpgrade=آخر تحديث لهذه النسخة
+VersionExperimental=تجريبية
+VersionDevelopment=تطويرية
+VersionUnknown=غير معروفة
+VersionRecommanded=موصى بها
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
+SessionId=رمز المرحلة
+SessionSaveHandler=معالج لحفظ المراحل
+SessionSavePath=مرحلة التخزين المحلية
+PurgeSessions=إزالة المراحل
+ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=معالج حفظ المرحلة المهيأ في لغة البي إتش بي لا يسمح بسرد كل المراحل التي تعمل
 LockNewSessions=قم بإقفال الإتصالات الجديدة
-ConfirmLockNewSessions=هل أنت متأكد من أنك تريد تقييد أي اتصال جديد من دوليبار لشخصك. <b>%s</b> المستخدم الوحيد الذي سيتمكن من الإتصال بعد هذه العملية.
-UnlockNewSessions=إزالة قفل الإتصالات
-YourSession=الجلسة الخاصة بك
-Sessions=جلسات المستخدمين
+ConfirmLockNewSessions=هل أنت متأكد من أنك تريد تقييد أي اتصال جديدة من دوليبار لنفسك. <b>%s</b> المستخدم الوحيد الذي سيتمكن من الإتصال بعد هذه العملية.
+UnlockNewSessions=إزالة قفل الإتصال
+YourSession=المرحلة الخاصة بك
+Sessions=مرحلة المستخدمين
 WebUserGroup=خادم الويب المستخدم / المجموعة
-NoSessionFound=يبدو أن البي إتش بي الخاص بك لا يسمح بإعداد قائمة الجلسات النشطة.قد يكون الدليل (<b>%s</b>) المستخدم لحفظ الجلسات محمي (محمي من قبل نظام الحماية الخاص ببرنامج التشغيل او لغة البي إتش بي, على سبيل المثال.)
-HTMLCharset=الترميزات الخاصة بصفحات الإتش تي إم إل
+NoSessionFound=يبدو أن البي إتش بي الخاص بك لا يسمح بسرد كل المراحل النشطة. الدليل  (<b>%s</b>) المستخدم لحفظ المراحل قد يكون محمي (على سبيل المثال, محمي من قبل نظام الحماية الخاص ببرنامج التشغيل او لغة البي إتش بي.)
+HTMLCharset=الترميزات الخاصة بصفحة الإتش تي إم إل
 DBStoringCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
-DBSortingCharset=الترميز الخاص بقاعدة البيانات لفرز المعلومات
-WarningModuleNotActive=يجب أن تكون الوحدة <b>%s</b> مفعلة لإستعمال هذه الوظيفة
-WarningOnlyPermissionOfActivatedModules=حذاري،فقط التصاريح المتعلقة بالوحدات المنشطة تظهر هنا. يمكنك تفعيل وحدات أخرى في الصفحة الرئيسية-> الإعداد ت-> صفحة الوحدات
-DolibarrSetup=تثبيت أو تطوير دوليبار
+DBSortingCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
+WarningModuleNotActive=يجب أن يكون النموذج <b>%s</b> مفعل
+WarningOnlyPermissionOfActivatedModules=فقط التصاريح المتعلقة بالنماذج المنشطة تظهر هنا. يمكنك تفعيل نماذج أخرى في الصفحة الرئيسية-> لإعداد ت-> صفحة النماذج
+DolibarrSetup=تركيب أو تطوير دوليبار
 DolibarrUser=مستخدم دوليبار
 InternalUser=مستخدم داخلي
 ExternalUser=مستخدم خارجي
 InternalUsers=مستخدمين داخليين
 ExternalUsers=مستخدمين خارجيين
-GlobalSetup=الإعداد الكلي
+GlobalSetup=الإعداد الكلية
 GUISetup=العرض
 SetupArea=منطقة الإعداد
-FormToTestFileUploadForm=وحدة لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
-IfModuleEnabled=ملاحظة : نعم فعال فقط في حال كانت الوحدة <b>%s</b> مفعلة
-RemoveLock=قم بحذف الملف <b>%s</b> إذا كان موجوداً لتمكين اداة التحديث
+FormToTestFileUploadForm=نموذج لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
+IfModuleEnabled=ملاحظة : نعم فعالة فقط في حال كان النموذج <b>%s</b> مفعل
+RemoveLock=قم بحذف الملف <b>%s</b> إذا كان موجوداً لتمكن اداة التحديث
 RestoreLock=قم بإستعادة الملف <b>%s</b> مع إذن القراءة فقط, وذلك لعرض أي استخدام خاص ب أداة التحديث
 SecuritySetup=الإعداد الأمني
-ErrorModuleRequirePHPVersion=خطأ ، هذا الوحدة يتطلب نسخة بي إتش بي %s أو أعلى
-ErrorModuleRequireDolibarrVersion=خطأ ، هذه الوحدة تتطلب إصدار دوليبار %s أو أعلى
-ErrorDecimalLargerThanAreForbidden=خطأ, برنامج دوليبار الحالي لا يدعم دقة أعلى من <b>%s</b> 
-DictionarySetup=إعداد القواميس
-Dictionary=القواميس
-Chartofaccounts=الحسابات
-Fiscalyear=السنة المالية
-ErrorReservedTypeSystemSystemAuto=القيم 'system' و 'systemauto' لهذا النوع مخصص. يمكنك إستخدام 'user' كقيمة لإضافة التسجيلاتك الخاصة بك
+ErrorModuleRequirePHPVersion=خطأ ، هذا النموذج يتطلب نسخة بي إتش بي %s أو أعلى
+ErrorModuleRequireDolibarrVersion=خطأ ، هذا النموذج يتطلب نسخة دوليبار %s أو أعلى
+ErrorDecimalLargerThanAreForbidden=خطأ, برنامج دوليبار <b>%s</b> الحالي لا يدعم دقة أعلى من الحالية
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا النوع محفوظ. يمكنك إستخدام 'user' كقيمة لإضافة السجل الخاص بك
 ErrorCodeCantContainZero=لا يمكن إستخدام القيمة 0 لهذا الكود
-DisableJavascript=تعطيل وظائف جافا سكريبت واياكس  (مستحسن للشخص الاعمى أو  لمتصفحات النصوص)
-ConfirmAjax=إستخدام نوافذ تأكيد أجاكس 
-UseSearchToSelectCompanyTooltipp=إذا كان لديك عدد كبير من الأجزاء الثالثة (> 100000)، يمكنك زيادة السرعة من خلال وضع الثابت COMPANY_DONOTSEARCH_ANYWHERE  إلى 1. في إعداد->أخرى. وبعد ذلك يقتصر البحث على بداية السلسلة.
-UseSearchToSelectCompany=استخدام حقول التكملة لاختيار الأطراف الثالثة بدلا من استخدام list boxes
-ActivityStateToSelectCompany= إضافة خيار للتصفية عند البحث لإظهار / إخفاء الأطراف  الثالثة في الخدمة أو التي توقفت عن الخدمة 
- UseSearchToSelectContactTooltip=إذا كان لديك عدد كبير من الأجزاء الثالثة (> 100000)، يمكنك زيادة السرعة من خلال وضع الثابت COMPANY_DONOTSEARCH_ANYWHERE  إلى 1.
-UseSearchToSelectContact=استخدام حقول التكملة لاختيار الأطراف الثالثة بدلا من استخدام list boxes
-DelaiedFullListToSelectCompany=الانتظار حتى الضغط على مفتاح قبل تحميل محتويات قائمة الاطراف الثالثة (يمكن هذا أن يزيد من الأداء إذا كان لديك عدد كبير من الاطراف الثالثة)
-DelaiedFullListToSelectContact=الانتظار حتى الضغط على مفتاح قبل تحميل محتويات قائمة جهات الاتصال (يمكن هذا أن يزيد من الأداء إذا كان لديك عدد كبير من جهات الاتصال)
-SearchFilter=خيارات عوامل تصفية البحث
+DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+ConfirmAjax=إستخدم تأكيد أجاكس المنبثق
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+ActivityStateToSelectCompany= أضف فلتر كخيار لعرض/إخفاء الجهات الأخرى التي تقوم بنشاط حالياً أو توقفت عنه
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
+SearchFilter=فلاتر خيارات البحث
 NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s
-ViewFullDateActions=أظهر التواريخ الكاملة للأحداث في صفحة الاطراف الثالثة
+ViewFullDateActions=أظهر التواريخ الكاملة للأحداث في الصفحة الثالثة
 NotAvailableWhenAjaxDisabled=غير متوفر عندما يكون أجاكس معطلاً
 JavascriptDisabled=الجافا سكربت معطل
 UsePopupCalendar=استخدام الصفحات المنبثقة لإدخال التواريخ
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
-PreviewNotAvailable=المعاينة غير جاهزة
-ThemeCurrentlyActive=الثيم الناشط حالياً
+PreviewNotAvailable=المعاينة غير متاحة
+ThemeCurrentlyActive=الثيم النشط حالياً
 CurrentTimeZone=حسب توقيت خادم البي إتش بي
-MySQLTimeZone=حسب توقيت خادم MySql
-TZHasNoEffect=يتم تخزين التواريخ و إعادتها من قبل خادم قاعدة البيانات كما لو كانت مخزنة كسلسلة. المنطقة الزمنية هي فعالة فقط عند استخدام وظيفة UNIX_TIMESTAMP (التي لا ينبغي أن تستخدم من قبل Dolibarr، لذلك لا يجب أن يكون أي تأثير للمنطقة الزمنية لقاعدة البيانات، حتى و لو تغيرت بعد أن تم إدخال البيانات )
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=فراغ
 Table=جدول
 Fields=حقول
 Index=الفهرس
 Mask=القناع
-NextValue=القيمة التالية
+NextValue=قيمة التالية
 NextValueForInvoices=القيمة التالية (الفواتير)
 NextValueForCreditNotes=القيمة التالية (ملاحظات دائن)
-NextValueForDeposit=القيمة التالية (المدفوعات)
-NextValueForReplacements=القيمة التالية (فواتير الاستبدال)
-MustBeLowerThanPHPLimit=ملاحظة : البي إتش بي الخاص بك يحدد من حجم الملفات المرسلة <b>%s</b> %s,مهما كانت قيمة هذه المعلمة
+NextValueForDeposit=Next value (deposit)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=ملاحظة : البي إتش بي الخاص بك يحد من حجم الملفات المرفوعة <b>%s</b> %s, مهما كان الحجم المدخل
 NoMaxSizeByPHPLimit=ملاحظة : لم يتم وضح حد في إعدادات الـ PHP الخاص بك
 MaxSizeForUploadedFiles=الحجم الأقصى لتحميل الملفات (0 لمنع أي تحميل)
-UseCaptchaCode=إستخدم رسوم (كابتشا) في صفحة الدخول
+UseCaptchaCode=إستخدم الرسوم كرمز (كابتشا) في صفحة الدخول
 UseAvToScanUploadedFiles=استخدام مضاد الفيروسات لفحص الملفات المحملة
 AntiVirusCommand= المسار الكامل لبرنامج مكافحة الفيروسات
-AntiVirusCommandExample=كلاموين على سبيل المثال : "c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemple pour ClamAv : /usr/bin/clamscan"
-AntiVirusParam= المزيد من الصلاحيات بإستخدام سطر الأوامر
-AntiVirusParamExample=كلاموين على سبيل المثال :"--database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=إعداد وحدة المحاسبة
-UserSetup=إعداد إدارة المستخدمين
-MenuSetup=إعداد إدارة  القوائم 
+AntiVirusCommandExample= مثل ل ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= المزيد من الصلاحيات بإستخدام command line
+AntiVirusParamExample= مثال على ClamWin:--database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=نموذج وحدة المحاسبة
+UserSetup=إعداد مستخدم الإدارة
+MenuSetup=إعداد قائمة الإدارة
 MenuLimits=الحدود و الدقة
-MenuIdParent=معرف القائمة الوَالِدَةٌ
-DetailMenuIdParent=معرف القائمة الوَالِدَةٌ (فراغ لقائمة عليا)
-DetailPosition=رقم الترتيب لتعريف الموقع في القائمة
+MenuIdParent=رمز القائمة العليا
+DetailMenuIdParent=رمز القائمة العليا (فراغ للقائمة العليا)
+DetailPosition=رتب الرقم لتعريف موقع القائمة
 PersonalizedMenusNotSupported=القوائم الشخصية غير مدعومة
 AllMenus=الكل
-NotConfigured=وحدة غير مهيئة
-Setup=إعداد
-Activation=تفعيل
+NotConfigured=النموذج غير مهيء
+Setup=الإعداد
+Activation=التفعيل
 Active=نشطة
-SetupShort=إعداد
-OtherOptions=خيارات الأخرى
-OtherSetup=إعدادات الأخرى
+SetupShort=الإعداد
+OtherOptions=الخيارات الأخرى
+OtherSetup=الإعدادات الأخرى
 CurrentValueSeparatorDecimal=الفاصلة العشرية
 CurrentValueSeparatorThousand=ألفاصلة الألفية
-Destination=المقصد
-IdModule=معرف الوحدة
-IdPermissions=معرف التصريح
-Modules=الوحدات
-ModulesCommon=الوحدات الرئيسية
-ModulesOther=وحدات أخرى
-ModulesInterfaces=واجهة الوحدات
-ModulesSpecial=وحدات محددة الغاية
-ParameterInDolibarr=المتغيرة %s
-LanguageParameter=متغيرة اللغة %s
-LanguageBrowserParameter=المتغيرة %s
-LocalisationDolibarrParameters=متغيرات تحديد الموقع
-ClientTZ=توقيت الزبون (المستخدم)
-ClientHour=ساعة الزبون (المستخدم)
-OSTZ=توقيت نظام التشغيل
-PHPTZ=المنطقة الزمنية لخادم PHP
-PHPServerOffsetWithGreenwich=فارق الزمن بين خط جرينتش و خادم الـ PHP (ثانية)
-ClientOffsetWithGreenwich=فارق الزمن بين خط الجرينتش و العميل / المتصفح (ثانية)
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+Modules=النموذج
+ModulesCommon=النماذج الرئيسية
+ModulesOther=نماذج أخرى
+ModulesInterfaces=واجهة النماذج
+ModulesSpecial=نماذج محددة للغاية
+ParameterInDolibarr=الوحدة %s
+LanguageParameter=وحدة اللغة %s
+LanguageBrowserParameter=الوحدة %s
+LocalisationDolibarrParameters=الوحدات المحلية
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=المنطقة الزمنية خادم PHP
+PHPServerOffsetWithGreenwich=عرض وزنية جرينتش لخادم لغة الـ PHP (ثانية)
+ClientOffsetWithGreenwich=عرض وزنية الجرينتش للعميل / المتصفح (ثانية)
 DaylingSavingTime=التوقيت الصيفي
-CurrentHour=ساعة خادم الـ PHP 
-CompanyTZ=المنطقة الزمنية للشركة الرئيسية
-CompanyHour=ساعةالشركة الرئيسية
-CurrentSessionTimeOut=مهلة مدة الجلسة الحالية
-YouCanEditPHPTZ=لضبط منطقة زمنية أخرى لل PHP (غير ضروري)، يمكنك محاولة إضافة ملف  .htaccess مع خط مثل "SetEnv TZ Europe/Paris"
+CurrentHour=PHP خادم ساعة
+CompanyTZ=المنطقة الزمنية لشركة من الشركات الرئيسية)
+CompanyHour=ساعة وشركة من الشركات الرئيسية)
+CurrentSessionTimeOut=إنتها مدة التصفح الحالية
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
 OSEnv=بيئة نظام التشغيل
-Box=صندوق
-Boxes=صناديق
-MaxNbOfLinesForBoxes=الحد الأقصى لعدد الخطوط في الصناديق
-PositionByDefault=الموقع الإفتراضي
-Position=الموقع
-MenusDesc=مديري القوائم يحددون محتويات اثنين من أشرطة القوائم ( الشريط  الأفقي و العمودي). فمن الممكن تعيين مدير مختلف اعتمادا على إذا ما كان المستخدم داخلي أو خارجي.
-MenusEditorDesc=محرري القوائم يسمحون لك بتعريف مدخلات شخصية في القوائم. يجب استخدامها بعناية لتجنب التأثير على برنامج دوليبار وجعله غير مستقر بالإضافة إلى جعل روابط القوائم غير متاحة. <br> بعض الوحدات تظيف خانات في القوائم (في القائمة <b>الكل</b> في معظم الحالات). إذا أزلت بعض هذه القيود عن طريق الخطأ ، يمكنك ان تستعيدها بتعطيل وتمكين الوحدة.
+Box=مربع
+Boxes=مربعات
+MaxNbOfLinesForBoxes=الحد الأقصى لعدد الخطوط في المربعات
+PositionByDefault=الطلبية الإفتراضية
+Position=Position
+MenusDesc=يمكن لرؤساء القوائم تعريف المحتوى لعمودين من القوائم (عمود افقي وعمود عمودي).
+MenusEditorDesc=محرر القوائم يسمح لك بتعريف مدخلات شخصية في القوائم. استخدامها بعناية لتجنب التأثير على برنامج دوليبار وجعله غير مستقر بالإضافة إلى جعل روابط القوائم غير متاحة. <br> بعض النماذج تظيف خانات في القوائم (في القائمة <b>الكل</b> في معظم الحالات). إذا أزلت بعض هذه القيود عن طريق الخطأ ، يمكنك ان تستعيدها وتعطيل وتمكين النموذج.
 MenuForUsers=قائمة للمستخدمين
-LangFile=ملف .lang
-System=نظام
-SystemInfo=معلومات النظام
-SystemTools=أدوات النظام
+LangFile=ملف لانج
+System=النظام
+SystemInfo=نظام المعلومات
 SystemToolsArea=منظقة أدوات نظام
-SystemToolsAreaDesc=هذه المنظقة توفر مميزات إدارية. استخدام القائمة لاختيار الخصائص التي تبحث عنها.
-Purge=حذف
-PurgeAreaDesc=تسمح لك هذه الصفحة بحذف كل الملفات التي بنيت أو تم تخزينها بواسطة دوليبار (ملفات المؤقتة ،أو كافة الملفات في المجلد <b>%s</b>) استخدام هذه الميزة ليست ضرورية. هذه الخدمة مقدمة للمستخدمين الذين يستخدمون برنامج دوليبار على خادم لا يوفر لهم صلاحيات حذف الملفات التي أنشئت من قبل خادم الويب.
-PurgeDeleteLogFile=حأذف الجريدة <b>%s</b> المعرفة لوحدة 'تسجيلات وآثار' (لا يوجد خطر على المعلومات)
-PurgeDeleteTemporaryFiles=أحذف جميع الملفات المؤقتة (لا يوجد خطر على البيانات)
-PurgeDeleteAllFilesInDocumentsDir=أحذف كل الملفات في المجلد <b>%s</b>. الملفات المؤقتة ، و أيضا ملفات استرجاع قاعدة البيانات, الملفات الملحقة بعناصر (الأطراف ثالالثة أو الخارجية ، الفواتير...) وتم تحمليها في وحدة إي ذي إم, سيتم حذفها
+SystemToolsAreaDesc=هذه المنقة توفر مميزات إدارية. استخدام القائمة لاختيار الخصائص التي تبحث عنها.
+Purge=أحذف
+PurgeAreaDesc=تسمح لك هذه الصفحة بحذف كل الملفات التي بنيت أو تم تخزينها بواسطة دوليبار (الملفات المؤقتة ، أو كافة الملفات في المجلد <b>%s</b>) استخدام هذه الميزة ليست ضرورية. هذه الخدمة مقدمة للمستخدمين الذين يستخدمون برنامج دوليبار على خادم لا يوف لهم صلاحيات حذف الملفات التي أنشئت من قبل خادم الويب.
+PurgeDeleteLogFile=قم بحذف ملفات السجلات <b>%s</b> المعرفة لنموذج النظام (لا يوجد خطر على المعلومات)
+PurgeDeleteTemporaryFiles=قم بحذف جميع الملفات المؤقتة (لا يوجد خطر على البيانات)
+PurgeDeleteAllFilesInDocumentsDir=حذف كل الملفات في المجلد <b>%s</b> الملفات المؤقتة ، بل أيضا ملفات استرجاع قاعدة البيانات, الملفات الملحقة بعناصر (أطراف ثالثة أو خارجية ، فواتير...) وتم تحمليها في نموذج إي سي إم, سيتم حذفها
 PurgeRunNow=إحذف الآن
-PurgeNothingToDelete=لا دليل أو ملف للحذف.
+PurgeNothingToDelete=لم يتم حذف مجلد او ملف
 PurgeNDirectoriesDeleted=<b>%s</b> ملفات او مجلدات حذفت
-PurgeAuditEvents=احذف جميع الأحداث المتعلقة بالأمن
+PurgeAuditEvents=احذف جميع الأحداث المتعلقة بالأمان
 ConfirmPurgeAuditEvents=هل أنت متأكد من حذف جميع الأحداث الأمنية؟ جميع سجلات الأمن سيتم حذفها ولن يتم حذف أي بيانات أخرى.
 NewBackup=نسخة احتياطية جديدة
 GenerateBackup=قم بإنشاء نسخة احتياطية
 Backup=نسخة احتياطية
 Restore=استعادة
-RunCommandSummary=تتم إطلاق عملية النسخة الإحتياطية بالأمر التالي
+RunCommandSummary=تم إطلاق عملية النسخة الإحتياطية بالأمر التالي
 RunCommandSummaryToLaunch=يمكن إطلاق عمل النسخة الإحتياطية بالأمر التالي
 WebServerMustHavePermissionForCommand=يجب أن يحتوي خادم الويب على صلاحيات لتشغيل مثل هذا الأمر
-BackupResult=نتيجة النسخة الإحتياطية
+BackupResult=نتيجة للنسخة الإحتياطية
 BackupFileSuccessfullyCreated=تم إنشاء ملف النسخة الاحتياطية بنجاح
 YouCanDownloadBackupFile=يمكن الآن تنزيل ملف النسخة الإحتياطية
 NoBackupFileAvailable=لا يوجد ملفات احتياطية.
@@ -177,433 +176,434 @@ ExportMethod=طريقة التصدير
 ImportMethod=طريقة الاستيراد
 ToBuildBackupFileClickHere=لعمل نسخة إحتياطية, اضغط <a href="%s">هنا</a>.
 ImportMySqlDesc=لاستيراد ملف النسخة الاحتياطية ، يجب استخدام mysql نافذة الأوامر للدوز او اللاينكس :
-ImportPostgreSqlDesc=لاستيراد ملف النسخة الاحتياطية ، يجب استخدام الأمر pg_restore 
+ImportPostgreSqlDesc=لاستيراد ملف النسخة الاحتياطية ، يجب استخدام pg_restore من نافذة الأوامر للدوز او اللاينكس :
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=اسم الملف المراد إنشائه
 Compression=ضغط الملف
 CommandsToDisableForeignKeysForImport=الأمر المستخدم لتعطيل المفتاح الخارجي في حالة الإستيراد
 CommandsToDisableForeignKeysForImportWarning=إجباري في حال اردت إسترجاع نسخة قاعدة البيانات الإحتياطية
-ExportCompatibility=توافق الملف المصدر
-MySqlExportParameters=قيم تصدير قاعدة البيانات MySql
-PostgreSqlExportParameters=قيم تصدير قاعدة البيانات PostgreSQL
+ExportCompatibility=توفق الملف المصدر
+MySqlExportParameters=تصدير قيم قاعدة البيانات MySql
+PostgreSqlExportParameters= تصدير قيم قاعدة البيانات PostgreSQL
 UseTransactionnalMode=إستخدم صيغة المعاملات
-FullPathToMysqldumpCommand=المسار الكامل للامر mysqldump
-FullPathToPostgreSQLdumpCommand=المسار الكامل للامر pg_dump
+FullPathToMysqldumpCommand=المسار الكامل لأوامر mysqldump
+FullPathToPostgreSQLdumpCommand=المسار الكامل لأوامر pg_dump
 ExportOptions=خيارات التصدير
-AddDropDatabase= إضافةأوامر : DROP DATABASE
-AddDropTable=إضافةأوامر : DROP TABLE
+AddDropDatabase=أمر إضافة, حذف قاعدة بيانات
+AddDropTable=أمر إضافة حذف الجدول
 ExportStructure=البنية
 Datas=البيانات
 NameColumn=اسم الأعمدة
-ExtendedInsert=أوامر INSERT الممددة
-NoLockBeforeInsert=لا أوامر قفل قبل الإضافة
+ExtendedInsert=الإضافة الممددة
+NoLockBeforeInsert=لا يوجد أوامر قفل حول الإضافة
 DelayedInsert=إضافة متأخرة
 EncodeBinariesInHexa=ترميز البيانات الأحادية لستة عشرية
-IgnoreDuplicateRecords=تجاهل الأخطاء في السجلات المكررة (INSERT IGNORE)
+IgnoreDuplicateRecords=تجاهل الأخطاء في السجلات المكررة (تجاهل الإدراج)
 Yes=نعم
 No=لا
 AutoDetectLang=اكتشاف تلقائي (لغة المتصفح)
-FeatureDisabledInDemo=الميزة معطلة في العرض التجريبي
+FeatureDisabledInDemo=الميزة معلطة في العرض التجريبي
 Rights=الصلاحيات
-BoxesDesc=الصناديق هي المناطق التي تُظهر بعض المعلومات في بعض الصفحات. يمكنك اختيار إظهارها أو إخفائها بإختيار الصفحات المطلوبة و الضغط على 'تنشيط', او بالضغط على الزر الآخر لتعطيلها.
-OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">الوحدات المفعلة </a> سوف تظهر.
-ModulesDesc=الوحدات Dolibarr  تحدد الميزات المتوفرة في التطبيق. وتتطلب بعض الوحدات حقوق يجب ان تمنح للمستخدمين بعد أن تمكن.
-ModulesInterfaceDesc=وحدات التفاعل تسمح لك صلة DOLIBARR ببرمجيات ،نظم وخدمات خارجية
-ModulesSpecialDesc=الوحدات الإضافية هي وحدات ذو استخدام محدد جدا و أقل من الوحدات البسيطة القياسية.
-ModulesJobDesc=الوحدات الإضافية المهنية هي وحدات يسمحون إعداد مسبق لأعمال معينة.
+BoxesDesc=المربعات هي المناطق التي تُظهر بعض المعلومات في بعض الصفحات. يمكنك اختيار إظهار أو إخفائها بإختيار الصفحات المطلوبة و الضغط على 'تنشيط', او بالضغط على الزر الآخر لتعطيلها.
+OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
+ModulesDesc=Dolibarr تحديد الوحدات التي تم تمكين وظيفة في مجال البرمجيات. وتتطلب بعض وحدات الأذونات ، يجب ان تمنح للمستخدمين ، وبعد أن تمكن وحدة.
+ModulesInterfaceDesc=فإن التفاعل بين وحدات Dolibarr يسمح لك بإضافة السمات الخارجية تعتمد على البرمجيات والنظم والخدمات.
+ModulesSpecialDesc=وحدات خاصة أو محددة جدا ونادرا ما تستخدم وحدات.
+ModulesJobDesc=توفير وحدات تجارية بسيطة ومحددة سلفا من Dolibarr الإعداد لأعمال معين.
 ModulesMarketPlaceDesc=يمكنك العثور على مزيد من وحدات للتحميل على مواقع الإنترنت الخارجية على شبكة الانترنت...
-ModulesMarketPlaces=المزيد من وحدات...
-DoliStoreDesc=DoliStore ، السوق الرسمي للوحدات و الملحقات الإضافية ل Dolibarr
-DoliPartnersDesc=قائمة بعض الشركات التي يمكن أن توفر / تطور وحدات أو وظائف مخصصة (ملاحظة: أي شركة للمصدر المفتوح تعرف لغة PHP يمكن أن توفرتطوير معين)
-WebSiteDesc=موقع ويب لمزودي وحدات DOLIBARR يمكنك البحث فيهاللعثور على المزيد من الوحدات...
+ModulesMarketPlaces=مزيد من وحدات...
+DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
+WebSiteDesc=مزودي موقع ويب يمكنك البحث للعثور على المزيد من وحدات...
 URL=رابط
-BoxesAvailable=الصناديق المتاحة
-BoxesActivated=الصناديق المفعلة
-ActivateOn=للتفعيل على
-ActiveOn=مفعلة على
-SourceFile=الملف المصدر
-AutomaticIfJavascriptDisabled=قدتم تعطيل جافاسكريبت التلقائي 
-AvailableOnlyIfJavascriptNotDisabled=متاحا إلا إذا كان جافاسكريبت معطل
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=متاحا إلا إذا كان جافاسكريبت و اجاكس معطلة
+BoxesAvailable=صناديق متاحة
+BoxesActivated=تفعيل صناديق
+ActivateOn=على تفعيل
+ActiveOn=على تفعيلها
+SourceFile=ملف المصدر
+AutomaticIfJavascriptDisabled=تلقائيا إذا تم تعطيل جافاسكريبت
+AvailableOnlyIfJavascriptNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين
 Required=مطلوب
-UsedOnlyWithTypeOption=مستخدم من قبل بعض بنود جدول الأعمال فقط
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=الأمن
-Passwords=كلمات السر
-DoNotStoreClearPassword=لا تخزن كلمات السر واضحة في قاعدة البيانات (تفعيل مستحسن)
-MainDbPasswordFileConfEncrypted=تشفير كلمة السر في قاعدة البيانات في conf.php (تفعيل مستحسن)
-InstrucToEncodePass=للحصول على كلمة السر المشفرة في ملف التكوين conf.php، استبدل في هذا  الملف الخط $dolibarr_main_db_pass="crypted:..." ب $dolibarr_main_db_pass="%s"
-InstrucToClearPass=لديك كلمة السر فك الشفرة (واضح) في <b>conf.php</b> الملف ، استبدال السطر <br> <b>dolibarr_main_db_pass $ = ":..." crypted</b> <br> من قبل <br> <b>dolibarr_main_db_pass $ = "٪ ق"</b>
-ProtectAndEncryptPdfFiles=حماية وثائق PDF المولدة (التنشيط غير مستحسن، يجعل توليد PDF الجماعي معطلة)
-ProtectAndEncryptPdfFilesDesc=حماية وثائق PDF يترك الوثيقة حرة للقراءة والطباعة مع أي برنامج قارئ لل PDF. على العكس، التعديل و النسخ أصبح مستحيلا. ملاحظة أن، بالإضافة إلى ذلك، استخدام هذا الخيار يمنع توليد ال PDF التراكمي (مثل الفواتير غير المدفوعة).
+Passwords=كلمة السر
+DoNotStoreClearPassword=لا تخزن كلمات السر في قاعدة بيانات واضحة في
+MainDbPasswordFileConfEncrypted=كلمة السر في قاعدة بيانات مشفرة conf.php
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=حماية الملفات ولدت الشعبي (لا recommandd ، تقتحم الجماهيري الشعبي وتوليد)
+ProtectAndEncryptPdfFilesDesc=حماية وجود وثيقة من وثائق وتبقي الشعبي توفيرها لقراءة وطباعة أي متصفح الشعبي. ومع ذلك ، وتحريرها ونسخها وليس من الممكن بعد الآن. علما أن استخدام هذه الميزة تجعل بناء عالمي لا يعمل المتراكمة الشعبي (مثل الفواتير غير المدفوعة).
 Feature=ميزة
 DolibarrLicense=الترخيص
-DolibarrProjectLeader=مدير المشروع
-Developpers=المطورين / المساهمين
-OtherDeveloppers=غيرها من المطورين / المساهمين
+DolibarrProjectLeader=المشروع
+Developpers=مطوري / المساهمين
+OtherDeveloppers=غيرها من مطوري / المساهمين
 OfficialWebSite=Dolibarr الدولي الموقع الرسمي
-OfficialWebSiteFr=الموقع الرسمي بالفرنسية 
-OfficialWiki=Dolibarr ويكي
-OfficialDemo=عرض على الخط ل dolibarr
-OfficialMarketPlace=السوق الرسمي للوحدات والملحقات المضافة
-OfficialWebHostingService=خدمات الإقامة المشار إليها (السحاب)
-ReferencedPreferredPartners=الشركاء المفضلين
-OtherResources=ملتقيات أخرى
-ForDocumentationSeeWiki= مما يخص وثائق المطور أو الأسئلة الشائعة استشارة الويكي دوليبار ,<br>consultez le wiki Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=بالنسبة لكل المسائل الأخرى / مساعدة، يمكنك استخدام المنتدى دوليبار :<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=هذا البرنامج يمكن أن يساعدك في الحصول على مساعدة لإيجاد خدمات دعم على دوليبار
-HelpCenterDesc2=اختر الخدمة التي تناسب حاجتك من خلال النقر على الرابط المناسب (بعض هذه الخدمات متوفرة باللغة الإنجليزية فقط).
-CurrentTopMenuHandler=المدير الحالي للقائمة الأعلى
-CurrentLeftMenuHandler=المدير الحالي للقائمة اليمنى
-CurrentMenuHandler=المدير الحالي للقائمة 
-CurrentSmartphoneMenuHandler=المدير الحالي للقائمة للهاتف الذكي
+OfficialWebSiteFr=الفرنسية الموقع الرسمي
+OfficialWiki=Dolibarr يكي
+OfficialDemo=Dolibarr الانترنت التجريبي
+OfficialMarketPlace=المسؤول عن وحدات السوق الخارجية / أدونس
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Autres ressources
+ForDocumentationSeeWiki=For user's or developer's documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target=للمستخدم أو للتطوير وثائق (مستدات ،...)، أسئلة وأجوبة <br> إلقاء نظرة على ويكي Dolibarr : <br> <a href="%s" target="_blank"><b>ق ٪</b></a>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target=عن أي أسئلة أخرى / مساعدة ، يمكنك استخدام Dolibarr المنتدى : <br> <a href="%s" target="_blank"><b>ق ٪</b></a>
+HelpCenterDesc1=هذا المجال يمكن أن تساعدك في الحصول على مساعدة لتقديم خدمات الدعم على Dolibarr.
+HelpCenterDesc2=جزء من هذه الخدمة متوفرة باللغة <b>الانكليزية فقط.</b>
+CurrentTopMenuHandler=مناول الحالية الأعلى
+CurrentLeftMenuHandler=مناول الحالية القائمة اليمنى
+CurrentMenuHandler=الحالية القائمة معالج
+CurrentSmartphoneMenuHandler=معالج الحالية القائمة الذكي
 MeasuringUnit=وحدة قياس
 Emails=البريد الإلكتروني
 EMailsSetup=إعداد رسائل البريد الإلكتروني
-EMailsDesc=تسمح لك هذه الصفحة الخاصة إستبدال معايير ال PHP لإرسال رسائل البريد الإلكتروني. في معظم الحالات على نظام يونيكس / لينكس ،لإعداد PHP لهذه الثوابت صحيح و هذه الصفحة عديمة الفائدة.
-MAIN_MAIL_SMTP_PORT=منفذ إعداد PHP SMTP / SMTPS (افتراضيا في لغة PHP): <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER= اسم الضيف أو عنوان   SMTP / SMTPS IP  (افتراضيا في لغة PHP: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=منفذ SMTP / SMTPS (غير معرف في PHP على الأنظمة شبه يونكس)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=سم الضيف أو عنوان  SMTP / SMTPS IP (غير معرف في PHP على الأنظمة شبه يونكس)
-MAIN_MAIL_EMAIL_FROM=مرسل البريد الإلكتروني لرسائل البريد الإلكتروني التلقائية (افتراضيا في php.ini : <b>٪)</b>
-MAIN_MAIL_ERRORS_TO=عنوان بريد إلكتروني مستخدم في عائدات رسائل البريد الإلكتروني  الخاطئة
-MAIN_MAIL_AUTOCOPY_TO= إرسال منهجي لصورة مخبأة من رسائل البريد الإلكتروني المرسلة إلى
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO=إرسال منهجي لصورة مخبأة من رسائل للفواتير الأولية المرسلة إلى
-MAIN_MAIL_AUTOCOPY_ASKPRICESUPPLIER_TO=إرسال منهجي لصورة مخبأة من طلبات الأسعار المرسلة إلى 
-MAIN_MAIL_AUTOCOPY_ORDER_TO=إرسال منهجي لصورة مخبأة من الأوامر التجارية المرسلة إلى 
-MAIN_MAIL_AUTOCOPY_INVOICE_TO= إرسال منهجي لصورة مخبأة من رسائل للفواتير المرسلة إلى
-MAIN_DISABLE_ALL_MAILS=تعطيل جميع رسائل البريد الإلكتروني الإرسال (لأغراض الاختبار أو التجريب)
-MAIN_MAIL_SENDMODE=طريقة إرسال رسائل البريد الإلكتروني
-MAIN_MAIL_SMTPS_ID= الهوية SMTP في حال يكون التوثيق SMTP لازم
-MAIN_MAIL_SMTPS_PW=كلمة السر SMTP في حال يكون التوثيق SMTP لازم
-MAIN_MAIL_EMAIL_TLS= استخدام تشفير TLS (خدمة تصميم المواقع) 
-MAIN_DISABLE_ALL_SMS=تعطيل كافة إرسالات SMS (لأغراض الاختبار أو التجريب)
-MAIN_SMS_SENDMODE=طريقة إرسال الرسائل القصيرة SMS
+EMailsDesc=تسمح لك هذه الصفحة الخاصة بك فوق PHP معايير لإرسال رسائل البريد الإلكتروني. في معظم الحالات على يونيكس / نظام لينكس ، PHP الخاصة بك الإعداد صحيح وهذه الثوابت هي عديمة الفائدة.
+MAIN_MAIL_SMTP_PORT=بروتوكول نقل البريد الإلكتروني / SMTPS ميناء (افتراضيا في php.ini : <b>٪)</b>
+MAIN_MAIL_SMTP_SERVER=بروتوكول نقل البريد الإلكتروني / SMTPS المضيف (افتراضيا في php.ini : <b>٪)</b>
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=بروتوكول نقل البريد الإلكتروني / SMTPS ميناء (غير محددة في مثل PHP على أنظمة يونكس)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=بروتوكول نقل البريد الإلكتروني / SMTPS المضيف (غير محددة في مثل PHP على أنظمة يونكس)
+MAIN_MAIL_EMAIL_FROM=مرسل البريد الإلكتروني للرسائل البريد الإلكتروني تلقائيا (افتراضيا في php.ini : <b>٪)</b>
+MAIN_MAIL_ERRORS_TO=أرسلت مرسل البريد الإلكتروني المستخدمة في رسائل البريد الإلكتروني عائدات خطأ
+MAIN_MAIL_AUTOCOPY_TO= إرسال منهجية خفية الكربون نسخة من جميع رسائل البريد الإلكتروني المرسلة إلى
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
+MAIN_DISABLE_ALL_MAILS=تعطيل جميع رسائل البريد الإلكتروني الإرسال (لأغراض الاختبار أو تجريبية)
+MAIN_MAIL_SENDMODE=طريقة استخدام لإرسال رسائل البريد الإلكتروني
+MAIN_MAIL_SMTPS_ID=إذا الهوية SMTP التوثيق اللازم
+MAIN_MAIL_SMTPS_PW=كلمة السر اذا SMTP التوثيق اللازم
+MAIN_MAIL_EMAIL_TLS= استخدام تلس (خدمة تصميم المواقع) تشفير
+MAIN_DISABLE_ALL_SMS=تعطيل كافة sendings SMS (لأغراض الاختبار أو تجريبية)
+MAIN_SMS_SENDMODE=طريقة استخدامه لإرسال الرسائل القصيرة SMS
 MAIN_MAIL_SMS_FROM=رقم الهاتف المرسل الافتراضي لإرسال الرسائل القصيرة
-FeatureNotAvailableOnLinux=ميزة لا تتوفر على الأنظمة مثل يونكس. اختبر برنامج sendmail الخاص بك محليا.
-SubmitTranslation=إذا كانت الترجمة لهذه اللغة ليست كاملة أو توجد الأخطاء ، يمكنك تصحيح ذلك عن طريق تحرير الملفات في الدليل <b>langs / s ٪</b> ، وإرسالها للتعديل على المنتدى www.dolibarr.org
-ModuleSetup=إعداد الوحدة
-ModulesSetup=إعداد الوحدات
+FeatureNotAvailableOnLinux=ميزة لا تتوفر على مثل أنظمة يونكس. sendmail برنامج الاختبار الخاص بك محليا.
+SubmitTranslation=إذا كان ترجمة لهذه اللغة ليست كاملة أو تجد الأخطاء ، يمكنك تصحيح هذا عن طريق تحرير الملفات إلى الدليل <b>langs / ق ٪</b> ، وإرسال ملفات تعديل على www.dolibarr.org المنتدى.
+ModuleSetup=إعداد وحدة
+ModulesSetup=نمائط الإعداد
 ModuleFamilyBase=نظام
-ModuleFamilyCrm=إدارة العلاقات مع الزبائن
+ModuleFamilyCrm=Ressource العملاء إدارة (إدارة علاقات العملاء)
 ModuleFamilyProducts=إدارة المنتجات
 ModuleFamilyHr=إدارة الموارد البشرية
 ModuleFamilyProjects=مشاريع / العمل التعاوني
 ModuleFamilyOther=أخرى
-ModuleFamilyTechnic=أدات بين عدة وحدات 
-ModuleFamilyExperimental=وحدات تجريبية
-ModuleFamilyFinancial=وحدات المالية (المحاسبة / الخزانة)
+ModuleFamilyTechnic=Multi بين وحدات وأدوات
+ModuleFamilyExperimental=نماذج تجريبية
+ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
 ModuleFamilyECM=إدارة المحتوى في المؤسسة
-MenuHandlers=مديري  القوائم 
-MenuAdmin=تحرير القائمة 
-DoNotUseInProduction=لا يستخدم في الإنتاج
+MenuHandlers=قائمة مناولي
+MenuAdmin=قائمة تحرير
+DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=هذا هو الإعداد لهذه العملية :
-ThisIsAlternativeProcessToFollow=هذه هي العملية البديلة للإعداد:
-StepNb=الخطوة رقم ٪s
-FindPackageFromWebSite=العثور على الحزمة التي توفر الميزة تريد (على سبيل المثال على موقع الويب s٪).
-DownloadPackageFromWebSite=تحميل الحزمة %s
-UnpackPackageInDolibarrRoot=قم بفك الحزمة في الدليل المخصص للوحدات الخارجية
-SetupIsReadyForUse=لقد إنتهى الاعداد. إن Dolibarr على استعداد لاستخدام هذا العنصر الجديد.
-NotExistsDirect=لا يوجد أي دليل بديل.
-InfDirAlt=منذ الإصدار 3 هو من الممكن تحديد دليل بديل يسمح لك بتخزين في نفس المكان وحدات ومواضيع مخصصة. بمجرد إنشاء دليل على جذر Dolibarr (مثل: custom)
-InfDirExample=ثم أعلن في الملف conf.php::<br> $dolibarr_main_url_root_alt='http://monserveur/custom'<br>$dolibarr_main_document_root_alt='/repertoire/de/dolibarr/htdocs/custom'<br>.*لقد تم تعليق هذه الخطوط ب "#".لحذف هذا التعليق، عليكببحذف الحرف ببساطة.
-YouCanSubmitFile=اختر الوحدة:
-CurrentVersion= النسخة الحالية ل Dolibarr
-CallUpdatePage= الذهاب إلى صفحة التحديثات و هيكل و قاعدة البيانات : %s.
-LastStableVersion= آخر نسخة مستقرة
-UpdateServerOffline=خادم التحديث غير متواجد حاليا
-GenericMaskCodes=يمكنك إدخال أي قناع ترقيم. في هذا القناع،يمكن استخدام العلامات التالية :<br><b>{000000}</b> يوازي رقم يتزايد كل ٪s. وضع عدد الأصفار يوازي الطول المطلوب للعداد. سيتمم العداد بعدد من 0 على اليسار من أجل الحصول على العدد المطلوب في القناع.<br><b>{000000+000}</b> كما من قبل، ولكن بفارق مقابل للعدد على يمين ال + يتم تطبيقه من أول s٪ . <br><b> {000000@x}</b> كما في السابق، و لكن يعاد العداد الى صفر لتعيين الشهر س من العام (س بين 1 و 12، أو  0 لاستخدام شهر بداية العام المالي المحدد في التكوين الخاص بك، أو 99 للإعادة للصفركل شهر). إذا تم استخدام هذا الخيار وس هو 2 أو أكثر، كان التسلسل إلزامي. <br><b>{dd}</b> يوم (01-31). <br><b>{mm}</b> أشهر (01-12). <br><b>{yy}</b>, <b>{yyyy}</b>أو <b>{y}</b> سنة على 2 أو 4 أو 1 أرقام.
-GenericMaskCodes2=رمز العميل على ن أحرف<br><b>{cccc000}</b> ويتبع رمز العميل على ن أحرف بعداد خاص بالعميل. هذا العداد خاص بالعميل هو أيضا يعاد ضبطه لصفر في نفس الوقت مع العداد العام. رمز نوع الطرف الثالث على ن أحرف (انظر معجم أنواع الأطراف الثالثة).
-GenericMaskCodes3=جميع الأحرف الاخرى في القناع سوف تظل بدون تغيير. <br> الفراغات غير مسموح بها. <br>
-GenericMaskCodes4a=<u>مثال على الطرف الثالث 99%s الشركة المنشئة في 2007-01-31 :</u><br>
-GenericMaskCodes4b=<u>ومثال على طرف ثالث خلق في 2007-03-01 :</u> <br>
-GenericMaskCodes4c=<u>ومثال على منتج خلق في 2007-03-01 :</u> <br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b>تعطي <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX-{dd}-YYY</b> تعطي <b>0199-XXX-31-YYY</b>
-GenericNumRefModelDesc=تعطي رقم يخصص وفقا لقناع يحدد.
-ServerAvailableOnIPOrPort=الخادم شغال ؜على العنوان %s على الميناء %s
-ServerNotAvailableOnIPOrPort=الخادم غير شغال ؜على العنوان %s على الميناء %s
-DoTestServerAvailability=اختبار توفر الخادم
-DoTestSend=اختبار الارسال
-DoTestSendHTML=اختبار ارسال HTML
-ErrorCantUseRazIfNoYearInMask=خطأ، لا يمكن استخدام الخيار @ لإعادة الضبط في بداية السنة، أو إذا كان التسلسل {yy} أو {yyyy} غير موجود في القناع.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطأ، لا يمكن استخدام الخيار @ إذا كان التسلسل {yy}{mm} أو {mm}{yyyy} غير موجود في القناع
-UMask=قناع من الملفات الجديدة تحت الأنظمة يونيكس / لينكس / بي إس دي.
-UMaskExplanation=تسمح لك هذه المعلمة تحديد الاذونات على الملفات التي أنشأتها على الخادم Dolibarr (خلال تحميلها على سبيل المثال). <br> يجب أن يكون رقم ثماني (على سبيل المثال ، 0666 : وسائل القراءة والكتابة للجميع). <br> هذا الضبط ليس له أي تأثير على خادم ويندوز.
-SeeWikiForAllTeam=إلقاء نظرة على صفحة الويكي لرؤية قائمة كاملة لجميع الجهات الفاعلة والمنظمة
-UseACacheDelay= التأخير للتخزين المؤقت اللصادرات - ثانية (0 فارغ أو لا مخبأ)
-DisableLinkToHelpCenter=اختباء وصلة <b>"هل تحتاج إلى مساعدة أو دعم"</b> على صفحة تسجيل الدخول
-DisableLinkToHelp=إخفاء رابط "%sمساعدة عبر الإنترنت" من القائمة اليسرى اليمنى
-AddCRIfTooLong=لا يوجد كسر خط التلقائي، حتى إذا كان النص طويل جدا على الوثائق، عليك أن تضيف بنفسك الإرجاع في مربع إدخال النص
-ModuleDisabled=وحدة معطلة
-ModuleDisabledSoNoEvent=وحدة معطلة,مما يجعل الحدث لن يخلق أبدا
-ConfirmPurge=هل أنت متأكد من إرادة تنفيذ ذلك التطهير؟ <br> هذا من شأنه بالتأكيد حذف جميع ملفاتك (صورة إدارة المحتوى في المؤسسة ، والملفات المرفقة...).
-MinLength=الحد الأدني
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+StepNb=الخطوة ق ٪
+FindPackageFromWebSite=العثور على الحزمة التي توفر ميزة تريد (على سبيل المثال على موقع الويب ق ٪).
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
+SetupIsReadyForUse=الانتهاء من تركيب وDolibarr على استعداد لاستخدام هذا العنصر الجديد.
+NotExistsDirect=The alternative root directory is not defined.<br>
+InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
+CurrentVersion=Dolibarr النسخة الحالية
+CallUpdatePage=الذهاب إلى صفحة التحديثات وdatas هيكل قاعدة البيانات : ٪ s.
+LastStableVersion=آخر نسخة مستقرة
+UpdateServerOffline=Update server offline
+GenericMaskCodes=يمكنك إدخال أي قناع الترقيم. في هذا القناع ، وبعد ويمكن استخدام العلامات : <br> <b>(000000)</b> يطابق عدد الذي سيكون على كل يزداد ٪ s. كما تدخل العديد من أصفار على النحو المنشود طول المضادة. المضاد وسيتم الانتهاء من اصفار من اليسار من أجل الحصول على أكبر عدد اصفار كما القناع. <br> <b>000000 +000) (نفس</b> السابقة ولكن يقابل المقابلة لعدد للحق من علامة + يطبق اعتبارا من أول ٪ s. <br> <b>000000 @ (س)</b> نفس السابقة ولكن المضاد هو إعادة الصفر عندما يتم التوصل إلى الشهر خ خ ما بين 1 و 12). إذا كان هذا الخيار هو المستخدمة وس 2 أو أعلى ، ثم تسلسل (ذ ذ م م)) ((سنة أو ملم)) (مطلوب أيضا. <br> <b>(ب)</b> اليوم (01 الى 31). <br> <b>() ملم</b> في الشهر (01 الى 12). <br> <b>(كذا)</b> ، <b>(سنة))</b> أو <b>(ذ</b> السنة أكثر من 2 أو 4 أو 1 الأرقام. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <br>
+GenericMaskCodes4a=<u>ومثال على 99th ق ٪ من طرف ثالث TheCompany عمله 2007-01-31 :</u> <br>
+GenericMaskCodes4b=<u>ومثال على طرف ثالث على خلق 2007-03-01 :</u> <br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericNumRefModelDesc=العودة للتخصيص وفقا لعدد محدد القناع.
+ServerAvailableOnIPOrPort=الخدمة متاحة في معالجة <b>٪ ق ق ٪</b> على الميناء
+ServerNotAvailableOnIPOrPort=الخدمة غير متاحة في التصدي <b>٪ ق ق ٪</b> على الميناء
+DoTestServerAvailability=اختبار خدمة التوصيل
+DoTestSend=ارسال الاختبار
+DoTestSendHTML=اختبار ارسال هتمل
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطأ ، لا يمكن للمستخدم الخيار في حال تسلسل @ (ذ ذ م م)) ((سنة أو ملم)) (لا تخفي.
+UMask=معلمة جديدة UMask صورة يونيكس / لينكس / بي إس دي نظام الملفات.
+UMaskExplanation=تسمح لك هذه المعلمة لتحديد الاذونات التي حددها تقصير من الملفات التي أنشأتها Dolibarr على الخادم (خلال تحميلها على سبيل المثال). <br> يجب أن يكون ثمانية القيمة (على سبيل المثال ، 0666 وسائل القراءة والكتابة للجميع). <br> م شمال شرق paramètre سرت sous الامم المتحدة لتقييم الأداء ويندوز serveur.
+SeeWikiForAllTeam=إلقاء نظرة على صفحة ويكي قائمة كاملة لجميع الجهات الفاعلة والمنظمة
+UseACacheDelay= التخزين المؤقت للتأخير في الرد على الصادرات ثانية (0 فارغة أو لا مخبأ)
+DisableLinkToHelpCenter=الاختباء وصلة <b>"هل تحتاج إلى مساعدة أو دعم"</b> على صفحة تسجيل الدخول
+DisableLinkToHelp=إخفاء ارتباط <b>"ق ٪ أخبار يساعد"</b> على القائمة اليمنى
+AddCRIfTooLong=ليس هناك التفاف تلقائي ، حتى إذا خرج من خط صفحة على وثائق لفترة طويلة جدا ، يجب إضافة حرف إرجاع نفسك في ناحية النص.
+ModuleDisabled=نميطة المعوقين
+ModuleDisabledSoNoEvent=نميطة المعوقين بغية خلق حالة أبدا
+ConfirmPurge=هل أنت متأكد من ذلك لتنفيذ تطهير؟ <br> وهذا من شأنه بالتأكيد حذف جميع بيانات ملفك بأي حال من الأحوال لترميمها (صورة إدارة المحتوى في المؤسسة ، والملفات المرفقة...).
+MinLength=الحد الأدني لمدة
 LanguageFilesCachedIntoShmopSharedMemory=لانغ لتحميل الملفات. في الذاكرة المشتركة
 ExamplesWithCurrentSetup=أمثلة مع تشغيل الإعداد الحالي
-ListOfDirectories=قائمة دلائل اللغة في الذاكرة المفتوحة 
-ListOfDirectoriesForModelGenODT=قائمة الدلائل التي تحتوي على ملفات ذات شكل قوالب مفتوحة. <br><br> ضع المسار الكامل من للدلائل. <br> إضافة حرف إرجاع بين الدلائل. <br> لإضافة دليل وحدة [GED] ، عين <br><b>DOL_DATA_ROOT/ecm/nomdurepertoireged</b><br><br>.  الملفات ذات شكل قالب في هذه الدلائل يجب أن تنتهي ب <b>.odt</b>
-NumberOfModelFilesFound=عدد الملفات ذو قالب ODT /ODS اللتي وجدت في هذه الدلائل
-ExampleOfDirectoriesForModelGen=مثال في بناء الجملة:  :<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir 
-FollowingSubstitutionKeysCanBeUsed=<br>لمعرفة كيفية كتابة قوالب مستندات ODT قبل وضعها في واحدة من هذه الدلائل، راجع وثائق الويكي:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Créer_un_modèle_de_document_ODT
-FirstnameNamePosition=ترتيب العرض : الاسم / اللقب
-DescWeather=سيتم عرض الصور التالية على لوحة القيادة عندما عدد العناصر المتأخرة تصل الى القيمة التالية:
-KeyForWebServicesAccess=المفتاح لاستخدام خدمات الشبكة العالمية (المعلمة "dolibarrkey" في هذه الخدمات)
-TestSubmitForm=استمارة اختبار الإدخال
-ThisForceAlsoTheme=استخدام هذا المدير للقائمة يجبر أيضا استخدام الموضوع خاصة، مهما كان خيار المستخدم للموضوع. أيضا هذا المدير المتخصص بالهواتف الذكية لا يعمل على جميع الهواتف الذكية. استخدم مدير آخر القائمة إذا واجهت مشاكل في استخدامه.
-ThemeDir=دليل المواضيع
+ListOfDirectories=قائمة الدلائل المفتوحة قوالب
+ListOfDirectoriesForModelGenODT=قائمة الدلائل التي تحتوي على ملفات ذات شكل قوالب المفتوحة. <br><br> هنا وضع المسار الكامل من الدلائل. <br> إضافة حرف إرجاع بين الدليل ايه. <br> لإضافة دليل وحدة [جد] ، أضيف هنا <b>DOL_DATA_ROOT / إدارة المحتوى في المؤسسة / yourdirectoryname.</b> <br><br> في هذه الدلائل يجب أن تنتهي مع <b>ملفات. odt.</b>
+NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+ExampleOfDirectoriesForModelGen=أمثلة على بناء الجملة : <br> ج : mydir \\ <br> / الوطن / mydir <br> DOL_DATA_ROOT / إدارة المحتوى في المؤسسة / ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br> لمعرفة كيفية إنشاء قوالب المستند ODT، قبل تخزينها في تلك الدلائل، وقراءة وثائق ويكي:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=موقف الإسم / اسم
+DescWeather=سيتم عرض الصور التالية على لوحة أجهزة القياس عند عدد من الإجراءات في وقت متأخر تصل الى القيم التالية:
+KeyForWebServicesAccess=مفتاح لاستخدام خدمات الشبكة العالمية (المعلمة &quot;dolibarrkey&quot; في webservices)
+TestSubmitForm=اختبار شكل مساهمة
+ThisForceAlsoTheme=وسوف تستخدم هذه القائمة أيضا استخدام مدير موضوعه الخاصة بكل ما هو خيار المستخدم. أيضا هذه القائمة مدير متخصصة للهواتف الذكية لا يعمل على جميع الهواتف الذكية. استخدم مدير آخر القائمة إذا واجهت مشاكل في يدكم.
+ThemeDir=جلود دليل
 ConnectionTimeout=بمناسبه المهلة
-ResponseTimeout= مهلة الاستجابة للتصالات
+ResponseTimeout=استجابة مهلة
 SmsTestMessage=رسالة اختبار من __PHONEFROM__ إلى __PHONETO__
-ModuleMustBeEnabledFirst=يجب تمكين الوحدة <b>%s</b> قبل استخدام هذه الميزة.
-SecurityToken=مفتاح تأمين المواقع 
-NoSmsEngine=لا مدير مرسل للرسائل القصيرة متاح. لم يتم تثبيت مرسل SMS مع مدير التوزيع الافتراضي (لأنها تعتمد على مورد خارجي)، لكن يمكنك أن تجد بعض منها على http://www.dolistore.com
+ModuleMustBeEnabledFirst=يجب تمكين <b>%s</b> الوحدة الأولى قبل استخدام هذه الميزة.
+SecurityToken=المفتاح لعناوين المواقع الآمنة
+NoSmsEngine=لا مدير مرسل الرسائل القصيرة المتاحة. لم يتم تثبيت SMS المرسل مع مدير التوزيع الافتراضي (لأنها تعتمد على مورد خارجي)، ولكن يمكنك أن تجد بعض على http://www.dolistore.com
 PDF=PDF
-PDFDesc=يمكنك التعيين هنا خيارات عامة متعلقة بإنشاء وثائق PDF
-PDFAddressForging=قواعد لتشكيل مناطق العناوين
-HideAnyVATInformationOnPDF=إخفاء كل المعلومات المتعلقة بالضريبة على القيمة المضافة عند إنشاء وثائق PDF
-HideDescOnPDF=إخفاءالوصف  عند إنشاء وثائق PDF
-HideRefOnPDF=إخفاءالمرجع عند إنشاء وثائق PDF
-HideDetailsOnPDF=إخفاءالتفاصيل عند إنشاء وثائق PDF
-Library=مكتبة
-UrlGenerationParameters=تأمين عناوين المواقع
-SecurityTokenIsUnique=استخدام معلمة securekey فريدة خاصة لكل URL
-EnterRefToBuildUrl=أدخل المرجع لإنشاءالموقع %s
-GetSecuredUrl=الحصول على عنوان محسوب للموقع 
-ButtonHideUnauthorized=إخفاء الأزرار الغير مأذون بها (بدلا من رؤيتها باللون الرمادي)
-OldVATRates=قيمة الضريبة على القيمة المضافة السابقة
-NewVATRates=قيمة الضريبة على القيمة المضافة الجديدة
-PriceBaseTypeToChange=تعديل على الأسعار التي مرجعها الأساسي هو
-MassConvert=تحويل جماعي
+PDFDesc=يمكنك تعيين كل الخيارات العالمية المتصلة جيل PDF
+PDFAddressForging=قواعد لتشكيل مربعات العناوين
+HideAnyVATInformationOnPDF=إخفاء كل المعلومات المتعلقة ضريبة القيمة المضافة على إنشاء قوات الدفاع الشعبي
+HideDescOnPDF=Hide products description on generated PDF
+HideRefOnPDF=Hide products ref. on generated PDF
+HideDetailsOnPDF=Hide products lines details on generated PDF
+Library=المكتبة
+UrlGenerationParameters=المعلمات لتأمين عناوين المواقع
+SecurityTokenIsUnique=استخدام معلمة securekey فريدة لكل URL
+EnterRefToBuildUrl=أدخل مرجع لكائن %s
+GetSecuredUrl=الحصول على عنوان محسوب
+ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch mass convert
 String=سلسلة
-TextLong=نص طويل
-Int=عدد طبيعي
-Float=عشري
-DateAndTime=التاريخ و الوقت
-Unique=وحيد
-Boolean=قيمة منطقية (خانة اختيار)
+TextLong=Long text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (Checkbox)
 ExtrafieldPhone = هاتف
 ExtrafieldPrice = الأسعار
-ExtrafieldMail = البريد الالكتروني
-ExtrafieldSelect =قائمة اختيار
-ExtrafieldSelectList =قائمة عقب جدول
-ExtrafieldSeparator=فاصل  بين الحقول
-ExtrafieldCheckBox=خانة اختيار
-ExtrafieldRadio=زر راديو
-ExtrafieldCheckBoxFromList=قائمة صندوق عقب جدول
-ExtrafieldLink=ربط على كائن
-ExtrafieldParamHelpselect=يجب أن تكون القائمة على شكل مفتاح،قيمة<br><br>. على سبيل المثال: 1-v1,2-v2,3-v3... كي تكون القائمة لا تعتمد على أخرى:1,valeur1|code_liste_parent:clef_parent<br>2,valeur2|code_liste_parent:clef_parent
-ExtrafieldParamHelpcheckbox=يجب أن تكون القائمة على شكل مفتاح، قيمة. على سبيل المثال: <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpradio=يجب أن تكون القائمة على شكل مفتاح، قيمة. على سبيل المثال: <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpsellist=القائمة تأتي من جدول <BR> بناء الجملة:... 
-ExtrafieldParamHelpchkbxlst=خانات الاختيارتأتي من جدول <BR> بناء الجملة:... 
-LibraryToBuildPDF=المكتبة المستخدمة لتوليد ...PDF
-WarningUsingFPDF=تحذير: يحتوي الملف conf.php  على التوجيه ...dolibarr_pdf_force_fpdf = 1 
-LocalTaxDesc=بعض البلدان تطبق 2 أو 3 الضرائب على كل خط الفاتورة...
-SMS=رسالةقصيرة
-LinkToTestClickToDial=أدخل رقم الهاتف للاتصال لاختبار الارتباط دعوة "ClickToDial" للمستخدم %s
-RefreshPhoneLink=تحديث الرابط 
-LinkToTest=صلة للنقر أنشئت للمستخدم (انقر على الرقم للاختبار)
-KeepEmptyToUseDefault=أترك الحقل فارغا للاستخدام الافتراضي
-DefaultLink=الارتباط الافتراضي
-ValueOverwrittenByUserSetup=يرجى ملاحظة أن هذه القيمة يمكن تجاوزها من قبل قيمة محددة لتكوين المستخدم (يمكن لكل مستخدم أن يكون URL خاص به "ClickToDial")
-ExternalModule=المساعد - مثبت في الدليل %s
-BarcodeInitForThirdparties=تهيئة الباركود بالجملة للأطراف الثالثة
-BarcodeInitForProductsOrServices=تهيئة أو تطهير الرموز الشريطية بالجملة للمنتجات أو الخدمات
-CurrentlyNWithoutBarCode=حاليا لديك %s تسجيلات على %s دون باركود محدد.
-InitEmptyBarCode=قم بتعيين القيم الفارغة للسجلات %s التالية
-EraseAllCurrentBarCode=مسح كافة قيم الباركود
-ConfirmEraseAllCurrentBarCode=هل أنت متأكد أنك تريد حذف كل القيم الباركود؟
-AllBarcodeReset=تم حذف كل الرموز الشريطية
-NoBarcodeNumberingTemplateDefined=لم يتم تفعيل أي نمط ترقيم الباركود في وحدة الباركود.
-NoRecordWithoutBarcodeDefined=لا يوجد سجل دون تعيين الباركود.
+ExtrafieldMail = Email
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator
+ExtrafieldCheckBox=Checkbox
+ExtrafieldRadio=Radio button
+ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+LibraryToBuildPDF=Library used to build PDF
+WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module - Installed into directory %s
+BarcodeInitForThirdparties=Mass barcode init for thirdparties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
 
 # Modules
-Module0Name=المجموعات و المستخدمين
+Module0Name=& مجموعات المستخدمين
 Module0Desc=إدارة المستخدمين والمجموعات
-Module1Name=الأطراف الثالثة
-Module1Desc=شركات الاتصالات والإدارة
+Module1Name=أطراف ثالثة
+Module1Desc=شركات الاتصالات وإدارة
 Module2Name=التجارية
 Module2Desc=الإدارة التجارية
 Module10Name=المحاسبة
 Module10Desc=إدارة المحاسبة البسيطة (ارسال الفواتير والمدفوعات)
-Module20Name=فواتير أولية (المقترحات التجارية)
-Module20Desc=إدارة الفواتير الأولية 
-Module22Name=البريد الإلكتروني
-Module22Desc=إدارة البريد الإلكتروني بالجملة 
-Module23Name=الطاقة
+Module20Name=مقترحات
+Module20Desc=مقترحات تجارية إدارة
+Module22Name=كتلة بالبريد الإلكتروني
+Module22Desc=البريد الإلكتروني الدمار إدارة
+Module23Name=طاقة
 Module23Desc=مراقبة استهلاك الطاقة
 Module25Name=طلبات الزبائن
-Module25Desc=إدارة طلبات الزبائن
-Module30Name=فواتير و موجودات
-Module30Desc=إدارة فواتير و موجودات العملاء.إدارة  فواتير الموردين
+Module25Desc=طلبات الزبائن إدارة
+Module30Name=فواتير
+Module30Desc=ويلاحظ اعتماد الفواتير وإدارة العملاء. فواتير إدارة الموردين
 Module40Name=الموردين
-Module40Desc=إدارة الموردين والمشتريات (الأوامر والفواتير)
-Module42Name=تسجيلات وآثار
-Module42Desc=إنشاءالتسجيلات (ملفات، syslogs، ...)
-Module49Name=برامج التحرير
-Module49Desc=إدارة برامج التحرير
+Module40Desc=الموردين وإدارة وشراء (الأوامر والفواتير)
+Module42Name=Syslog
+Module42Desc=قطع الأشجار مرافق (syslog)
+Module49Name=المحررين
+Module49Desc=المحررين إدارة
 Module50Name=المنتجات
-Module50Desc=إدارة المنتجات 
+Module50Desc=منتجات إدارة
 Module51Name=الرسائل الجماعية
-Module51Desc=إدارة بعث الرسائل الجماعية
-Module52Name=المخزونات
-Module52Desc=إدارة مخازين المنتجات
+Module51Desc=الدمار ورقة الرسائل الإدارية
+Module52Name=الاسهم
+Module52Desc=مخزون إدارة المنتجات
 Module53Name=الخدمات
-Module53Desc=إدارة الخدمات
-Module54Name=العقود / الاشتراكات
-Module54Desc=إدارة العقود (الخدمات أو الاشتراكات المتكررة)
-Module55Name=الرموز الشريطية
-Module55Desc=إدارة  الرموز الشريطية
+Module53Desc=الخدمات الإدارية
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcodes إدارة
 Module56Name=الخدمات الهاتفية
-Module56Desc=إدارة الخدمات الهاتفية
+Module56Desc=تكامل الخدمات الهاتفية
 Module57Name=أوامر دائمة
-Module57Desc=الانسحابات
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
-Module58Desc=إدماج أنظمة Asterisk,ClickToDial ...
+Module58Desc=ClickToDial التكامل
 Module59Name=Bookmark4u
-Module59Desc=إضافة مهمة لتوليد حساب Bookmark4u منذ حساب Dolibarr
+Module59Desc=إضافة مهمة لتوليد Bookmark4u الحساب من حساب Dolibarr
 Module70Name=المداخلات
-Module70Desc=إدارة المداخلات
-Module75Name=ملاحظات النفقات و الرحلات
-Module75Desc=إدارة ملاحظات النفقات و الرحلات
-Module80Name=المرسلات
-Module80Desc=إدارة المرسلات وإستلامات الزبائن 
-Module85Name=البنوك و الصناديق
-Module85Desc=إدارة البنوك و الصناديق
-Module100Name=مواقع خارجية
-Module100Desc=يزيد مواقع خارجية في قوائم Dolibarr وإعلانها في إطار Dolibarr
-Module105Name=Mailman و SPIP
-Module105Desc=Mailman و SPIP واجهة للوحدة "أعضاء"
+Module70Desc=التدخلات الإدارية
+Module75Name=ويلاحظ نفقات رحلات
+Module75Desc=ونفقات الرحلات تلاحظ إدارة
+Module80Name=الإرسال
+Module80Desc=الإرسال وتسليم الأوامر الإدارية
+Module85Name=المصارف والنقد
+Module85Desc=إدارة حسابات مصرفية أو نقدا
+Module100Name=ExternalSite
+Module100Desc=وتشمل أي موقع خارجي في القوائم Dolibarr ومشاهدته في إطار Dolibarr
+Module105Name=ساعي البريد ورشفة
+Module105Desc=ساعي البريد أو SPIP واجهة وحدة عضو
 Module200Name=LDAP
-Module200Desc=التزامن مع دليل LDAP
+Module200Desc=دليل LDAP نمازتلا
 Module210Name=PostNuke
-Module210Desc=التكامل مع PostNuke
-Module240Name=تصدير البيانات
-Module240Desc=أداة لتصديربيانات Dolibarr (عن طريق مساعد)
-Module250Name=استيراد البيانات 
-Module250Desc=أداة لاستيراد البيانات في Dolibarr (عن طريق مساعد)
+Module210Desc=PostNuke التكامل
+Module240Name=بيانات الصادرات
+Module240Desc=أداة لتصدير Dolibarr datas (مساعدين)
+Module250Name=بيانات الاستيراد
+Module250Desc=أداة لاستيراد datas في Dolibarr (مساعدين)
 Module310Name=أعضاء
-Module310Desc=إدارة أعضاء جمعية
-Module320Name=تدفق RSS
-Module320Desc=إضافة تدفق RSS داخل شاشات صفحة Dolibarr
-Module330Name=إشارات مرجعية
-Module330Desc=إدارة إشارات مرجعية
-Module400Name=المشاريع / فرص التجارية
-Module400Desc=إدارة المشاريع / فرص التجارية
+Module310Desc=أعضاء إدارة المؤسسة
+Module320Name=تغذية RSS
+Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr
+Module330Name=العناوين
+Module330Desc=العناوين إدارة
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
-Module410Desc=واجهة مع الجدول الزمني Webcalendar 
-Module500Name=مصروفات خاصة (ضرائب,رسوم وأرباح)
-Module500Desc=إدارة المصروفات الخاصة (الضرائب,الرسوم والأرباح)
-Module510Name=الموظفين
-Module510Desc=إدارة مدفوعات أجور الموظفين
-Module520Name=القروض
-Module520Desc=إدارة القروض
-Module600Name=الإشعارات
-Module600Desc=إرسال بريد إلكتروني للإشعار على بعض صفقات لأحداث Dolibarr، إلى الجهات الثالثة (بعدما نفذ التكوين على كل طرف ثالث)
+Module410Desc=Webcalendar التكامل
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module510Name=Salaries
+Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
+Module600Name=الإخطارات
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=التبرعات
-Module700Desc=إدارة التبرعات 
-Module770Name=ملاحظات النفقات
-Module770Desc=الإدارة والإبلاغ عن النفقات (النقل وجبات الطعام، ...)
-Module1120Name=الفواتير الأولية للموردين
-Module1120Desc=إدارة الفواتير الأولية للموردين
-Module1200Name=مانتيس
-Module1200Desc=التفاعل مع ال bug tracker مانتيس
+Module700Desc=التبرعات إدارة
+Module770Name=Expense reports
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
+Module1200Name=فرس النبي
+Module1200Desc=فرس النبي التكامل
 Module1400Name=المحاسبة
-Module1400Desc=إدارة المحاسبة (طرف مزدوج)
-Module1520Name=توليد الوثائق
-Module1520Desc=توليد وثائق البريد المباشر
-Module1780Name=تسميات / تصنيفات
-Module1780Desc=خلق تسميات / تصنيفات (بالنسبة للمنتجات والعملاء والموردين، والاتصالات و أفراد) 
+Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
-Module2000Desc=يسمح بمصادرة بعض الحقول النصية بفضل محرر متقدم
-Module2200Name=أسعار محسوبة ديناميكيا
-Module2200Desc=أفعال استخدام للعبارات الرياضية
-Module2300Name=أشغال مبرمجة
-Module2300Desc=أشغال مبرمجة
+Module2000Desc=سوغ محرر
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
+Module2300Name=Cron
+Module2300Desc=Scheduled job management
 Module2400Name=جدول الأعمال
 Module2400Desc=الأعمال / الإدارة المهام وجدول الأعمال
 Module2500Name=إدارة المحتوى الإلكتروني
 Module2500Desc=حفظ وتبادل الوثائق
-Module2600Name=خدمات الويب
-Module2600Desc=تمكين خدمات الويب Dolibarr 
-Module2650Name=خدمات الويب(الزبائن)
-Module2650Desc=تفعيل خدمات العملاء على شبكة الإنترنت (يمكن استخدامها لدفع البيانات لخادمين خارجيين. أوامر الموردين مستعملة فقط في الوقت الحاضر)
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=غرفتر
-Module2700Desc=ااستخدام الخدمة عبر الإنترنت غرفتر (www.gravatar.com) لعرض الصور المستخدمين / الأعضاء (اعتمادا على بريدهم الإلكتروني ). تحتاج الوصول إلى الإنترنت.
-Module2800Desc=زبون FTP
+Module2700Desc=استخدام خدمة غرفتر على الانترنت (www.gravatar.com) لإظهار الصورة من المستخدمين / أعضاء (وجدت مع رسائل البريد الإلكتروني الخاصة بهم). في حاجة الى الوصول الى شبكة الانترنت
+Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
-Module2900Desc=قدرات التحويلات GeoIP Maxmind
+Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3100Name=Skype
-Module3100Desc=إضافة زر سكايب في الأوراق المنضمة /الأطراف  الثالثة / الاتصالات
+Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
 Module5000Name=شركة متعددة
-Module5000Desc=إدارة الشركات المتعددة
-Module6000Name=تدفق العمل
-Module6000Desc=إدارة تدفق العمل
-Module20000Name=إدارة طلبات إجازة
-Module20000Desc=إعلان ومتابعة  طلبات إجازة للموظفين
-Module39000Name=المنتجات بالقسمة و الرقم التسلسلي
-Module39000Desc=إدارة المنتجات بالقسمة أو الرقم التسلسلي.
+Module5000Desc=يسمح لك لإدارة الشركات المتعددة
+Module6000Name=Workflow
+Module6000Desc=Workflow management
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
-Module50000Desc=وحدة لتقديم الدفع على صفحة الإنترنت عن طريق بطاقة الائتمان مع PayBox
+Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
 Module50100Name=نقطة البيع
-Module50100Desc=إدارة وحدة نقطة بيع 
+Module50100Desc=نقطة بيع وحدة
 Module50200Name=باي بال
-Module50200Desc=وحدة لتقديم الدفع على صفحة الإنترنت عن طريق بطاقة الائتمان مع  بايبال
-Module50400Name=المحاسبة (متقدمة)
-Module50400Desc=إدارة المحاسبة (طرف مزدوج)
+Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال
+Module50400Name=Accounting (advanced)
+Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=الطباعة المباشرة (دون فتح الوثيقة) باستخدام تفاعل  IPP (يجب أن تكون الطابعة مرئية من الخادم، يجب تثبيت CUPS على الخادم).
-Module55000Name=استطلاعات الرأي
-Module55000Desc=وحدة لدمجاستطلاعات الرأي  (مثلDoodle, Studs, Rdvz, ...)
-Module59000Name=الهوامش
-Module59000Desc=وحدة لإدارة الهوامش
-Module60000Name=اللجان
-Module60000Desc=وحدة لإدارة اللجان
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
+Module55000Name=Open Poll
+Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
 Permission11=قراءة الفواتير
-Permission12=خلق فواتير الزبائن
-Permission13=تعديل فواتير الزبائن
-Permission14=التحقق من صحة فواتير الزبائن
-Permission15=ارسال فواتير الزبائن عن طريق البريد الإلكتروني
-Permission16=خلق دفع فواتير الزبائن
-Permission19=حذف فواتير الزبائن
-Permission21=قراءة المقترحات التجارية
-Permission22=إنشاء / تعديل المقترحات التجارية
-Permission24=مصادقة على المقترحات التجارية
-Permission25=ارسال المقترحات التجارية
+Permission12=خلق الفواتير
+Permission13=تعديل الفواتير
+Permission14=التحقق من صحة الفواتير
+Permission15=ارسال الفواتير عن طريق البريد الإلكتروني
+Permission16=خلق دفع الفواتير
+Permission19=حذف الفواتير
+Permission21=قراءة مقترحات تجارية
+Permission22=إنشاء / تعديل مقترحات تجارية
+Permission24=مصادقة على مقترحات تجارية
+Permission25=ارسال مقترحات تجارية
 Permission26=وثيقة المقترحات التجارية
-Permission27=حذف المقترحات التجارية
-Permission28=تصدير المقترحات التجارية
+Permission27=حذف مقترحات تجارية
+Permission28=الصادرات التجارية مقترحات
 Permission31=قراءة المنتجات
 Permission32=إنشاء / تعديل المنتجات
 Permission34=حذف المنتجات
-Permission36=نظر / إدارة المنتجات المخفية
-Permission38=تصدير المنتجات 
-Permission41=قراءة المشاريع والمهام (المشتركة أو التي أنا بالاتصال معها)
-Permission42=إنشاء / تعديل المشاريع مهام (المشتركة أو التي أنا بالاتصال معها)
-Permission44=حذف المشاريع (المشتركة أو التي أنا بالاتصال معها)
+Permission36=انظر / إدارة المنتجات المخفية
+Permission38=منتجات التصدير
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission42=إنشاء / تعديل مشاريع تعديل مهام بلدي المشاريع
+Permission44=حذف مشاريع
 Permission61=قراءة التدخلات
 Permission62=إنشاء / تعديل التدخلات
 Permission64=حذف التدخلات
 Permission67=تصدير التدخلات
 Permission71=قراءة الأعضاء
-Permission72=إنشاء / تعديل الأعضاء
-Permission74=حذف الأعضاء
-Permission75=تكوين أنواع الأعضاء
-Permission76=تصدير الأعضاء
+Permission72=إنشاء / تعديل أعضاء
+Permission74=حذف أعضاء
+Permission75=Setup types of membership
+Permission76=تصدير datas
 Permission78=قراءة الاشتراكات
-Permission79=إنشاء / تعديل الاشتراكات
+Permission79=إنشاء / تعديل والاشتراكات
 Permission81=قراءة أوامر العملاء
 Permission82=إنشاء / تعديل أوامر العملاء
-Permission84=تأكيد أوامر العملاء
+Permission84=صحة أوامر العملاء
 Permission86=إرسال أوامر العملاء
-Permission87=إغلاق أوامر العملاء
+Permission87=وثيقة أوامر العملاء
 Permission88=إلغاء أوامر العملاء
 Permission89=حذف أوامر العملاء
-Permission91=قراءة المساهمات الاجتماعية وضريبة القيمة المضافة
-Permission92=إنشاء / تعديل المساهمات الاجتماعية وضريبة القيمة المضافة
-Permission93=حذف المساهمات الاجتماعية وضريبة القيمة المضافة
-Permission94=تصدير المساهمات الاجتماعية
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=قراءة تقارير
 Permission101=قراءة الإرسال
 Permission102=إنشاء / تعديل الإرسال
@@ -621,9 +621,9 @@ Permission121=قراءة الغير مرتبطة المستخدم
 Permission122=إنشاء / تغيير الغير مرتبطة المستخدم
 Permission125=حذف الغير مرتبطة المستخدم
 Permission126=الصادرات الغير
-Permission141=المهام اقرأ
-Permission142=إنشاء / تعديل المهام
-Permission144=حذف المهام
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=قراءة موفري
 Permission147=قراءة احصائيات
 Permission151=قراءة أوامر دائمة
@@ -801,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -818,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=الإعداد المحفوظة
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=Back to dictionaries list
@@ -937,13 +940,14 @@ CompanyZip=الرمز البريدي
 CompanyTown=مدينة
 CompanyCountry=قطر
 CompanyCurrency=العملة الرئيسية
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=لا تظهر
 DoNotSuggestPaymentMode=لا توحي
 NoActiveBankAccountDefined=لا يعرف في حساب مصرفي نشط
 OwnerOfBankAccount=صاحب الحساب المصرفي ق ٪
 BankModuleNotActive=الحسابات المصرفية وحدة لا يمكن
-ShowBugTrackLink=وتظهر وصلة "تقرير خلل"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=وتظهر "طاولة العمل" على الصفحة الرئيسية
 Alerts=تنبيهات
 Delays=التأخير
@@ -953,7 +957,7 @@ DelaysOfToleranceBeforeWarning=محذرا من التأخير قبل التسا
 DelaysOfToleranceDesc=تتيح لك هذه الشاشة لتحديد التأخير قبل السماح تنبيه يقال على الشاشة مع picto ٪ ق لكل عنصر في وقت متأخر.
 Delays_MAIN_DELAY_ACTIONS_TODO=تأخير التسامح (أيام) قبل اتخاذ إجراءات في حالة تأهب على المخطط لم تتحقق
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=تأخير التسامح (أيام) قبل تنبيه على أوامر لم
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=التسامح التأخير (في أيام) قبل التنبيه على أوامر الموردين لم تتم مديرة حتى الآن
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=التسامح التأخير (في أيام) قبل التنبيه على أوامر الموردين لم تتم معالجة حتى الآن
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=التسامح التأخير (في يوم) في حالة تأهب على المقترحات المعروضة ليقفل
 Delays_MAIN_DELAY_PROPALS_TO_BILL=تأخير التسامح (أيام) قبل تنبيه بشأن المقترحات لا توصف
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=تأخير التسامح (في يوم) في حالة تأهب قبل يوم والخدمات لتفعيل
@@ -1010,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=ماكس عشرية لأسعار الوحدات
 MAIN_MAX_DECIMALS_TOT=الحد الأقصى لمجموع أسعار عشرية
 MAIN_MAX_DECIMALS_SHOWN=ماكس عشرية لأسعار تظهر على الشاشة (يضاف هذا العدد <b>بعد...</b> إذا كنت تريد أن <b>ترى...</b> عندما العدد مبتورة عندما تظهر على الشاشة)
 MAIN_DISABLE_PDF_COMPRESSION=الاستخدام الشعبي للضغط الشعبي ولدت الملفات.
-MAIN_ROUNDING_RULE_TOT= حجم التقريب مجموعة (لبلدان النادرة التي يتم التقريب على شيء آخر من قاعدة 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=صافي سعر وحدة من المنتج
 TotalPriceAfterRounding=إجمالي السعر الصافي / ضريبة القيمة المضافة / ضريبة مدفوع) بعد التقريب
 ParameterActiveForNextInputOnly=معلمة فعالة للمساهمة المقبل فقط
@@ -1078,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1110,7 +1114,7 @@ UsersSetup=شاهد الإعداد وحدة
 UserMailRequired=مطلوب بريد إلكتروني لإنشاء مستخدم جديد
 ##### Company setup #####
 CompanySetup=وحدة الإعداد للشركات
-CompanyCodeChecker=وحدة للجيل الثالث لقانون الأحزاب ومراجعة (عميل أو مورد)
+CompanyCodeChecker=نموذج للجيل الثالث لقانون الأحزاب ومراجعة (عميل أو مورد)
 AccountCodeManager=رمز وحدة لتوليد المحاسبة (عميل أو مورد)
 ModuleCompanyCodeAquarium=عودة رمز المحاسبة التي بناها: <br> يتبع %s بواسطة طرف ثالث رمز المورد عن مورد قانون المحاسبة، <br> يتبع %s بواسطة طرف ثالث رمز العملاء لعميل قانون المحاسبة.
 ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة.
@@ -1154,9 +1158,9 @@ WebCalCheckWebcalSetup=ربما Webcal نميطة الإعداد غير صحيح
 BillsSetup=وحدة إعداد الفواتير
 BillsDate=تاريخ الفواتير
 BillsNumberingModule=الفواتير والقروض وتلاحظ وحدة الترقيم
-BillsPDFModules=فاتورة وحدات الوثائق
+BillsPDFModules=فاتورة نماذج الوثائق
 CreditNoteSetup=علما الإعداد وحدة الائتمان
-CreditNotePDFModules=المذكرة وثيقة من وثائق الائتمان الوحدات
+CreditNotePDFModules=المذكرة وثيقة من وثائق الائتمان النماذج
 CreditNote=علما الائتمان
 CreditNotes=ويلاحظ الائتمان
 ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة على
@@ -1171,8 +1175,8 @@ WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PropalSetup=وحدة إعداد مقترحات تجارية
 CreateForm=خلق أشكال
 NumberOfProductLines=عدد خطوط الإنتاج
-ProposalsNumberingModules=اقتراح وحدات تجارية الترقيم
-ProposalsPDFModules=اقتراح وحدات الوثائق التجارية
+ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
+ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
 ClassifiedInvoiced=صنف في الفاتورة
 HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة
 AddShippingDateAbility=إضافة قدرة الشحن والتاريخ
@@ -1191,7 +1195,7 @@ BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination o
 ##### Orders #####
 OrdersSetup=أوامر إدارة الإعداد
 OrdersNumberingModules=أوامر الترقيم نمائط
-OrdersModelModule=وثائق من أجل الوحدات
+OrdersModelModule=وثائق من أجل النماذج
 HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=للمصادقة على النظام بعد اقتراح أوثق ، لا يجعل من الممكن للخطوة من جانب النظام المؤقت
 FreeLegalTextOnOrders=بناء على أوامر النص الحر
@@ -1207,7 +1211,7 @@ Bookmark4uSetup=إعداد وحدة Bookmark4u
 InterventionsSetup=وحدة التدخل الإعداد
 FreeLegalTextOnInterventions=حرر النص على وثائق التدخل
 FicheinterNumberingModules=الترقيم وحدات التدخل
-TemplatePDFInterventions=تدخل بطاقة وحدات الوثائق
+TemplatePDFInterventions=تدخل بطاقة نماذج الوثائق
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
 ContractsSetup=Contracts/Subscriptions module setup
@@ -1254,7 +1258,7 @@ LDAPUserDn=المستخدمين DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=DN الكامل (مثلا : où= المستخدمين ، العاصمة= المجتمع ، العاصمة= كوم)
 LDAPGroupDn=الجماعات DN
 LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=DN الكامل (مثلا : où= المجموعات العاصمة= المجتمع ، العاصمة= كوم)
-LDAPServerExample=خادم مديرة (مثلا : localhost ، 192.168.0.2 ، ldaps : / / ldap.example.com /)
+LDAPServerExample=خادم معالجة (مثلا : localhost ، 192.168.0.2 ، ldaps : / / ldap.example.com /)
 LDAPServerDnExample=Complete DN (ex: dc=company,dc=DN الكامل (مثلا : العاصمة= شركة العاصمة= كوم)
 LDAPPasswordExample=كلمة السر الادارية
 LDAPDnSynchroActive=مستخدمين والمجموعات التزامن
@@ -1385,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=ا
 ConfirmDeleteProductLineAbility=تأكيد عندما إزالة خطوط الإنتاج في الأشكال
 ModifyProductDescAbility=الشخصي من الأشكال في وصف المنتج
 ViewProductDescInFormAbility=تصور وصف المنتج في أشكال (ما المنبثقة tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=تصور من أوصاف المنتجات في لغة مرشحين عن
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=الدعم الاقتصادي Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=النوع الافتراضي لاستخدام الباركود للمنتجات
 SetDefaultBarcodeTypeThirdParties=النوع الافتراضي لاستخدام الباركود لأطراف ثالثة
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1421,6 +1427,8 @@ BarcodeDescUPC=الباركود نوع من اتحاد الوطنيين الكو
 BarcodeDescISBN=الباركود من نوع ردمك
 BarcodeDescC39=الباركود من نوع C39
 BarcodeDescC128=الباركود من نوع C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1443,14 +1451,14 @@ ListOfAvailableNotifications=List of events you can set notification on, for eac
 FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=ارسال وحدة الإعداد
-SendingsReceiptModel=ارسال استلام وحدة
+SendingsReceiptModel=ارسال استلام نموذج
 SendingsNumberingModules=Sendings ترقيم الوحدات
 SendingsAbility=Support shipment sheets for customer deliveries
 NoNeedForDeliveryReceipts=في معظم الحالات ، تستخدم الإرسال إيصالات سواء صحائف لتسليم العميل (قائمة المنتجات ارسال) ، وصحائف التي وقعت عليها recevied الزبون. حتى المنتج تسليم الإيصالات هي سمة مزدوجة ونادرا ما تفعيلها.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=تلقي شحنات المنتجات الترقيم وحدة
-DeliveryOrderModel=تلقي شحنات المنتجات الوحدةية
+DeliveryOrderModel=تلقي شحنات المنتجات النموذجية
 DeliveriesOrderAbility=دعم المنتجات تسليم الإيصالات
 FreeLegalTextOnDeliveryReceipts=نص حر بتسليم إيصالات
 ##### FCKeditor #####
@@ -1483,7 +1491,7 @@ MenuHandler=قائمة مناول
 MenuModule=مصدر في وحدة
 HideUnauthorizedMenu= إخفاء القوائم غير المصرح به (الرمادي)
 DetailId=معرف القائمة
-DetailMenuHandler=قائمة المدير حيث تظهر قائمة جديدة
+DetailMenuHandler=قائمة المعالج حيث تظهر قائمة جديدة
 DetailMenuModule=اسم وحدة قائمة في حال الدخول من وحدة
 DetailType=نوع القائمة (أعلى أو إلى اليسار)
 DetailTitre=قائمة علامة أو بطاقة رمز للترجمة
@@ -1503,7 +1511,7 @@ ConfirmDeleteMenu=هل أنت متأكد من أنك تريد حذف القائ
 DeleteLine=حذف السطر
 ConfirmDeleteLine=هل أنت متأكد من أنك تريد حذف هذا الخط؟
 ##### Tax #####
-TaxSetup=الضرائب والمساهمات الاجتماعية والأرباح وحدة الإعداد
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=ضريبة القيمة المضافة المستحقة
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1531,7 +1539,7 @@ AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filt
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 ##### ClickToDial #####
-ClickToDialDesc=هذا الوحدة يسمح لإضافة رمز بعد رقم هاتف Dolibarr الاتصالات. وهناك اضغط على هذه الأيقونة ، سوف يطلب من أحد serveur معينة مع تحديد عنوان لكم أدناه. ويمكن استخدام هذه الكلمة لدعوة من مركز نظام Dolibarr التي يمكن الاتصال على رقم الهاتف هذا المسبار النظام على سبيل المثال.
+ClickToDialDesc=هذا النموذج يسمح لإضافة رمز بعد رقم هاتف Dolibarr الاتصالات. وهناك اضغط على هذه الأيقونة ، سوف يطلب من أحد serveur معينة مع تحديد عنوان لكم أدناه. ويمكن استخدام هذه الكلمة لدعوة من مركز نظام Dolibarr التي يمكن الاتصال على رقم الهاتف هذا المسبار النظام على سبيل المثال.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=نقاط البيع
 CashDeskSetup=مكتب الإعداد وحدة نقدية
@@ -1546,13 +1554,22 @@ StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatib
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=إعداد وحدة المرجعية
-BookmarkDesc=هذا الوحدة يسمح لك لإدارة العناوين. يمكنك أيضا إضافة أي Dolibarr اختصارات لصفحات أو مواقع الويب externale على القائمة اليمنى.
+BookmarkDesc=هذا النموذج يسمح لك لإدارة العناوين. يمكنك أيضا إضافة أي Dolibarr اختصارات لصفحات أو مواقع الويب externale على القائمة اليمنى.
 NbOfBoomarkToShow=أكبر عدد ممكن من العناوين تظهر في القائمة اليمنى
 ##### WebServices #####
 WebServicesSetup=إعداد وحدة Webservices
 WebServicesDesc=من خلال تمكين هذه الوحدة ، Dolibarr تصبح خدمة الإنترنت لتوفير خدمات الإنترنت وخدمات متنوعة.
 WSDLCanBeDownloadedHere=اختصار الواصفة ملف قدمت serviceses هنا يمكن التحميل
 EndPointIs=الصابون العملاء يجب إرسال الطلبات إلى نقطة النهاية Dolibarr متاحة في الموقع
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=إعداد وحدة مصرفية
 FreeLegalTextOnChequeReceipts=نص حر على الشيكات والإيصالات
@@ -1562,7 +1579,7 @@ BankOrderGlobalDesc=عرض عام النظام
 BankOrderES=الأسبانية
 BankOrderESDesc=الأسبانية عرض النظام
 ##### Multicompany #####
-MultiCompanySetup=وحدة متعدد شركة الإعداد
+MultiCompanySetup=نموذج متعدد شركة الإعداد
 ##### Suppliers #####
 SuppliersSetup=المورد الإعداد وحدة
 SuppliersCommandModel=قالب كاملة من أجل المورد (logo...)
@@ -1579,9 +1596,10 @@ TestGeoIPResult=اختبار لتحويل الملكية الفكرية --> ال
 ##### Projects #####
 ProjectsNumberingModules=مشاريع وحدة الترقيم
 ProjectsSetup=مشروع إعداد وحدة
-ProjectsModelModule=المشروع وحدة التقرير وثيقة
+ProjectsModelModule=المشروع نموذج التقرير وثيقة
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1595,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1623,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 1e1bc134583..9139de7369b 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=تم الموافقة على %s من الطلب
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة
-OrderCanceledInDolibarr=تم إلغاء %s من الطلب
 ProposalSentByEMail=تم إرسال العرض الرسمي %s بواسطة البريد الإلكتروني
 OrderSentByEMail=تم إرسال طلبية العميل %s بواسطة البريد الإلكتروني
 InvoiceSentByEMail=تم إرسال فاتروة العميل %s بواسطة البريد الإلكتروني
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 3f11c7edbf2..da6da12e749 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -94,12 +94,12 @@ Conciliate=التوفيق
 Conciliation=توفيق
 ConciliationForAccount=التوفيق في هذا الحساب
 IncludeClosedAccount=وتشمل حسابات مغلقة
-OnlyOpenedAccount=إلا فتح حسابات
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=الحساب على الائتمان
 AccountToDebit=لحساب الخصم
 DisableConciliation=تعطيل ميزة التوفيق لهذا الحساب
 ConciliationDisabled=توفيق سمة المعوقين
-StatusAccountOpened=فتح
+StatusAccountOpened=Open
 StatusAccountClosed=مغلقة
 AccountIdShort=عدد
 EditBankRecord=تعديل السجل
@@ -113,7 +113,7 @@ CustomerInvoicePayment=عملاء الدفع
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=المورد الدفع
 WithdrawalPayment=انسحاب الدفع
-SocialContributionPayment=دفع المساهمة الاجتماعية
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=مجلة الحساب المالي
 BankTransfer=حوالة مصرفية
 BankTransfers=التحويلات المصرفية
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 103f8dc779d..f47038ac702 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=ملاحظة : من الفواتير
 NumberOfBillsByMonth=ملحوظة من الفواتير من قبل شهر
 AmountOfBills=مبلغ الفواتير
 AmountOfBillsByMonthHT=كمية من الفواتير من قبل شهر (بعد خصم الضرائب)
-ShowSocialContribution=وتظهر مساهمة الاجتماعية
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=وتظهر الفاتورة
 ShowInvoice=وتظهر الفاتورة
 ShowInvoiceReplace=وتظهر استبدال الفاتورة
@@ -270,7 +270,7 @@ BillAddress=مشروع قانون معالجة
 HelpEscompte=هذا الخصم هو الخصم الممنوح للعميل لأن الدفع قبل البعيد.
 HelpAbandonBadCustomer=هذا المبلغ قد تم التخلي عنها (وذكر أن العملاء سيئة العملاء) ، ويعتبر أحد exceptionnal فضفاضة.
 HelpAbandonOther=هذا المبلغ قد تم التخلي عنها لأنها كانت خطأ (خطأ أو فاتورة العميل أي بعبارة أخرى على سبيل المثال)
-IdSocialContribution=المساهمة الاجتماعية معرف
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=دفع معرف
 InvoiceId=فاتورة معرف
 InvoiceRef=المرجع الفاتورة.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=فورا
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index f2aa5325277..441d4250558 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=آخر العقود
 BoxLastContacts=مشاركة اتصالات / عناوين
 BoxLastMembers=مشاركة الأعضاء
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=مبيعات
 BoxTotalUnpaidCustomerBills=مجموع الفواتير غير المدفوعة للعميل
 BoxTotalUnpaidSuppliersBills=مجموع الفواتير غير المدفوعة المورد
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=مبيعات
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index faf94a352fa..9bd3a337287 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>ق ٪</b> أضيفت بنجاح.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
 CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=بلا
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=هذه الفئة موجودة بالفعل في نفس المكان
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=محتويات غير مرئي من قبل جميع
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. الفئات
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 0646bcd465e..eb3980baa1b 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=طرف ثالث اتصال
 StatusContactValidated=مركز الاتصال
 Company=شركة
 CompanyName=اسم الشركة
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=الشركات
 CountryIsInEEC=البلد داخل المجموعة الاقتصادية الأوروبية
 ThirdPartyName=اسم طرف ثالث
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=مطلق الخصومات المتاحة
 DiscountNone=بلا
 Supplier=المورد
 CompanyList=شركات قائمة
-AddContact=إضافة
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=تحرير الاتصال / عنوان
 EditContactAddress=Edit contact/address
 Contact=جهة اتصال
@@ -268,8 +269,8 @@ ContactsAddresses=اتصالات / عناوين
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=لا يوجد اتصال محددة لهذا الطرف الثالث
 DefaultContact=الاتصال الافتراضية
-AddCompany=إضافة شركة
-AddThirdParty=إضافة طرف ثالث
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=حذف شركة
 PersonalInformations=البيانات الشخصية
 AccountancyCode=قانون المحاسبة
@@ -379,8 +380,8 @@ DeliveryAddressLabel=تسليم بطاقة معالجة
 DeleteDeliveryAddress=حذف عنوان التسليم
 ConfirmDeleteDeliveryAddress=هل أنت متأكد من أنك تريد حذف هذا عنوان التسليم؟
 NewDeliveryAddress=تقديم معالجة جديدة
-AddDeliveryAddress=أضف معالجة
-AddAddress=أضف معالجة
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=لا بديل عن تقديم معالجة محددة
 SupplierCategory=المورد الفئة
 JuridicalStatus200=المستقلة
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=عودة número مع الشكل nnnn - ٪ syymm الزبون ورمز وnnnn - ٪ syymm مورد للقانون حيث السنة هو السنة ، هو شهر ملم وnnnn هو تسلسل بلا كسر وعدم العودة إلى 0.
 LeopardNumRefModelDesc=العميل / المورد مدونة مجانية. هذا القانون يمكن تعديلها في أي وقت.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 266314ebe98..3aeacdce788 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -56,23 +56,23 @@ VATCollected=جمعت ضريبة القيمة المضافة
 ToPay=دفع
 ToGet=العودة
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=ضريبة أرباح الأسهم والمساهمات الاجتماعية ، ومنطقة
-SocialContribution=المساهمة الاجتماعية
-SocialContributions=المساهمات الاجتماعية
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=الضرائب وعوائد
 MenuSalaries=Salaries
-MenuSocialContributions=المساهمات الاجتماعية
-MenuNewSocialContribution=مساهمة جديدة
-NewSocialContribution=المساهمة الاجتماعية الجديدة
-ContributionsToPay=دفع الاشتراكات
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=المحاسبة / الخزانة المنطقة
 AccountancySetup=المحاسبة الإعداد
 NewPayment=دفع جديدة
 Payments=المدفوعات
 PaymentCustomerInvoice=الزبون تسديد الفاتورة
 PaymentSupplierInvoice=دفع فاتورة المورد
-PaymentSocialContribution=دفع المساهمة الاجتماعية
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=دفع ضريبة القيمة المضافة
 PaymentSalary=Salary payment
 ListPayment=قائمة المدفوعات
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=دفع ضريبة القيمة المضافة
 VATPayments=دفع ضريبة القيمة المضافة
-SocialContributionsPayments=المساهمات الاجتماعية المدفوعات
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=وتظهر دفع ضريبة القيمة المضافة
 TotalToPay=على دفع ما مجموعه
 TotalVATReceived=تلقى مجموع الضريبة على القيمة المضافة
@@ -116,11 +116,11 @@ NewCheckDepositOn=تهيئة لتلقي الودائع على حساب : ٪ ق
 NoWaitingChecks=لم ينتظر إيداع الشيكات.
 DateChequeReceived=استقبال المدخلات تاريخ الشيك
 NbOfCheques=ملاحظة : للشيكات
-PaySocialContribution=دفع المساهمات الاجتماعية
-ConfirmPaySocialContribution=هل أنت متأكد من أن يصنف هذه المساهمة paid الاجتماعية؟
-DeleteSocialContribution=حذف المساهمات الاجتماعية
-ConfirmDeleteSocialContribution=هل أنت متأكد من أنك تريد حذف هذه المساهمة الاجتماعية؟
-ExportDataset_tax_1=المساهمات الاجتماعية والمدفوعات
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 45f695fa7dc..7404d5fb07e 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -4,10 +4,10 @@ About = حول
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=تاريخ البدء
 CronDtEnd=نهاية التاريخ
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=الطريقة
 CronModule=وحدة
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=البارامترات
 CronSaveSucess=Save succesfully
 CronNote=التعليق
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index 48005676fe2..9e048d12820 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=بحث عن وجوه
 ECMSectionOfDocuments=أدلة وثائق
 ECMTypeManual=دليل
 ECMTypeAuto=التلقائي
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=وثائق مرتبطة أطراف ثالثة
 ECMDocsByProposals=وثائق مرتبطة مقترحات
 ECMDocsByOrders=وثائق مرتبطة أوامر العملاء
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index de1ec8009ce..1f72c62549e 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index 0e453b01075..7accad52c25 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=سبب
 UserCP=مستخدم
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=القيمة
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/ar_SA/incoterm.lang b/htdocs/langs/ar_SA/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/ar_SA/incoterm.lang
+++ b/htdocs/langs/ar_SA/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
index 45e0f50cdf6..d7c718f38ff 100644
--- a/htdocs/langs/ar_SA/languages.lang
+++ b/htdocs/langs/ar_SA/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=العربية
 Language_ar_SA=العربية
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=كاتالاني
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=الإنكليزية (الولايات المتحدة)
 Language_en_ZA=English (South Africa)
 Language_es_ES=الأسبانية
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=الأسبانية (الأرجنتين)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=الأسبانية (هندوراس)
 Language_es_MX=الإسبانية (المكسيك)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=الآيسلندي
 Language_it_IT=الإيطالي
 Language_ja_JP=اليابانية
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=السويدية
 Language_sv_SE=السويدية
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 676e1e8aba6..3541af66011 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=الإخطارات
 NoNotificationsWillBeSent=إشعارات البريد الإلكتروني لا يجري التخطيط لهذا الحدث ، وشركة
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 64d059476b7..28d64afe39f 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=تم العثور على بعض الأخط
 ErrorConfigParameterNotDefined=المعلم <b>ل ٪</b> غير محدد Dolibarr داخل ملف <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=فشلت في العثور على المستخدم <b>٪ ق</b> Dolibarr في قاعدة البيانات.
 ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يعرف لمعدلات ضريبة القيمة المضافة فى البلاد ٪ ق.
-ErrorNoSocialContributionForSellerCountry=خطأ ، لا يوجد نوع المساهمة الاجتماعية المحددة للبلد '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=خطأ ، وفشلت في انقاذ الملف.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=سعر الوحدة (صافي)
 UnitPriceTTC=سعر الوحدة
 PriceU=ارتفاع
 PriceUHT=ارتفاع (صافي)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=ارتفاع
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=مبلغ
 AmountInvoice=مبلغ الفاتورة
 AmountPayment=دفع مبلغ
@@ -339,6 +339,7 @@ IncludedVAT=وتشمل الضريبة على القيمة المضافة
 HT=بعد خصم الضرائب
 TTC=شركة ضريبة على القيمة المضافة
 VAT=ضريبة القيمة المضافة
+VATs=Sales taxes
 LT1ES=تعاود
 LT2ES=IRPF
 VATRate=سعر الضريبة على القيمة المضافة
@@ -413,6 +414,8 @@ Qty=الكمية
 ChangedBy=تغيير
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=النجاح
 ResultKo=فشل
@@ -421,7 +424,7 @@ Reportings=الإبلاغ
 Draft=مسودة
 Drafts=المسودات
 Validated=صادق
-Opened=فتح
+Opened=Open
 New=جديد
 Discount=الخصم
 Unknown=غير معروف
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
@@ -732,3 +739,4 @@ ShortThursday=تي
 ShortFriday=واو
 ShortSaturday=دإ
 ShortSunday=دإ
+SelectMailModel=Select email template
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index ee9d10f88e0..4d9cbb1f4bf 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -199,7 +199,8 @@ Entreprises=الشركات
 DOLIBARRFOUNDATION_PAYMENT_FORM=أن يسدد الاشتراك باستخدام حوالة مصرفية، راجع صفحة <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> الدفع باستخدام بطاقة ائتمان أو باي بال، وانقر على زر في أسفل هذه الصفحة. <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 1afad05c4f5..3d37a17eeb4 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=من أجل المورد
 SuppliersOrders=الموردين أوامر
 SuppliersOrdersRunning=الحالية الموردين أوامر
 CustomerOrder=عملاء النظام
-CustomersOrders=Customers orders
-CustomersOrdersRunning=الحالية الزبائن
-CustomersOrdersAndOrdersLines=أوامر العملاء وأوامر خطوط
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=المورد أوامر لمعالجة
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=ألغى
 StatusOrderDraftShort=مسودة
 StatusOrderValidatedShort=صادق
@@ -75,8 +75,9 @@ AddToMyOrders=أضف إلى أوامر
 AddToOtherOrders=إضافة إلى أوامر أخرى
 AddToDraftOrders=Add to draft order
 ShowOrder=وتبين من أجل
-NoOpenedOrders=أي أوامر فتح
-NoOtherOpenedOrders=أي أوامر فتح
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=أوامر أخرى
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index af86a545f5c..92f6ed52491 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=تدخل المصادق
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=فاتورة مصادق
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=من أجل الموافقة على المورد
 Notify_ORDER_SUPPLIER_REFUSE=من أجل رفض الموردين
 Notify_ORDER_VALIDATE=التحقق من صحة النظام العميل
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=إضافة الدخول في التقويم ق ٪
diff --git a/htdocs/langs/ar_SA/printing.lang b/htdocs/langs/ar_SA/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/ar_SA/printing.lang
+++ b/htdocs/langs/ar_SA/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 945757cd0ef..acf87d7a9e2 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -23,14 +23,14 @@ ProductOrService=المنتج أو الخدمة
 ProductsAndServices=المنتجات والخدمات
 ProductsOrServices=منتجات أو خدمات
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=المنتجات والخدمات والإحصاءات
 ProductsStatistics=المنتجات إحصاءات
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=إشارة الداخلية
 LastRecorded=آخر المنتجات والخدمات المسجلة على بيع
@@ -44,7 +44,7 @@ CardProduct1=بطاقة الخدمة
 CardContract=عقد بطاقة
 Warehouse=مخزن
 Warehouses=المستودعات
-WarehouseOpened=فتح مخزن
+WarehouseOpened=Warehouse open
 WarehouseClosed=مخزن مغلق
 Stock=الأسهم
 Stocks=الاسهم
@@ -71,21 +71,21 @@ SellingPriceTTC=سعر البيع (شركة الضريبية)
 PublicPrice=السعر العام
 CurrentPrice=السعر الحالي
 NewPrice=السعر الجديد
-MinPrice=القطرة. سعر البيع
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=سعر البيع لا يمكن أن يكون أقل من الحد الأدنى المسموح لهذا المنتج (٪ ق بدون الضرائب)
 ContractStatus=عقد مركز
 ContractStatusClosed=مغلقة
-ContractStatusRunning=على التوالي
+ContractStatusRunning=Ongoing
 ContractStatusExpired=انتهى
-ContractStatusOnHold=لا تعمل
-ContractStatusToRun=To get running
-ContractNotRunning=هذا العقد لا تعمل
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=منتج مع الإشارة ٪ ق موجود بالفعل.
 ErrorProductBadRefOrLabel=قيمة خاطئة لإشارة أو علامة.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=الموردين
 SupplierRef=المرجع المورد.
 ShowProduct=وتظهر المنتج
@@ -117,12 +117,12 @@ ServiceLimitedDuration=إذا كان المنتج هو خدمة لفترة مح
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=عدد من السعر
 MultiPriceLevelsName=سعر الفئات
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=المنتسبون
 Translation=الترجمة
 KeywordFilter=الكلمة الرئيسية فلتر
@@ -131,7 +131,7 @@ ProductToAddSearch=إضافة إلى البحث عن المنتج
 AddDel=إضافة / حذف
 Quantity=الكمية
 NoMatchFound=العثور على أي مباراة
-ProductAssociationList=قائمة المنتجات المتعلقة / الخدمات : اسم المنتج / الخدمة (الكمية المتضررة)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
 DeleteProduct=حذف المنتجات / الخدمات
@@ -179,16 +179,41 @@ CloneProduct=استنساخ المنتجات أو الخدمات
 ConfirmCloneProduct=هل أنت متأكد من أن المنتج أو الخدمة استنساخ <b>٪ ق؟</b>
 CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات
 ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=ويستخدم هذا المنتج
 NewRefForClone=المرجع. من المنتجات الجديدة / خدمة
-CustomerPrices=أسعار العملاء
-SuppliersPrices=أسعار الموردين
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=قانون الجمارك
 CountryOrigin=بلد المنشأ
 HiddenIntoCombo=مخبأة في قوائم مختارة
 Nature=طبيعة
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 028bb4b69a2..388df9f46f1 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسم
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=ويعرض هذا الرأي جميع المشاريع (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 MyTasksDesc=ويقتصر هذا الرأي على المشروعات أو المهام التي هي الاتصال للحصول على (ما هو نوع).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة.
 TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=مشاريع المنطقة
 NewProject=مشروع جديد
 AddProject=إنشاء مشروع
@@ -29,7 +30,7 @@ ProjectsList=قائمة المشاريع
 ShowProject=وتبين للمشروع
 SetProject=وضع المشروع
 NoProject=لا يعرف أو المملوكة للمشروع
-NbOpenTasks=ملاحظة : من مهام فتح
+NbOpenTasks=Nb of open tasks
 NbOfProjects=ملاحظة : للمشاريع
 TimeSpent=الوقت الذي تستغرقه
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=جديد الوقت الذي يقضيه
 MyTimeSpent=وقتي قضى
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=قائمة التدخلات المرتبطة با
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
 ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
 ActivityOnProjectThisYear=نشاط المشروع هذا العام
@@ -95,7 +98,7 @@ DeleteATimeSpent=قضى الوقت حذف
 ConfirmDeleteATimeSpent=هل أنت متأكد أنك تريد حذف هذا الوقت الذي يقضيه؟
 DoNotShowMyTasksOnly=انظر أيضا المهام  الغير موكلة الي
 ShowMyTasksOnly=عرض فقط المهام الموكلة الي
-TaskRessourceLinks=ملتقيات
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=مشاريع مخصصة لهذا الطرف الثالث
 NoTasks=أية مهام لهذا المشروع
 LinkedToAnotherCompany=ربط طرف ثالث آخر
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang
index 6e319c4587f..9102095dc15 100644
--- a/htdocs/langs/ar_SA/propal.lang
+++ b/htdocs/langs/ar_SA/propal.lang
@@ -4,7 +4,7 @@ Proposal=اقتراح التجارية
 ProposalShort=اقتراح
 ProposalsDraft=مقترحات مشاريع تجارية
 ProposalDraft=اقتراح لمشروع تجاري
-ProposalsOpened=افتتح مقترحات تجارية
+ProposalsOpened=Open commercial proposals
 Prop=مقترحات تجارية
 CommercialProposal=اقتراح التجارية
 CommercialProposals=مقترحات تجارية
@@ -16,7 +16,7 @@ Prospect=احتمال
 ProspectList=احتمال قائمة
 DeleteProp=اقتراح حذف التجارية
 ValidateProp=مصادقة على اقتراح التجارية
-AddProp=إضافة اقتراح
+AddProp=Create proposal
 ConfirmDeleteProp=هل أنت متأكد من أنك تريد حذف هذا التجارية الاقتراح؟
 ConfirmValidateProp=هل أنت متأكد من هذا التجارية للمصادقة على الاقتراح؟
 LastPropals=آخر مقترحات ٪
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=المبلغ في الشهر (بعد خصم الضر
 NbOfProposals=عدد من المقترحات والتجاري
 ShowPropal=وتظهر اقتراح
 PropalsDraft=المسودات
-PropalsOpened=فتح
+PropalsOpened=Open
 PropalsNotBilled=مغلقة لا توصف
 PropalStatusDraft=مشروع (لا بد من التحقق من صحة)
 PropalStatusValidated=صادق (اقتراح فتح)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=لم يتم التوقيع (مغلقة)
 PropalStatusBilled=فواتير
 PropalStatusDraftShort=مسودة
 PropalStatusValidatedShort=صادق
-PropalStatusOpenedShort=فتح
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=مغلقة
 PropalStatusSignedShort=وقعت
 PropalStatusNotSignedShort=لم يتم التوقيع
@@ -51,12 +51,10 @@ PropalsToClose=مقترحات ليقفل التجارية
 PropalsToBill=ووقع على مشروع القانون التجاري مقترحات
 ListOfProposals=قائمة مقترحات تجارية
 ActionsOnPropal=الإجراءات على الاقتراح
-NoOpenedPropals=فتحت أي مقترحات تجارية
-NoOtherOpenedPropals=أي اقتراحات أخرى افتتح التجارية
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=اقتراح المرجع التجارية
 SendPropalByMail=اقتراح ارسال التجارية عن طريق البريد
-FileNotUploaded=الملف ليس تحميل
-FileUploaded=الملف بنجاح تحميلها
 AssociatedDocuments=الوثائق المرتبطة الاقتراح :
 ErrorCantOpenDir=لا نستطيع فتح الدليل
 DatePropal=تاريخ الاقتراح
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal ق لم يتم العثور على ٪
 Estimate=التقدير :
 EstimateShort=التقدير
 OtherPropals=مقترحات أخرى
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=اقتراح إنشاء التجارية عن طريق نسخ وجود اقتراح
 CreateEmptyPropal=خلق خاليا التجارية vierge مقترحات أو من قائمة المنتجات / الخدمات
 DefaultProposalDurationValidity=تقصير مدة صلاحية اقتراح التجارية (أيام)
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=اتصل العملاء اقتراح متا
 # Document models
 DocModelAzurDescription=اقتراح نموذج كامل (logo...)
 DocModelJauneDescription=اقتراح نموذج اليد الصفراء
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index 56b60af94b8..de637e4c14b 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=وثيقة نموذج بسيط
 DocumentModelMerou=Mérou A5 نموذج
 WarningNoQtyLeftToSend=تحذير ، لا تنتظر أن المنتجات المشحونة.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=مسطح تاريخ التسليم
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=تلقى تاريخ التسليم
 SendShippingByEMail=ارسال شحنة عن طريق البريد الالكتروني
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 8471a5db997..f35a1045369 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=المستودعات
 NewWarehouse=المستودع الجديد / بورصة المنطقة
 WarehouseEdit=تعديل مستودع
 MenuNewWarehouse=مستودع جديد
-WarehouseOpened=فتح مخزن
+WarehouseOpened=Warehouse open
 WarehouseClosed=مخزن مغلق
 WarehouseSource=مصدر مخزن
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=اختيار مستودع لاستخدامها 
 SelectWarehouseForStockIncrease=اختيار مستودع لاستخدامها لزيادة المخزون
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 3416148052d..149cddbc96a 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
index 5e026e3d0ff..403947a1f84 100644
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=قائمة الرسوم
 NewTrip=New expense report
 CompanyVisited=الشركة / المؤسسة زارت
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index e0d5726d41b..08df7d7dfdf 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=إزالة من المجموعة
 PasswordChangedAndSentTo=تم تغيير كلمة المرور وترسل إلى <b>٪ ق.</b>
 PasswordChangeRequestSent=طلب تغيير كلمة السر لإرسالها إلى <b>٪ ق ٪ ق.</b>
 MenuUsersAndGroups=مجموعات المستخدمين
+MenuMyUserCard=My user card
 LastGroupsCreated=ق الماضي خلق مجموعات ٪
 LastUsersCreated=آخر مستخدمين خلق ق ٪
 ShowGroup=وتبين لفريق
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index b32f10157fa..f2ba3820c8c 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=دفع %s النظام الدائمة من قبل البنك
diff --git a/htdocs/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index 7b8cc45f187..883a1c2c0d7 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=سير العمل وحدة الإعداد
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=لا يوجد سير العمل الذي يمكن تعديل وحدة لكنت قد قمت بتنشيط.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=إنشاء النظام العميل تلقائيا بعد التوقيع على اقتراح تجارية
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيا بعد التوقيع على اقتراح تجارية
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيا بعد التحقق من صحة العقد
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيا بعد إغلاق النظام العميل
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index cf7fa6b6cc9..bdd524f9d35 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 26563ac77b6..548ea4b0dd3 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Меню за потребители
 LangFile=.lang файл
 System=Система
 SystemInfo=Системна информация
-SystemTools=Системни инструменти
 SystemToolsArea=Системни инструменти
 SystemToolsAreaDesc=Тук се предоставят административни функции. Използвайте менюто за да изберете функцията която търсите.
 Purge=Изчистване
@@ -232,8 +231,8 @@ Security=Сигурност
 Passwords=Пароли
 DoNotStoreClearPassword=Да не се магазин ясни пароли в базата данни, но се съхранява само криптирана стойност (Активира се препоръчва)
 MainDbPasswordFileConfEncrypted=Парола за базата данни, кодирани в conf.php (Активира се препоръчва)
-InstrucToEncodePass=За да имате парола кодирано в <b>conf.php</b> файл, замени линия <br> <b>$ Dolibarr_main_db_pass = &quot;...&quot;</b> <br> от <br> <b>$ Dolibarr_main_db_pass = &quot;криптирани: %s&quot;</b>
-InstrucToClearPass=За да имате парола декодирана (ясно) в <b>conf.php</b> файл, сменете линия <br> <b>$ Dolibarr_main_db_pass = &quot;криптирани: ...&quot;</b> <br> от <br> <b>$ Dolibarr_main_db_pass = &quot;%s&quot;</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Защита на генерираните PDF файлове (активиран не се препоръчва, почивки поколение на маса PDF)
 ProtectAndEncryptPdfFilesDesc=Защита на PDF документ продължава да прочетете и отпечатате с всеки PDF браузър. Въпреки това, редактиране и копиране не е възможно повече. Имайте предвид, че използването на тази функция изграждането на глобална сборен PDF не работи (като неплатени фактури).
 Feature=Особеност
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Това е настройка на процеса:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Стъпка %s
 FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
-DownloadPackageFromWebSite=Изтегляне на пакет %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install е завършен и Dolibarr е готов за използване с този нов компонент.
 NotExistsDirect=Алтернатива главната директория не е дефинирано. <br>
 InfDirAlt=От версия 3 е възможно да се определи алтернативен directory.This корен ви позволява да съхранявате, едно и също място, плъгини и собствени шаблони. <br> Просто създайте директория, в основата на Dolibarr (напр. по поръчка). <br>
 InfDirExample=<br> След това заяви в файла conf.php <br> $ Dolibarr_main_url_root_alt = 'http://myserver/custom &quot; <br> $ Dolibarr_main_document_root_alt = &quot;/ път / / dolibarr / htdocs / по избор&quot; <br> * Тези линии са коментирани с &quot;#&quot;, да разкоментирате само да премахнете характер.
-YouCanSubmitFile=Изберете модул:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Отидете на страницата, която се актуализира структурата на базата данни и презареждане на: %s.
 LastStableVersion=Последна стабилна версия
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Библиотека използвана за направа на PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Обнови връзка
@@ -430,8 +429,8 @@ Module20Name=Предложения
 Module20Desc=Търговско предложение управление
 Module22Name=Масови имейли
 Module22Desc=Управление на масови имейли
-Module23Name= Енергия
-Module23Desc= Наблюдение на консумацията на енергия
+Module23Name=Енергия
+Module23Desc=Наблюдение на консумацията на енергия
 Module25Name=Поръчки от клиенти
 Module25Desc=Управление на поръчка на клиента
 Module30Name=Фактури
@@ -492,8 +491,8 @@ Module400Name=Проекти/Възможности
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Известия
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Дарения
 Module700Desc=Управление на дарения
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Дневен ред
 Module2400Desc=Събития/задачи и управление на дневен ред
 Module2500Name=Електронно Управление на Съдържанието
 Module2500Desc=Запазване и споделяне на документи
-Module2600Name=WebServices
-Module2600Desc=Активирайте сървъра на Dolibarr за уеб услуги
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Създаване / промяна на продукти
 Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Износ на продукти
-Permission41=Четене на проекти (общи проекти и проекти съм се с нас за)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Създаване / промяна на проекти (общи проекти и проекти съм се с нас за)
 Permission44=Изтриване на проекти (общи проекти и проекти съм се с нас за)
 Permission61=Прочети интервенции
@@ -599,10 +600,10 @@ Permission86=Изпрати клиенти поръчки
 Permission87=Затваряне на поръчките на клиентите
 Permission88=Отказ клиенти поръчки
 Permission89=Изтриване на клиенти поръчки
-Permission91=Социалноосигурителните вноски и ДДС
-Permission92=Създаване / промяна на социалните вноски и ДДС
-Permission93=Изтриване на социалноосигурителните вноски и ДДС
-Permission94=Експортиране на социалноосигурителните вноски
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Прочети доклада
 Permission101=Прочети sendings
 Permission102=Създаване / промяна sendings
@@ -620,9 +621,9 @@ Permission121=Четене на трети лица, свързани с пот
 Permission122=Създаване / промяна трети страни, свързани с потребителя
 Permission125=Изтриване на трети лица, свързани с потребителя
 Permission126=Трети страни за износ
-Permission141=Прочетете проекти (лично аз не съм се с нас за)
-Permission142=Създаване / промяна проекти (лично аз не съм се свържете)
-Permission144=Изтриване на проекти (лично аз не съм се с нас за)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Прочети доставчици
 Permission147=Прочети статистиката
 Permission151=Нареждания за периодични преводи
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup спаси
 BackToModuleList=Обратно към списъка с модули
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=П. код
 CompanyTown=Град
 CompanyCountry=Държава
 CompanyCurrency=Основната валута
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Не показвай
 DoNotSuggestPaymentMode=Да не предполагат
 NoActiveBankAccountDefined=Не е активна банкова сметка на определени
 OwnerOfBankAccount=Собственик на %s банкови сметки
 BankModuleNotActive=Банкови сметки модул не е активиран
-ShowBugTrackLink=Показване на връзката "Доклад за бъг"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Показване на "инструментариума" на началната страница
 Alerts=Сигнали
 Delays=Закъснения
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Макс знака след десетичната за
 MAIN_MAX_DECIMALS_TOT=Макс знака след десетичната запетая за крайни цени
 MAIN_MAX_DECIMALS_SHOWN=Максималният брой десетични числа за цени, показан на екрана <b>(...</b> след тази цифра, ако искате да видите <b>...</b> когато се отрязва номер, когато е показан на екрана)
 MAIN_DISABLE_PDF_COMPRESSION=Използвайте PDF компресия за генерираните PDF файлове.
-MAIN_ROUNDING_RULE_TOT= Размер на закръгляване гама (за редките страни, където закръгляването се извършва върху нещо друго, отколкото база 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Нетен единичната цена на даден продукт
 TotalPriceAfterRounding=Обща цена (нето / с ДДС / с ДДС) след закръгляване
 ParameterActiveForNextInputOnly=Параметър ефективно само за следващия вход
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Общия брой на активираните
 YouMustEnableOneModule=Трябва да даде възможност на най-малко 1 модул
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Имайте впредвид, че само следните модули са отворени за външни потребители (каквито и да са правата на тези потребители):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Максимален брой продукти в к
 ConfirmDeleteProductLineAbility=Потвърждение при премахване на продуктови линии във форми
 ModifyProductDescAbility=Персонализация на описания на продукти във формите
 ViewProductDescInFormAbility=Визуализация на описания на продукти във формите (в противен случай като изскачащ прозорец подсказка)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Визуализация на продукти, описания в thirdparty език
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Подкрепа Eco-Taxe (ОЕЕО)
 SetDefaultBarcodeTypeProducts=Тип баркод по подразбиране за продукти
 SetDefaultBarcodeTypeThirdParties=Тип баркод по подразбиране за трети страни
+UseUnits=Support units
 ProductCodeChecker= Модул за генериране и проверка на кода на продукта (продукт или услуга)
 ProductOtherConf= Продукт / услуга конфигурация
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Баркод от тип UPC
 BarcodeDescISBN=Баркод от тип ISBN
 BarcodeDescC39=Баркод от типа С39
 BarcodeDescC128=Баркод от тип C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Сигурен ли сте, че искате да изтри
 DeleteLine=Изтриване на ред
 ConfirmDeleteLine=Сигурни ли сте, че желаете да изтриете този ред?
 ##### Tax #####
-TaxSetup=Данъци, социални осигуровки и дивиденти модул за настройка
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Дължимия ДДС
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=WebServices модул за настройка
 WebServicesDesc=С активирането на този модул, Dolibarr се превърне в уеб сървъра на услугата за предоставяне на различни уеб услуги.
 WSDLCanBeDownloadedHere=WSDL ЕВРОВОК файлове на предоставяните услуги може да изтеглите от тук
 EndPointIs=SOAP клиентите трябва да изпратят своите заявки на разположение на Адреса на крайна точка Dolibarr
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Модул за настройка на банката
 FreeLegalTextOnChequeReceipts=Свободен текст чековите разписки
@@ -1581,6 +1599,7 @@ ProjectsSetup=Инсталационния проект модул
 ProjectsModelModule=Проект доклади документ модел
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index 3c0497e6c70..7be2428c3cd 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Поръчка %s одобрен
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова
-OrderCanceledInDolibarr=Поръчка %s отменен
 ProposalSentByEMail=Търговски %s предложението, изпратено по електронна поща
 OrderSentByEMail=, Изпратени по електронната поща %s поръчка на клиента
 InvoiceSentByEMail=, Изпратени по електронната поща %s клиенти фактура
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index 8644681b941..89e3d8d99d3 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Помирение
 ConciliationForAccount=Reconcile тази сметка
 IncludeClosedAccount=Включват затворени сметки
-OnlyOpenedAccount=Само открити сметки
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Профил на кредитен
 AccountToDebit=Сметка за дебитиране
 DisableConciliation=Деактивирате функцията помирение за тази сметка
 ConciliationDisabled=Помирение функция инвалиди
-StatusAccountOpened=Отворен
+StatusAccountOpened=Open
 StatusAccountClosed=Затворен
 AccountIdShort=Номер
 EditBankRecord=Редактиране на запис
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Клиентско плащане
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Доставчик плащане
 WithdrawalPayment=Оттегляне плащане
-SocialContributionPayment=Осигурителната вноска за плащане
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Финансова сметка списание
 BankTransfer=Банков превод
 BankTransfers=Банкови преводи
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index eacfbd69a02..0e05f865ad3 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb на фактури
 NumberOfBillsByMonth=Nb на фактури по месец
 AmountOfBills=Размер на фактури
 AmountOfBillsByMonthHT=Размер на фактури от месец (нетно от данъци)
-ShowSocialContribution=Показване на осигурителната вноска
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Покажи фактура
 ShowInvoice=Покажи фактура
 ShowInvoiceReplace=Покажи замяна фактура
@@ -270,7 +270,7 @@ BillAddress=Бил адрес
 HelpEscompte=Тази отстъпка е отстъпка, предоставена на клиента, тъй като плащането е извършено преди термина.
 HelpAbandonBadCustomer=Тази сума е бил изоставен (клиент казва, че е лош клиент) и се счита като извънредна в насипно състояние.
 HelpAbandonOther=Тази сума е изоставена, тъй като тя е грешка (грешен клиент или фактура, заменен от друг например)
-IdSocialContribution=Социален принос ID
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Плащане ID
 InvoiceId=Фактура номер
 InvoiceRef=Фактура с реф.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Непосредствен
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 3baced62eb9..3b09c8c20ff 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Последните договори
 BoxLastContacts=Последните контакти/адреси
 BoxLastMembers=Последните членове
 BoxFicheInter=Последните намеси
-BoxCurrentAccounts=Открити сметки баланс
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Оборот от продажби
 BoxTotalUnpaidCustomerBills=Общо неплатени фактури на клиента
 BoxTotalUnpaidSuppliersBills=Общо неплатени фактури на доставчика
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Последни %s членове
 BoxTitleLastFicheInter=Последните %s променени intervention
 BoxTitleOldestUnpaidCustomerBills=Най-стари %s неплатени клиентски фактури
 BoxTitleOldestUnpaidSupplierBills=Най-стари %s неплатени фактури доставчик
-BoxTitleCurrentAccounts=Открити сметки баланси
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Оборот от продажби
 BoxTitleTotalUnpaidCustomerBills=Неплатени клиентски фактури
 BoxTitleTotalUnpaidSuppliersBills=Неплатени доставни фактури
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index c38713bb228..2b835bdfdf4 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> е добавен успешно.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Няма
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Тази категория вече съществува с този код
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Съдържанието не е видимо от
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo / Prosp. категории
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index c33043c5f38..85778f1cff0 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=От страна на трети лица за контакт
 StatusContactValidated=Състояние на контакт/адрес
 Company=Фирма
 CompanyName=Име на фирмата
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Фирми
 CountryIsInEEC=Държавата е част от Европейската икономическа общност
 ThirdPartyName=Име на Трета страна
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Връщане Numero с формат %syymm-NNNN за клиента код и %syymm-NNNN за доставчика код, където YY е годината, mm е месец и NNNN е последователност, без почивка и няма връщане назад до 0.
 LeopardNumRefModelDesc=Кодът е безплатно. Този код може да бъде променен по всяко време.
 ManagingDirectors=Наименование на управител(и)  (гл. изп. директор, директор, президент...)
-SearchThirdparty=Търсене на трети лица
+SearchThirdparty=Search third party
 SearchContact=Търсене на контакт
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 64930c64da3..bf667e62414 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Събраният ДДС
 ToPay=За да платите
 ToGet=За да се върнете
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Данъци, вноски за социално и дивиденти площ
-SocialContribution=Социален принос
-SocialContributions=Социалноосигурителни вноски
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Данъци и дивиденти
 MenuSalaries=Salaries
-MenuSocialContributions=Социалноосигурителни вноски
-MenuNewSocialContribution=Нов принос
-NewSocialContribution=Нова социална принос
-ContributionsToPay=Вноски за плащане
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Счетоводство / Каса
 AccountancySetup=Настройки на счетоводството
 NewPayment=Нов плащане
 Payments=Плащания
 PaymentCustomerInvoice=Плащане на клиенти фактура
 PaymentSupplierInvoice=Плащане доставчик фактура
-PaymentSocialContribution=Осигурителната вноска за плащане
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Плащането на ДДС
 PaymentSalary=Salary payment
 ListPayment=Списък на плащанията
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Плащането на ДДС
 VATPayments=Плащанията по ДДС
-SocialContributionsPayments=Социални плащания вноски
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Покажи плащане на ДДС
 TotalToPay=Всичко за плащане
 TotalVATReceived=Общо ДДС
@@ -116,11 +116,11 @@ NewCheckDepositOn=Създаване на разписка за депозит 
 NoWaitingChecks=Няма проверки за депозит.
 DateChequeReceived=Проверете датата рецепция
 NbOfCheques=Nb на проверките
-PaySocialContribution=Заплащане на осигурителната вноска
-ConfirmPaySocialContribution=Сигурен ли сте, че искате да класифицира този осигурителната вноска като платен?
-DeleteSocialContribution=Изтриване на осигурителната вноска
-ConfirmDeleteSocialContribution=Сигурен ли сте, че искате да изтриете тази осигурителната вноска?
-ExportDataset_tax_1=Социални вноски и плащания
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Клониране на социално-осигурителни вноски
-ConfirmCloneTax=Потвърдете клонирането на социално-осигурителните вноски
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Клониране за следващ месец
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 39c37094ded..eadcc3d2e9d 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -4,10 +4,10 @@ About = За
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Начална дата
 CronDtEnd=Крайна дата
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Метод
 CronModule=Модул
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Параметри
 CronSaveSucess=Save succesfully
 CronNote=Коментар
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Системния команден ред за стартиране.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Информация
 # Common
-CronType=Тип на задачата
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Терминална команда
 CronMenu=Крон (софтуер за изпънение на автоматични задачи)
 CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/bg_BG/ecm.lang b/htdocs/langs/bg_BG/ecm.lang
index 47143f6cc38..6e46ba15a07 100644
--- a/htdocs/langs/bg_BG/ecm.lang
+++ b/htdocs/langs/bg_BG/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Търсене по обект
 ECMSectionOfDocuments=Директории на документи
 ECMTypeManual=Ръчно
 ECMTypeAuto=Автоматично
-ECMDocsBySocialContributions=Документи, които се отнасят до социални вноски
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Документи, свързани с трети страни
 ECMDocsByProposals=Документи, свързани с предложения
 ECMDocsByOrders=Документи, свързани с поръчки на клиенти
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 167445d56a1..e3c5c086eb8 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Датата на плащане (%s) е по-ранна от датата на фактуриране (%s) за фактура %s.
 WarningTooManyDataPleaseUseMoreFilters=Твърде много данни. Моля, използвайте повече филтри
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index f3d9c9dcba9..c92b03e94cc 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -3,7 +3,7 @@ HRM=ЧР
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Месечно извлечение
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Причина
 UserCP=Потребител
 ErrorAddEventToUserCP=Възникна грешка при добавяне на изключително отпуск.
 AddEventToUserOkCP=Добавянето на извънредния отпуск е завършена.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=В изпълнение на
 UserUpdateCP=За потребителя
@@ -93,6 +93,7 @@ ValueOptionCP=Стойност
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Потвърждаване на конфигурацията
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Актуализира се успешно.
 ErrorUpdateConfCP=Възникна грешка по време на актуализацията, моля опитайте отново.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Възникна грешка при изпращане на и
 NoCPforMonth=Не оставяйте този месец.
 nbJours=Брой дни
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/bg_BG/incoterm.lang b/htdocs/langs/bg_BG/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/bg_BG/incoterm.lang
+++ b/htdocs/langs/bg_BG/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 8f31aacacc0..2cef87323e0 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Сървъра на база данни - достъп 
 CheckToCreateDatabase=Отметка в квадратчето, ако базата данни не съществува и трябва да бъде създаден. <br> В този случай, трябва да попълните потребителско име / парола за за суперпотребител сметка в долната част на тази страница.
 CheckToCreateUser=Отметка в квадратчето, ако собственик на базата данни не съществува и трябва да бъде създаден. <br> В този случай, трябва да изберете потребителско име и парола и да попълните име / парола за суперпотребител сметка в долната част на тази страница. Ако това поле не е отметнато, собственик на база данни и пароли трябва да съществува.
 Experimental=(Експериментален)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Вход на потребителя е разрешено да създавате нови бази данни или нови потребители, безполезна, ако вашата база данни и потребителско име база данни вече съществува (като, когато сте домакин на уеб доставчик на хостинг услуги).
 KeepEmptyIfNoPassword=Оставете празно, ако потребителят не разполага с парола (да се избягва този)
 SaveConfigurationFile=Запиши стойности
diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang
index f3fd393cedb..97974c8beea 100644
--- a/htdocs/langs/bg_BG/languages.lang
+++ b/htdocs/langs/bg_BG/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Арабски
 Language_ar_SA=Арабски
+Language_bn_BD=Bengali
 Language_bg_BG=Български
 Language_bs_BA=Босненски
 Language_ca_ES=Каталонски
@@ -21,9 +22,10 @@ Language_en_SA=English (Саудитска Арабия)
 Language_en_US=English (United States)
 Language_en_ZA=English (Южна Африка)
 Language_es_ES=Испански
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Испански (Аржентина)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Испански (Хондурас)
 Language_es_MX=Испански (Мексико)
 Language_es_PY=Испански (Парагвай)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Исландски
 Language_it_IT=Италиански
 Language_ja_JP=Японски
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Корейски
+Language_lo_LA=Lao
 Language_lt_LT=Литовски
 Language_lv_LV=Латвийски
 Language_mk_MK=Македонски
@@ -64,6 +69,7 @@ Language_sv_SV=Шведски
 Language_sv_SE=Шведски
 Language_sq_AL=Албански
 Language_sk_SK=Словашки
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Украински
 Language_uz_UZ=Узбекски
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 003c2d40637..7d0bbab486d 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Обратна разписка
 YourMailUnsubcribeOK=От пощенския списък на <b>%s</b> имейл е правилно unsubcribe
 MailtoEMail=Хипер-връзка на приятел
 ActivateCheckRead=Оставя се да се използва за четене тракер получаване и връзката unsubcribe
-ActivateCheckReadKey=Key използване за криптиране на използването на URL адрес за обратна разписка и функция unsubcribe
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Tracker поща отвори
 TagUnsubscribe=Отписване връзка
 TagSignature=Подпис изпращане на потребителя
 TagMailtoEmail=E-mail на получателя
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Известия
 NoNotificationsWillBeSent=Не са планирани за това събитие и компания известия по имейл
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index b291c22fcd3..dc20004f0ce 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Някои бяха открити гре
 ErrorConfigParameterNotDefined=Параметъра <b>%s</b> не е дефиниран в конфигурационния файл на Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Не можа да се намери потребител <b>%s</b> в базата данни на Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Грешка, няма дефинирани ДДС ставки, за държавата '%s'.
-ErrorNoSocialContributionForSellerCountry=Грешка, не е социален тип участие, определено за &quot;%s&quot; страна.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Грешка, файла не е записан.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Единична цена (нето)
 UnitPriceTTC=Единична цена
 PriceU=U.P.
 PriceUHT=U.P. (нето)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Размер
 AmountInvoice=Фактурирана стойност
 AmountPayment=Сума за плащане
@@ -339,6 +339,7 @@ IncludedVAT=С включен данък
 HT=без данък
 TTC=с данък
 VAT=Данък върху продажбите
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Данъчната ставка
@@ -413,6 +414,8 @@ Qty=Количество
 ChangedBy=Променено от
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Успех
 ResultKo=Провал
@@ -421,7 +424,7 @@ Reportings=Докладване
 Draft=Чернова
 Drafts=Чернови
 Validated=Потвърден
-Opened=Отворен
+Opened=Open
 New=Нов
 Discount=Отстъпка
 Unknown=Неизвестен
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Свързано с даден контакт на пот
 DeleteAFile=Изтриване на файл
 ConfirmDeleteAFile=Сигурни ли сте, че елаете да изтриете файла
 NoResults=Няма намерени резултати
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Тест
 Element=Елемент
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
@@ -732,3 +739,4 @@ ShortThursday=Ч
 ShortFriday=П
 ShortSaturday=С
 ShortSunday=Н
+SelectMailModel=Select email template
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 88566d73fdb..cce96a600da 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -199,7 +199,8 @@ Entreprises=Фирми
 DOLIBARRFOUNDATION_PAYMENT_FORM=За да направите абонамент на плащане чрез банков превод, вижте стр. <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> За да платите чрез кредитна карта или Paypal, кликнете върху бутона в долната част на тази страница. <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index 4c2ecd6f2d6..16c6247c17e 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Доставчик за
 SuppliersOrders=Доставчик поръчки
 SuppliersOrdersRunning=Доставчика за поръчки
 CustomerOrder=Клиента заявка
-CustomersOrders=Customers orders
-CustomersOrdersRunning=На клиента за поръчки
-CustomersOrdersAndOrdersLines=Клиентските поръчки и реда линии
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Доставчик нареждания за обработка на
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Отменен
 StatusOrderDraftShort=Проект
 StatusOrderValidatedShort=Утвърден
@@ -75,8 +75,9 @@ AddToMyOrders=Добави към моите заповеди
 AddToOtherOrders=Добави към други поръчки
 AddToDraftOrders=Add to draft order
 ShowOrder=Покажи за
-NoOpenedOrders=Не са открити поръчки
-NoOtherOpenedOrders=Няма други поръчки
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Други поръчки
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 55710fc727e..623efc8863c 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Интервенция валидирани
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Клиентът фактура се заверява
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Доставчик утвърдения
 Notify_ORDER_SUPPLIER_REFUSE=Доставчик за отказа
 Notify_ORDER_VALIDATE=Клиента заявка се заверява
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=Необходимо е да щтракнете върху следния линк за да потвърдите промяната на паролата
 ForgetIfNothing=Ако не сте заявили промяната, просто забравете за този имейл. Вашите идентификационни данни се съхраняват на сигурно място.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Добави запис в календара %s
diff --git a/htdocs/langs/bg_BG/printing.lang b/htdocs/langs/bg_BG/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/bg_BG/printing.lang
+++ b/htdocs/langs/bg_BG/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index a4a601493bd..a9f8c7638be 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Продукт или Услуга
 ProductsAndServices=Продукти и Услуги
 ProductsOrServices=Продукти или Услуги
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Статистика на Продукти и Услуги
 ProductsStatistics=Статистика на продукти
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Вътрешна препратка
 LastRecorded=Последните записани продукти / услуги по продажба
@@ -44,7 +44,7 @@ CardProduct1=Карта на услуга
 CardContract=Карта на контакт
 Warehouse=Склад
 Warehouses=Складове
-WarehouseOpened=Склада е отворен
+WarehouseOpened=Warehouse open
 WarehouseClosed=Склада е затворен
 Stock=Наличност
 Stocks=Наличности
@@ -71,21 +71,21 @@ SellingPriceTTC=Продажна цена (с ДДС)
 PublicPrice=Публична цена
 CurrentPrice=Текуща цена
 NewPrice=Нова цена
-MinPrice=Миним. продажна цена
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Продажната цена не може да бъде по-ниска от максимално допустимата за този продукт (%s без ДДС). Това съобщение може да се появи, ако въведете твърде важна отстъпка.
 ContractStatus=Състояние на договор
 ContractStatusClosed=Затворен
-ContractStatusRunning=Работи
+ContractStatusRunning=Ongoing
 ContractStatusExpired=изтекъл
-ContractStatusOnHold=Не работи
-ContractStatusToRun=To get running
-ContractNotRunning=Този договор не се изпълнява
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Вече съществува продукт с референция %s .
 ErrorProductBadRefOrLabel=Грешна стойност за референция или етикет.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Доставчици
 SupplierRef=Продукт доставчик изх.
 ShowProduct=Покажи продукт
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ако продуктът е услуга с ограни
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Категории цени
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Асоцииране
 Translation=Превод
 KeywordFilter=Филтър по ключова дума
@@ -131,7 +131,7 @@ ProductToAddSearch=Търсене на продукт за добавяне
 AddDel=Добавяне/Изтриване
 Quantity=Количество
 NoMatchFound=Не са намерени съвпадения
-ProductAssociationList=Списък на продукти / услуги, свързани с: име на продукта / услугата (количество засегнати)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Един от избрания продукт е родител с настоящия продукт
 DeleteProduct=Изтриване на продукта/услугата
@@ -179,16 +179,41 @@ CloneProduct=Клониране на продукт или услуга
 ConfirmCloneProduct=Сигурни ли сте, че желаете да клонирате продукта или услугата <b>%s?</b>?
 CloneContentProduct=Клониране на всички основни данни за продукта/услугата
 ClonePricesProduct=Клониране на основните данни и цени
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Този продукт е използван
 NewRefForClone=Реф. на нов продукт/услуга
-CustomerPrices=Цени за клиенти
-SuppliersPrices=Цени на доставцици
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Държава на произход
 HiddenIntoCombo=Hidden into select lists
 Nature=Природа
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Създаване на карта на продукт
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index bac8cef7acc..d11bc610f4a 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Този възглед представя всички пр
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Този възглед представя всички проекти (потребителски разрешения ви даде разрешение да видите всичко).
 MyTasksDesc=Тази гледна точка е ограничена до проекти или задачи, които са контакт (какъвто и да е тип).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Този възглед представя всички проекти и задачи, които може да чете.
 TasksDesc=Този възглед представя всички проекти и задачи (потребителски разрешения ви даде разрешение да видите всичко).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Проекти област
 NewProject=Нов проект
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Списък на проектите
 ShowProject=Покажи проект
 SetProject=Задайте проект
 NoProject=Нито един проект няма определени или собственост
-NbOpenTasks=Nb отворени задачи
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb на проекти
 TimeSpent=Времето, прекарано
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Времето, прекарано на
 MyTimeSpent=Времето, прекарано
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Списък на интервенциите, с
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Дейности в проекта тази седмица
 ActivityOnProjectThisMonth=Дейност по проект, този месец
 ActivityOnProjectThisYear=Дейности в проекта тази година
@@ -95,7 +98,7 @@ DeleteATimeSpent=Изтриване на времето, прекарано
 ConfirmDeleteATimeSpent=Сигурен ли сте, че искате да изтриете това време, прекарано?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Проекти, насочени към тази трета страна
 NoTasks=Няма задачи за този проект
 LinkedToAnotherCompany=Свързано с друга трета страна
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
index 95ebedf7d85..7e9c21e13b7 100644
--- a/htdocs/langs/bg_BG/propal.lang
+++ b/htdocs/langs/bg_BG/propal.lang
@@ -4,7 +4,7 @@ Proposal=Търговско предложение
 ProposalShort=Предложение
 ProposalsDraft=Проектът на търговски предложения
 ProposalDraft=Проект на търговско предложение
-ProposalsOpened=Отворените търговски предложения
+ProposalsOpened=Open commercial proposals
 Prop=Търговски предложения
 CommercialProposal=Търговско предложение
 CommercialProposals=Търговски предложения
@@ -16,7 +16,7 @@ Prospect=Перспектива
 ProspectList=Prospect списък
 DeleteProp=Изтриване на търговско предложение
 ValidateProp=Одобряване на търговско предложение
-AddProp=Добави предложението
+AddProp=Create proposal
 ConfirmDeleteProp=Сигурен ли сте, че искате да изтриете тази търговска предложение?
 ConfirmValidateProp=Сигурен ли сте, че искате да проверите това търговско предложение?
 LastPropals=Последните предложения %s
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Сума от месец (нетно от данъц
 NbOfProposals=Брой на търговски предложения
 ShowPropal=Покажи предложение
 PropalsDraft=Чернови
-PropalsOpened=Отворен
+PropalsOpened=Open
 PropalsNotBilled=Затворен не таксувани
 PropalStatusDraft=Проект (трябва да бъдат валидирани)
 PropalStatusValidated=Утвърден (предложението е отворен)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Не сте (затворен)
 PropalStatusBilled=Таксува
 PropalStatusDraftShort=Проект
 PropalStatusValidatedShort=Утвърден
-PropalStatusOpenedShort=Отворен
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Затворен
 PropalStatusSignedShort=Подписан
 PropalStatusNotSignedShort=Не сте
@@ -51,12 +51,10 @@ PropalsToClose=Търговски предложения, за да го зат
 PropalsToBill=Подписани търговски предложения законопроект
 ListOfProposals=Списък на търговски предложения
 ActionsOnPropal=Събития по предложение
-NoOpenedPropals=Не са открити търговски предложения
-NoOtherOpenedPropals=Няма други отворени търговски предложения
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Търговско предложение код
 SendPropalByMail=Изпратете търговско предложение по пощата
-FileNotUploaded=Файлът не е качен
-FileUploaded=Файлът е качен успешно
 AssociatedDocuments=Документи, свързани с предложението:
 ErrorCantOpenDir=Не мога да отворя директорията
 DatePropal=Дата на предложението
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal %s не е намерена
 Estimate=Оцени:
 EstimateShort=Преценка
 OtherPropals=Други предложения
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=Създаване на търговско предложение копиране съществуващото предложение
 CreateEmptyPropal=Създаване на празен търговски vierge предложения или от списъка на продуктите / услугите
 DefaultProposalDurationValidity=Default търговски продължителност предложение на валидност (в дни)
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=Контакт с клиентите сле
 # Document models
 DocModelAzurDescription=Цялостен модел за предложение (logo. ..)
 DocModelJauneDescription=Jaune предложение модел
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index b5b74bc1035..44e93f50da8 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 71f689c32dd..5e5cb41a298 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Обикновено документ модел
 DocumentModelMerou=Merou A5 модел
 WarningNoQtyLeftToSend=Внимание, няма продукти, които чакат да бъдат изпратени.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Нарязани датата на доставка
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Дата на доставка
 SendShippingByEMail=Изпращане на пратка по имейл
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 46623620792..ac66d71557b 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Складове
 NewWarehouse=Нов склад
 WarehouseEdit=Промяна на склад
 MenuNewWarehouse=Нов склад
-WarehouseOpened=Склада е отворен
+WarehouseOpened=Warehouse open
 WarehouseClosed=Склада е затворен
 WarehouseSource=Изпращащ склад
 WarehouseSourceNotDefined=Няма зададен склад,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Изберете склад, да се изпо
 SelectWarehouseForStockIncrease=Изберете склад, да се използва за увеличение на склад
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Поръчки чакат за приеми
-DesiredStock=Желана наличност
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Вирт. наличност
 CurentlyUsingPhysicalStock=Факт. наличност
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Само известия
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=За този склад
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Попълване
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index 67f85043e38..c8889046b00 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=Списък на нарежданията за доставчика
 MenuOrdersSupplierToBill=Поръчки на доставчика за фактуриране
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
index cf20af222e5..332600d4894 100644
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Списък на такси
 NewTrip=New expense report
 CompanyVisited=Фирмата/организацията е посетена
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index cd53dfb8c2c..2710d84ff2b 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Премахване от групата
 PasswordChangedAndSentTo=Паролата е сменена и изпратена на <b>%s</b>.
 PasswordChangeRequestSent=Заявка за промяна на паролата на <b>%s,</b> е изпратена на <b>%s.</b>
 MenuUsersAndGroups=Потребители и Групи
+MenuMyUserCard=My user card
 LastGroupsCreated=Последните %s създадени групи
 LastUsersCreated=Последните %s създадени потребители
 ShowGroup=Показване на групата
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 599a843661b..55535a35af5 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Плащане на постоянно нареждане %s от банката
diff --git a/htdocs/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
index c79cc9bdef8..19c4c47e4ba 100644
--- a/htdocs/langs/bg_BG/workflow.lang
+++ b/htdocs/langs/bg_BG/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Настройки на модул Workflow
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Не е работния процес, можете да модифицирате за модул сте активирали.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Създаване на заявка на клиента автоматично, след като е подписано търговско предложение
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Създаване на фактура на клиента автоматично, след като е подписано търговско предложение
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Създаване на фактура на клиента автоматично след договор е потвърден
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Създаване на фактура на клиента се затваря автоматично след поръчка на клиента
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Класифицира свързан източник на предложение за Плоскоклюн при поръчка на клиента на платен
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 9782c2ea27f..13f7eb7c6ec 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -297,15 +296,16 @@ MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -396,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -428,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -490,15 +491,17 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -508,20 +511,22 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -537,8 +542,8 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -555,8 +560,6 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
 Permission13=Unvalidate customer invoices
@@ -576,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -597,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -618,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -792,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -809,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -844,12 +856,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices,
 LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
@@ -928,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1001,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1009,14 +1022,14 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
 NoEventFoundWithCriteria=No security event has been found for such search criterias.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
-BackupDesc2=* Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant.
+BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=Archived directory should be stored in a secure place.
 BackupDescY=The generated dump file should be stored in a secure place.
 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
 RestoreDesc=To restore a Dolibarr backup, you must:
-RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
 ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
 PreviousDumpFiles=Available database backup dump files
@@ -1069,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1107,7 +1120,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1328,6 +1341,8 @@ LDAPFieldCountry=Country
 LDAPFieldCountryExample=Example : c
 LDAPFieldDescription=Description
 LDAPFieldDescriptionExample=Example : description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= Group members
 LDAPFieldGroupMembersExample= Example : uniqueMember
 LDAPFieldBirthdate=Birthdate
@@ -1374,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1410,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1492,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1531,7 +1550,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
@@ -1542,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1557,6 +1585,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
@@ -1570,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1583,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1601,3 +1631,22 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
index 04e2ae30de8..3e8b2309f8f 100644
--- a/htdocs/langs/bn_BD/agenda.lang
+++ b/htdocs/langs/bn_BD/agenda.lang
@@ -48,11 +48,13 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -91,3 +93,7 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index a2306950fb4..d12f45387d6 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
@@ -163,3 +163,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 69e1510ca44..3210e0bf517 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -294,8 +294,11 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -427,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index bf118b9b88e..b61cf77019f 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
@@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
+LastXMonthRolling=The last %s month rolling
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 22914931db1..9c3a956727e 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 8abf1fd1c5a..42a9a884c76 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index 28dfc7770b2..bd85715642e 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,21 +26,21 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -75,13 +75,15 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/bn_BD/ecm.lang
+++ b/htdocs/langs/bn_BD/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 700e6344d7d..89b073e4622 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -159,8 +159,18 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -181,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/bn_BD/holiday.lang
+++ b/htdocs/langs/bn_BD/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/bn_BD/incoterm.lang b/htdocs/langs/bn_BD/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/bn_BD/incoterm.lang
+++ b/htdocs/langs/bn_BD/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang
index d20aab00146..aaeeb235544 100644
--- a/htdocs/langs/bn_BD/languages.lang
+++ b/htdocs/langs/bn_BD/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spanish (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
 Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 7a211198822..3bebb0c2aff 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
@@ -139,3 +140,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index d40e28cb776..12d9337641d 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -220,6 +220,7 @@ Next=Next
 Cards=Cards
 Card=Card
 Now=Now
+HourStart=Start hour
 Date=Date
 DateAndHour=Date and hour
 DateStart=Date start
@@ -242,6 +243,8 @@ DatePlanShort=Date planed
 DateRealShort=Date real.
 DateBuild=Report build date
 DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -298,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -336,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -352,6 +356,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +399,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -407,6 +412,10 @@ OtherInformations=Other informations
 Quantity=Quantity
 Qty=Qty
 ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -415,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -672,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -694,6 +704,12 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -723,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index 8efafa5e94e..55802b4bb48 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -74,11 +75,14 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
-LastOrders=Last %s orders
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=Last %s modified orders
 LastClosedOrders=Last %s closed orders
 AllOrders=All orders
@@ -102,6 +106,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +124,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 08747ea884b..c49606b8f75 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
@@ -201,6 +203,8 @@ NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/bn_BD/printing.lang b/htdocs/langs/bn_BD/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/bn_BD/printing.lang
+++ b/htdocs/langs/bn_BD/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index 45263681965..37ceaa49b38 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 3a18cda69e7..55b1d016827 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,20 +262,37 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#options_myextrafieldkey#</b>
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 44d0d89687a..7a2688a4461 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -11,9 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -28,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -40,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -72,7 +74,10 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -93,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -137,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/bn_BD/propal.lang b/htdocs/langs/bn_BD/propal.lang
index 2b6d12870a1..d10dbb15122 100644
--- a/htdocs/langs/bn_BD/propal.lang
+++ b/htdocs/langs/bn_BD/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,8 +51,8 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
 AssociatedDocuments=Documents associated with the proposal:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune proposal model
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
index b1ff55f71c1..1dc182c6fdc 100644
--- a/htdocs/langs/bn_BD/sendings.lang
+++ b/htdocs/langs/bn_BD/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
@@ -52,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -66,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 29706d17615..7aeef1c9641 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -16,6 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
+StocksByLotSerial=Stock by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -78,6 +79,7 @@ IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
@@ -93,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -110,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -122,13 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
index baf573c66ac..5388a4867c7 100644
--- a/htdocs/langs/bn_BD/suppliers.lang
+++ b/htdocs/langs/bn_BD/suppliers.lang
@@ -42,4 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/bn_BD/trips.lang b/htdocs/langs/bn_BD/trips.lang
index ba36fc9b07b..a5b2569942e 100644
--- a/htdocs/langs/bn_BD/trips.lang
+++ b/htdocs/langs/bn_BD/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -69,16 +68,15 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -95,32 +93,10 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/bn_BD/workflow.lang b/htdocs/langs/bn_BD/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/bn_BD/workflow.lang
+++ b/htdocs/langs/bn_BD/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 0561ee194d6..17c4a8bac6c 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Računovodstvo
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index efe5ae4147e..6cd00fac66c 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Zaštita PDF dokument drži ga na raspolaganju za čitanje i printanje za bilo kojiPDF preglednikom. Međutim, uređivanje i kopiranje nije moguće. Imajte na umu da koristite ovu funkciju čine izgradnju globalne kumulirane pdf fajlove ne radi (kao što su neplaćeni računi).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Ove postavke su za procesuiranje:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Čitanje trećih stranaka vezanih za korisnika
 Permission122=Kreiranje/mijenjati trećih strana vezanih sa korisnika
 Permission125=Brisanje trećih stranaka vezanih za korisnika
 Permission126=Izvoz trećih stranaka
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Postavke snimljene
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=Možete koristiti driver %s koji je trenutno najbolji.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Vizualizacija opisa proizvoda u jeziku treće stranke
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Defaultni tip barkoda koji se koristi za treće stranke
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Menadžer za automatsko određivanje barkod brojeva
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Modul za numerisanje zadataka
 TaskModelModule=Model dokumenta za izvještaj o zadacima
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index 614ec124570..07a687bf6da 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
-OrderCanceledInDolibarr=Narudžba %s otkazana
 ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila
 OrderSentByEMail=Narudžba za kupca %s poslana putem e-maila
 InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 8ec490d7e5f..f00a91cd646 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Izmiriti
 Conciliation=Podmirivanje
 ConciliationForAccount=Izmiriti ovaj račun
 IncludeClosedAccount=Uključiti zatvorene račune
-OnlyOpenedAccount=Samo otvoreni računi
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Račun za potraživanja
 AccountToDebit=Račun za zaduživanje
 DisableConciliation=Isključi opciju podmirenja za ovaj račun
 ConciliationDisabled=Opcija podmirivanja isključena
-StatusAccountOpened=Otvoreno
+StatusAccountOpened=Open
 StatusAccountClosed=Zatvoreno
 AccountIdShort=Broj
 EditBankRecord=Uredi zapis
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Uplata mušterije
 CustomerInvoicePaymentBack=Vraćanje novca kupcu
 SupplierInvoicePayment=Plaćanje dobavljača
 WithdrawalPayment=Povlačenje uplate
-SocialContributionPayment=Plaćanje socijalnog doprinosa
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Dnevnik financijskog računa
 BankTransfer=Bankovna transakcija
 BankTransfers=Bankovne transakcije
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 2ccb041fd4f..25c723e8b9a 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Broj faktura
 NumberOfBillsByMonth=Broj faktura po mjesecu
 AmountOfBills=Iznos faktura
 AmountOfBillsByMonthHT=Iznos faktura po mjesecu (bez PDV-a)
-ShowSocialContribution=PRikaži socijale doprinose
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Prikaži fakturu
 ShowInvoice=Prikaži fakturu
 ShowInvoiceReplace=Prikaži zamjensku fakturu
@@ -270,7 +270,7 @@ BillAddress=Adresa fakture
 HelpEscompte=Ovaj popust je odobren za kupca jer je isplata izvršena prije roka.
 HelpAbandonBadCustomer=Ovaj iznos je otkazan (kupac je loš kupac) i smatra se kao potencijalni gubitak.
 HelpAbandonOther=Ovaj iznos je otkazan jer je došlo do greške (naprimjer pogrešan kupac ili faktura zamijenjena sa nekom drugom)
-IdSocialContribution=ID socijalnog doprinosa
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID uplate
 InvoiceId=ID fakture
 InvoiceRef=Referenca fakture
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Odmah
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 6b13f5176ff..181c237b40b 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Zadnji ugovori
 BoxLastContacts=Zadnji kontakti/adrese
 BoxLastMembers=Zadnji članovi
 BoxFicheInter=Zadnje intervencije
-BoxCurrentAccounts=Stanje otvorenih računa
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Ukupno neplaćenih faktura kupca
 BoxTotalUnpaidSuppliersBills=Ukupno neplaćenih faktura dobavljača
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Zadnjih %s izmijenjenih intervencija
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Stanja otvorenog računa
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 1e2151b4945..95e3b13a40c 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> je uspješno dodan/a.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Ništa
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Već postoji kategorija sa ovom referencom
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Sadržaj nije vidljiv svima
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 94c67f22f85..67d3f9723e3 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Kontakt/Adresa subjekta
 StatusContactValidated=Status kontakta/adrese
 Company=Kompanija
 CompanyName=Ime kompanije
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Kompanije
 CountryIsInEEC=Zemlja je unutar Evropske ekonomske zajednice
 ThirdPartyName=Ime subjekta
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Fiksni popust dostupan
 DiscountNone=Ništa
 Supplier=Dobavljač
 CompanyList=Lista kompanije
-AddContact=Dodaj kontakt
-AddContactAddress=Dodaj kontakt/adresu
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
 Contact=Kontakt
@@ -268,8 +269,8 @@ ContactsAddresses=Kontakti/Adrese
 NoContactDefinedForThirdParty=Nema definiranih kontakata za ovaj subjekt
 NoContactDefined=Nijedan kontakt definiran
 DefaultContact=Defaultni kontakt/adresa
-AddCompany=Dodaj kompaniju
-AddThirdParty=Dodaj subjekta
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Obrisati kompaniju
 PersonalInformations=Osobni podaci
 AccountancyCode=Šifra računovodstva
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Oznaka za adresu za dostavu
 DeleteDeliveryAddress=Obrisani adresu za dostavu
 ConfirmDeleteDeliveryAddress=Jeste li sigurni da želite obrisati ovu adresu za dostavu?
 NewDeliveryAddress=Nova adresa za dostavu
-AddDeliveryAddress=Dodaj adresu
-AddAddress=Dodaj adresu
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=Nema definisane alternativne adrese za dostavu
 SupplierCategory=Kategorija dobavljača
 JuridicalStatus200=Nezavisno
@@ -410,5 +411,10 @@ OutstandingBillReached=Dostugnut je max. za neplaćeni račun
 MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 562c32c5ab6..f99a44facf0 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index c3144314bef..7503afe9119 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -4,10 +4,10 @@ About = O programu
 CronAbout = O Cron-u
 CronAboutPage = Stranica o Cron-u
 # Right
-Permission23101 = Pročitaj redovne zadatke
-Permission23102 = Kreiraj/Ažuriraj redovni zadatak
-Permission23103 = Obriši redovan zadatak
-Permission23104 = Izvrši redovan zadatak
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Izvještaj o zadnjem pokretanju
 CronLastResult=Šifra rezultat zadnjeg pokretanja
 CronListOfCronJobs=Lista redovnih poslova
 CronCommand=Komanda
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Datum početka
 CronDtEnd=End date
 CronDtNextLaunch=Sljedeće izvršenje
 CronDtLastLaunch=Zadnje izvršenje
-CronFrequency=Frekvencija
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metoda
 CronModule=Modul
 CronAction=Akcija
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Dodaj posao
-CronHourStart= Vrijeme početka i datum zadatka
-CronEvery= I izvrši zadatak vaki
-CronObject= Instanca/Objekat za kreirati
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instanca/Objekat za kreirati
 CronArgs=PArametri
 CronSaveSucess=Save succesfully
 CronNote=Komentar
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za izvršenje
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Inromacije
 # Common
-CronType=Tip zadatka
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell komanda
 CronMenu=Cron
 CronCannotLoadClass=Ne može se otvoriti klada %s ili objekat %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
index 546c678bbaa..6f2d0a0b6a4 100644
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Traži po objektu
 ECMSectionOfDocuments=Direktoriji dokumenata
 ECMTypeManual=Ručno
 ECMTypeAuto=Automatski
-ECMDocsBySocialContributions=Dokumenti vezani za socijalne doprinose
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumenti vezani sza subjekte
 ECMDocsByProposals=Dokumenti vezani za prijedloge
 ECMDocsByOrders=Dokumenti vezani za narudžbe kupaca
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index 23d4c100a2f..0e41abb4f79 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -3,7 +3,7 @@ HRM=Kadrovska služba
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Mjesečni izvještaj
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Razlog
 UserCP=Korisnik
 ErrorAddEventToUserCP=Došlo je do greške prilikom dodavanja izuzetnog odsustva.
 AddEventToUserOkCP=Dodavanje izuzetno odsustva je kopmletirano.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Izvršeno od strane
 UserUpdateCP=Za korisnika
@@ -93,6 +93,7 @@ ValueOptionCP=Vrijednost
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Potvrdite konfiguraciju
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Uspješno ažuriranje.
 ErrorUpdateConfCP=Došlo je do greške prilikom ažuriranja, molimo pokušajte ponovo.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Desila se greška prilikom slanja emaila:
 NoCPforMonth=Nema odsustva za ovaj mjesec.
 nbJours=Broj dana
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Zdravo
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/bs_BA/incoterm.lang b/htdocs/langs/bs_BA/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/bs_BA/incoterm.lang
+++ b/htdocs/langs/bs_BA/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang
index 35316b980da..f6a1db84373 100644
--- a/htdocs/langs/bs_BA/languages.lang
+++ b/htdocs/langs/bs_BA/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arapski
 Language_ar_SA=Arapski
+Language_bn_BD=Bengali
 Language_bg_BG=Bugarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonski
@@ -21,9 +22,10 @@ Language_en_SA=Engleski (Saudijska Arabija)
 Language_en_US=Engleski (United States)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španski
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Španjolski (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Španjolski (Honduras)
 Language_es_MX=Španjolski (Meksiko)
 Language_es_PY=Španjolski (Paragvaj)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Islandski
 Language_it_IT=Italijanski
 Language_ja_JP=Japanski
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korejski
+Language_lo_LA=Lao
 Language_lt_LT=Litvanski
 Language_lv_LV=Letonski
 Language_mk_MK=Makedonski
@@ -64,6 +69,7 @@ Language_sv_SV=Švedski
 Language_sv_SE=Švedski
 Language_sq_AL=Albanian
 Language_sk_SK=Slovački
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrajinski
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index b2ea4f11995..0f93932885d 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Pročitaj potvrdu
 YourMailUnsubcribeOK=E-pošta <b>%s</b> je uspješno ispisana sa liste e-pošte
 MailtoEMail=Hyper link na e-poštu
 ActivateCheckRead=Dozvoli korištenje "Ispiši se" linka
-ActivateCheckReadKey=Kljul korišten za enkriptovanje linka koristi se za "Pročitaj potvrdu" i "Ispiši se" mogućnosti
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-pošta poslana %s primaocima
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Prati otvaranje mailova
 TagUnsubscribe=Link za ispisivanje
 TagSignature=Korisnik sa slanjem potpisa
 TagMailtoEmail=E-pošta primalac
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifikacije
 NoNotificationsWillBeSent=Nema planiranih email notifikacija za ovaj događaj i kompaniju
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index b7b40e8e498..5931030500c 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/bs_BA/printing.lang b/htdocs/langs/bs_BA/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/bs_BA/printing.lang
+++ b/htdocs/langs/bs_BA/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 79debdf06b8..9cee0564251 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi i usluge
 ProductsOrServices=Proizvodi ili usluge
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Statistika proizvoda i usluga
 ProductsStatistics=Statistika proizvoda
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Interna referenca
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index d4fb90709bf..e51f9272dd3 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Ovaj pregled predstavlja sve projekte (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 MyTasksDesc=Ovaj pregled predstavlja sve projekte ili zadatke za koje ste kontakt (bilo koji tip).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
 TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Područje za projekte
 NewProject=Novi projekat
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Lista projekata
 ShowProject=Prikaži projekt
 SetProject=Postavi projekat
 NoProject=Nema definisanog ili vlastitog projekta
-NbOpenTasks=Broj otvorenih zadataka
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Broj projekata
 TimeSpent=Vrijeme provedeno
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nova provedeno vrijeme
 MyTimeSpent=Moje provedeno vrijeme
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista događaja u vezi s projektom
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice
 ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca
 ActivityOnProjectThisYear=Aktivnost na projektu ove godine
@@ -95,7 +98,7 @@ DeleteATimeSpent=Brisanje provedenog vremena
 ConfirmDeleteATimeSpent=Jeste li sigurni da želite obrisati ovo provedeno vrijeme?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Izvori
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu
 NoTasks=Nema zadataka za ovaj projekat
 LinkedToAnotherCompany=U vezi sa drugim subjektom
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/bs_BA/propal.lang b/htdocs/langs/bs_BA/propal.lang
index 36068d27014..acc4766ce2c 100644
--- a/htdocs/langs/bs_BA/propal.lang
+++ b/htdocs/langs/bs_BA/propal.lang
@@ -4,7 +4,7 @@ Proposal=Poslovni prijedlog
 ProposalShort=Prijedlog
 ProposalsDraft=Nacrti poslovnih prijedloga
 ProposalDraft=Nacrt poslovnog prijedloga
-ProposalsOpened=Otvoreni poslovni prijedlozi
+ProposalsOpened=Open commercial proposals
 Prop=Poslovni prijedlozi
 CommercialProposal=Poslovni prijedlog
 CommercialProposals=Poslovni prijedlozi
@@ -16,7 +16,7 @@ Prospect=Mogući klijent
 ProspectList=Lista mogućih klijenata
 DeleteProp=Obrši poslovni prijedlog
 ValidateProp=Potbrdi poslovni prijedlog
-AddProp=Dodaj prijedlog
+AddProp=Create proposal
 ConfirmDeleteProp=Jeste li sigurni da želite obrisati ovaj poslovni prijedlog?
 ConfirmValidateProp=Jeste li sigurni da želite potvrditi ovaj poslovni prijedlog pod nazivom <b>%s</b> ?
 LastPropals=Zadnjih %s prijedloga
@@ -27,76 +27,75 @@ LastProposals=Zadnji prijedlozi
 SearchAProposal=Traži prijedlog
 ProposalsStatistics=Statistika poslovnog prijedloga
 NumberOfProposalsByMonth=Broj po mjesecu
-# AmountOfProposalsByMonthHT=Amount by month (net of tax)
+AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Broj poslovnih prijedloga
-# ShowPropal=Show proposal
-# PropalsDraft=Drafts
-# PropalsOpened=Opened
-# PropalsNotBilled=Closed not billed
-# PropalStatusDraft=Draft (needs to be validated)
-# PropalStatusValidated=Validated (proposal is open)
-# PropalStatusOpened=Validated (proposal is open)
-# PropalStatusClosed=Closed
-# PropalStatusSigned=Signed (needs billing)
-# PropalStatusNotSigned=Not signed (closed)
-# PropalStatusBilled=Billed
-# PropalStatusDraftShort=Draft
-# PropalStatusValidatedShort=Validated
-# PropalStatusOpenedShort=Opened
-# PropalStatusClosedShort=Closed
-# PropalStatusSignedShort=Signed
-# PropalStatusNotSignedShort=Not signed
-# PropalStatusBilledShort=Billed
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalsNotBilled=Closed not billed
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusOpened=Validated (proposal is open)
+PropalStatusClosed=Closed
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
+PropalStatusOpenedShort=Open
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
 PropalsToClose=Poslovni prijedlozi za zatvaranje
 PropalsToBill=Potpisani poslovni prijedlozi za fakturisanje
 ListOfProposals=Lista poslovnih prijedloga
-# ActionsOnPropal=Events on proposal
-NoOpenedPropals=Nema otvorenih poslovnih prijedloga
-NoOtherOpenedPropals=Nema drugih otvorenih poslovnih prijedloga
+ActionsOnPropal=Events on proposal
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Ref poslovnog prijedloga
 SendPropalByMail=Pošalji poslovni prijedlog e-mailom
-# FileNotUploaded=The file was not uploaded
-# FileUploaded=The file was successfully uploaded
-# AssociatedDocuments=Documents associated with the proposal:
-# ErrorCantOpenDir=Can't open directory
-# DatePropal=Date of proposal
-# DateEndPropal=Validity ending date
-# DateEndPropalShort=Date end
-# ValidityDuration=Validity duration
-# CloseAs=Close with status
-# ClassifyBilled=Classify billed
-# BuildBill=Build invoice
-# ErrorPropalNotFound=Propal %s not found
-# Estimate=Estimate :
-# EstimateShort=Estimate
-# OtherPropals=Other proposals
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AssociatedDocuments=Documents associated with the proposal:
+ErrorCantOpenDir=Can't open directory
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+DateEndPropalShort=Date end
+ValidityDuration=Validity duration
+CloseAs=Close with status
+ClassifyBilled=Classify billed
+BuildBill=Build invoice
+ErrorPropalNotFound=Propal %s not found
+Estimate=Estimate :
+EstimateShort=Estimate
+OtherPropals=Other proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=Kreiraj poslovni prijedlog kopiranje postojećeg prijedloga
-# CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-# DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-# UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-# ClonePropal=Clone commercial proposal
-# ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-# ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-# ProposalsAndProposalsLines=Commercial proposal and lines
-# ProposalLine=Proposal line
-# AvailabilityPeriod=Availability delay
-# SetAvailability=Set availability delay
-# AfterOrder=after order
+CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+ClonePropal=Clone commercial proposal
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
 ##### Availability #####
-# AvailabilityTypeAV_NOW=Immediate
-# AvailabilityTypeAV_1W=1 week
-# AvailabilityTypeAV_2W=2 weeks
-# AvailabilityTypeAV_3W=3 weeks
-# AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
-# TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-# TypeContact_propal_external_BILLING=Customer invoice contact
-# TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 # Document models
-# DocModelAzurDescription=A complete proposal model (logo...)
-# DocModelJauneDescription=Jaune proposal model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=A complete proposal model (logo...)
+DocModelJauneDescription=Jaune proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index 4957b903f6b..daff6d59a94 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Jednostavni model dokumenta
 DocumentModelMerou=Model dokumenta Merou A5
 WarningNoQtyLeftToSend=Upozorenje, nema proizvoda na čekanju za slanje
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planirani datum isporuke
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Datum prijema isporuke
 SendShippingByEMail=Pošalji pošiljku na e-mail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 21c1a748cb4..d4aad9a4ec1 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Skladišta
 NewWarehouse=Dio za novo skladište/zalihu
 WarehouseEdit=Modifikovanje skladišta
 MenuNewWarehouse=Novo skladište
-WarehouseOpened=Skladište otvoreno
+WarehouseOpened=Warehouse open
 WarehouseClosed=Skladište zatvoreno
 WarehouseSource=Izvorno skladište
 WarehouseSourceNotDefined=Nema definisanog skladišta,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Odaberi skladište za smanjenje zalihe
 SelectWarehouseForStockIncrease=Odaberi skladište za povećanje zalihe
 NoStockAction=Nema akcija zaliha
 LastWaitingSupplierOrders=Narudžbe na čekanju za prijem
-DesiredStock=Željena zaliha
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Za narudžbu
 Replenishment=Nadopuna
 ReplenishmentOrders=Narudžne za nadopunu
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Pravila za nadopunjenje zaliha
@@ -112,8 +113,8 @@ AlertOnly= Samo uzbune
 WarehouseForStockDecrease=Skladište <b>%s</b> će biti korišteno za smanjenje zalihe
 WarehouseForStockIncrease=Skladište <b>%s</b> će biti korišteno za povećanje zalihe
 ForThisWarehouse=Za ovo skladište
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Nadopune
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Zapiši transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Kretanja zalihe zapisana
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 62e1d2bf6b8..2c12ddef705 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Poslano prema dobavljačima
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index 69211305741..65bd0833f93 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Lista naknada
 NewTrip=New expense report
 CompanyVisited=Posjeta kompaniji/fondaciji
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index 97d04af3c0a..a3359a6969b 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Šifra promijenjena i poslana korisniku <b>%s</b>.
 PasswordChangeRequestSent=Zahtjev za promjenu šifre za <b>%s</b> poslana na <b>%s</b>.
 MenuUsersAndGroups=Korisnici i grupe
+MenuMyUserCard=My user card
 LastGroupsCreated=Posljednje kreirane %s grupe
 LastUsersCreated=Posljednji kreirani %s korisnici
 ShowGroup=Prikaži grupu
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index 40739a95d50..07ef56ff483 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Plaćanje trajnog naloga %s od strane banke
diff --git a/htdocs/langs/bs_BA/workflow.lang b/htdocs/langs/bs_BA/workflow.lang
index 4861252312d..80e119d46e1 100644
--- a/htdocs/langs/bs_BA/workflow.lang
+++ b/htdocs/langs/bs_BA/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Postavke workflow modula
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Nema workflow-a koji možete mijenjati za modul koji ste aktivirali.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Kreiraj narudžbu za kupca automatski nakon potpisivanja poslovnog prijedloga
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Kreiraj fakturu kupca automatski nakon potpisivanja poslovnog prijedloga
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Kreiraj fakturu kupca automatski nakon potvrđivanja ugovora
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Kreiraj fakturu za kupca automatski nakon zatvaranja narudžbe kupca
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označiti povezani izvorni prijedlog kao naplaćen odmah nakon plaćanja narudžbe za kupca
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označiti povezanu izvornu narudžbu(e) kao plaćene kada je faktura za kupca postavljena kao plaćena.
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označiti povezanu izvornu narudžbu(e) kao plaćene kada je faktura za kupca postavljena kao potvrđena.
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 97ae33839b8..12012b8e5bc 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menú per als usuaris
 LangFile=arxiu .lang
 System=Sistema
 SystemInfo=Info. sistema
-SystemTools=Utilitats sistema
 SystemToolsArea=Àrea utilitats del sistema
 SystemToolsAreaDesc=Aquesta àrea ofereix diverses funcions d'administració. Utilitzeu el menú per triar la funcionalitat cercada.
 Purge=Purga
@@ -232,8 +231,8 @@ Security=Seguretat
 Passwords=Contrasenyes
 DoNotStoreClearPassword=No emmagatzemar la contrasenya sense xifrar a la base
 MainDbPasswordFileConfEncrypted=Encriptar la contrasenya de la base en l'arxiu conf.php
-InstrucToEncodePass=Per tenir la contrasenya de la base de dades codificada en el fitxer de configuració< b> conf.php </b>, reemplaçar en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="..."</b><br> per <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Per tenir la contrasenya de la base de dades descodificat en el fitxer de configuració b> conf.php </b>, reemplaçar en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> per <br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protecció i encriptació dels pdf generats
 ProtectAndEncryptPdfFilesDesc=La protecció d'un document pdf deixa el document lliure a la lectura ia la impressió a qualsevol lector de PDF. Per contra, la modificació i la còpia resulten impossibles.
 Feature=Funció
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Heus aquí el procediment a seguir:
 ThisIsAlternativeProcessToFollow=Aquesta es una configuració alternativa per processar:
 StepNb=Pas %s
 FindPackageFromWebSite=Cercar el paquet que respon a la seva necessitat (per exemple en el lloc web %s)
-DownloadPackageFromWebSite=Descarregar el paquet %s.
-UnpackPackageInDolibarrRoot=Descomprimir el paquet en el directori dedicat als móduls externs <b>%s</b>
+DownloadPackageFromWebSite=Descarrega el paquet (per exemple del lloc web oficial %s).
+UnpackPackageInDolibarrRoot=Descomprimir el paquet en el directori Dolibarr dedicat als móduls externs: <b>%s</b>
 SetupIsReadyForUse=La instal·lació ha finalitzat i Dolibarr està disponible amb el nou component.
 NotExistsDirect=No existeix el directori alternatiu.<br>
 InfDirAlt=Des de la versió 3 és possible definir un directori root alternatiu, això li permet emmagatzemar en el mateix lloc mòduls i temes personalitzades.<br>Només cal crear un directori en l'arrel de Dolibarr (per exemple: custom).<br>
 InfDirExample=<br>Seguidament es declara a l'arxiu conf.php:<br> $dolibarr_main_url_root_alt='http://miservidor/custom'<br>$dolibarr_main_document_root_alt='/directorio/de/dolibarr/htdocs/custom'<br>*Aquestes línies venen comentades amb un "#", per descomentar-les només cal retirar el caràcter.
-YouCanSubmitFile=Seleccioneu mòdul:
+YouCanSubmitFile=Per aquest pas, pots enviar el paquet utilitzant aquesta utilitat: Selecciona el fitxer del mòdul
 CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Trucar a la pàgina d'actualització de l'estructura i dades de la base de dades %s.
 LastStableVersion=Última versió estable disponible
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Llista Paràmetres be de una taula<br>Sintaxis: nom_t
 ExtrafieldParamHelpchkbxlst=Llista de paràmetres bé d'una taula<br>Sintaxi: table_name:label_field:id_field::filter<br>Exemple: c_typent:libelle:id::filter<br><br>filtre pot ser una prova simple (per exemple, actiu = 1) per mostrar el valor només s'activa<br>si desitja filtrar un camp extra, utilitza la sintaxi extra.fieldcode=... (on el codi del camp extra)<br><br>per tenir la llista en funció d'un altre:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Llibreria usada per a la creació d'arxius PDF
 WarningUsingFPDF=Atenció: El seu arxiu <b>conf.php</b> conté la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.<br> Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la <a href="http://www.tcpdf.org/" target="_blank"> llibreria TCPDF </a>, i a continuació comentar o eliminar la línia <b>$dolibarr_pdf_force_fpdf=1</b>, i afegir al seu lloc <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
-LocalTaxDesc=Alguns països aplica'n 2 o 3 tasses a cada línea de factura. Si és el cas, esculli el tipus de la segona i tercera tassa i el seu valor. Els possibles tipus són:<br>1: Tassa local aplicable a productes i serveis sense IVA (tassa local es calculada sobre la base imposable)<br>2: Tassa local s'aplica a productes i serveis incloent l'IVA (tassa local es calcula sobre la base imposable+IVA)<br>3: Tassa local s'aplica a productes sense IVA (tassa local es calcula sobre la base imposable)<br>4: Tassa local s'aplica a productes incloent l'IVA (tassa local es calcula sobre la base imposable+IVA)<br>5: Tassa local s'aplica a serveis sin IVA (tassa local es calcula sobre la base imposable)<br>6: Tassa local s'aplica a serveis incloent l'IVA (tassa local es calcula sobre base imposable+IVA)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari <strong>%s</strong>
 RefreshPhoneLink=Refrescar enllaç
@@ -430,8 +429,8 @@ Module20Name=Pressupostos
 Module20Desc=Gestió de pressupostos/propostes comercials
 Module22Name=E-Mailings
 Module22Desc=Administració i enviament d'E-Mails massius
-Module23Name= Energia
-Module23Desc= Realitza el seguiment del consum d'energies
+Module23Name=Energia
+Module23Desc=Realitza el seguiment del consum d'energies
 Module25Name=Comandes de clients
 Module25Desc=Gestió de comandes de clients
 Module30Name=Factures i abonaments
@@ -492,8 +491,8 @@ Module400Name=Projectes/Oportunitats/Leads
 Module400Desc=Gestió de projectes, oportunitats o clients potencials. A continuació, pot assignar qualsevol element (factura, ordre, proposta, intervenció, ...) a un projecte i obtenir una visió transversal de la vista del projecte.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
-Module500Name=Despeses especials (impostos, càrregues socials, dividends)
-Module500Desc=Gestió de despeses especials, impostos, càrregues socials, dividends i salaris
+Module500Name=Pagaments especials
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Sous
 Module510Desc=Gestió dels salaris dels empleats i pagaments
 Module520Name=Préstec
@@ -502,7 +501,7 @@ Module600Name=Notificacions
 Module600Desc=Enviar notificacions per correu electrònic sobre alguns esdeveniments de negocis del Dolibarr als contactes de tercers (configuració definida en cada tercer)
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
-Module770Name=Informe de despeses
+Module770Name=Expense reports
 Module770Desc=Informes de despeses de gestió i reclamació (transport, menjar, ...)
 Module1120Name=Pressupost de proveïdor
 Module1120Desc=Sol·licitud pressupost i preus a proveïdor
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Gestió de l'agenda i de les accions
 Module2500Name=Gestió Electrònica de Documents
 Module2500Desc=Permet administrar una base de documents
-Module2600Name=WebServices
-Module2600Desc=Activa els serveis de servidor web services de Dolibarr
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Habilitar els serveis de client web de Dolibarr (pot ser utilitzar per gravar dades/sol·licituds de servidors externs. De moment només és suporta comandes a proveïdors)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Crear/modificar productes
 Permission34=Eliminar productes
 Permission36=Veure/gestionar els productes ocults
 Permission38=Exportar productes
-Permission41=Consultar projectes i tasques (compartits o és contacte)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Crear/modificar projectes i tasques (compartits o és contacte)
 Permission44=Eliminar projectes i tasques (compartits o és contacte)
 Permission61=Consultar intervencions
@@ -599,10 +600,10 @@ Permission86=Enviar comandes de clients
 Permission87=Tancar comandes de clients
 Permission88=Anul·lar comandes de clients
 Permission89=Eliminar comandes de clients
-Permission91=Consultar impostos i IVA
-Permission92=Crear/modificar impostos i IVA
-Permission93=Eliminar impostos i IVA
-Permission94=Exporta impostos
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Consultar balanços i resultats
 Permission101=Consultar expedicions
 Permission102=Crear/modificar expedicions
@@ -620,9 +621,9 @@ Permission121=Consultar empreses
 Permission122=Crear/modificar empreses
 Permission125=Eliminar empreses
 Permission126=Exportar les empreses
-Permission141=Consultar tots els projectes i tasques (incloent-hi els privats dels que no sigui contacte)
-Permission142=Crear/modificar tots els projectes i tasques (incloent-hi els privats dels que no sigui contacte)
-Permission144=Eliminar tots els projectes i tasques (incloent-hi els privats dels que no sigui contacte)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Consultar proveïdors
 Permission147=Consultar estadístiques
 Permission151=Consultar domiciliacions
@@ -800,7 +801,7 @@ DictionaryCountry=Països
 DictionaryCurrency=Monedes
 DictionaryCivility=Títol cortesia
 DictionaryActions=Tipus d'esdeveniments de l'agenda
-DictionarySocialContributions=Tipus de càrregues socials
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Taxa d'IVA (Impost sobre vendes als EEUU)
 DictionaryRevenueStamp=Imports de segells fiscals
 DictionaryPaymentConditions=Condicions de pagament
@@ -817,6 +818,9 @@ DictionarySource=Orígens de pressupostos/comandes
 DictionaryAccountancyplan=Pla comptable
 DictionaryAccountancysystem=Models de plans comptables
 DictionaryEMailTemplates=Models d'emails
+DictionaryUnits=Unitats
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Configuració desada
 BackToModuleList=Retornar llista de mòduls
 BackToDictionaryList=Tornar a la llista de diccionaris
@@ -936,13 +940,14 @@ CompanyZip=Codi postal
 CompanyTown=Població
 CompanyCountry=Pais
 CompanyCurrency=Divisa principal
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=No mostrar
 DoNotSuggestPaymentMode=No sugerir
 NoActiveBankAccountDefined=Cap compte bancari actiu definit
 OwnerOfBankAccount=Titular del compte %s
 BankModuleNotActive=Mòdul comptes bancaris no activat
-ShowBugTrackLink=Mostra vincle "Assenyalar un bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Mostra panell d'informació a la pàgina principal
 Alerts=Alertes
 Delays=Terminis
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Decimals màxims per als preus unitaris
 MAIN_MAX_DECIMALS_TOT=Decimals màxims per als preus totals
 MAIN_MAX_DECIMALS_SHOWN=Decimals màxims per als imports mostrats a la pantalla (Posar <b> ...</b> després del màxim si vol veure <b> ...</b> quan el nombre es trunque al mostrar a la pantalla)
 MAIN_DISABLE_PDF_COMPRESSION=Utilitzar la compressió PDF per els arxius PDF generats
-MAIN_ROUNDING_RULE_TOT= Mida rang per l'arrodoniment (per a alguns països que arrodoneixen sobre una altra base que no sigui base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Preu unitari sense IVA d'un producte
 TotalPriceAfterRounding=Preu total després de l'arrodoniment
 ParameterActiveForNextInputOnly=Paràmetre efectiu només a partir de les properes sessions
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Nombre total de mòduls activats: <b>%s</b>
 YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
 ClassNotFoundIntoPathWarning=No s'ha trobat la classe %s en el seu path PHP
 YesInSummer=Sí a l'estiu
-OnlyFollowingModulesAreOpenedToExternalUsers=Recordeu que només els mòduls següents estan oberts a usuaris externs (siguin quins siguin els permisos dels usuaris):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin
 ConditionIsCurrently=Actualment la condició és %s
 YouUseBestDriver=Està utilitzant el driver %s, actualment és el millor driver disponible.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Nº de productes màx a les llistes (0= sense límit
 ConfirmDeleteProductLineAbility=Confirmació d'eliminació d'una línia de producte en els formularis
 ModifyProductDescAbility=Personalització de les descripcions dels productes en els formularis
 ViewProductDescInFormAbility=Visualització de les descripcions dels productes en els formularis
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualització de les descripcions de productes en l'idioma del tercer
 UseSearchToSelectProductTooltip=També si vostè té un gran número de productes (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. PRODUCT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena
 UseSearchToSelectProduct=Utilitzeu un formulari de cerca per triar un producte (en lloc d'una llista desplegable).
 UseEcoTaxeAbility=Assumir ecotaxa (DEEE)
 SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes
 SetDefaultBarcodeTypeThirdParties=Tipus de codi de barres utilitzat per defecte per als tercers
+UseUnits=Support units
 ProductCodeChecker= Mòdul per a la generació i comprovació del codi d'un producte o servei
 ProductOtherConf= Configuració de productes/serveis
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Codis de barra tipus UPC
 BarcodeDescISBN=Codis de barra tipus ISBN
 BarcodeDescC39=Codis de barra tipus C39
 BarcodeDescC128=Codis de barra tipus C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Generador de codi de barres (utilitzat pel motor intern per a alguns tipus de codis de barres). Ha de ser compatible amb "genbarcode".<br>Per exemple: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
 BarCodeNumberManager=Configuració de la numeració automatica de codis de barres
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Esteu segur que voleu eliminar l'entrada de menú <b>%s</b> ?
 DeleteLine=Eliminació de línea
 ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia?
 ##### Tax #####
-TaxSetup=Configuració del mòdul d'impostos, càrregues socials i dividends
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Opció de càrrega d'IVA
 OptionVATDefault=Efectiu
 OptionVATDebitOption=Dèbit
@@ -1552,6 +1561,15 @@ WebServicesSetup=Configuració del mòdul webservices
 WebServicesDesc=Mitjançant l'activació d'aquest mòdul, Dolibarr es converteix en el servidor de serveis web oferint diversos serveis web.
 WSDLCanBeDownloadedHere=La descripció WSDL dels serveis prestats es poden recuperar aquí
 EndPointIs=Els clients SOAP hauran d'enviar les seves sol·licituds al punt final a la URL Dolibarr
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Configuració del mòdul Banc
 FreeLegalTextOnChequeReceipts=Menció complementària a les remeses de xecs
@@ -1581,6 +1599,7 @@ ProjectsSetup=Configuració del mòdul Projectes
 ProjectsModelModule=Model de document per a informes de projectes
 TasksNumberingModules=Mòdul numeració de tasques
 TaskModelModule=Mòdul de documents informes de tasques
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Configuració del mòdul GED
 ECMAutoTree = L'arbre automàtic està disponible
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Obrir any fiscal
 CloseFiscalYear=Tancar any fiscal
 DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
-Opened=Obert
+Opened=Open
 Closed=Tancat
 AlwaysEditable=Sempre es pot editar
 MAIN_APPLICATION_TITLE=Forçar visibilitat del nom de l'aplicació (advertència: indicar el seu propi nom aquí pot trencar la característica d'auto-omple natge de l'inici de sessió en utilitzar l'aplicació mòbil DoliDroid)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòd
 SomethingMakeInstallFromWebNotPossible2=Per aquesta raó, explicarem aquí els passos del procés d'actualització manual que pot realitzar un usuari amb privilegis
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
 ConfFileMuseContainCustom=La instal·lació de mòduls externs des de l'aplicació guarda els arxius dels mòduls en el directori <strong>%s</strong>. Per disposar d'aquest directori a Dolibarr, té que configurar l'arxiu <strong>conf/conf.php</strong> per tenir l'opció <br>- <strong>$dolibarr_main_url_root_alt</strong> activat amb el valor <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> activat amb el valor <strong"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index e2eba6040c6..5937190b408 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Comanda %s classificada com a facturada
 OrderApprovedInDolibarr=Comanda %s aprovada
 OrderRefusedInDolibarr=Comanda %s rebutjada
 OrderBackToDraftInDolibarr=Comanda %s tordada a borrador
-OrderCanceledInDolibarr=Commanda %s anul·lada
 ProposalSentByEMail=Pressupost %s enviat per e-mail
 OrderSentByEMail=Comanda de client %s enviada per e-mail
 InvoiceSentByEMail=Factura a client %s enviada per e-mail
@@ -96,3 +95,5 @@ AddEvent=Crear esdeveniment
 MyAvailability=La meva disponibilitat
 ActionType=Tipus d'esdeveniment
 DateActionBegin=Data d'inici de l'esdeveniment
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index ed13b490920..8d428ce69da 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Conciliar
 Conciliation=Conciliació
 ConciliationForAccount=Conciliacions en aquest compte
 IncludeClosedAccount=Incloure comptes tancats
-OnlyOpenedAccount=Només comptes oberts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Compte de crèdit
 AccountToDebit=Compte de dèbit
 DisableConciliation=Desactivar la funció de conciliació per a aquest compte
 ConciliationDisabled=Funció de conciliació desactivada
-StatusAccountOpened=Oberta
+StatusAccountOpened=Open
 StatusAccountClosed=Tancada
 AccountIdShort=Número
 EditBankRecord=Editar registre
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Cobrament a client
 CustomerInvoicePaymentBack=Reemborsament a client
 SupplierInvoicePayment=Pagament a proveïdor
 WithdrawalPayment=Cobrament de domiciliació
-SocialContributionPayment=Pagament càrrega social
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Diari de tresoreria del compte
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index ab76a683f19..f62d5d749c7 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nº de factures
 NumberOfBillsByMonth=Nº de factures per mes
 AmountOfBills=Import de les factures
 AmountOfBillsByMonthHT=Import de les factures per mes (Sense IVA)
-ShowSocialContribution=Mostrar contribució social
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Veure factura
 ShowInvoice=Veure factura
 ShowInvoiceReplace=Veure factura rectificativa
@@ -270,7 +270,7 @@ BillAddress=Direcció de facturació
 HelpEscompte=Un <b>descompte</b> és un descompte acordat sobre una factura donada, a un client que va realitzar el seu pagament molt abans del venciment.
 HelpAbandonBadCustomer=Aquest import es va abandonar (client jutjat com morós) i es considera com una pèrdua excepcional.
 HelpAbandonOther=Aquest import es va abandonar ja que es tractava d'un error de facturació (mala introducció de dades, factura substituïda per una altra).
-IdSocialContribution=ID càrega social
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID pagament
 InvoiceId=Id factura
 InvoiceRef=Ref. factura
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index d89e66e5a44..8cde2db0235 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Últims contractes
 BoxLastContacts=Últims contactes/adreçes
 BoxLastMembers=Últims membres modificats
 BoxFicheInter=Últimes intervencions modificades
-BoxCurrentAccounts=Balanç de comptes oberts
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Volum de vendes
 BoxTotalUnpaidCustomerBills=Total factures a clients pendents de cobrament
 BoxTotalUnpaidSuppliersBills=Total factures de proveïdors pendents de pagament
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Últims %s membres modificats
 BoxTitleLastFicheInter=Les %s últimes intervencions modificades
 BoxTitleOldestUnpaidCustomerBills=Les %s factures més antigues a clients pendents de cobrament
 BoxTitleOldestUnpaidSupplierBills=Les %s factures més antigues de proveïdors pendents de pagament
-BoxTitleCurrentAccounts=Balanç de comptes oberts
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Volum de vendes realitzades
 BoxTitleTotalUnpaidCustomerBills=Factures a clients pendents de cobrament
 BoxTitleTotalUnpaidSuppliersBills=Factures de proveïdors pendents de pagament
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 45b7b4a888c..e3319e19ec4 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -43,18 +43,18 @@ ImpossibleAssociateCategory=Impossible associar l'etiqueta/categoria
 WasAddedSuccessfully=s'ha afegit amb èxit.
 ObjectAlreadyLinkedToCategory=L'element ja està enllaçat a aquesta etiqueta/categoria
 CategorySuccessfullyCreated=L'etiqueta/categoria %s s'ha inserit correctament
-ProductIsInCategories=Aquest producte/servei es troba en les següents etiquetes/categories
-SupplierIsInCategories=Aquest proveïdors es troba en les següents etiquetes/categories
-CompanyIsInCustomersCategories=Aquesta empresa es troba en les següents etiquetes/categories
-CompanyIsInSuppliersCategories=Aquesta empresa es troba en les següents etiquetes/categories de proveïdors
-MemberIsInCategories=Aquest membre es troba en les següents etiquetes/categories de membres
-ContactIsInCategories=Aquest contacte es troba a les següents etiquetes/categories
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=Aquest producte/servei no es troba en cap etiqueta/categoria en particular
 SupplierHasNoCategory=Aquest proveïdor no es troba en cap etiqueta/categoria en particular
-CompanyHasNoCategory=Aquesta empresa no es troba en cap etiqueta/categoria en particular
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=Aquest membre no es troba en cap etiqueta/categoria en particular
 ContactHasNoCategory=Aquest contacte no es troba a ninguna etiqueta/cateogria
-ClassifyInCategory=Classificar en la etiqueta/categoria
+ClassifyInCategory=Add to tag/category
 NoneCategory=Cap
 NotCategorized=Sense etiqueta/categoria
 CategoryExistsAtSameLevel=Aquesta categoria ja existeix per aquesta referència
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contingut no visible per tots
 CategoriesTree=Arbre d'etiquetes/categories
 DeleteCategory=Eliminar etiqueta/categoria
 ConfirmDeleteCategory=Eseu segur de voler eliminar aquesta etiqueta/categoria?
-RemoveFromCategory=Suprimir l'enllaç amb etiqueta/categoria
-RemoveFromCategoryConfirm=Esteu segur de voler suprimir el vincle entre la transacció i l'etiqueta/categoria
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=Nova etiqueta/categoria definida
-SuppliersCategoryShort=Etiquetes/categories de proveïdors
-CustomersCategoryShort=Etiquetes/categories de clients
-ProductsCategoryShort=Etiquetes/categories de productes
-MembersCategoryShort=Etiquetes/categories de membres
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Etiquetes/categories de proveïdors
 CustomersCategoriesShort=Etiquetes/categories de clients
 CustomersProspectsCategoriesShort=Categories clients
@@ -94,7 +94,7 @@ CatSupList=Llistat de les etiquetes/categories de proveïdors
 CatCusList=Llistat de les etiquetes/categories de clients
 CatProdList=Llistat de les etiquetes/categories de productes
 CatMemberList=Llistat de les etiquetes/categories dels membres
-CatContactList=Llistat de etiquetes/categories i contactes
+CatContactList=List of contact tags/categories
 CatSupLinks=Enllaços entre proveïdors i etiquetes/categories
 CatCusLinks=Enllaços entre clients/clients potencials i etiquetes/categories
 CatProdLinks=Enllaços entre productes/serveis i etiquetes/categories
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index a4f4f32f6d3..529fdcca833 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -18,7 +18,7 @@ NewCompany=Nova empresa (client potencial, client, proveïdor)
 NewThirdParty=Nou tercer (client potencial, client, proveïdor)
 NewSocGroup=Nova agrupació d'empreses
 NewPrivateIndividual=Nou particular (client potencial, client, proveïdor)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateDolibarrThirdPartySupplier=Crear un tercer (proveïdor)
 ProspectionArea=Àrea de prospecció
 SocGroup=Agrupament d'empreses
 IdThirdParty=ID tercer
@@ -30,6 +30,7 @@ ThirdPartyContact=Contacte tercer
 StatusContactValidated=Estat del contacte
 Company=Empresa
 CompanyName=Raó social
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Empreses
 CountryIsInEEC=Pais de la Comunitat Econòmica Europea
 ThirdPartyName=Nom del tercer
@@ -68,8 +69,8 @@ CountryCode=Codi pais
 CountryId=Id pais
 Phone=Telèfon
 Skype=Skype
-Call=Call
-Chat=Chat
+Call=Trucar
+Chat=Xat
 PhonePro=Teléf. treball
 PhonePerso=Telèf. particular
 PhoneMobile=Mòbil
@@ -83,7 +84,7 @@ DefaultLang=Idioma per defecte
 VATIsUsed=Subjecte a IVA
 VATIsNotUsed=No subjecte a IVA
 CopyAddressFromSoc=Copiar l'adreça de l'empresa
-NoEmailDefined=There is no email defined
+NoEmailDefined=No hi ha adreça de correu electrònic definida
 ##### Local Taxes #####
 LocalTax1IsUsedES= Subjecte a RE
 LocalTax1IsNotUsedES= No subjecte a RE
@@ -91,9 +92,9 @@ LocalTax2IsUsedES= Subjecte a IRPF
 LocalTax2IsNotUsedES= No subjecte a IRPF
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=Tipus de RE
+TypeLocaltax2ES=Tipus de IRPF
+TypeES=Tipus
 ThirdPartyEMail=%s
 WrongCustomerCode=Codi client incorrecte
 WrongSupplierCode=Códi proveïdor incorrecte
@@ -367,10 +368,10 @@ ExportCardToFormat=Exporta fitxa a format
 ContactNotLinkedToCompany=Contacte no vinculat a un tercer
 DolibarrLogin=Login usuari
 NoDolibarrAccess=Sense accés d'usuari
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Tercers (empreses/institucions/persones fisiques) i atributs
 ExportDataset_company_2=Contactes de tercers i atributs
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
+ImportDataset_company_1=Tercers (empreses/institucions/persones fisiques) i atributs
+ImportDataset_company_2=Contactes/Adreces (de tercers o no) i atributs
 ImportDataset_company_3=Comptes bancaris
 PriceLevel=Nivell de preus
 DeliveriesAddress=Adreça(es) d'enviament
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Etiqueta d'enviament
 DeleteDeliveryAddress=Eliminar una adreça d'enviament
 ConfirmDeleteDeliveryAddress=Esteu segur de voler eliminar aquesta adreça d'enviament?
 NewDeliveryAddress=Nova adreça d'enviament
-AddDeliveryAddress=Afegir l'adreça
-AddAddress=Crear adreça
+AddDeliveryAddress=Crear direcció d'entrega
+AddAddress=Crear direcció
 NoOtherDeliveryAddress=No hi ha adreces alternatives definides
 SupplierCategory=Categoria de proveïdor
 JuridicalStatus200=Independent
@@ -397,18 +398,23 @@ YouMustCreateContactFirst=Ha d'establir contactes amb e-mail en els tercers per
 ListSuppliersShort=Llistat de proveïdors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Àrea de tercers i contactes
 LastModifiedThirdParties=Els %s últims tercers modificats
 UniqueThirdParties=Total de tercers únics
 InActivity=Actiu
 ActivityCeased=Tancat
 ActivityStateFilter=Estat d'activitat
-ProductsIntoElements=List of products into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Reached max. for outstanding bill
+ProductsIntoElements=Llistat de productes en %s
+CurrentOutstandingBill=Factura pendent actual
+OutstandingBill=Max. de factures pendents
+OutstandingBillReached=S'ha arribat al màx. de factures pendents
 MonkeyNumRefModelDesc=Retorna un número sota el format %syymm-nnnn per als codis de clients  i %syymm-nnnn per als codis dels proveïdors, on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0.
 LeopardNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
+SearchThirdparty=Search third party
+SearchContact=Cercar contacte
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 46953d02459..7abd193aeb5 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -56,23 +56,23 @@ VATCollected=IVA recuperat
 ToPay=A pagar
 ToGet=A tornar
 SpecialExpensesArea=Àrea per tots els pagaments especials
-TaxAndDividendsArea=Àrea impostos, càrregues socials i dividends
-SocialContribution=Càrrega social
-SocialContributions=Càrregues socials
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Pagaments especials
 MenuTaxAndDividends=Impostos i càrregues
 MenuSalaries=Salaris
-MenuSocialContributions=Càrregues socials
-MenuNewSocialContribution=Nova càrrega
-NewSocialContribution=Nova càrrega social
-ContributionsToPay=Càrregues a pagar
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Àrea comptabilitat/tresoreria
 AccountancySetup=Configuració comptabilitat
 NewPayment=Nou pagament
 Payments=Pagaments
 PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament factura de proveïdor
-PaymentSocialContribution=Pagament càrrega social
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Pagament IVA
 PaymentSalary=Pagament salario
 ListPayment=Llistat de pagaments
@@ -91,7 +91,7 @@ LT1PaymentES=Pagament de RE
 LT1PaymentsES=Pagaments de RE
 VATPayment=Pagament IVA
 VATPayments=Pagaments IVA
-SocialContributionsPayments=Pagaments càrregues socials
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
 TotalVATReceived=Total IVA percebut
@@ -116,11 +116,11 @@ NewCheckDepositOn=Crear nova remesa al compte: %s
 NoWaitingChecks=No hi ha xecs en espera d'ingressar.
 DateChequeReceived=Data recepció del xec
 NbOfCheques=N º de xecs
-PaySocialContribution=Pagar una càrrega social
-ConfirmPaySocialContribution=Esteu segur de voler classificar aquesta càrrega social com pagada?
-DeleteSocialContribution=Eliminar càrrega social
-ConfirmDeleteSocialContribution=Esteu segur de voler eliminar aquesta càrrega social?
-ExportDataset_tax_1=Càrregues socials i pagaments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
 CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
 CalcModeDebt=Mode <b>%sReclamacions-Deutes%s</b> anomenada <b>Comptabilitad de compromís</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per a
 TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode <b>comptabilitat de caixa </b> no és rellevant. Aquest informe només està disponible quan s'utilitza el mode <b>compromís comptable</b>(consulteu la configuració del mòdul de comptabilitat).
 CalculationMode=Mode de càlcul
 AccountancyJournal=Codi comptable diari
-ACCOUNTING_VAT_ACCOUNT=Codi comptable per defecte per l'IVA repercutit
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Codi comptable per defecte per l'IVA soportat
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable per defecte per a clients
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable per defecte per a proveïdors
-CloneTax=Clonar una càrrega social
-ConfirmCloneTax=Confirma la clonació de la càrrega social
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 0331f92ef1f..b1fa7fc1df0 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -4,10 +4,10 @@ About = Sobre
 CronAbout = Sobre Cron
 CronAboutPage = Sobre Cron
 # Right
-Permission23101 = Veure les tasques programades
-Permission23102 = Crear/Modificar les tasques programades
-Permission23103 = Eliminar les tasques programades
-Permission23104 = Executar les tasques programades
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Pàgina de configuració del mòdul - Gestió de tasques planificades
 URLToLaunchCronJobs=URL per llançar les tasques automàtiques
@@ -26,11 +26,11 @@ CronLastOutput=Última sortida
 CronLastResult=Últim codi tornat
 CronListOfCronJobs=Llista de tasques programades
 CronCommand=Comando
-CronList=Tasca programada
+CronList=Scheduled jobs
 CronDelete=Eliminar tasca programada
-CronConfirmDelete=Estàs segur de voler eliminar aquesta tasca programada?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Llançar tasques programades
-CronConfirmExecute=Estàs segur de voler executar aquesta tasca ara?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Tasques programades li permet executar tasques que han sigut programades
 CronWaitingJobs=Treballs en espera
 CronTask=Tasca
@@ -39,8 +39,8 @@ CronDtStart=Data inici
 CronDtEnd=Data fi
 CronDtNextLaunch=Propera execució
 CronDtLastLaunch=Darrera execució
-CronFrequency=Freqüència
-CronClass=Clase
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Mètod
 CronModule=Mòdul
 CronAction=Acció
@@ -55,9 +55,9 @@ CronEach=Tota (s)
 JobFinished=Tasques llançades i finalitzades
 #Page card
 CronAdd= Afegir una tasca
-CronHourStart= Dia i hora d'inici de la tasca
-CronEvery= Executar cada
-CronObject= Instància/Objecte a crear
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instància/Objecte a crear
 CronArgs=Argument
 CronSaveSucess=Registre guardat
 CronNote=Nota
@@ -76,13 +76,14 @@ CronMethodHelp=El método a lanzar. <BR> Por ejemplo para llamar el método fetc
 CronArgsHelp=Los argumentos del método. <BR> Por ejemplo para usar el método fetch del objeto Product deDolibarr /htdocs/product/class/product.class.php, el valor del parámetro podría ser <i>0, RefProduit</i>
 CronCommandHelp=El comando del sistema a executar
 CronCreateJob=Crear nova tasca programada
+CronFrom=From
 # Info
 CronInfoPage=Informació
 # Common
-CronType=Tipus d'acció a executar
+CronType=Job type
 CronType_method=Mètode d'una classe d'un mòdul Dolibarr
 CronType_command=Comando Shell
 CronMenu=Cron
 CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s
 UseMenuModuleToolsToAddCronJobs=Anar a "inici - Utilitats mòduls - Llista de tasques Cron" per veure i editar tasques programades
-TaskDisabled=Tasca deshabilitada
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
index e1687c25e6f..0afd6bcb754 100644
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/htdocs/langs/ca_ES/donations.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donació
-Donations=Donacións
+Donations=Donacions
 DonationRef=Ref. donació
 Donor=Donant
 Donors=Donants
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index a256f69447f..67bee6d0889 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -23,10 +23,10 @@ ECMNewDocument=Nou document
 ECMCreationDate=Data creació
 ECMNbOfFilesInDir=Nombre d'arxius a la carpeta
 ECMNbOfSubDir=nombre de subcarpetes
-ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=Nombre d'arxius en les subcarpetes
 ECMCreationUser=Creador
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Àrea GED
+ECMAreaDesc=L'àrea GED (Gestió Electrònica de Documents) li permet controlar ràpidament els documents en Dolibarr.
 ECMAreaDesc2=Podeu crear carpetes manuals i adjuntar els documents<br>Les carpetes automàtiques són emplenades automàticament en l'addició d'un document en una fitxa.
 ECMSectionWasRemoved=La carpeta <b>%s</b> ha estat eliminada
 ECMDocumentsSection=Document de la secció
@@ -35,7 +35,7 @@ ECMSearchByEntity=Cercar per objecte
 ECMSectionOfDocuments=Carpetes de documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automàtic
-ECMDocsBySocialContributions=Documents asociats a càrreges socials
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents associats a tercers
 ECMDocsByProposals=Documents associats a pressupostos
 ECMDocsByOrders=Documents associats a comandes
@@ -43,8 +43,8 @@ ECMDocsByContracts=Documents associats a contractes
 ECMDocsByInvoices=Documents associats a factures
 ECMDocsByProducts=Documents enllaçats a productes
 ECMDocsByProjects=Documents enllaçats a projectes
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByUsers=Documents referents a usuaris
+ECMDocsByInterventions=Documents relacionats amb les intervencions
 ECMNoDirectoryYet=No s'ha creat carpeta
 ShowECMSection=Mostrar carpeta
 DeleteSection=Eliminació carpeta
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 5100c45ae79..0171a609c91 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=El client SOAP ha fallat amb l'error '%s'
 ErrorGlobalVariableUpdater5=Sense variable global seleccionada
 ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de contenir un valor numèric
 ErrorFieldMustBeAnInteger=El camp <b>%s</b> ha de ser un enter
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
@@ -190,3 +191,4 @@ WarningNotRelevant=Operació irrellevant per a aquest conjunt de dades
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalitat desactivada quant la configuració de visualització és optimitzada per a persones cegues o navegadors de text.
 WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a la data (%s) de la factura %s.
 WarningTooManyDataPleaseUseMoreFilters=Masses dades. Utilitzi més filtres.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index 6bcb7534e1a..f7ffcbe5387 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -3,7 +3,7 @@ HRM=RRHH
 Holidays=Dies lliures
 CPTitreMenu=Dies lliures
 MenuReportMonth=Estat mensual
-MenuAddCP=Realitzar una petició de dies lliures
+MenuAddCP=New leave request
 NotActiveModCP=Ha d'activar el mòdul Dies lliures retribuïts per veure aquesta pàgina
 NotConfigModCP=Ha de configurar el mòdul Dies lliures retribuïts per veure aquesta pàgina. Per configurar-lo, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> faci clic aquí </a>.
 NoCPforUser=No té peticions de dies lliures
@@ -71,7 +71,7 @@ MotifCP=Motiu
 UserCP=Usuari
 ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional.
 AddEventToUserOkCP=S'ha afegit el permís excepcional.
-MenuLogCP=Veure l'historial de dies lliures
+MenuLogCP=View change logs
 LogCP=Historial d'actualizacions de dies lliures
 ActionByCP=Realitzat per
 UserUpdateCP=Per a l'usuari
@@ -93,6 +93,7 @@ ValueOptionCP=Valor
 GroupToValidateCP=Grup amb possibilitat d'aprobar els dies lliures
 ConfirmConfigCP=Validar la configuració
 LastUpdateCP=Última actualització automàticament de dies lliures
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Actualització efectuada correctament.
 ErrorUpdateConfCP=S'ha produït un error durant l'actualització, torne a provar.
 AddCPforUsers=Afegeix els saldos de dies lliures dels usuaris <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">fent clic aquí</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic:
 NoCPforMonth=Sense vacances aquest mes.
 nbJours=Número de dies
 TitleAdminCP=Configuració dels dies lliures retribuïts
+NoticePeriod=Notice period
 #Messages
 Hello=Hola
 HolidaysToValidate=Dies lliures retribuïts a validar
@@ -139,10 +141,11 @@ HolidaysRefused=Dies lliures retribuïts denegats
 HolidaysRefusedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut denegada per el següent motiu: 
 HolidaysCanceled=Dies lliures retribuïts cancel·lats
 HolidaysCanceledBody=La seva solicitud de dies lliures retribuïts del %s al %s ha sigut cancel·lada.
-Permission20000=Llegir els seus propis dies lliures retribuïts
-Permission20001=Crear/modificar els seus dies lliures retribuïts
-Permission20002=Crear/modificar dies lliures retribuïts per a tots
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Eliminar peticions de dies lliures retribuïts
-Permission20004=Configurar dies lliures retribuïts d'usuaris
-Permission20005=Consultar l'historial de modificacions de dies lliures retribuïts
-Permission20006=Llegir informe mensual de dies lliures retribuïts
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/ca_ES/incoterm.lang b/htdocs/langs/ca_ES/incoterm.lang
index 2396d2acb0e..90406e210b0 100644
--- a/htdocs/langs/ca_ES/incoterm.lang
+++ b/htdocs/langs/ca_ES/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
-IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetupTitle1=Funció
+IncotermSetupTitle2=Estat
+IncotermSetup=Configuració del mòdul Incoterm
+IncotermFunctionDesc=Activa funcionalitats Incoterm (tercer, Pressupostos, Comandes, Factura a client, Enviament, Comandes a proveïdor)
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 4b0bf7265e7..3abf13783a6 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Base de dades - Accés super usuari
 CheckToCreateDatabase=Seleccioneu aquesta opció si la base de dades no existeix i s'ha de crear. En aquest cas, cal indicar usuari/contrasenya de superusuari, més endavant en aquesta pàgina.
 CheckToCreateUser=Seleccioneu aquesta opció si l'usuari no existeix i s'ha de crear.<br>En aquest cas, cal indicar usuari/contrasenya de superusuari, més endavant en aquesta pàgina.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Usuari de la base que té els drets de creació de bases de dades o compte per a la base de dades, inútil si la base de dades i el seu usuari ja existeixen (com quan estan en un amfitrió).
 KeepEmptyIfNoPassword=Deixi buit si l'usuari no té contrasenya
 SaveConfigurationFile=Gravació del fitxer de configuració
@@ -155,8 +156,8 @@ MigrationFinished=Acabada l'actualització
 LastStepDesc=<strong>Últim pas</strong>: Indiqueu aquí el compte i la contrasenya del primer usuari que fareu servir per connectar-se a l'aplicació. No perdi aquests identificadors, és el compte que permet administrar la resta.
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+WarningUpgrade=Advertència:\nHas fet primer una copia de seguretat de la base de dades?\nAixò es recomana: per exemple, a causa d'alguns errors en els sistemes de bases de dades (per exemple MySQL versió 5.5.40), algunes dades o taules es poden perdre durant aquest procés, es recomana tenir una copia completa de la base de dades abans d'iniciar la migració.\n\nFeu clic a D'acord per iniciar el procés de migració...
+ErrorDatabaseVersionForbiddenForMigration=La versió de la seva base de dades és %s. Aquesta te un error crític i es poden perdre dades si es fa un canvi a l'estructura de la base de dades i per fer l'actualització necessita fer aquests canvis. Per aquesta raó, la migració no es permetrà fins que s'actualitzi la seva base de dades a una versió estable i/o superior (llista de versions afectades: %s)
 
 #########
 # upgrade
@@ -208,7 +209,7 @@ MigrationProjectTaskTime=Actualització de temps dedicat en segons
 MigrationActioncommElement=Actualització de les dades de accions sobre elements
 MigrationPaymentMode=Actualització de les formes de pagament
 MigrationCategorieAssociation=Actualització de les categories
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Migració d'esdeveniments per afegir propietari a la taula d'asignació
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Mostra opcions no disponibles
+HideNotAvailableOptions=Amaga opcions no disponibles
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index afd0df5ec70..93242dd45e5 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Àrab
 Language_ar_SA=Àrab
+Language_bn_BD=Bengali
 Language_bg_BG=Búlgar
 Language_bs_BA=Bosni
 Language_ca_ES=Català
@@ -10,10 +11,10 @@ Language_da_DA=Danès
 Language_da_DK=Danès
 Language_de_DE=Alemany
 Language_de_AT=Alemany (Austria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Aleman (Switzerland)
 Language_el_GR=Grec
 Language_en_AU=Anglès (Australia)
-Language_en_CA=English (Canada)
+Language_en_CA=Anglès (Canada)
 Language_en_GB=Anglès (Regne Unit)
 Language_en_IN=Anglès (Índia)
 Language_en_NZ=Anglès (Nova Zelanda)
@@ -21,9 +22,10 @@ Language_en_SA=Anglès (Aràbia Saudita)
 Language_en_US=Anglès (Estats Units)
 Language_en_ZA=Anglès (Àfrica del Sud)
 Language_es_ES=Espanyol
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Espanyol (Argentina)
-Language_es_CL=Spanish (Chile)
+Language_es_CL=Espanyol (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Espenyol (Republica Dominicana)
 Language_es_HN=Espanyol (Honduras)
 Language_es_MX=Espanyol (Mèxic)
 Language_es_PY=Espanyol (Paraguai)
@@ -41,11 +43,14 @@ Language_fr_NC=Francès (Nova Caledònia)
 Language_he_IL=Hebreu
 Language_hr_HR=Croat
 Language_hu_HU=Hongarès
-Language_id_ID=Indonesian
+Language_id_ID=Indonesia
 Language_is_IS=Islandès
 Language_it_IT=Italià
 Language_ja_JP=Japonès
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Coreà
+Language_lo_LA=Lao
 Language_lt_LT=Lituà
 Language_lv_LV=Letó
 Language_mk_MK=Macedoni
@@ -62,8 +67,9 @@ Language_tr_TR=Turc
 Language_sl_SI=Eslovè
 Language_sv_SV=Suec
 Language_sv_SE=Suec
-Language_sq_AL=Albanian
+Language_sq_AL=Albania
 Language_sk_SK=Eslovac
+Language_sw_SW=Kiswahili
 Language_th_TH=Tailandès
 Language_uk_UA=Ucraïnès
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index cc7f19037aa..7ffc4b96c5a 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-ShowLoanPayment=Show Loan Payment
+Loan=Préstec
+Loans=Préstecs
+NewLoan=Nou préstec
+ShowLoan=Mostrar préstec
+PaymentLoan=Pagament del préstec
+ShowLoanPayment=Veure pagament del préstec
 Capital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
+Insurance=Assegurança
+Interest=Interessos
+Nbterms=Nombre de termes
 LoanAccountancyCapitalCode=Accountancy code capital
 LoanAccountancyInsuranceCode=Accountancy code insurance
 LoanAccountancyInterestCode=Accountancy code interest
-LoanPayment=Loan payment
+LoanPayment=Pagament del préstec
 ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
+LoanPaid=Préstec pagat
 ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
 ErrorLoanLength=Loan length has to be numeric and greater than zero.
 ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index e2ab8c4f50a..bc0ea58e6b6 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Confirmació de lectura
 YourMailUnsubcribeOK=El correu electrònic <b>%s</b>  és correcta desuscribe.
 MailtoEMail=mailto email (hyperlink)
 ActivateCheckRead=Activar confirmació de lectura i opció de Desubscripció
-ActivateCheckReadKey=Clau usada per xifrar la URL de la confirmació de lectura i la funció de desubscripció
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-Mail enviat a %s destinataris.
 XTargetsAdded=<b>%s</b> destinataris agregats a la llista
 EachInvoiceWillBeAttachedToEmail=Es creara i adjuntara a cada e-mail un document usant el model de factura per defecte.
@@ -128,6 +128,7 @@ TagCheckMail=Seguiment de l'obertura del email
 TagUnsubscribe=Link de Desubscripció
 TagSignature=Signatura de l'usuari remitent
 TagMailtoEmail=Email del destinatario
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notificacions
 NoNotificationsWillBeSent=Cap notificació per e-mail està prevista per a aquest esdeveniment i empresa
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index f38b9536289..aef2fc896f8 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=S'han trobat alguns errors. Modificacions
 ErrorConfigParameterNotDefined=El paràmetre <b>%s</b> no està definit en el fitxer de configuració Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossible trobar l'usuari <b>%s</b> a la base de dades Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al país '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, cap tipus de càrrega social definida per al país '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 SetDate=Definir data
 SelectDate=Seleccioneu una data
@@ -301,8 +301,8 @@ UnitPriceHT=Preu base
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
-AskPriceSupplierUHT=P.U. solicitat
-PriceUTTC=P.U. Total
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Import
 AmountInvoice=Import factura
 AmountPayment=Import pagament
@@ -339,6 +339,7 @@ IncludedVAT=IVA inclòs
 HT=Sense IVA
 TTC=IVA inclòs
 VAT=IVA
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Taxa IVA
@@ -413,6 +414,8 @@ Qty=Qt.
 ChangedBy=Modificat per
 ApprovedBy=Aprovat per
 ApprovedBy2=Aprovat per (segona aprovació)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalcular
 ResultOk=Èxit
 ResultKo=Error
@@ -421,7 +424,7 @@ Reportings=Informes
 Draft=Esborrany
 Drafts=Esborranys
 Validated=Validat
-Opened=Obert
+Opened=Open
 New=Nou
 Discount=Descompte
 Unknown=Desconegut
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Enllaçat a un contacte d'usuari particular
 DeleteAFile=Eliminació d'arxiu
 ConfirmDeleteAFile=Confirme l'eliminació de l'arxiu
 NoResults=Cap resultat
+SystemTools=System tools
 ModulesSystemTools=Utilitats mòduls
 Test=Prova
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Mostra transacció
 GoIntoSetupToChangeLogo=Anar a Inici->Configuració->Empresa per canviar el logotip o anar a Inici->Configuració->Visualització per amagar.
 Deny=Denegar
 Denied=Denegad
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
@@ -732,3 +739,4 @@ ShortThursday=Dj
 ShortFriday=Dv
 ShortSaturday=Ds
 ShortSunday=Dg
+SelectMailModel=Select email template
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 6a164471ba2..e4f1bdd380c 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -8,7 +8,7 @@ Members=Membres
 MemberAccount=Login membre
 ShowMember=Mostrar fitxa membre
 UserNotLinkedToMember=Usuari no vinculat a un membre
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Tercer no associat a un membre
 MembersTickets=Etiquetes membres
 FundationMembers=Membres de l'associació
 Attributs=Atributs
@@ -85,7 +85,7 @@ SubscriptionLateShort=En retard
 SubscriptionNotReceivedShort=No rebuda
 ListOfSubscriptions=Llista d'afiliacions
 SendCardByMail=Enviar fitxa per e-mail
-AddMember=Create member
+AddMember=Crear membre
 NoTypeDefinedGoToSetup=Cap tipus de membre definit. Aneu a Configuració->Tipus de membres
 NewMemberType=Nou tipus de membre
 WelcomeEMail=E-mail
@@ -125,7 +125,7 @@ Date=Data
 DateAndTime=Data i hora
 PublicMemberCard=Fitxa pública membre
 MemberNotOrNoMoreExpectedToSubscribe=No sotmesa a cotització
-AddSubscription=Create subscription
+AddSubscription=Crear afiliació
 ShowSubscription=Mostrar afiliació
 MemberModifiedInDolibarr=Membre modificat en Dolibarr
 SendAnEMailToMember=Enviar e-mail d'informació al membre (E-mail: <b>%s</b>)
@@ -170,8 +170,8 @@ LastSubscriptionAmount=Import de l'última cotització
 MembersStatisticsByCountries=Estadístiques de membres per país
 MembersStatisticsByState=Estadístiques de membres per població
 MembersStatisticsByTown=Estadístiques de membres per població
-MembersStatisticsByRegion=Members statistics by region
-MemberByRegion=Members by region
+MembersStatisticsByRegion=Estadístiques de membres per regió
+MemberByRegion=Membres per regió
 NbOfMembers=Nombre de membres
 NoValidatedMemberYet=Cap membre validat trobat
 MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de membres per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet.
@@ -199,8 +199,9 @@ Entreprises=Empreses
 DOLIBARRFOUNDATION_PAYMENT_FORM=Per realitzar el pagament de la seva cotització per transferència bancària, visiteu la pàgina <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Per pagar amb targeta de crèdit o PayPal, feu clic al botó a la part inferior d'aquesta pàgina.<br><br>
 ByProperties=Per característiques
 MembersStatisticsByProperties=Estadístiques dels membres per característiques
-MembersByNature=Membres per naturalesa
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Taxa d'IVA per les afiliacions
 NoVatOnSubscription=Sense IVA per a les afiliacions
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per la línia de subscripció a la factura: %s
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 71f502ffa6b..85fdad272b5 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Comanda a proveïdor
 SuppliersOrders=Comandes a proveïdors
 SuppliersOrdersRunning=Comandes a proveïdors en curs
 CustomerOrder=Comada de client
-CustomersOrders=Comandes de clients
-CustomersOrdersRunning=Comandes de clients en curs
-CustomersOrdersAndOrdersLines=Comandes de clients i línies de comanda
-OrdersToValid=Comandes de clients a validar
-OrdersToBill=Comandes de clients a facturar
-OrdersInProcess=Comandes de clients en procés
-OrdersToProcess=Comandes de clients a processar
-SuppliersOrdersToProcess=Comandes a proveïdors a processar
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Anul·lada
 StatusOrderDraftShort=Esborrany
 StatusOrderValidatedShort=Validada
@@ -75,8 +75,9 @@ AddToMyOrders=afegir a les meves comandes
 AddToOtherOrders=Afegir a altres comandes
 AddToDraftOrders=Afegir a comanda esborrany
 ShowOrder=Mostrar comanda
-NoOpenedOrders=Cap comanda esborrany
-NoOtherOpenedOrders=Cap altra comanda esborrany
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Sense comandes esborrany
 OtherOrders=Altres comandes
 LastOrders=Últimes %s comandes de clients
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 825b196a8b5..5dc62cb7821 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -204,6 +204,7 @@ ClickHereToGoTo=Faci clic aquí per anar a %s
 YouMustClickToChange=però, primer ha de fer clic en el següent enllaç per validar aquest canvi de contrasenya
 ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura
 IfAmountHigherThan=si l'import es major que <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Afegir entrada al calendari
diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang
index f0cd2a40292..08e7e8ea343 100644
--- a/htdocs/langs/ca_ES/printing.lang
+++ b/htdocs/langs/ca_ES/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
-TestDriver=Test
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
+Module64000Name=Impressió automàtica
+Module64000Desc=Habilita el sistema de impressió automàtica
+PrintingSetup=Configuració del sistema de impressió automàtic
+PrintingDesc=Aquest mòdul afegeix un boto per enviar documents directament a una impresoa (sense obrir el document a la aplicació) amb varis mòduls
+ModuleDriverSetup=Configuració del mòdul Drivers
+PrintingDriverDesc=Configuració variables pel driver d'impressió
+ListDrivers=Llista de controladors
+PrintTestDesc=Llista de impressores
+FileWasSentToPrinter=L'arxiu %s ha sigut enviat a la impressora
+NoActivePrintingModuleFound=Sense mòdul actiu per imprimir docuements
+PleaseSelectaDriverfromList=Seleccini un driver del llistat
+SetupDriver=Configuració del driver
+TestDriver=Prova
+TargetedPrinter=Impresora destí
+UserConf=Configuració per usuari
 PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
-STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
-STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
+PrintGCPDesc=Aquest driver li permet enviar documents directament a una impressora amb Google Cloud Print
+PrintingDriverDescprintgcp=Configuraciño variables del driver d'impresió Google Cloud Print
+PrintTestDescprintgcp=Llistat d'impressores per a Google Cloud Print
+PRINTGCP_LOGIN=Compte de Google
+PRINTGCP_PASSWORD=Contrasenya de Google
+STATE_ONLINE=En línia
+STATE_UNKNOWN=Desconegut
+STATE_OFFLINE=Fora de línia
+STATE_DORMANT=Desconectada
 TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
+TYPE_HP=Impressora HP
 TYPE_DOCS=DOCS
 TYPE_DRIVE=Google Drive
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
-PrintTestDescprintipp=List of Printers for driver PrintIPP.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
+GCP_Name=Nom
+GCP_displayName=Nom a mostrar
+GCP_Id=ID d'impressora
+GCP_OwnerName=Nom del propietari
+GCP_State=Estat de l'impressora
+GCP_connectionStatus=Estat On-line
+GCP_Type=Tipus d'impressora
+PRINTIPP=Driver PrintPP
+PrintIPPSetup=Configuració del mòdul d'Impressora Directe
+PrintIPPDesc=Aquest mòdul afegeix un boto per enviar documents directament a una impressora. Es necessari un SSOO Linux amb CUPS instal·lat.
+PrintingDriverDescprintipp=Configuració variable del driver d'impressió PrintPP
+PrintTestDescprintipp=Llistat d'impressores del driver PrintPP
+PRINTIPP_ENABLED=Mostrar icona "impressió directe" en els llistats de documents
+PRINTIPP_HOST=Servidor d'impressió
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
-IPP_BW=BW
+PRINTIPP_USER=Usuari
+PRINTIPP_PASSWORD=Contrasenya
+NoPrinterFound=No s'han trobat impressores (Comprovi la configuració del CUPS)
+NoDefaultPrinterDefined=No hi ha impressores per defecte definides
+DefaultPrinter=Impresora per defecte
+Printer=Impressora
+CupsServer=Servidor CUPS
+IPP_Uri=URI Impressora
+IPP_Name=Nom de l'impressora
+IPP_State=Estat de l'impressora
+IPP_State_reason=Raó de l'estat
+IPP_State_reason1=Raó 1 de l'estat
+IPP_BW=Blanc i negre
 IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
+IPP_Device=Dispositiu
+IPP_Media=Comunicació impressora
+IPP_Supported=Tipus de comunicació
 STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
-STATE_IPP_none=None
-MEDIA_IPP_stationery=Stationery
-MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+STATE_IPP_stopped=Aturat
+STATE_IPP_paused=En pausa
+STATE_IPP_toner-low-report=Toner baix
+STATE_IPP_none=Cap
+MEDIA_IPP_stationery=Safata
+MEDIA_IPP_thermal=Tèrmica
+IPP_COLOR_print-black=Impressora blanc i negre
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 8438ddea768..25be28ec4b0 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Quant.: %d
 AddDispatchBatchLine=Afegir una línia per despatx per caducitat
 BatchDefaultNumber=Indefinit
 WhenProductBatchModuleOnOptionAreForced=Si el mòdul de Lot/Serie esta activat, l'increment/disminució d'estoc esta forçada a l'últim escollit i no pot editar-se. Altres opcions poden definir-se si es necessita
-ProductDoesNotUseBatchSerial=Aquest producte no utilitza numeració per lot/series
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 2323a3d7b46..f364d23d0b9 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Producte o servei
 ProductsAndServices=Productes i serveis
 ProductsOrServices=Productes o serveis
 ProductsAndServicesOnSell=Productes i serveis en vende o compra
-ProductsAndServicesNotOnSell=Productes i Serveis fora de venda
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Estadístiques productes i serveis
 ProductsStatistics=Estadístiques productes
-ProductsOnSell=Producte en vende o compra
-ProductsNotOnSell=Producte fora de venda i compra
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Productes en vende o en compra
 ServicesOnSell=Serveis en venda o compra
-ServicesNotOnSell=Serveis fora de venda
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Serveis en vende o en compra
 InternalRef=Referència interna
 LastRecorded=Ultims productes/serveis en venda registrats
@@ -44,7 +44,7 @@ CardProduct1=Fitxa servei
 CardContract=Fitxa contrate
 Warehouse=Magatzem
 Warehouses=Magatzems
-WarehouseOpened=Magatzem obert
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magatzem tancat
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=PVP amb IVA
 PublicPrice=Preu públic
 CurrentPrice=Preu actual
 NewPrice=Nou preu
-MinPrice=Preu de venda min.
-MinPriceHT=Preu mínim de vende (a.i.)
-MinPriceTTC=Preus mínim de venda (i.i.)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=El preu de venda no ha de ser inferior al mínim per a aquest producte (%s sense IVA). Aquest missatge pot estar causat per un descompte molt gran.
 ContractStatus=Estat de contracte
 ContractStatusClosed=Tancat
-ContractStatusRunning=En servei
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Expirat
-ContractStatusOnHold=Fora de servei
-ContractStatusToRun=A l'iniciar
-ContractNotRunning=Aquest contracte no està en servei
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Un producte amb la referència %s ja existeix.
 ErrorProductBadRefOrLabel=El valor de la referència o etiqueta és incorrecte
 ErrorProductClone=S'ha produït un error en intentar clonar el producte o servei.
-ErrorPriceCantBeLowerThanMinPrice=Error, el preu no pot ser menor que el preu mínim.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Proveïdors
 SupplierRef=Ref. producte proveïdor
 ShowProduct=Mostrar producte
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Si el servei és de durada limitada:
 MultiPricesAbility=Diversos nivells de preus per producte/servei
 MultiPricesNumPrices=Nº de preus
 MultiPriceLevelsName=Categoria de preus
-AssociatedProductsAbility=Activar la funcionalitat de productes compostos
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Producte compost
-AssociatedProductsNumber=Nº de productes que componen aquest producte
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Nº de productes que aquest compon
-IfZeroItIsNotAVirtualProduct=Si 0, aquest producte no és un producte compost
-IfZeroItIsNotUsedByVirtualProduct=Si 0, aquest producte no pot ser utilitzat per cap producte compost
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Compondre
 Translation=Traducció
 KeywordFilter=Filtre per clau
@@ -131,7 +131,7 @@ ProductToAddSearch=Cercar productes a adjuntar
 AddDel=Adjuntar/Retirar
 Quantity=Quantitat
 NoMatchFound=No s'han trobat resultats
-ProductAssociationList=Llistat de productes/serveis components d'aquest producte: el nombre entre parèntesis és la quantitat afectada en aquesta composició
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Llistat de productes/serveis amb aquest producte com a component
 ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs
 DeleteProduct=Eliminar un producte/servei
@@ -179,16 +179,41 @@ CloneProduct=Clonar producte/servei
 ConfirmCloneProduct=Esteu segur de voler clonar el producte o servei <b>%s</b> ?
 CloneContentProduct=Clonar només la informació general del producte/servei
 ClonePricesProduct=Clonar la informació general i els preus
-CloneCompositionProduct=Clonar productes/serveis compostos
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Aquest producte és utilitzat
 NewRefForClone=Ref. del nou producte/servei
-CustomerPrices=Preus clients
-SuppliersPrices=Preus proveïdors
-SuppliersPricesOfProductsOrServices=Preus de proveïdors (productes o serveis)
+CustomerPrices=Preus de client
+SuppliersPrices=Preus de proveïdor
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Codi duaner
 CountryOrigin=País d'origen
 HiddenIntoCombo=Ocult en les llistes
 Nature=Naturalesa
+ShortLabel=Etiqueta curta
+Unit=Unitat
+p=u.
+set=set
+se=set
+second=segon
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Model de ref. del producte
 ServiceCodeModel=Model de ref. del servei
 AddThisProductCard=Crear fitxa producte
@@ -214,7 +239,7 @@ CostPmpHT=Cost de compra
 ProductUsedForBuild=Auto consumit per producció
 ProductBuilded=Producció completada
 ProductsMultiPrice=Producte multi-preu
-ProductsOrServiceMultiPrice=Preus a clients (productes o serveis, multi-preus)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Vendes de productes base imposable
 ServiceSellByQuarterHT=Vendes de serveis base imposable
 Quarter1=1º trimestre
@@ -240,7 +265,7 @@ PricingRule=Regles per preus a clients
 AddCustomerPrice=Afegir preus per client
 ForceUpdateChildPriceSoc=Establir el mateix preu a les filials dels clients
 PriceByCustomerLog=Log de preus per clients
-MinimumPriceLimit=El preu mínim no pot ser menor de %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=El preu mínim recomenat es: %s
 PriceExpressionEditor=Editor de expresió de preus
 PriceExpressionSelected=Expressió de preus seleccionat
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=el format es {"URL": "http://example.com/urlofw
 UpdateInterval=Interval d'actualizació (minuts)
 LastUpdated=Última actualització
 CorrectlyUpdated=Actualitzat correctament
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 9f78eb88bbd..1c8b21fce32 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té
 ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret a visualitzar
 ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa).
 MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és un contacte afectat en almenys una tasca (qualsevol tipus).
-OnlyOpenedProject=Només són visibles els projectes oberts (els projectes amb estat esborrany o tancat no són visibles)
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
 TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa).
-AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a aquests projectes són visibles, però introduir temps només per a la tasca que tingui assignada.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Àrea projectes
 NewProject=Nou projecte
 AddProject=Crear projecte
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte
 ListExpenseReportsAssociatedProject=Llistat d'informes de despeses associades al projecte
 ListDonationsAssociatedProject=Llistat de donacions associades al projecte
 ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana
 ActivityOnProjectThisMonth=Activitat en el projecte aquest mes
 ActivityOnProjectThisYear=Activitat en el projecte aquest any
@@ -95,7 +98,7 @@ DeleteATimeSpent=Eliminació de temps dedicat
 ConfirmDeleteATimeSpent=Esteu segur de voler eliminar aquest temps dedicat?
 DoNotShowMyTasksOnly=Veure també tasques no assignades a mi
 ShowMyTasksOnly=Veure nomes tasques assignades a mi
-TaskRessourceLinks=Recursos afectats
+TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer
 NoTasks=Cap tasca per a aquest projecte
 LinkedToAnotherCompany=Enllaçat a una altra empresa
@@ -139,8 +142,15 @@ ProjectReferers=Objectes vinculats
 SearchAProject=Cercar un projecte
 ProjectMustBeValidatedFirst=El projecte primer ha de ser validat
 ProjectDraft=Projectes esborrany
-FirstAddRessourceToAllocateTime=Associar un recurs per assignar el temps consumit
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Entrada per dia
 InputPerWeek=Entrada per setmana
 InputPerAction=Entrada per acció
 TimeAlreadyRecorded=Temps dedicat ja registrat per aquesta tasca/dia i usuari %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 5adf1a94547..e5cc3479e1e 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -4,7 +4,7 @@ Proposal=Pressupost
 ProposalShort=Pressupost
 ProposalsDraft=Pressupostos esborrany
 ProposalDraft=Pressupost esborrany
-ProposalsOpened=Pressupostos oberts
+ProposalsOpened=Obre pressupostos
 Prop=Pressupostos
 CommercialProposal=Pressupost
 CommercialProposals=Pressupostos
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Import per mes (Sense IVA)
 NbOfProposals=Número pressupostos
 ShowPropal=Veure pressupost
 PropalsDraft=Esborrany
-PropalsOpened=Oberts
+PropalsOpened=Actiu
 PropalsNotBilled=No facturats
 PropalStatusDraft=Esborrany (a validar)
 PropalStatusValidated=Validat (pressupost obert)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=No signat (tancat)
 PropalStatusBilled=Facturat
 PropalStatusDraftShort=Esborrany
 PropalStatusValidatedShort=Validat
-PropalStatusOpenedShort=Obert
+PropalStatusOpenedShort=Actiu
 PropalStatusClosedShort=Tancat
 PropalStatusSignedShort=Signat
 PropalStatusNotSignedShort=No signat
@@ -52,11 +52,9 @@ PropalsToBill=Pressupostos signats a facturar
 ListOfProposals=Llistat de pressupostos
 ActionsOnPropal=Esdeveniments sobre el pressupost
 NoOpenedPropals=Sense pressupostos oberts
-NoOtherOpenedPropals=Cap altre pressupost obert
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Ref. pressupost
 SendPropalByMail=Enviar pressupost per e-mail
-FileNotUploaded=No s'ha pujat l'arxiu
-FileUploaded=L'arxiu s'ha carregat correctament
 AssociatedDocuments=Documents associats al pressupost:
 ErrorCantOpenDir=Impossible obrir la carpeta
 DatePropal=Data pressupost
@@ -100,3 +98,4 @@ DocModelJauneDescription=Model de pressupost Jaune
 DefaultModelPropalCreate=Model per defecte
 DefaultModelPropalToBill=Model per defecte en tancar un pressupost (a facturar)
 DefaultModelPropalClosed=Model per defecte en tancar un pressupost (no facturat)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 894e8f6adc1..a4328af34a5 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Veure pagament de sous
 THM=Preu mig per hora
 TJM=Preu mig per dia
 CurrentSalary=Salari actual
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 6ab0eba8acc..8a261349a20 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Model simple
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Alerta, cap producte en espera d'enviament.
 StatsOnShipmentsOnlyValidated=Estadístiques realitzades únicament sobre les expedicions validades
-DateDeliveryPlanned=Data prevista de lliurament
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Data real de recepció
 SendShippingByEMail=Enviament d'expedició per e-mail
 SendShippingRef=Enviament de l'expedició %s
@@ -67,7 +67,7 @@ SendingRunning=Producte de comandes de clients
 SuppliersReceiptRunning=Producte de comandes a proveïdors
 ProductQtyInCustomersOrdersRunning=Quantitat de comandes de clients obertes
 ProductQtyInSuppliersOrdersRunning=Quantitat de comandes a proveïdors obertes
-ProductQtyInShipmentAlreadySent=Quantitat de comandes de clients ja enviats
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Quantitat de comandes a proveïdors ja rebudes
 
 # Sending methods
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 6b60723b94f..1e63bbc41ba 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Magatzems
 NewWarehouse=Nou magatzem o zona d'emmagatzematge
 WarehouseEdit=Edició magatzem
 MenuNewWarehouse=Nou magatzem
-WarehouseOpened=Magatzem obert
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magatzem tancat
 WarehouseSource=Magatzem origen
 WarehouseSourceNotDefined=Sense magatzems definits,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Seleccioneu el magatzem a usar en el decrement d
 SelectWarehouseForStockIncrease=Seleccioneu el magatzem a utilitzar en l'increment d'estoc
 NoStockAction=Sense accions sobre l'estoc
 LastWaitingSupplierOrders=Comandes en espera de recepció
-DesiredStock=Stock desitjat
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=A demanar
 Replenishment=Reaprovisionament
 ReplenishmentOrders=Ordres de reaprovisionament
-VirtualDiffersFromPhysical=D'acord amb les opcions de decrement/increment d'estoc, l'estoc físic i l'estoc virtual (físic + comandes actuals) poden diferir
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Utilitzar estoc virtual per defecte, en lloc d'estoc físic, per la funció d'aprovisionament
 UseVirtualStock=Utilitzar estoc virtual
 UsePhysicalStock=Utilitzar estoc físic
-CurentSelectionMode=Mètode de selecció actual
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Estoc virtual
 CurentlyUsingPhysicalStock=Estoc físic
 RuleForStockReplenishment=Regla per al reaprovisionament de stcok
@@ -112,8 +113,8 @@ AlertOnly= Només alertes
 WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem <b>%s</b>
 WarehouseForStockIncrease=Pe l'increment d'estoc s'utilitzara el magatzem <b>%s</b>
 ForThisWarehouse=Per aquest magatzem
-ReplenishmentStatusDesc=Aquesta és la llista de tots els productes amb un estoc menor que l'estoc desitjat (o menor que el valor de l'alerta si el checkbox "només alertes" esta marcat) i que suggereixi crear comandes de proveïdor per emplenar la diferencia
-ReplenishmentOrdersDesc=Aquest és el llistat de totes les comandes a proveïdors amb productes predefinits. Només són visibles comandes obertes amb productes que poden afectar l'estoc
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=reaprovisionament
 NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode seleccionat (< %s)
 NbOfProductAfterPeriod=Quantitat del producte %s en estoc despres del periode seleccionat (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Registrar transferencies
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
 RuleForStockAvailability=Regles de requeriment d'estoc
-StockMustBeEnoughForInvoice=El nivell d'existencies ha de ser suficient per afegir productes/serveis a factures
-StockMustBeEnoughForOrder=El nivell d'existències ha de ser suficient per afegir productes/serveis a comandes
-StockMustBeEnoughForShipment= El nivell d'existències ha de ser suficient per afegir productes/serveis a enviaments
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Etiqueta del moviment
 InventoryCode=Moviments o codi d'inventari
 IsInPackage=Contingut del paquet
 ShowWarehouse=Mostrar magatzem
-MovementCorrectStock=Correcció d'estoc del producte %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Transferencia d'estoc del producte %s a un altre magatzem
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=S'ha de definir aquí un magatzem origen quant el mòdul de lots estar actiu. S'utilitza per augmentar lots/series disponibles del producte per realitzar un moviment. Si desitja enviar productes de diferents magatzems, simplement faci l'enviament amb diversos passos
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Codi Inv./Mov.
-NoPendingReceptionOnSupplierOrder=o existeixen recepcions pendent, ja que la comanda esta oberta
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/serie (<strong%s</strong>) ja existeix, però amb una data de caducitat o venda diferent (trobat <strong>%s</strong> però ha introduït <strong>%s</strong>).
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index 2bf7b390f0f..b8d7fdad411 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Enviat a proveïdors
 ListOfSupplierOrders=Llista de comandes a proveïdors
 MenuOrdersSupplierToBill=Comandes a proveïdors a facturar
 NbDaysToDelivery=Temps d'entrega en dies
-DescNbDaysToDelivery=El major plaç es visualitza en el llistat de comandes de productes
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Usar aprovació doble (la segona aprovació pot ser realitzada per un usuari amb el permís dedicat)
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 47d44923fa4..528dbe03282 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Llistat notes de honoraris
 NewTrip=New expense report
 CompanyVisited=Empresa/institució visitada
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,15 +40,14 @@ TF_BUS=Bus
 TF_CAR=Cotxe
 TF_PEAGE=Peatge
 TF_ESSENCE=Combustible
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
-AddLineMini=Add
+AddLineMini=Afegir
 
 Date_DEBUT=Period date start
 Date_FIN=Period date end
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edita
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 6c93a4d8d1c..cb82636b03d 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
 MenuUsersAndGroups=Usuaris i grups
+MenuMyUserCard=My user card
 LastGroupsCreated=Els %s darrers grups creats
 LastUsersCreated=Els %s darrers usuaris creats
 ShowGroup=Veure grup
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 52ec233a026..d77ba754274 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Arxiu de la domiciliació
 SetToStatusSent=Classificar com "Arxiu enviat"
 ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades
 StatisticsByLineStatus=Estadístiques per estats de línies
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Abonament de domiciliació %s pel banc
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index 807af682c2d..646b13e6301 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Configuració del mòdul workflow
-WorkflowDesc=Aquest modul li permet canviar el comportament de les accions automàticament en l'aplicació. De forma predeterminada, el workflow esta obert (configuri segons les seves necessitats). Activi les accions automàtiques que li interessin.
-ThereIsNoWorkflowToModify=No hi ha workflow modificable per als mòduls que té activats.
+WorkflowDesc=Aquest mòdul li permet canviar el comportament de les accions automàticament en l'aplicació. De forma predeterminada, el workflow està obert (configuri segons les seves necessitats). Activi les accions automàtiques que li interessin.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear una comanda de client automàticament a la signatura d'un pressupost
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear una factura a client automàticament a la signatura d'un pressupost
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear una factura a client automàticament a la validació d'un contracte
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear una factura a client automàticament al tancament d'una comanda de client
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically crear una factura a client després de signar un pressupost
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically crear una factura a client a la validació d'un contracte
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically crear una factura a client al tancament d'una comanda de client
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar com facturat el pressupost quan la comanda de client relacionada es classifiqui com pagada
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificar com facturades les comanda(es) quan la factura relacionada es classifiqui com a pagada
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificar com a facturades les comanda(es) de clients relacionats quan la factura sigui validada
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index c41c67ab572..72b0991e1de 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu pro uživatele
 LangFile=soubor .lang
 System=Systém
 SystemInfo=Informace o systému
-SystemTools=Systémové nástroje
 SystemToolsArea=Sekce systémových nástrojů
 SystemToolsAreaDesc=Tato sekce poskytuje správu uživatelských funkcí. V menu vyberte funkci, kterou hledáte.
 Purge=Očistit
@@ -232,8 +231,8 @@ Security=Zabezpečení
 Passwords=Hesla
 DoNotStoreClearPassword=Ukládat hesla v databázi pouze šifrovaně (Doporučeno)
 MainDbPasswordFileConfEncrypted=Šifrovat přístupové heslo databáze v conf.php (Doporučeno)
-InstrucToEncodePass=Pro uložení zašifrovaného hesla do <b>conf.php</b>, nahraďte řádku <br> <b>$dolibarr_main_db_pass="..."</b> <br> hodnotou <br> <b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Pro uložení nezašifrovaného hesla do <b>conf.php</b>, nahraďte řádku <br> <b>$dolibarr_main_db_pass="crypted:..."</b> <br> hodnotou <br> <b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Přidat ochranu generovaných souborů PDF (Nedoporučuje se, zablokuje hromadné generování PDF)
 ProtectAndEncryptPdfFilesDesc=Ochrana dokumentů PDF neomezí možnost otevírání dokumentů jakýmkoliv prohlížečem. Nicméně, editace a kopírování přestane být možná. Zapnutím této ochrany přijdete o možnost vytváření kumulovaných PDF (např. nezaplacených faktur)
 Feature=Funkce
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Nastaveno na proces:
 ThisIsAlternativeProcessToFollow=To je alternativa k nastavení procesu:
 StepNb=Krok %s
 FindPackageFromWebSite=Nalezni balíček, obsahující funkci jež chcete (např. na oficiálních stránkách %s).
-DownloadPackageFromWebSite=Download balíčku %s.
-UnpackPackageInDolibarrRoot=Rozbalte soubor balíčku do adresáře, vyhrazenému pro externí moduly: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Instalace je dokončena a Dolibarr je připraven k použití.
 NotExistsDirect=Alternativní kořenový adresář není definován. <br>
 InfDirAlt=Od verze 3 je možné definovat alternativní kořenovou složku. To umožňuje ukládat na stejné místo plug-iny a vlastní šablony. <br> Stačí vytvořit adresář v kořenovém adresáři Dolibarr (např.: custom). <br>
 InfDirExample=<br>Pak je deklarujte v souboru conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Řádky jsou zakomentovány znakem "#", pro odkomentování tento znak odmažte.
-YouCanSubmitFile=Vyberte modul:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr aktuální verze
 CallUpdatePage=Přejděte na stránku, která aktualizuje databázovou strukturu a údaje: %s.
 LastStableVersion=Poslední stabilní verze
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Knihovna použít k vytvoření PDF
 WarningUsingFPDF=Upozornění: Váš <b>conf.php</b> obsahuje direktivu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že můžete používat knihovnu FPDF pro generování PDF souborů. Tato knihovna je stará a nepodporuje mnoho funkcí (Unicode, obraz transparentnost, azbuka, arabské a asijské jazyky, ...), takže může dojít k chybám při generování PDF. <br> Chcete-li vyřešit tento a mají plnou podporu generování PDF, stáhněte si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knihovny</a> , pak komentář nebo odebrat řádek <b>$ dolibarr_pdf_force_fpdf = 1,</b> a místo něj doplnit <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
-LocalTaxDesc=Některé země uplatňovat 2 nebo 3 daně na každé faktuře řádek. Pokud se jedná o tento případ, zvolit typ pro druhé a třetí daňové a jeho rychlosti. Možné typ jsou: <br> 1: místní daň vztahovat na výrobky a služby bez DPH (localtax je vypočtena na částku bez daně) <br> 2: místní daň platí o produktech a službách, včetně DPH (localtax je vypočtena na částku + hlavní daně) <br> 3: místní daň vztahovat na výrobky bez DPH (localtax je vypočtena na částku bez daně) <br> 4: místní daň vztahovat na produkty, včetně DPH (DPH se vypočítá na množství + hlavní DPH) <br> 5: místní daň platí o službách bez DPH (localtax je vypočtena na částku bez daně) <br> 6: místní daň platí o službách, včetně DPH (localtax je vypočtena na částku + daň)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Zadejte telefonní číslo pro volání ukázat odkaz na test ClickToDial URL pro <strong>%s</strong>
 RefreshPhoneLink=Obnovit odkaz
@@ -430,8 +429,8 @@ Module20Name=Návrhy
 Module20Desc=Komerční návrh řízení
 Module22Name=Mass E-mailing
 Module22Desc=Mass E-mailing řízení
-Module23Name= Energie
-Module23Desc= Sledování spotřeby energií
+Module23Name=Energie
+Module23Desc=Sledování spotřeby energií
 Module25Name=Zákaznických objednávek
 Module25Desc=Zákazníka řízení
 Module30Name=Faktury
@@ -492,8 +491,8 @@ Module400Name=Projekty/Příležitosti/Vedení
 Module400Desc=Řízení projektů, příležitostí nebo vedení. Můžete přiřadit libovolný prvek (faktura, objednávka, návrh, intervence, ...) na projekt a získat příčný pohled z pohledu projektu.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrace
-Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy)
-Module500Desc=Řízení zvláštních výdajů, jako jsou daně, sociální příspěvky, divideny a platy
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Platy
 Module510Desc=Řízení výplat zaměstnanců a plateb
 Module520Name=Půjčka
@@ -502,7 +501,7 @@ Module600Name=Upozornění
 Module600Desc=Posílat e-mailové upozornění na některé Dolibarr firemních akcí až kontaktů třetích stran (nastavení definován na každém thirdparty)
 Module700Name=Dary
 Module700Desc=Darování řízení
-Module770Name=Seznam rozšíření
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Dodavatel obchodní nabídky
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Pořad jednání
 Module2400Desc=Události / úkoly a agendy vedení
 Module2500Name=Elektronický Redakční
 Module2500Desc=Uložit a sdílet dokumenty
-Module2600Name=WebServices
-Module2600Desc=Povolit Dolibarr webových služeb serveru
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (klient)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Vytvořit / upravit produktů
 Permission34=Odstranit produkty
 Permission36=Viz / správa skryté produkty
 Permission38=Export produktů
-Permission41=Přečtěte projektů (společné projekty, projekt a já jsem kontakt pro)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Vytvořit / upravit projektů (společné projekty, projekt a já jsem kontakt pro)
 Permission44=Odstranit projektů (společné projekty, projekt a já jsem kontakt pro)
 Permission61=Přečtěte intervence
@@ -599,10 +600,10 @@ Permission86=Poslat objednávky odběratelů
 Permission87=Zavřít zákazníky objednávky
 Permission88=Storno objednávky odběratelů
 Permission89=Odstranit objednávky odběratelů
-Permission91=Přečtěte si příspěvky na sociální zabezpečení a daně z přidané hodnoty
-Permission92=Vytvořit / upravit příspěvky na sociální zabezpečení a daně z přidané hodnoty
-Permission93=Odstranění sociální příspěvky a daně z přidané hodnoty
-Permission94=Export příspěvky na sociální zabezpečení
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Přečtěte si zprávy
 Permission101=Přečtěte si sendings
 Permission102=Vytvořit / upravit sendings
@@ -620,9 +621,9 @@ Permission121=Přečtěte třetí strany v souvislosti s uživateli
 Permission122=Vytvořit / modifikovat třetí strany spojené s uživateli
 Permission125=Odstranění třetí strany v souvislosti s uživateli
 Permission126=Export třetí strany
-Permission141=Přečtěte projektů (i soukromé nejsem kontakt pro)
-Permission142=Vytvořit / upravit projektů (i soukromé nejsem kontakt pro)
-Permission144=Odstranit projekty (i soukromé nejsem kontakt pro)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Přečtěte si poskytovatelé
 Permission147=Přečtěte si statistiky
 Permission151=Přečtěte si trvalé příkazy
@@ -800,7 +801,7 @@ DictionaryCountry=Země
 DictionaryCurrency=Měny
 DictionaryCivility=Zdvořilostní oslovení
 DictionaryActions=Typ agendy událostí
-DictionarySocialContributions=Typy příspěvků na sociální zabezpečení
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Sazby DPH nebo daň z prodeje
 DictionaryRevenueStamp=Výše příjmů známek
 DictionaryPaymentConditions=Platební podmínky
@@ -817,6 +818,9 @@ DictionarySource=Původ nabídky/objednávky
 DictionaryAccountancyplan=Graf účtů
 DictionaryAccountancysystem=Modely pro účetní osnovy
 DictionaryEMailTemplates=E-maily šablony
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Nastavení uloženo
 BackToModuleList=Zpět na seznam modulů
 BackToDictionaryList=Zpět k seznamu slovníků
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Město
 CompanyCountry=Země
 CompanyCurrency=Hlavní měna
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Nezobrazovat
 DoNotSuggestPaymentMode=Nenaznačují
 NoActiveBankAccountDefined=Žádný aktivní bankovní účet definován
 OwnerOfBankAccount=Majitel %s bankovních účtů
 BankModuleNotActive=Účty v bankách modul není povolen,
-ShowBugTrackLink=Ukázat odkaz &quot;Nahlásit chybu&quot;
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Ukázat &quot;ponk&quot; na domovské stránce
 Alerts=Upozornění
 Delays=Zpoždění
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max desetinná pro jednotkových cen
 MAIN_MAX_DECIMALS_TOT=Max desetinná místa pro celkové ceny
 MAIN_MAX_DECIMALS_SHOWN=Max desetinná pro ceny zobrazeny na obrazovce (Přidat <b>...</b> po této řady, chcete-li vidět <b>...</b> když je číslo zkrácena při zobrazení na obrazovce)
 MAIN_DISABLE_PDF_COMPRESSION=Použít kompresi PDF generovaných souborů PDF.
-MAIN_ROUNDING_RULE_TOT= Velikost zaokrouhlení rozsahu (u mála zemí, kde je provedeno zaokrouhlení na něco jiného než základ 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Čistá jednotková cena produktu
 TotalPriceAfterRounding=Celková cena (bez DPH / s DPH / s DPH) po zaokrouhlení
 ParameterActiveForNextInputOnly=Parametr efektivní pro další vstup pouze
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Celkový počet aktivovaných funkcí modulů: <b>
 YouMustEnableOneModule=Musíte povolit alespoň jeden modul
 ClassNotFoundIntoPathWarning=Třída %s nenašli cestu do PHP
 YesInSummer=Ano v létě
-OnlyFollowingModulesAreOpenedToExternalUsers=Na vědomí, že pouze následující moduly otevřel externím uživatelům (ať jsou povolení těchto uživatelů):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Úložiště relace šifrována Suhosin
 ConditionIsCurrently=Podmínkou je v současné době %s
 YouUseBestDriver=Pomocí ovladače %s, že je nejlepší řidič současné době k dispozici.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Maximální počet výrobků ve komba vyberte seznam
 ConfirmDeleteProductLineAbility=Potvrzení při odstraňování produktové řady ve formulářích
 ModifyProductDescAbility=Personalizace popisy produktů ve formách
 ViewProductDescInFormAbility=Vizualizace popisy produktů ve formách (jinak jako vyskakovací bublině)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Vizualizace Popisy výrobků v thirdparty jazyce
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Použijte vyhledávací formulář pro výběr produku (spíše než rozevíracího seznamu).
 UseEcoTaxeAbility=Podpora Eco-taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Výchozí typ čárového kódu použít pro produkty
 SetDefaultBarcodeTypeThirdParties=Výchozí typ čárového kódu použít k třetím osobám
+UseUnits=Support units
 ProductCodeChecker= Modul pro generování kódu produktu a přezkušování (výrobku nebo služby)
 ProductOtherConf= Katalog / Konfigurace služby
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Čárových kódů typu UPC
 BarcodeDescISBN=Čárový kód typu ISBN
 BarcodeDescC39=Čárový kód typu C39
 BarcodeDescC128=Čárový kód typu C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Čárový kód generování nástroj pro příkazovou řádku (používaný vnitřním motorem u některých typů čárových kódů). Musí být v souladu s "genbarcode". <br> Například: / usr / local / bin / genbarcode
 BarcodeInternalEngine=Vnitřní motor
 BarCodeNumberManager=Manažer automatického definování čísel čárových kódů
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Jste si jisti, že chcete smazat <b>%s</b> položka menu?
 DeleteLine=Odstranění řádku
 ConfirmDeleteLine=Jste si jisti, že chcete smazat tento řádek?
 ##### Tax #####
-TaxSetup=Daně, sociální příspěvky a dividendy modul nastavení
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=DPH z důvodu
 OptionVATDefault=Cash základ
 OptionVATDebitOption=Akruální báze
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices modul nastavení
 WebServicesDesc=Tím, že tento modul, Dolibarr stal webový server služby poskytovat různé webové služby.
 WSDLCanBeDownloadedHere=WSDL deskriptor soubory poskytovaných služeb lze stáhnout zde
 EndPointIs=SOAP klienti musí poslat své požadavky na koncový bod Dolibarr k dispozici na adrese
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bankovní modul nastavení
 FreeLegalTextOnChequeReceipts=Volný text na kontroly příjmů
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekt modul nastavení
 ProjectsModelModule=Projekt zprávy Vzor dokladu
 TasksNumberingModules=Úkoly číslování modul
 TaskModelModule=Úkoly zprávy Vzor dokladu
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatické strom složek a dokumentů
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Otevřeno fiskální rok
 CloseFiscalYear=Zavřít fiskální rok
 DeleteFiscalYear=Smazat fiskální rok
 ConfirmDeleteFiscalYear=Jste si jisti, že chcete tento fiskální rok smazat?
-Opened=Otevřeno
+Opened=Open
 Closed=Zavřeno
 AlwaysEditable=Může být vždy upraveno
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Instalace externího modulu není možné
 SomethingMakeInstallFromWebNotPossible2=Z tohoto důvodu, proces upgradovat popsáno zde je pouze ruční kroky privilegovaný uživatel může dělat.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index b7222546db9..5ac9c8b7d20 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Objednávka %s označena jako zaúčtovaná
 OrderApprovedInDolibarr=Objednávka %s schválena
 OrderRefusedInDolibarr=Objednávka %s zamítnuta
 OrderBackToDraftInDolibarr=Objednávka %s vrácena do stavu návrhu
-OrderCanceledInDolibarr=Objednávka %s zrušena
 ProposalSentByEMail=Komerční návrh %s zaslán e-mailem
 OrderSentByEMail=Zákaznická objednávka %s zaslána e-mailem
 InvoiceSentByEMail=Zákaznická faktura %s zaslána e-mailem
@@ -96,3 +95,5 @@ AddEvent=Vytvořit událost
 MyAvailability=Moje dostupnost
 ActionType=Typ události
 DateActionBegin=Datum zahájení události
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 2b8e1123263..c6de160a0b8 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -1,78 +1,78 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
 Banks=Banky
-MenuBankCash=Banka / Peníze
-MenuSetupBank=Banka / Peníze nastavení
+MenuBankCash=Banka/Peníze
+MenuSetupBank=Nastavení banka/peníze
 BankName=Název banky
 FinancialAccount=Účet
 FinancialAccounts=Účty
 BankAccount=Bankovní účet
 BankAccounts=Bankovní účty
-ShowAccount=Show Account
+ShowAccount=Ukázat účet
 AccountRef=Finanční účet ref
-AccountLabel=Finanční účet štítek
+AccountLabel=Štítek finančního účtu
 CashAccount=Pokladní účet
 CashAccounts=Hotovostní účty
 MainAccount=Hlavní účet
 CurrentAccount=Běžný účet
 CurrentAccounts=Běžné účty
-SavingAccount=Spořitelní účet
+SavingAccount=Spořicí účet
 SavingAccounts=Spořicí účty
-ErrorBankLabelAlreadyExists=Finanční účet štítek již existuje
+ErrorBankLabelAlreadyExists=Štítek finančního účtu již existuje
 BankBalance=Zůstatek
 BankBalanceBefore=Zůstatek před
 BankBalanceAfter=Zůstatek po
-BalanceMinimalAllowed=Minimální zůstatek povolena
+BalanceMinimalAllowed=Minimální povolený zůstatek
 BalanceMinimalDesired=Minimální požadovaný zůstatek
 InitialBankBalance=Počáteční zůstatek
-EndBankBalance=Konec zůstatek
+EndBankBalance=Konečný zůstatek
 CurrentBalance=Běžný zůstatek
-FutureBalance=Budoucí rovnováha
-ShowAllTimeBalance=Zobrazit rovnováhy od začátku
-AllTime=From start
-Reconciliation=Smíření
+FutureBalance=Budoucí zůstatek
+ShowAllTimeBalance=Zobrazit zůstatky od začátku
+AllTime=Od začátku
+Reconciliation=Vyrovnání
 RIB=Číslo bankovního účtu
 IBAN=IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
-BIC=BIC / SWIFT číslo
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+IbanValid=IBAN je platný
+IbanNotValid=IBAN není platný
+BIC=BIC/SWIFT kód
+SwiftValid=BIC/SWIFT je platný
+SwiftNotValid=BIC/SWIFT není platný
 StandingOrders=Trvalé příkazy
 StandingOrder=Trvalý příkaz
 Withdrawals=Výběry
-Withdrawal=Odnětí
+Withdrawal=Výběr
 AccountStatement=Výpis z účtu
 AccountStatementShort=Prohlášení
 AccountStatements=Výpisy z účtů
 LastAccountStatements=Poslední výpis z účtu
 Rapprochement=Reconciliate
-IOMonthlyReporting=Měsíční reporting
+IOMonthlyReporting=Měsíční hlášení
 BankAccountDomiciliation=Účetní adresa
 BankAccountCountry=Účet země
-BankAccountOwner=Majitel účtu Název
-BankAccountOwnerAddress=Majitel účtu adresa
-RIBControlError=Kontrola integrity hodnot selže. To znamená, že informace v tomto čísle účtu nejsou úplné nebo špatně (zjistit zemi, čísla a IBAN).
+BankAccountOwner=Název majitele účtu
+BankAccountOwnerAddress=Adresa majitele účtu
+RIBControlError=Kontrola integrity hodnot selhala. To znamená, že informace v tomto čísle účtu nejsou úplné nebo špatné (Zkontrolujte zemi, čísla a IBAN).
 CreateAccount=Vytvořit účet
 NewAccount=Nový účet
 NewBankAccount=Nový bankovní účet
 NewFinancialAccount=Nový finanční účet
 MenuNewFinancialAccount=Nový finanční účet
-NewCurrentAccount=Nový běžného účtu
+NewCurrentAccount=Nový běžný účet
 NewSavingAccount=Nový spořicí účet
 NewCashAccount=Nový peněžní účet
 EditFinancialAccount=Upravit účet
-AccountSetup=Finanční účty pro nastavení
-SearchBankMovement=Hledat banka hnutí
+AccountSetup=Nastavení finančních účtů
+SearchBankMovement=Hledat bankovní pohyb
 Debts=Pohledávky
 LabelBankCashAccount=Banka nebo peněžní štítek
 AccountType=Typ účtu
-BankType0=Spořitelní účet
-BankType1=Proudu nebo účtu ke kreditní kartě
+BankType0=Spořicí účet
+BankType1=Běžný nebo kreditní účet
 BankType2=Pokladní účet
 IfBankAccount=Pokud bankovní účet
-AccountsArea=Účty oblast
-AccountCard=Účet karta
+AccountsArea=Oblast účtů
+AccountCard=Karta účtu
 DeleteAccount=Smazat účet
 ConfirmDeleteAccount=Jste si jisti, že chcete smazat tento účet?
 Account=Účet
@@ -81,58 +81,58 @@ ByRubriques=Podle kategorií
 BankTransactionByCategories=Bankovní transakce podle kategorií
 BankTransactionForCategory=Bankovní transakce pro kategorie <b>%s</b>
 RemoveFromRubrique=Odstraňte spojení s kategorií
-RemoveFromRubriqueConfirm=Jste si jisti, že chcete odstranit vazbu mezi transakce a kategorie?
+RemoveFromRubriqueConfirm=Jste si jisti, že chcete odstranit vazbu mezi transakcí a kategorií?
 ListBankTransactions=Přehled bankovních transakcí
 IdTransaction=ID transakce
 BankTransactions=Bankovní transakce
 SearchTransaction=Hledat transakce
 ListTransactions=Seznam transakcí
-ListTransactionsByCategory=Seznam transakcí / kategorie
-TransactionsToConciliate=Transakce smířit
-Conciliable=Může být porovnána
-Conciliate=Smířit
-Conciliation=Smíření
-ConciliationForAccount=Smiřte se tento účet
-IncludeClosedAccount=Zahrnout uzavřených účtů
+ListTransactionsByCategory=Seznam transakcí/kategorie
+TransactionsToConciliate=Porovnat transakce
+Conciliable=Může být porovnáno
+Conciliate=Porovnat
+Conciliation=Porovnání
+ConciliationForAccount=Porovnat tento účet
+IncludeClosedAccount=Zahrnout uzavřené účty
 OnlyOpenedAccount=Pouze otevřené účty
-AccountToCredit=Účet na úvěr
+AccountToCredit=Úvěrový účet
 AccountToDebit=Účet na vrub
-DisableConciliation=Zakázat usmíření funkci pro tento účet
-ConciliationDisabled=Odsouhlasení funkce vypnuta
+DisableConciliation=Zakázat funkci porovnání pro tento účet
+ConciliationDisabled=Funkce porovnání vypnuta
 StatusAccountOpened=Otevřeno
 StatusAccountClosed=Zavřeno
 AccountIdShort=Číslo
 EditBankRecord=Upravit záznam
 LineRecord=Transakce
-AddBankRecord=Přidat obchod
-AddBankRecordLong=Přidat obchod ručně
-ConciliatedBy=Odsouhlaseny
-DateConciliating=Synchronizovat data
-BankLineConciliated=Transakce smířil
-CustomerInvoicePayment=Klientská platba
-CustomerInvoicePaymentBack=Klientská platba zpět
-SupplierInvoicePayment=Dodavatel platba
-WithdrawalPayment=Odstoupení platba
-SocialContributionPayment=Sociální příspěvek platba
-FinancialAccountJournal=Finanční účet časopis
+AddBankRecord=Přidat transakci
+AddBankRecordLong=Přidat transakci ručně
+ConciliatedBy=Porovnáno
+DateConciliating=Datum porovnání
+BankLineConciliated=Transakce porovnána
+CustomerInvoicePayment=Zákaznická platba
+CustomerInvoicePaymentBack=Vrátit zákaznickou platbu
+SupplierInvoicePayment=Dodavatelská platba
+WithdrawalPayment=Výběr platby
+SocialContributionPayment=Social/fiscal tax payment
+FinancialAccountJournal=Deník finanční účet
 BankTransfer=Bankovní převod
 BankTransfers=Bankovní převody
-TransferDesc=Přenos z jednoho účtu na jiný, bude Dolibarr psát dva záznamy (debetní ve zdrojovém účtu a úvěr v cílovém účtu, ve stejné výši. Stejné označení a datum bude použit pro tuto transakci)
+TransferDesc=Přenos z jednoho účtu na jiný bude Dolibarr účtovat dvěma záznamy (debetní ve zdrojovém účtu a kreditní v cílovém účtu, ve stejné výši. Stejné označení a datum bude použito pro tuto transakci)
 TransferFrom=Z
 TransferTo=Na
-TransferFromToDone=Transfer z <b>%s</b> na <b>%s</b> %s <b>%s</b> ze byl zaznamenán.
-CheckTransmitter=Vysílač
-ValidateCheckReceipt=Ověření tohoto políčka příjem?
-ConfirmValidateCheckReceipt=Jste si jisti, že chcete ověřit zaškrtnutí tohoto potvrzení, nebude možné měnit jakmile se tak stane?
-DeleteCheckReceipt=Odstraňte zaškrtnutí tohoto příjmu?
-ConfirmDeleteCheckReceipt=Jste si jisti, že chcete smazat toto políčko příjem?
+TransferFromToDone=Převod z <b>%s</b> na <b>%s</b> %s <b>%s</b> byl zaznamenán.
+CheckTransmitter=Převádějící
+ValidateCheckReceipt=Ověření příjmu tohoto políčka?
+ConfirmValidateCheckReceipt=Jste si jisti, že chcete ověřit zaškrtnutí tohoto potvrzení? Jakmile ho provedete, nebudete ho již moci změnit.
+DeleteCheckReceipt=Odstranit zaškrtnutí tohoto příjmu?
+ConfirmDeleteCheckReceipt=Jste si jisti, že chcete smazat toto políčko příjmu?
 BankChecks=Bankovní šeky
-BankChecksToReceipt=Kontroly čekají na uložení
-ShowCheckReceipt=Zobrazit zkontrolovat depozitní potvrzení
-NumberOfCheques=Nb šeku
+BankChecksToReceipt=Šeky čekající na uložení
+ShowCheckReceipt=Zobrazit příjmový vklad šeku
+NumberOfCheques=Nb šeky
 DeleteTransaction=Odstranit transakce
 ConfirmDeleteTransaction=Jste si jisti, že chcete smazat tuto transakci?
-ThisWillAlsoDeleteBankRecord=To bude také odstranit vznikající bankovní transakce
+ThisWillAlsoDeleteBankRecord=Toto odstraní vznikající bankovní transakce
 BankMovements=Pohyby
 CashBudget=Peněžní rozpočet
 PlannedTransactions=Plánované transakce
@@ -141,27 +141,27 @@ ExportDataset_banque_1=Bankovní transakce a výpis z účtu
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transakce na jiný účet
 TransactionWithOtherAccount=Převodem na účet
-PaymentNumberUpdateSucceeded=Platba číslo aktualizovány úspěšně
-PaymentNumberUpdateFailed=Platba číslo nelze aktualizovat
-PaymentDateUpdateSucceeded=Datum platby aktualizovat úspěšně
+PaymentNumberUpdateSucceeded=Číslo platby úspěšně aktualizováno
+PaymentNumberUpdateFailed=Číslo platby nelze aktualizovat
+PaymentDateUpdateSucceeded=Datum platby úspěšně aktualizováno
 PaymentDateUpdateFailed=Datum platby nelze aktualizovat
 Transactions=Transakce
 BankTransactionLine=Bankovní transakce
-AllAccounts=Všechny bankovní / peněžní účty
-BackToAccount=Zpět na účtu
+AllAccounts=Všechny bankovní/peněžní účty
+BackToAccount=Zpět na účet
 ShowAllAccounts=Zobrazit pro všechny účty
-FutureTransaction=Transakce v Futur. Žádný způsob, jak se smířit.
-SelectChequeTransactionAndGenerate=Výběr / filtr, aby kontroly zahrnovaly do obdržení šeku vkladů a klikněte na &quot;Vytvořit&quot;.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Nakonec určit kategorii, ve které chcete klasifikovat záznamy
-ToConciliate=Smířit?
-ThenCheckLinesAndConciliate=Poté zkontrolujte, zda řádky, které jsou ve výpisu z účtu a klepněte na tlačítko
-BankDashboard=Účty shrnutí
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
-StartDate=Start date
-EndDate=End date
+FutureTransaction=Transakce v budoucnosti.  Žádný způsob, jak porovnat.
+SelectChequeTransactionAndGenerate=Výběr/filtr kontrol zahrnujících příjem šekových vkladů, a klikněte na "Vytvořit".
+InputReceiptNumber=Vyberte si výpis z účtu v souvislosti s porovnáváním. Použijte tříditelnou číselnou hodnotu: YYYYMM nebo YYYYMMDD
+EventualyAddCategory=Eventuelně upřesněte kategorii, ve které chcete klasifikovat záznamy
+ToConciliate=Porovnat?
+ThenCheckLinesAndConciliate=Poté zkontrolujte řádky, které jsou ve výpisu z účtu a klikněte na tlačítko
+BankDashboard=Shrnutí bankovních účtů
+DefaultRIB=Výchozí BAN
+AllRIB=Všechny BAN
+LabelRIB=BAN Štítek
+NoBANRecord=Žádný BAN záznam
+DeleteARib=Smazat BAN záznam
+ConfirmDeleteRib=Jste si jisti, že chcete smazat tento BAN záznam?
+StartDate=Datum zahájení
+EndDate=Datum ukončení
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 3357958b063..801c90bf697 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb faktur
 NumberOfBillsByMonth=Nb faktury měsíce
 AmountOfBills=Částka faktur
 AmountOfBillsByMonthHT=Čýstka faktur měsíčně (bez daně)
-ShowSocialContribution=Zobrazit sociální příspěvek
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Zobrazit fakturu
 ShowInvoice=Zobrazit fakturu
 ShowInvoiceReplace=Zobrazit opravenou fakturu
@@ -270,7 +270,7 @@ BillAddress=Účetní adresa
 HelpEscompte=Tato sleva je sleva poskytnuta zákazníkovi, protože jeho platba byla provedena před termínem splatnosti.
 HelpAbandonBadCustomer=Tato částka byla opuštěna (zákazník řekl, aby byl špatný zákazník) a je považována za výjimečně volnou.
 HelpAbandonOther=Tato částka byla opuštěna, protože došlo k chybě (například špatný zákazník nebo faktura nahrazena jinou)
-IdSocialContribution=ID sociálního příspěvku
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID platby
 InvoiceId=ID faktury
 InvoiceRef=Faktura čj.
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 57041820006..f312dd24be8 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Kontakty/adresy třetí strany
 StatusContactValidated=Stav kontaktu/adresy
 Company=Společnost
 CompanyName=Název společnosti
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Společnosti
 CountryIsInEEC=Země je uvnitř Evropského hospodářského společenství
 ThirdPartyName=Název třetí strany
@@ -410,5 +411,10 @@ OutstandingBillReached=Dosaženo max. pro nezaplacený účet
 MonkeyNumRefModelDesc=Vrátí číslo ve formátu %syymm-nnnn pro kód zákazníka a %syymm-nnnn pro kód dodavatele kde yy je rok, mm měsíc a nnnn je číselná řada bez přerušení a bez návratu k 0.
 LeopardNumRefModelDesc=Kód je volný. Tento kód lze kdykoli změnit.
 ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...)
-SearchThirdparty=Hledat třetí stranu
+SearchThirdparty=Search third party
 SearchContact=Hledat kontakt
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Třetí strany  byly sloučeny
+ErrorThirdpartiesMerge=Došlo k chybě při mazání třetích stran. Zkontrolujte log soubor. Změny byly vráceny.
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 3f170dea2d1..1063083f1cb 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Vybraná DPH
 ToPay=Zaplatit
 ToGet=Chcete-li získat zpět
 SpecialExpensesArea=Oblast pro všechny speciální platby
-TaxAndDividendsArea=Oblast pro daně, sociální příspěvky a dividendy
-SocialContribution=Sociální příspěvek
-SocialContributions=Sociální příspěvky
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Zvláštní výdaje
 MenuTaxAndDividends=Daně a dividendy
 MenuSalaries=Mzdy
-MenuSocialContributions=Sociální příspěvky
-MenuNewSocialContribution=Nový příspěvek
-NewSocialContribution=Nový příspěvek na sociální zabezpečení
-ContributionsToPay=Platba příspěvků
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Oblast Účetnictví/Pokladna
 AccountancySetup=Nastavení účetnictví
 NewPayment=Nová platba
 Payments=Platby
 PaymentCustomerInvoice=Platba zákaznické faktury
 PaymentSupplierInvoice=Platba dodavatelské faktury
-PaymentSocialContribution=Platba sociálního příspěvku
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Platba DPH
 PaymentSalary=Výplaty
 ListPayment=Seznam plateb
@@ -91,7 +91,7 @@ LT1PaymentES=RE Platba
 LT1PaymentsES=RE Platby
 VATPayment=Platba DPH
 VATPayments=Platby DPH
-SocialContributionsPayments=Platby sociálních příspěvků
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zobrazit platbu DPH
 TotalToPay=Celkem k zaplacení
 TotalVATReceived=Obdržené DPH celkem
@@ -116,11 +116,11 @@ NewCheckDepositOn=Vytvořte potvrzení o vkladu na účet: %s
 NoWaitingChecks=Žádné kontroly čekání na vklad.
 DateChequeReceived=Zkontrolujte datum příjmu
 NbOfCheques=Nb kontroly
-PaySocialContribution=Platba sociálního příspěvku
-ConfirmPaySocialContribution=Jste si jisti, že chcete klasifikovat tento sociální příspěvek jako vyplacený?
-DeleteSocialContribution=Odstranit sociální příspěvek
-ConfirmDeleteSocialContribution=Jste si jisti, že chcete smazat tento příspěvek na sociální zabezpečení?
-ExportDataset_tax_1=Sociální příspěvky a platby
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režim <b>%sDPH zápočtu na závazky%s.</b>
 CalcModeVATEngagement=Režim <b>%sDPH z rozšířených příjmů%s.</b>
 CalcModeDebt=Režim <b>%sPohledávky-závazky%s</b> zobrazí <b>Závazky účetnictví.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=podle dodavatele zvolte vhodnou metodu použití ste
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obratová zpráva za zboží při použití režimu <b>hotovostního účetnictví</b> není relevantní. Tato zpráva je k dispozici pouze při použití režimu <b>zapojeného účetnictví</b>  (viz nastavení účetního modulu).
 CalculationMode=Výpočetní režim
 AccountancyJournal=Deník účetnických kódů
-ACCOUNTING_VAT_ACCOUNT=Výchozí účetnické kódy pro vybírání DPH
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Výchozí účetnické kódy pro placení DPH
 ACCOUNTING_ACCOUNT_CUSTOMER=Účetnické kódy ve výchozím nastavení pro zákazníka třetích stran
 ACCOUNTING_ACCOUNT_SUPPLIER=Výchozí účetnické kódy pro dodavatele třetích stran
-CloneTax=Kopírovat sociální příspěvek
-ConfirmCloneTax=Potvrďte kopírování sociálního příspěvku
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Kopírovat pro příští měsíc
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 695153d122f..102fcd94bd6 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -4,10 +4,10 @@ About = O aplikaci
 CronAbout = O cronu
 CronAboutPage = Cron o stránce
 # Right
-Permission23101 = Číst naplánovanou úlohu
-Permission23102 = Vytvořit/aktualizovat naplánovanou úlohu
-Permission23103 = Odstranit naplánovanou úlohu
-Permission23104 = Provést naplánované úlohy
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Nastavení naplánovaných úloh
 URLToLaunchCronJobs=URL ke kontrole a spuštění úlohy v případě potřeby
@@ -26,11 +26,11 @@ CronLastOutput=Výstup poslední úlohy
 CronLastResult=Výstup posledního kódu
 CronListOfCronJobs=Seznam naplánovaných úloh
 CronCommand=Příkaz
-CronList=Naplánovaná úloha
+CronList=Naplánované úlohy
 CronDelete=Smazat naplánované úlohy
-CronConfirmDelete=Jste si jisti, že chcete smazat tyto naplánované úlohy?
+CronConfirmDelete=Jste si jisti, že chcete odstranit tyto naplánované úlohy?
 CronExecute=Spuštění naplánovaných úloh
-CronConfirmExecute=Opravdu chcete provést tyto naplánované úlohy nyní?
+CronConfirmExecute=Jste si jisti, že chcete provést tyto naplánované úlohy nyní?
 CronInfo=Plánovací modul úloh umožňují provádět úlohy, které byly plánované
 CronWaitingJobs=Čekající úlohy
 CronTask=Práce
@@ -39,7 +39,7 @@ CronDtStart=Datum zahájení
 CronDtEnd=Datum ukončení
 CronDtNextLaunch=Další provedení
 CronDtLastLaunch=Poslední provedení
-CronFrequency=Frekvenční
+CronFrequency=Frekvence
 CronClass=Třída
 CronMethod=Metoda
 CronModule=Modul
@@ -55,9 +55,9 @@ CronEach=Každý
 JobFinished=Práce zahájena a dokončena
 #Page card
 CronAdd= Přidat práci
-CronHourStart= Hodina a datum startu úkolu
-CronEvery= A úkol provést každý
-CronObject= Vytvoření Instance/objektu 
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Vytvoření Instance/objektu 
 CronArgs=Parametry
 CronSaveSucess=Úspěšně uloženo
 CronNote=Komentář
@@ -76,6 +76,7 @@ CronMethodHelp=Objekt způsob startu. <BR> Např načíst metody objektu .../htd
 CronArgsHelp=Metoda argumenty. <BR> Např načíst metody objektu výrobku .../htdocs/product/class/product.class.php, hodnota paramteru může být <i>0, ProductRef</i>
 CronCommandHelp=Spustit příkazový řádek. 
 CronCreateJob=Vytvořit novou naplánovanou úlohu
+CronFrom=From
 # Info
 CronInfoPage=Informace
 # Common
@@ -85,4 +86,4 @@ CronType_command=Shell příkaz
 CronMenu=Cron
 CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
 UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home- Moduly nářadí- Seznam úloh" kde vidíte a upravujete naplánované úlohy.
-TaskDisabled=Task vypnut
+TaskDisabled=Úloha vypnuta
diff --git a/htdocs/langs/cs_CZ/dict.lang b/htdocs/langs/cs_CZ/dict.lang
index 21c16a44cae..e5412af3278 100644
--- a/htdocs/langs/cs_CZ/dict.lang
+++ b/htdocs/langs/cs_CZ/dict.lang
@@ -6,7 +6,7 @@ CountryES=Španělsko
 CountryDE=Německo
 CountryCH=Švýcarsko
 CountryGB=Velká Británie
-# CountryUK=United Kingdom
+CountryUK=Spojené Království Velká Británie
 CountryIE=Irsko
 CountryCN=Čína
 CountryTN=Tunisko
@@ -20,13 +20,13 @@ CountryNL=Nizozemsko
 CountryHU=Maďarsko
 CountryRU=Rusko
 CountrySE=Švédsko
-CountryCI=Ivoiry pobřeží
+CountryCI=Ivoiry
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Kamerun
 CountryPT=Portugalsko
 CountrySA=Saúdská Arábie
-CountryMC=Monaco
+CountryMC=Monako
 CountryAU=Austrálie
 CountrySG=Singapur
 CountryAF=Afghánistán
@@ -65,14 +65,14 @@ CountryKH=Kambodža
 CountryCV=Kapverdy
 CountryKY=Kajmanské ostrovy
 CountryCF=Středoafrická republika
-CountryTD=Chad
+CountryTD=Čad
 CountryCL=Chile
 CountryCX=Vánoční ostrov
-CountryCC=Cocos (Keeling) Islands
+CountryCC=Kokosové ostrovy  (Keeling)
 CountryCO=Kolumbie
-CountryKM=Komory
+CountryKM=Komorské ostrovy
 CountryCG=Kongo
-CountryCD=Kongo Demokratická republika
+CountryCD=Demokratická republika Kongo
 CountryCK=Cookovy ostrovy
 CountryCR=Kostarika
 CountryHR=Chorvatsko
@@ -95,8 +95,8 @@ CountryFO=Faerské ostrovy
 CountryFJ=Fidži
 CountryFI=Finsko
 CountryGF=Francouzská Guyana
-CountryPF=Francouzská polynésie
-CountryTF=Francouzská jižní území
+CountryPF=Francouzská Polynésie
+CountryTF=Francouzská Jižní území
 CountryGM=Gambie
 CountryGE=Gruzie
 CountryGH=Ghana
@@ -112,7 +112,7 @@ CountryGW=Guinea-Bissau
 CountryGY=Guyana
 CountryHT=Haiti
 CountryHM=Heardův ostrov a McDonaldovy
-CountryVA=Svatý stolec (Vatikánský městský stát)
+CountryVA=Vatikán (Svatý stolec)
 CountryHN=Honduras
 CountryHK=Hongkong
 CountryIS=Icelande
@@ -130,18 +130,18 @@ CountryKI=Kiribati
 CountryKP=Severní Korea
 CountryKR=Jižní Korea
 CountryKW=Kuvajt
-CountryKG=Kyrghyztan
-CountryLA=Lao
+CountryKG=Kyrgyzstán
+CountryLA=Laos
 CountryLV=Lotyšsko
 CountryLB=Libanon
 CountryLS=Lesotho
 CountryLR=Libérie
-CountryLY=Libyjská
+CountryLY=Libye
 CountryLI=Lichtenštejnsko
-CountryLT=Litevských
+CountryLT=Litva
 CountryLU=Lucembursko
 CountryMO=Macao
-CountryMK=Makedonie, Bývalá jugoslávská z
+CountryMK=Makedonie
 CountryMG=Madagaskar
 CountryMW=Malawi
 CountryMY=Malajsie
@@ -159,7 +159,7 @@ CountryMD=Moldavsko
 CountryMN=Mongolsko
 CountryMS=Monserrat
 CountryMZ=Mosambik
-CountryMM=Birmania (Myanmar)
+CountryMM=Barma (Myanmar)
 CountryNA=Namibie
 CountryNR=Nauru
 CountryNP=Nepál
@@ -170,7 +170,7 @@ CountryNI=Nikaragua
 CountryNE=Niger
 CountryNG=Nigérie
 CountryNU=Niue
-CountryNF=Norfolk Island
+CountryNF=Norfolkské ostrovy
 CountryMP=Severní Mariany
 CountryNO=Norsko
 CountryOM=Omán
@@ -186,7 +186,7 @@ CountryPN=Pitcairn ostrovy
 CountryPL=Polsko
 CountryPR=Portoriko
 CountryQA=Katar
-CountryRE=Shledání
+CountryRE=Reunion
 CountryRO=Rumunsko
 CountryRW=Rwanda
 CountrySH=Svatá Helena
@@ -211,7 +211,7 @@ CountrySD=Súdán
 CountrySR=Surinam
 CountrySJ=Špicberky a Jan Mayen
 CountrySZ=Svazijsko
-CountrySY=Syřan
+CountrySY=Sýrie
 CountryTW=Tchaj-wan
 CountryTJ=Tádžikistán
 CountryTZ=Tanzanie
@@ -232,7 +232,7 @@ CountryUY=Uruguay
 CountryUZ=Uzbekistán
 CountryVU=Vanuatu
 CountryVE=Venezuela
-CountryVN=Viet Nam
+CountryVN=Vietnam
 CountryVG=Britské Panenské ostrovy
 CountryVI=Panenské ostrovy, USA
 CountryWF=Wallis a Futuna
@@ -242,7 +242,7 @@ CountryZM=Zambie
 CountryZW=Zimbabwe
 CountryGG=Guernsey
 CountryIM=Isle of Man
-CountryJE=Trikot
+CountryJE=Jersey
 CountryME=Černá Hora
 CountryBL=Saint Barthelemy
 CountryMF=Svatý Martin
@@ -250,38 +250,37 @@ CountryMF=Svatý Martin
 ##### Civilities #####
 CivilityMME=Paní
 CivilityMR=Pan
-CivilityMLE=Paní
+CivilityMLE=Slečna
 CivilityMTRE=Mistr
 CivilityDR=Lékař
-
 ##### Currencies #####
 Currencyeuros=Euro
-CurrencyAUD=AU dolar
+CurrencyAUD=AU dolary
 CurrencySingAUD=AU dolar
-CurrencyCAD=CAN dolar
+CurrencyCAD=CAN dolary
 CurrencySingCAD=CAN Dollar
-CurrencyCHF=Švýcarský frank
+CurrencyCHF=Švýcarské franky
 CurrencySingCHF=Švýcarský frank
-CurrencyEUR=Euro
+CurrencyEUR=Eura
 CurrencySingEUR=Euro
-CurrencyFRF=Francouzských franků
+CurrencyFRF=Francouzské franky
 CurrencySingFRF=Francouzský frank
-CurrencyGBP=GB liber
-CurrencySingGBP=GB Pound
-CurrencyINR=Indických rupií
+CurrencyGBP=Libry
+CurrencySingGBP=Libra
+CurrencyINR=Indické rupie
 CurrencySingINR=Indická rupie
-CurrencyMAD=Na tuto měnu
-CurrencySingMAD=Na tuto měnu
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
 CurrencyMGA=Ariary
 CurrencySingMGA=Ariary
 CurrencyMUR=Mauricius rupie
 CurrencySingMUR=Mauricius rupie
-CurrencyNOK=Norské Krones
+CurrencyNOK=Norské koruny
 CurrencySingNOK=Norská koruna
 CurrencyTND=Tuniských dinárů
 CurrencySingTND=Tuniský dinár
-CurrencyUSD=Americké dolary
-CurrencySingUSD=US Dollar
+CurrencyUSD=Dolary
+CurrencySingUSD=Dolar
 CurrencyUAH=Hřivna
 CurrencySingUAH=Hřivna
 CurrencyXAF=CFA frank BEAC
@@ -290,23 +289,22 @@ CurrencyXOF=CFA frank BCEAO
 CurrencySingXOF=CFA frank BCEAO
 CurrencyXPF=CFP frank
 CurrencySingXPF=Frank CFP
-
 CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=tisícina
-
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=E-mailové kampaně
-DemandReasonTypeSRC_CAMP_EMAIL=E-mailem kampaň
-DemandReasonTypeSRC_CAMP_PHO=Telefon kampaň
+DemandReasonTypeSRC_CAMP_MAIL=Mailová kampaň
+DemandReasonTypeSRC_CAMP_EMAIL=E-mailová kampaň
+DemandReasonTypeSRC_CAMP_PHO=Telefonická kampaň
 DemandReasonTypeSRC_CAMP_FAX=Fax kampaň
 DemandReasonTypeSRC_COMM=Obchodní kontakt
-DemandReasonTypeSRC_SHOP=Shop Kontakt
-DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_SHOP=Prodejní ontakt
+DemandReasonTypeSRC_WOM=Dané slovo
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Zaměstnanec
 DemandReasonTypeSRC_SPONSORING=Sponzoring
-
 #### Paper formats ####
 PaperFormatEU4A0=Formát 4A0
 PaperFormatEU2A0=Formát 2A0
diff --git a/htdocs/langs/cs_CZ/ecm.lang b/htdocs/langs/cs_CZ/ecm.lang
index 21a9237c9a8..8652607c4b1 100644
--- a/htdocs/langs/cs_CZ/ecm.lang
+++ b/htdocs/langs/cs_CZ/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Hledat podle objektu
 ECMSectionOfDocuments=Adresáře dokumentů
 ECMTypeManual=Manuální
 ECMTypeAuto=Automatický
-ECMDocsBySocialContributions=Dokumenty související odvody na sociální zabezpečení
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumenty související se třetími stranami
 ECMDocsByProposals=Dokumenty související s návrhy
 ECMDocsByOrders=Dokumenty související s objednávkami zákazníků
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 7a9d91e0766..cb31f7aeb37 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
@@ -190,3 +191,4 @@ WarningNotRelevant=Nerozhoduje provoz v našem souboru
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index 7f6a87c6762..fbd481d7461 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -1,76 +1,76 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Vývoz plocha
-ImportArea=Dovoz oblast
-NewExport=New export
+ExportsArea=Oblast exportu
+ImportArea=Oblast importu
+NewExport=Nový export
 NewImport=Nový import
-ExportableDatas=Exportovat dataset
+ExportableDatas=Exportovatelný dataset
 ImportableDatas=Importovatelný dataset
 SelectExportDataSet=Vyberte datový soubor, který chcete exportovat ...
 SelectImportDataSet=Vyberte datový soubor, který chcete importovat ...
-SelectExportFields=Vyberte pole, která chcete exportovat, nebo zvolte předdefinovanou export 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=Oblasti zdrojovém souboru nejsou dováženy
-SaveExportModel=Uložit tento export profil, pokud máte v plánu znovu později ...
-SaveImportModel=Uložit tuto importu profilu, pokud máte v plánu znovu později ...
-ExportModelName=Export název profilu
-ExportModelSaved=Export profil uloží pod názvem <b>%s.</b>
+SelectExportFields=Vyberte pole, která chcete exportovat, nebo zvolte předdefinovaný profil exportu
+SelectImportFields=Zvolte pole zdrojového souboru, který chcete importovat, a jejich cílové pole v databázi jejich přesunutím nahoru a dolů s ukotvením %s, nebo vyberte předdefinovaný profil pro import:
+NotImportedFields=Položky zdrojového souboru nejsou importovány
+SaveExportModel=Uložte tento profil exportu, pokud máte v plánu použít ho znovu později ...
+SaveImportModel=Uložte tento profil exportu, pokud máte v plánu použít ho znovu později ...
+ExportModelName=Název profilu exportu
+ExportModelSaved=Profil exportu byl uložen pod názvem <b>%s.</b>
 ExportableFields=Exportovatelné pole
 ExportedFields=Exportovat pole
-ImportModelName=Dovoz název profilu
-ImportModelSaved=Dovoz profil uloží pod názvem <b>%s.</b>
-ImportableFields=Dováženého pole
-ImportedFields=Importované pole
+ImportModelName=Název profilu importu
+ImportModelSaved=Profil importu byl uložen pod názvem <b>%s.</b>
+ImportableFields=Importované položky
+ImportedFields=Importovaná položka
 DatasetToExport=Dataset export
 DatasetToImport=Importovat soubor do datového souboru
-NoDiscardedFields=Žádné položky ve zdrojovém souboru jsou ignorovány
+NoDiscardedFields=Žádné položky ve zdrojovém souboru nejsou zlikvidovány
 Dataset=Dataset
-ChooseFieldsOrdersAndTitle=Zvolte pole objednávku ...
-FieldsOrder=Pole s cílem
-FieldsTitle=Pole Název
-FieldOrder=Pole, aby
+ChooseFieldsOrdersAndTitle=Zvolte pole objednávky ...
+FieldsOrder=Pole objednávky
+FieldsTitle=Pole název
+FieldOrder=Pole objednávky
 FieldTitle=Pole název
 ChooseExportFormat=Zvolte formát exportu
-NowClickToGenerateToBuildExportFile=Nyní vyberte formát souboru v poli se seznamem a klikněte na &quot;Vytvořit&quot; stavět soubor exportu ...
+NowClickToGenerateToBuildExportFile=Nyní vyberte formát souboru v poli se seznamem a klikněte na "Generovat" pro sestavení souboru exportu ....
 AvailableFormats=Dostupné formáty
 LibraryShort=Knihovna
-LibraryUsed=Knihovna používá
+LibraryUsed=Použitá knihovna
 LibraryVersion=Verze
 Step=Krok
-FormatedImport=Import assistant
-FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge.
-FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load.
-FormatedExport=Export assistant
-FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order.
-FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
+FormatedImport=Asistent importu
+FormatedImportDesc1=Tato oblast umožňuje importovat osobní údaje, pomocí asistenta, který vám pomůže v procesu, bez technických znalostí.
+FormatedImportDesc2=Prvním krokem je vybrat řídící data která chcete nahrát, ak soubor načíst, a pak si vybrat, která pole chcete načíst.
+FormatedExport=Asistent exportu
+FormatedExportDesc1=Tato oblast umožňuje exportovat osobní údaje, pomocí asistenta, který vám pomůže v procesu, bez technických znalostí.
+FormatedExportDesc2=Prvním krokem je vybrat předem definovaný dataset, pak si vybrat, která pole chcete v souborech výsledků, a v jakém pořadí.
+FormatedExportDesc3=Když jsou vybraná data na export, můžete definovat formát výstupního souboru, který chcete exportovat.
 Sheet=List
-NoImportableData=Žádné dovážet data (žádný modul s definicemi povolit import dat)
-FileSuccessfullyBuilt=Export souboru který byl vygenerován
-SQLUsedForExport=Dotaz SQL použít k vytvoření exportovaného souboru
+NoImportableData=Žádné importovatelné údaje (žádný modul s definicemi povolení importu dat)
+FileSuccessfullyBuilt=Generován export souboru
+SQLUsedForExport=Dotaz SQL použitý k vytvoření exportovaného souboru
 LineId=Id řádku
-LineDescription=Popis linky
-LineUnitPrice=Jednotková cena linky
-LineVATRate=Sazba DPH linky
-LineQty=Množství pro linku
+LineDescription=Popis řádku
+LineUnitPrice=Jednotková cena z řádku
+LineVATRate=Sazba DPH z řádku
+LineQty=Množství pro řádek
 LineTotalHT=Čistá částka daně na řádku
 LineTotalTTC=Částka s DPH za řádek
 LineTotalVAT=Částka DPH za řádek
-TypeOfLineServiceOrProduct=Použitý typ linky (0 = produkt, 1 = služba)
+TypeOfLineServiceOrProduct=Použitý typ řádku (0 = produkt, 1 = služba)
 FileWithDataToImport=Soubor s daty pro import
 FileToImport=Zdrojový soubor k importu
-FileMustHaveOneOfFollowingFormat=Importovat soubor musí mít jeden z následujících formátu
+FileMustHaveOneOfFollowingFormat=Soubor pro import musí mít jeden z následujících formátů
 DownloadEmptyExample=Stáhněte si příklad prázdného zdrojového souboru
 ChooseFormatOfFileToImport=Zvolte si formát souboru jako formát souboru pro import kliknutím na %s Piktogram vyberte ...
-ChooseFileToImport=Nahrát soubor klepněte na %s Piktogram pro výběr souboru jako zdrojový soubor importu ...
+ChooseFileToImport=Pro nahrání souboru klepněte na ikonku %s pro výběr souboru jako zdrojový soubor importu ...
 SourceFileFormat=Zdrojový soubor
 FieldsInSourceFile=Pole ve zdrojovém souboru
 FieldsInTargetDatabase=Cílové pole v Dolibarr databázi (tučně = povinná)
 Field=Pole
 NoFields=Žádné položky
-MoveField=Přesuňte pole %s číslo sloupce
+MoveField=Přesuňte pole na číslo sloupce %s
 ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Uložit tento import profil
-ErrorImportDuplicateProfil=Nepodařilo se uložit tento import profilu s tímto jménem. Existující profil již existuje s tímto jménem.
+SaveImportProfile=Uložit tento profil importu
+ErrorImportDuplicateProfil=Nepodařilo se uložit tento profil importu. Existující profil s tímto jménem již existuje.
 ImportSummary=Importovat nastavení shrnutí
 TablesTarget=Cílené stoly
 FieldsTarget=Cílené pole
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index b62e2abbde5..b7bdc415b96 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Dovolená
 CPTitreMenu=Dovolená
 MenuReportMonth=Měsíční výkaz
-MenuAddCP=Požádejte o dovolenou
+MenuAddCP=New leave request
 NotActiveModCP=Musíte povolit modul dovolená pro zobrazení této stránky.
 NotConfigModCP=Musíte nakonfigurovat modul dovolení pro  zobrazení této stránky. Provedete zde:, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> klikněte zde </ a>.
 NoCPforUser=Nemáte k dispozici žádné volné dny.
@@ -71,7 +71,7 @@ MotifCP=Důvod
 UserCP=Uživatel
 ErrorAddEventToUserCP=Došlo k chybě při přidávání požadavku na výjimečnou dovolenou.
 AddEventToUserOkCP=Přidání výjimečné dovolené bylo dokončeno.
-MenuLogCP=Zobrazit logy žádostí o dovolenou
+MenuLogCP=View change logs
 LogCP=Log aktualizací dostupných prázdninových dnů
 ActionByCP=Účinkují
 UserUpdateCP=Pro uživatele
@@ -93,6 +93,7 @@ ValueOptionCP=Hodnota
 GroupToValidateCP=Skupina se schopností schvalovat žádosti o dovolenou
 ConfirmConfigCP=Ověření konfigurace
 LastUpdateCP=Poslední automatická aktualizace alokace dovolených
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Aktualizováno úspěšně.
 ErrorUpdateConfCP=Došlo k chybě při aktualizaci, zkuste to prosím znovu.
 AddCPforUsers=Prosím, přidejte rovnováhu dovolené alokace uživatelům <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikněte zde</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Došlo k chybě při odesílání na e-mail:
 NoCPforMonth=Nelze opustit tento měsíc.
 nbJours=Počet dní
 TitleAdminCP=Konfigurace dovolené
+NoticePeriod=Notice period
 #Messages
 Hello=Ahoj
 HolidaysToValidate=Ověření žádosti o dovolenou
@@ -139,10 +141,11 @@ HolidaysRefused=Požadavek zamítnut
 HolidaysRefusedBody=Vaše žádost o dovolenou pro %s do %s byla zamítnuta z těchto důvodů:
 HolidaysCanceled=Zrušené požadavky na dovolenou
 HolidaysCanceledBody=Vaše žádost o dovolenou pro %s na %s byla zrušena.
-Permission20000=Přečtěte si vlastní žádosti o dovolenou
-Permission20001=Vytvořit/upravit vaše požadavky na dovolenou
-Permission20002=Vytvořit/upravit žádosti o dovolenou pro každého
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Smazat žádosti o dovolenou
-Permission20004=Uživatelské nastavení dostupné pro dovolenouy
-Permission20005=Přezkum logu žádostí modifikovaných dovolených
-Permission20006=Čtení zpráv měsíčních dovolených
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/cs_CZ/incoterm.lang b/htdocs/langs/cs_CZ/incoterm.lang
index 2396d2acb0e..2f8c22c215b 100644
--- a/htdocs/langs/cs_CZ/incoterm.lang
+++ b/htdocs/langs/cs_CZ/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Přidat funkce pro správu Incotermu
 IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
+IncotermSetupTitle1=Vlastnosti
 IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetup=Nastavení modulu Incoterm
+IncotermFunctionDesc=Aktivace Incoterm funkcí (Třetí strany, Návrh, Objednávky zákazníka, Zákaznické faktury, Přeprava, Dodavatelské objednávky)
diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
index d8ab2115f4a..c4a65838ff7 100644
--- a/htdocs/langs/cs_CZ/languages.lang
+++ b/htdocs/langs/cs_CZ/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabština
 Language_ar_SA=Arabština
+Language_bn_BD=Bengali
 Language_bg_BG=Bulharština
 Language_bs_BA=Bosenský
 Language_ca_ES=Katalánština
@@ -21,9 +22,10 @@ Language_en_SA=Angličtina (Saúdská Arábie)
 Language_en_US=Angličtina (Spojené státy)
 Language_en_ZA=Angličtina (Jižní Afrika)
 Language_es_ES=Španělština
-Language_es_DO=Španělština (Dominikánská republika)
 Language_es_AR=Španělština (Argentina)
 Language_es_CL=Španělština (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Španělština (Dominikánská republika)
 Language_es_HN=Španělština (Honduras)
 Language_es_MX=Španělština (Mexiko)
 Language_es_PY=Španělština (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonésie
 Language_is_IS=Islandština
 Language_it_IT=Italština
 Language_ja_JP=Japonsky
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korejština
+Language_lo_LA=Lao
 Language_lt_LT=Litevský
 Language_lv_LV=Lotyština
 Language_mk_MK=Makedonský
@@ -64,6 +69,7 @@ Language_sv_SV=Švédsky
 Language_sv_SE=Švédský
 Language_sq_AL=Albánština
 Language_sk_SK=Slovenština
+Language_sw_SW=Kiswahili
 Language_th_TH=Thajsko
 Language_uk_UA=Ukrajina
 Language_uz_UZ=Uzbecký
diff --git a/htdocs/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
index cc7f19037aa..a0932ee8963 100644
--- a/htdocs/langs/cs_CZ/loan.lang
+++ b/htdocs/langs/cs_CZ/loan.lang
@@ -1,53 +1,53 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-ShowLoanPayment=Show Loan Payment
-Capital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-LoanAccountancyCapitalCode=Accountancy code capital
-LoanAccountancyInsuranceCode=Accountancy code insurance
-LoanAccountancyInterestCode=Accountancy code interest
-LoanPayment=Loan payment
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
-ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
-ErrorLoanLength=Loan length has to be numeric and greater than zero.
-ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+Loan=Úvěr
+Loans=Úvěry
+NewLoan=Nový úvěr
+ShowLoan=Zobrazit úvěr
+PaymentLoan=Platba úvěru
+ShowLoanPayment=Zobrazit paltbu úvěru
+Capital=Kapitál
+Insurance=Pojištění
+Interest=Zájem
+Nbterms=Počet termínů
+LoanAccountancyCapitalCode=Kód kapitál v ůčetnictví
+LoanAccountancyInsuranceCode=Kód pojištění v účetnictví
+LoanAccountancyInterestCode=Kód zájmu v účetnictví
+LoanPayment=Platba úvěru
+ConfirmDeleteLoan=Potvrdit smazání tohoto úvěru
+LoanDeleted=Úvěr úspěšně smazán
+ConfirmPayLoan=Potvrďte klasifikaci zaplatit tento úvěr
+LoanPaid=Placený úvěr
+ErrorLoanCapital=Výše úvěru musí být číselné a větší než nula.
+ErrorLoanLength=Délka úvěru musí být číselná a větší než nula.
+ErrorLoanInterest=Roční úrok musí být číselný a větší než nula.
 # Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Length of Mortgage
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s on your house in year %s
+LoanCalc=Kalkulátor bankovního úvěru
+PurchaseFinanceInfo=Platební & finanční informace
+SalePriceOfAsset=Prodejní cena aktiv
+PercentageDown=Procento dlů
+LengthOfMortgage=Délka hypotéky
+AnnualInterestRate=Roční úroková sazba
+ExplainCalculations=Vysvětlení výpočtů
+ShowMeCalculationsAndAmortization=Ukažte mi výpočty a amortizaci
+MortgagePaymentInformation=Informace o platbě hypotéky
+DownPayment=Záloha
+DownPaymentDesc=<b>Záloha</b> = základní vynásobená procentem dolů dělená 100 (pro dolů 5% se stává 5/100 nebo 0,05)
+InterestRateDesc=<b>Úroková sazba</b> = roční úroková procena děleno 100,
+MonthlyFactorDesc=<b>Měsíční faktor</b> = výsledkem následujícího vzorce
+MonthlyInterestRateDesc=<b>Měsíční úroková sazba</b> = roční úroková sazba děleno 12 (za 12 měsíců v roce)
+MonthTermDesc=<b>Měsíc Termín</b> úvěru v měsících = počet let, na které jste vzali úvěr  - pozor na časy 12
+MonthlyPaymentDesc=Měsíční platba se počítá podle následujícího vzorce
+AmortizationPaymentDesc=<a href="#amortization">amortizace</a>se mění, jak moc vaše měsíční splátka jde vstříc zájmu banky, a kolik jde do splácení jistiny vašeho úvěru.
+AmountFinanced=Financovaná částka
+AmortizationMonthlyPaymentOverYears=Odpisy měsíční splátky: <b>%s</b> přes %s let
+Totalsforyear=Součty pro rok
+MonthlyPayment=Měsíční platby
+LoanCalcDesc=Tato <b>hypoteční kalkulačka</b> může být použita ke zjistit měsíční platby hypotečního úvěru, na základě místní prodejní ceny, termínu úvěru požadovaného, ​​kupujícího akontace procentech, a takového úvěru úrokové sazby. <br> Tato kalkulačka faktory PMI (soukromé pojištění hypotéky) u přijatých úvěrů, kde je méně než 20% dal jako zálohu. Také vzít v úvahu, jsou městské daně z nemovitostí, a jejich vliv na celkové měsíční splátky hypotéky. <br>
+GoToInterest=%s půjde na ZÁJEM
+GoToPrincipal=%s půjde na HLAVNÍCH
+YouWillSpend=Strávíte %s na vašem domě v roce %s
 # Admin
-ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
+ConfigLoan=Konfigurace modulu úvěru
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Výchozí nastavení kód kapitálu v účetnictví
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=kód úroků ve výchozím nastavení účetnictví
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Kód pojištění ve výchozím nastavení účetnictví
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index faae153984e..075b10add6d 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -29,7 +29,7 @@ DeleteAMailing=Odstranit všechny maily
 PreviewMailing=Náhled zprávy
 PrepareMailing=Připravit mail
 CreateMailing=Vytvořit mail
-MailingDesc=Tato stránka vám umožňuje posílat mail ke skupině lidí.
+MailingDesc=Tato stránka vám umožňuje posílat zprávy skupině lidí.
 MailingResult=Výsledek odeslání mailů
 TestMailing=Zkušební mail
 ValidMailing=Platné posílání e-mailů
@@ -77,7 +77,7 @@ CheckRead=Přečteno příjemcem
 YourMailUnsubcribeOK=Mailová zpráva <b>%s</b> byla správně odstraněna z mailing listu
 MailtoEMail=Odkaz na e-mail
 ActivateCheckRead= Můžete použít odkaz "Odhlásit"
-ActivateCheckReadKey=Tlačítko slouží pro šifrování URL pro využití funkce "Potvrzení o přečtení" a "Odhlášení"
+ActivateCheckReadKey=Tlačítko slouží k šifrování URL používané pro "Potvrzení o přečtení" a funkce "Odhlášení"
 EMailSentToNRecipients=Email byl odeslán na %s příjemcům.
 XTargetsAdded=<b>%s</b> příjemců přidáno do seznamu cílů
 EachInvoiceWillBeAttachedToEmail=Dokument s použitím šablony výchozí faktury dokumentu bude vytvořen a připojen k každému mailu.
@@ -128,6 +128,7 @@ TagCheckMail=Sledování mailů aktivováno
 TagUnsubscribe=Link pro odhlášení 
 TagSignature=Podpis zasílání uživateli
 TagMailtoEmail=E-mail příjemce
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Upozornění
 NoNotificationsWillBeSent=Nejsou plánovány žádná e-mailová oznámení pro tuto událost nebo společnost
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 3ccc5ccbc29..87c426be740 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Byly nalezeny nějaké chyby. Veškeré zm
 ErrorConfigParameterNotDefined=Parametr <b>%s</b> není definován v konfiguračním souboru Dolibarr <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Nepodařilo se najít uživatele <b>%s</b> v databázi Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Chyba, pro zemi '%s' nejsou definovány žádné sazby DPH.
-ErrorNoSocialContributionForSellerCountry=Chyba, žádný typ sociálních příspěvků není definován pro zemi '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Chyba, nepodařilo se uložit soubor.
 SetDate=Nastavení datumu
 SelectDate=Výběr datumu
@@ -301,8 +301,8 @@ UnitPriceHT=Jednotková cena (bez DPH)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
-AskPriceSupplierUHT=P.U. HT Požadováno
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Požadováno
+PriceUTTC=U.P. (inc. tax)
 Amount=Množství
 AmountInvoice=Fakturovaná částka
 AmountPayment=Částka platby
@@ -339,6 +339,7 @@ IncludedVAT=Včetně daně
 HT=Po odečtení daně
 TTC=Inc daň
 VAT=Daň z obratu
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Daňová sazba
@@ -413,6 +414,8 @@ Qty=Množství
 ChangedBy=Změnil
 ApprovedBy=Schváleno
 ApprovedBy2=Schváleno (druhé schválení)
+Approved=Schváleno
+Refused=Odmítnuto
 ReCalculate=Přepočítat
 ResultOk=Úspěch
 ResultKo=Selhání
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Souvisí s konkrétním uživatelem kontaktu
 DeleteAFile=Odstranění souboru
 ConfirmDeleteAFile=Jste si jisti, že chcete smazat tento soubor?
 NoResults=Žádné výsledky
+SystemTools=System tools
 ModulesSystemTools=Moduly nástrojů
 Test=Test
 Element=Prvek
@@ -703,6 +707,9 @@ ShowTransaction=Ukázat transakci
 GoIntoSetupToChangeLogo=Jděte na Domů-Nastavení-Společnost pro změnu loga, nebo je v nastavení skryjte.
 Deny=Odmítnout
 Denied=Odmítnuto
+ListOfTemplates=Seznam šablon
+Genderman=Muž
+Genderwoman=Žena
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
@@ -732,3 +739,4 @@ ShortThursday=Č
 ShortFriday=PÁ
 ShortSaturday=S
 ShortSunday=N
+SelectMailModel=Vybrat šablonu e-mailu
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index d2f00c116d8..a2f8c7220b0 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -199,7 +199,8 @@ Entreprises=Firmy
 DOLIBARRFOUNDATION_PAYMENT_FORM=Chcete-li, aby vaše předplatné platbu bankovním převodem, viz strana <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Chcete-li platit pomocí kreditní karty nebo PayPal, klikněte na tlačítko v dolní části této stránky. <br>
 ByProperties=Charakteristikami
 MembersStatisticsByProperties=Členové statistiky dle charakteristik
-MembersByNature=Členové od přírody
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Sazba DPH se má použít pro předplatné
 NoVatOnSubscription=Ne TVA za upsaný vlastní kapitál
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozornit při Dolibarr obdržíte potvrzení o ověřenou platby za předplatné
diff --git a/htdocs/langs/cs_CZ/printing.lang b/htdocs/langs/cs_CZ/printing.lang
index f0cd2a40292..590281184d4 100644
--- a/htdocs/langs/cs_CZ/printing.lang
+++ b/htdocs/langs/cs_CZ/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
+Module64000Name=Přímý tisk
+Module64000Desc=Povolit Direct Printing System
+PrintingSetup=Nastavit systém přímého tisku
+PrintingDesc=Tento modul přidá tlačítko Tisk pro odesílání dokumentů přímo na tiskárnu (bez otevření dokumentu do aplikace) s různými moduly.
+ModuleDriverSetup=Nastaevní ovladače modulu
+PrintingDriverDesc=Konfigurace proměnných pro tiskový ovladač.
+ListDrivers=Výpis ovladačů
+PrintTestDesc=Výpis tiskáren
+FileWasSentToPrinter=Soubor %s byl odeslán na tiskárnu
+NoActivePrintingModuleFound=Žádný aktivní modul pro tisk dokumentu
+PleaseSelectaDriverfromList=Prosím vyberte ovladač ze seznamu.
+SetupDriver=Nastavení ovladače
 TestDriver=Test
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
+TargetedPrinter=Cílová tiskárna
+UserConf=Nastavení pro uživatele
+PRINTGCP=Google Cloud tisk
+PrintGCPDesc=Tento ovladač umožňuje odesílat dokumenty přímo k tiskárně s Google Cloud Print.
+PrintingDriverDescprintgcp=Konfigurace proměnných pro ovladač tisku přes Google Cloud Print.
+PrintTestDescprintgcp=Seznam tiskáren pro Google Cloud Print.
+PRINTGCP_LOGIN=Přihlášení k účtu Google
+PRINTGCP_PASSWORD=Heslo k účtu Google
 STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
+STATE_UNKNOWN=Neznámý
 STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
-TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
+STATE_DORMANT=Offline na nějakou dobu
+TYPE_GOOGLE=Strejda Google
+TYPE_HP=Tiskárna HP
 TYPE_DOCS=DOCS
-TYPE_DRIVE=Google Drive
+TYPE_DRIVE=Ovladač Google
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
-PrintTestDescprintipp=List of Printers for driver PrintIPP.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
+GCP_Name=Název
+GCP_displayName=Zobrazovaný název
+GCP_Id=ID tiskárny
+GCP_OwnerName=Jméno majitele
+GCP_State=Stav tiskárny
+GCP_connectionStatus=Online stav
+GCP_Type=Typ tiskárny
+PRINTIPP=PrintIPP ovladač
+PrintIPPSetup=Nastavení modulu přímého tisku
+PrintIPPDesc=Tento ovladač umožňuje odesílat dokumenty přímo na tiskárnu. To vyžaduje systém Linux s nainstalovaným CUPS.
+PrintingDriverDescprintipp=Konfigurace proměnných pro tiskový ovladač PrintIPP.
+PrintTestDescprintipp=Výpis tiskáren pro PrintlPP
+PRINTIPP_ENABLED=Zobrazit ikonu "Přímý tisk" v seznamech dokumentů
+PRINTIPP_HOST=Tiskový server
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+PRINTIPP_USER=Přihlášení
+PRINTIPP_PASSWORD=Heslo
+NoPrinterFound=Nebyly nalezeny žádné tiskárny (zkontrolovat nastavení CUPS)
+NoDefaultPrinterDefined=Není definovaná žádná výchozí tiskárna
+DefaultPrinter=Výchozí tiskárna
+Printer=Tiskárna
+CupsServer=CUPS server
+IPP_Uri=Uri tiskárny
+IPP_Name=Název tiskárny
+IPP_State=Status tiskárny
+IPP_State_reason=Důvod statusu
+IPP_State_reason1=Důvod statusu1
 IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
+IPP_Color=Barva
+IPP_Device=Zařízení
+IPP_Media=Tisková média
+IPP_Supported=Typ médií
 STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
+STATE_IPP_stopped=Zastaveno
+STATE_IPP_paused=Pauza
+STATE_IPP_toner-low-report=Málo toneru
 STATE_IPP_none=None
-MEDIA_IPP_stationery=Stationery
+MEDIA_IPP_stationery=Zásobník
 MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+IPP_COLOR_print-black=BW tiskárna
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 956df5e0b97..6655cfb0665 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produkt nebo služba
 ProductsAndServices=Produkty a služby
 ProductsOrServices=Výrobky nebo služby
 ProductsAndServicesOnSell=Produkty a služby na prodej nebo k nákupu
-ProductsAndServicesNotOnSell=Produkty a služby z prodeje
+ProductsAndServicesNotOnSell=Produkty a služby, které nejsou na prodej
 ProductsAndServicesStatistics=Statistiky produktů a služeb
 ProductsStatistics=Statistiky produktů
 ProductsOnSell=Produkt k prodeji nebo k nákupu
-ProductsNotOnSell=Produkty vyřazené z prodeje nebo nákupu
+ProductsNotOnSell=Výrobek není k prodeji a není pro nákup
 ProductsOnSellAndOnBuy=Produkty pro prodej a pro nákup
 ServicesOnSell=Služby k prodeji nebo k nákupu
-ServicesNotOnSell=Služby vyřazené z prodeje
+ServicesNotOnSell=Služby, které nejsou na prodej
 ServicesOnSellAndOnBuy=Služby pro prodej a pro nákup
 InternalRef=Interní referenční číslo
 LastRecorded=Poslední produkty/služby vložené do prodeje
@@ -71,21 +71,21 @@ SellingPriceTTC=Prodejní cena (vč. DPH)
 PublicPrice=Veřejná cena
 CurrentPrice=Aktuální cena
 NewPrice=Nová cena
-MinPrice=Minimální cena
+MinPrice=Min. prodejní cena
 MinPriceHT=Minimální prodejní cena (bez daně)
 MinPriceTTC=Minimální prodejní cena (vč. daně)
 CantBeLessThanMinPrice=Prodejní cena nesmí být nižší než minimální povolená pro tento produkt (%s bez daně). Toto hlášení se může také zobrazí, pokud zadáte příliš důležitou slevu.
 ContractStatus=Stav smlouvy
 ContractStatusClosed=Zavřeno
-ContractStatusRunning=Běh
+ContractStatusRunning=Pokračující
 ContractStatusExpired=vypršela
-ContractStatusOnHold=Neběží
-ContractStatusToRun=V chodu
-ContractNotRunning=Tato smlouva není v chodu
+ContractStatusOnHold=Pozdržen
+ContractStatusToRun=Pokračovat
+ContractNotRunning=Tato smlouva není pokračující
 ErrorProductAlreadyExists=Výrobek s referenčním %s již existuje.
 ErrorProductBadRefOrLabel=Chybná hodnota pro reference nebo etikety.
 ErrorProductClone=Vyskytl se problém při pokusu o kopírování produktu nebo služby.
-ErrorPriceCantBeLowerThanMinPrice=Chyba: Cena nemůže být nižší než minimální cena.
+ErrorPriceCantBeLowerThanMinPrice=Chyba, cena nesmí být nižší než minimální cena.
 Suppliers=Dodavatelé
 SupplierRef=Dodavatele produktů čj.
 ShowProduct=Zobrazit produkt
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobek službou s omezeným trváním:
 MultiPricesAbility=Několik úrovní cen za produkt/službu
 MultiPricesNumPrices=Počet cen
 MultiPriceLevelsName=Cenová kategorie
-AssociatedProductsAbility=Aktivace funkce virtuálního balíku
+AssociatedProductsAbility=Aktivovat balíček funkcí
 AssociatedProducts=Balení produktu
-AssociatedProductsNumber=Počet výrobků tvořících tento virtuální produktový balíček
+AssociatedProductsNumber=Počet výrobků tvořících tento produktový balíček
 ParentProductsNumber=Počet výchozích balení výrobku
-IfZeroItIsNotAVirtualProduct=Pokud je hodnota 0, tento produkt není virtuální produktový balíček
-IfZeroItIsNotUsedByVirtualProduct=Pokud je hodnota 0, tento produkt není použit pro žádný virtuální produktový balíček
+IfZeroItIsNotAVirtualProduct=Pokud je hodnota 0, tento produkt není produktový balíček
+IfZeroItIsNotUsedByVirtualProduct=Pokud je hodnota 0, tento produkt není použit pro žádný produktový balíček
 EditAssociate=Asociovat
 Translation=Překlad
 KeywordFilter=Filtr klíčového slova
@@ -131,7 +131,7 @@ ProductToAddSearch=Hledat produkt pro přidání
 AddDel=Přidat/Smazat
 Quantity=Množství
 NoMatchFound=Shoda nenalezena
-ProductAssociationList=Seznam souvisejících produktů/služeb: název produktu/služby (ovlivněno množstvím)
+ProductAssociationList=Seznam produktů/služeb, které jsou součástí tohoto virtuálního produktu/balíčku
 ProductParentList=Seznam balení produktů/služeb s tímto produktem jako součást
 ErrorAssociationIsFatherOfThis=Jedním z vybraného produktu je rodič s aktuálním produktem
 DeleteProduct=Odstranění produktu/služby
@@ -182,13 +182,38 @@ ClonePricesProduct=Kopírovat hlavní informace a ceny
 CloneCompositionProduct=Kopírování balení zboží/služby
 ProductIsUsed=Tento produkt se používá
 NewRefForClone=Ref. nového produktu/služby
-CustomerPrices=Prodejní ceny
-SuppliersPrices=Dodavatelská cena
+CustomerPrices=Zákaznické ceny
+SuppliersPrices=Dodavatelské ceny
 SuppliersPricesOfProductsOrServices=Dodavatelské ceny (výrobků či služeb)
 CustomCode=Zákaznický kód
 CountryOrigin=Země původu
 HiddenIntoCombo=Skryté do vybraných seznamů
 Nature=Příroda
+ShortLabel=Krátký štítek
+Unit=Jednotka
+p=u.
+set=sada
+se=sada
+second=druhý
+s=s
+hour=hodina
+h=h
+day=den
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=metr
+m=m
+linear metr = lineární metr
+lm=lm
+square metr = metr čtvereční
+m2=m²
+cubic metr = metr krychlový
+m3=m³
+liter=litr
+l=L
 ProductCodeModel=Ref šablona produktu
 ServiceCodeModel=Ref šablona služby
 AddThisProductCard=Vytvořte kartu produktu
@@ -237,7 +262,7 @@ ResetBarcodeForAllRecords=Definovat hodnotu čárového kódu pro všechny zázn
 PriceByCustomer=Různé ceny pro každého zákazníka
 PriceCatalogue=Unikátní cena pro produkt/službu
 PricingRule=Pravidla pro zákaznických ceny
-AddCustomerPrice=Přidejte cenu pro zákazníky
+AddCustomerPrice=Přidejte cenu pro zákazníka
 ForceUpdateChildPriceSoc=Nastavit stejné ceny pro dceřiné společnosti zákazníka
 PriceByCustomerLog=Cena dle protokolu zákazníka
 MinimumPriceLimit=Minimální cena nesmí být nižší než %s
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=formát je:  {"URL": "http://example.com/urlofw
 UpdateInterval=Interval aktualizace (minuty)
 LastUpdated=Naposledy aktualizováno
 CorrectlyUpdated=Správně aktualizováno
+PropalMergePdfProductActualFile=Soubory používají k přidání do PDF Azur template are/is
+PropalMergePdfProductChooseFile=Vyberte soubory PDF
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 3d294c18fb3..5c3745b9301 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Tento pohled zobrazuje všechny projekty které máte oprávn
 ProjectsPublicTaskDesc=Tento pohled představuje všechny projekty a úkoly, které mají povoleno číst.
 ProjectsDesc=Tento pohled zobrazuje všechny projekty (vaše uživatelské oprávnění vám umožňuje vidět vše).
 MyTasksDesc=Tento pohled je omezen na projekty či úkoly u kterých jste uveden jako kontakt (jakéhokoliv typu)
-OnlyOpenedProject=Pouze otevřené projekty jsou viditelné (projekty s návrhem nebo uzavřeným stavem nejsou viditelné).
+OnlyOpenedProject=Pouze otevřené projekty jsou viditelné (projekty v návrhu ani v uzavřeném stavu nejsou viditelné).
 TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte oprávnění číst.
 TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské oprávnění vám umožňuje vidět vše).
-AllTaskVisibleButEditIfYouAreAssigned=Všechny úkoly takového projektu jsou viditelné, ale můžete zadat čas pouze k přiřazenému úkolu.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projekty
 NewProject=Nový projekt
 AddProject=Vytvořit projekt
@@ -41,7 +42,7 @@ TaskTimeSpent=Čas strávený na úkolech
 TaskTimeUser=Uživatel
 TaskTimeNote=Poznámka
 TaskTimeDate=Datum
-TasksOnOpenedProject=Úkoly otevřených projektů
+TasksOnOpenedProject=Úkoly na otevřených projektech
 WorkloadNotDefined=Pracovní zátěž není definována
 NewTimeSpent=Nový strávený čas
 MyTimeSpent=Můj strávený čas
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Seznam zákroků spojených s projektem
 ListExpenseReportsAssociatedProject=Seznam vyúčtování výdajů souvisejících s projektem
 ListDonationsAssociatedProject=Seznam darů spojených s projektem
 ListActionsAssociatedProject=Seznam událostí spojených s projektem
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Týdenní projektová aktivita
 ActivityOnProjectThisMonth=Měsíční projektová aktivita
 ActivityOnProjectThisYear=Roční projektová aktivita
@@ -139,8 +142,15 @@ ProjectReferers=Odkazující objekty
 SearchAProject=Hledat projekt
 ProjectMustBeValidatedFirst=Projekt musí být nejdříve ověřen
 ProjectDraft=Návrhy projektů
-FirstAddRessourceToAllocateTime=Přiřadit zdroje k  vyčlenění času
+FirstAddRessourceToAllocateTime=Přiřadit zdroj k vyčlenění času
 InputPerDay=Vstup za den
 InputPerWeek=Vstup za týden
 InputPerAction=Vstup za akci
 TimeAlreadyRecorded=Strávený čas již zaznamenána pro tento úkol/den a uživatele %s
+ProjectsWithThisUserAsContact=Projekty s tímto uživatelem jako kontakt
+TasksWithThisUserAsContact=Úkoly přidělené tomuto uživateli
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index 8e3208a9d73..6eaac8c378b 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Ukázat platbu mzdy
 THM=Průměrná hodinová mzda
 TJM=Průměrná denní cena
 CurrentSalary=Současná mzda
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
index 2a6e6a5be57..91df57b9656 100644
--- a/htdocs/langs/cs_CZ/trips.lang
+++ b/htdocs/langs/cs_CZ/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Zprávy výdajů
 TripsAndExpensesStatistics=Statistiky výdaje
 TripCard=Karta zpráv výdajů
 AddTrip=Vytvoření zprávy o výdajích
-ListOfTrips=Seznam zpráv výdajů
+ListOfTrips=Seznam vyúčtování výdajů
 ListOfFees=Sazebník poplatků
 NewTrip=Nová zpráva výdaje
 CompanyVisited=Firma/nadace navštívena
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Informovat osobu o schválení.
 TripSociete=Informace o firmě
 TripSalarie=Informace o uživateli
 TripNDF=Informace o správě nákladů
-DeleteLine=Vymazat Ligne výdajovou zprávu
+DeleteLine=Odstranění řádku zprávy výdajů
 ConfirmDeleteLine=Jste si jisti, že chcete smazat tento řádek?
 PDFStandardExpenseReports=Standardní šablona pro vytvoření PDF dokumentu pro zprávy o výdajích
 ExpenseReportLine=Výdajová zpráva řádek
@@ -40,11 +40,10 @@ TF_BUS=Autobus
 TF_CAR=Auto
 TF_PEAGE=Mýto
 TF_ESSENCE=Palivo
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Deklaroval jste další hlášení výdajů do podobného časového období.
-ListTripsAndExpenses=Seznam vyúčtování výdajů
 AucuneNDF=Žádné zprávy o výdajích nalezených podle tohoto kritéria
 AucuneLigne=Neexistuje žádná zpráva o právě deklarovaném výdaji
 AddLine=Přidat řádek
@@ -56,12 +55,12 @@ ModePaiement=Režim platby
 Note=poznámka
 Project=Projekt
 
-VALIDATOR=Uživatel informoval o kolaudaci
+VALIDATOR=Uživatel odpovídá za schválení
 VALIDOR=Schváleno
 AUTHOR=Zaznamenáno
 AUTHORPAIEMENT=Placeno
 REFUSEUR=Zamítnuto
-CANCEL_USER=Zrušeno
+CANCEL_USER=Smazáno
 
 MOTIF_REFUS=Důvod
 MOTIF_CANCEL=Důvod
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Datum platby
 
 TO_PAID=Platba
 BROUILLONNER=Znovu otevřeno
-SendToValid=Odesláno ke schválení
+SendToValid=Odesláno na schválení
 ModifyInfoGen=Úprava
 ValidateAndSubmit=Kontrola a odeslání schválení
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Nemáte dovoleno schvalovat tuto zprávu o výdajích
 NOT_AUTHOR=Nejste autorem této zprávy výdajů. Operace zrušena.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Jste si jisti, že chcete změnit stav této zprávy výdajů na
 CancelTrip=Zrušit zprávu o výdajích
 ConfirmCancelTrip=Jste si jisti, že chcete zrušit tuto zprávu o výdajích?
 
-BrouillonnerTrip=Přesun zpět zprávu o výdajích do stavu "Koncept" n
+BrouillonnerTrip=Návrat výdajových zpráv do stavu "Koncept"
 ConfirmBrouillonnerTrip=Jste si jisti, že chcete přesunout tuto zprávu o výdajích na status "Koncept"?
 
 SaveTrip=Ověřit zprávu o výdajích
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index bde2e649dca..f1efca9a101 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Odstranit ze skupiny
 PasswordChangedAndSentTo=Heslo změněno a poslán na <b>%s.</b>
 PasswordChangeRequestSent=Žádost o změnu hesla <b>%s</b> zaslána na <b>%s.</b>
 MenuUsersAndGroups=Uživatelé a skupiny
+MenuMyUserCard=My user card
 LastGroupsCreated=Posledních %s vytvořených skupin
 LastUsersCreated=Posledních %s vytvořených uživatelů
 ShowGroup=Zobrazit skupinu
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 86dbd7bcc57..423159c827b 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Soubor výběru
 SetToStatusSent=Nastavte na stav "Odeslaný soubor"
 ThisWillAlsoAddPaymentOnInvoice=To se bude vztahovat i platby faktur a bude klasifikováno jako "Placeno"
 StatisticsByLineStatus=Statistika podle stavu řádků
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Platba trvalého příkazu %s bankou
diff --git a/htdocs/langs/cs_CZ/workflow.lang b/htdocs/langs/cs_CZ/workflow.lang
index c91127aff4f..7b72e004eda 100644
--- a/htdocs/langs/cs_CZ/workflow.lang
+++ b/htdocs/langs/cs_CZ/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Nastavení workflow modulu
 WorkflowDesc=Tento modul je určen k úpravě chování automatických akcí, v aplikaci. Ve výchozím nastavení workflow je otevřen (uděláte něco, co chcete). Můžete aktivovat automatické akce, které jsou zajímavé.
-ThereIsNoWorkflowToModify=Workflow zde není nastaven, můžete upravit modul pokud ho chcete aktivovat.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Vytvoření objednávky zákazníka automaticky po podepsání komerčního návrhu
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Vytvoření zákaznické faktury automaticky po podepsání komerčního návrhu
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Vytvoření zákaznické faktury automaticky po schválení kontraktu
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Vytvoření zákaznické faktury automaticky po uzavření objednávky zákazníka
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically Vytvoření zákaznické faktury po podepsání komerčního návrhu
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically Vytvoření zákaznické faktury  po schválení kontraktu
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically Vytvoření zákaznické faktury  po uzavření objednávky zákazníka
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označit propojený zdrojový návrh jako zaúčtovaný, když je objednávka zákazníka nastavena jako placená
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označit propojenou zdrojovou objednávku zákazníka(ů) jako zaúčtované, když jsou zákaznické faktury nastaveny jako placené
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označit propojenou zdrojovou objednávku zákazníka(ů) jako zaúčtovanou, když je ověřená zákaznická faktura
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 65d6fad2389..8b51a014b7a 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Regnskab
 Globalparameters=Globale parametre
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Længde af de tredjeparts-konti
 
 ACCOUNTING_SELL_JOURNAL=Salgskladde
 ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde
-ACCOUNTING_BANK_JOURNAL=Bankkladde
-ACCOUNTING_CASH_JOURNAL=Kontantkladde
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diversekladde
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Socialkladde
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto overførsel
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 1d4269faf05..56196921833 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for brugere
 LangFile=Fil. Lang
 System=System
 SystemInfo=System information
-SystemTools=Systemværktøjer
 SystemToolsArea=Systemværktøjer område
 SystemToolsAreaDesc=Dette område giver administration funktioner. Brug menuen til at vælge den funktion, du leder efter.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Sikkerhed
 Passwords=Passwords
 DoNotStoreClearPassword=Må ikke gemme adgangskoder i klar i databasen
 MainDbPasswordFileConfEncrypted=Database adgangskode krypteres i conf.php
-InstrucToEncodePass=For at få password kodet ind i <b>conf.php</b> fil, erstatte linjen <br> <b>$ Dolibarr_main_db_pass ="..."</b> <br> af <br> <b>$ Dolibarr_main_db_pass = "krypteret: %s"</b>
-InstrucToClearPass=For at få afkodet password (klar) i <b>conf.php</b> fil, erstatte linjen <br> <b>$ Dolibarr_main_db_pass = "krypteret :..."</b> <br> af <br> <b>$ Dolibarr_main_db_pass = "%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Beskyttelse af genereret pdf-filer (ikke recommandd, pauser masse pdf generation)
 ProtectAndEncryptPdfFilesDesc=Beskyttelse af et PDF-dokument holder den til rådighed for at læse og udskrive med alle PDF browser. Men, redigering og kopiering er ikke muligt længere. Bemærk, at du bruger denne funktion gør opbygningen af et globalt kumulerede pdf virker ikke (som ubetalte fakturaer).
 Feature=Funktion
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Det er opsætningen til processen:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Trin %s
 FindPackageFromWebSite=Find en pakke, der giver funktion, du ønsker (for eksempel på web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Installer er færdig og Dolibarr er klar til brug med denne nye komponent.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr aktuelle version
 CallUpdatePage=Gå til den side, der opdaterer database struktur og oplysningerne %s.
 LastStableVersion=Seneste stabile version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Forslag
 Module20Desc=Kommerciel forslag 'ledelse
 Module22Name=E-mails
 Module22Desc=E-mails' ledelse
-Module23Name= Energi
-Module23Desc= Overvågning af forbruget af energi
+Module23Name=Energi
+Module23Desc=Overvågning af forbruget af energi
 Module25Name=Kunden Ordrer
 Module25Desc=Kunden ordrer 'ledelse
 Module30Name=Fakturaer
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Adviséringer
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donationer
 Module700Desc=Gaver 'ledelse
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Handlinger / opgaver og dagsorden forvaltning
 Module2500Name=Elektronisk Content Management
 Module2500Desc=Gemme og dele dokumenter
-Module2600Name=WebServices
-Module2600Desc=Aktiver Dolibarr webtjenester server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Opret / ændre produkter / ydelser
 Permission34=Slet produkter / ydelser
 Permission36=Eksportere produkter / ydelser
 Permission38=Eksportere produkter
-Permission41=Læs projekter og opgaver
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Opret / ændre projekter, redigere opgaver for mine projekter
 Permission44=Slet projekter
 Permission61=Læs interventioner
@@ -599,10 +600,10 @@ Permission86=Send kundernes ordrer
 Permission87=Luk kunderne ordrer
 Permission88=Annuller kundernes ordrer
 Permission89=Slet kundernes ordrer
-Permission91=Læs sociale bidrag og moms
-Permission92=Opret / ændre sociale bidrag og moms
-Permission93=Slet sociale bidrag og moms
-Permission94=Eksporter sociale bidrag
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Læs rapporter
 Permission101=Læs sendings
 Permission102=Opret / ændre sendings
@@ -620,9 +621,9 @@ Permission121=Læs tredjemand knyttet til brugerens
 Permission122=Opret / ændre tredjemand knyttet til brugerens
 Permission125=Slet tredjemand knyttet til brugerens
 Permission126=Eksporter tredjemand
-Permission141=Læs opgaver
-Permission142=Opret / ændre opgaver
-Permission144=Slet opgaver
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Læs udbydere
 Permission147=Læs statistikinterval
 Permission151=Læs stående ordrer
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=E-mail skabeloner
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=By
 CompanyCountry=Land
 CompanyCurrency=Main valuta
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Vis ikke
 DoNotSuggestPaymentMode=Ikke tyder
 NoActiveBankAccountDefined=Nr. aktiv bankkonto defineret
 OwnerOfBankAccount=Ejer af bankkonto %s
 BankModuleNotActive=Bankkonti modul er ikke aktiveret
-ShowBugTrackLink=Vis linket "Fejlmeld"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "arbejdsbord" på hjemmeside
 Alerts=Indberetninger
 Delays=Forsinkelser
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimaler for enhedspriser
 MAIN_MAX_DECIMALS_TOT=Max decimaler for total priser
 MAIN_MAX_DECIMALS_SHOWN=Max decimaler for priser vises på skærmen (Tilføj <b>...</b> efter dette nummer, hvis du vil se <b>...,</b> når nummeret er afkortet, når der vises på skærmen)
 MAIN_DISABLE_PDF_COMPRESSION=Brug PDF-komprimering for genereret PDF filer.
-MAIN_ROUNDING_RULE_TOT= Størrelse på afrunding række (for sjældne lande, hvor afrunding sker på noget andet end base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net enhedsprisen på en vare
 TotalPriceAfterRounding=Samlet pris (net / beholder / incl moms) efter afrunding
 ParameterActiveForNextInputOnly=Parameter effektive for næste input kun
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=Max
 ConfirmDeleteProductLineAbility=Bekræftelse af fjernelse af en linje producerer i former
 ModifyProductDescAbility=Tilpasning af beskrivelser produceret i former
 ViewProductDescInFormAbility=Visualisering af Varebeskrivelserne i de former (ellers som popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualisering af produkter beskrivelser i thirdparty sprog
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default stregkode type bruge til produkter
 SetDefaultBarcodeTypeThirdParties=Default stregkode type bruge til tredjemand
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode typeidentifikationsmærker UPC
 BarcodeDescISBN=Barcode typeidentifikationsmærker ISBN
 BarcodeDescC39=Barcode af type C39
 BarcodeDescC128=Barcode af type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Er du sikker på du vil slette menuen <b>indrejse %s?</b>
 DeleteLine=Slet linie
 ConfirmDeleteLine=Er du sikker på du vil slette denne linje?
 ##### Tax #####
-TaxSetup=Skatter, sociale bidrag og udbytte modul opsætning
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Mulighed d'exigibilit de TVA
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices modul opsætning
 WebServicesDesc=Ved at aktivere dette modul Dolibarr blive en web service-server til at give diverse web-tjenester.
 WSDLCanBeDownloadedHere=WSDL deskriptor sagsakter forudsat serviceses kan downloade det her
 EndPointIs=SOAP klienter skal sende deres ansøgninger til Dolibarr endpoint tilgængelig på webadressen
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank modul opsætning
 FreeLegalTextOnChequeReceipts=Fri tekst på check kvitteringer
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project modul opsætning
 ProjectsModelModule=Projekt rapport dokument model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index 66276978bdf..1ecafba1fe6 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestil %s godkendt
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Bestil %s gå tilbage til udkast til status
-OrderCanceledInDolibarr=Bestil %s annulleret
 ProposalSentByEMail=Kommercielle forslag %s sendt via e-mail
 OrderSentByEMail=Kunde ordre %s sendt via e-mail
 InvoiceSentByEMail=Kundefaktura %s sendt via e-mail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 38da46493aa..1686a558eb5 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Forlige
 Conciliation=Forligsudvalget
 ConciliationForAccount=Forlige denne konto
 IncludeClosedAccount=Medtag lukkede konti
-OnlyOpenedAccount=Kun åbnet konti
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Hensyn til kredit
 AccountToDebit=Hensyn til at debitere
 DisableConciliation=Deaktiver forlig kendetegn for denne konto
 ConciliationDisabled=Forligsudvalget funktionen slået
-StatusAccountOpened=Åbnet
+StatusAccountOpened=Open
 StatusAccountClosed=Lukket
 AccountIdShort=Antal
 EditBankRecord=Rediger record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Kundens betaling
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Leverandør betaling
 WithdrawalPayment=Tilbagetrækning betaling
-SocialContributionPayment=Sociale bidrag betaling
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Finansiel konto tidsskrift
 BankTransfer=Bankoverførsel
 BankTransfers=Bankoverførsler
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 25e0c915ce1..b446ff7bef9 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb af fakturaer
 NumberOfBillsByMonth=Nb af fakturaer efter måned
 AmountOfBills=Mængden af fakturaer
 AmountOfBillsByMonthHT=Mængden af ​​fakturaer efter måned (efter skat)
-ShowSocialContribution=Vis sociale bidrag
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Vis faktura
 ShowInvoice=Vis faktura
 ShowInvoiceReplace=Vis erstatning faktura
@@ -270,7 +270,7 @@ BillAddress=Bill adresse
 HelpEscompte=Denne rabat er en rabat, der ydes til kunden, fordi dens paiement blev foretaget før sigt.
 HelpAbandonBadCustomer=Dette beløb er blevet opgivet (kunde siges at være en dårlig kunde) og betragtes som en exceptionnal løs.
 HelpAbandonOther=Dette beløb er blevet opgivet, da det var en fejl (forkert kunde eller faktura erstattes af en anden for eksempel)
-IdSocialContribution=Sociale bidrag id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Betaling id
 InvoiceId=Faktura id
 InvoiceRef=Faktura ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Omgående
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index 04ef669a9b5..d691ac93ec4 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Seneste kontrakter
 BoxLastContacts=Sidste kontakter / adresser
 BoxLastMembers=Nyeste medlemmer
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Omsætning
 BoxTotalUnpaidCustomerBills=Total ubetalte kundens fakturaer
 BoxTotalUnpaidSuppliersBills=Total ubetalte leverandørens fakturaer
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Omsætning
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index caa830e7065..4829ef21034 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b> %s</b> blev tilføjet med succes.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Ingen
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denne kategori allerede findes på samme sted
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Indholdet ikke er synligt fra alle
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / prosp. kategorier
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index dcf77ba4f56..06d8a91d905 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Tredjepart kontakt
 StatusContactValidated=Status for kontakt
 Company=Firma
 CompanyName=Firmanavn
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Selskaber
 CountryIsInEEC=Landet er inde i Det Europæiske Økonomiske Fællesskab
 ThirdPartyName=Tredjeparts navn
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolut rabatter til rådighed
 DiscountNone=Ingen
 Supplier=Leverandør
 CompanyList=Selskabernes liste
-AddContact=Tilføj kontakt
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Rediger kontakt / adresse
 EditContactAddress=Edit contact/address
 Contact=Kontakt
@@ -268,8 +269,8 @@ ContactsAddresses=Kontakt / Adresser
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=Ingen kontakt er defineret for denne tredjepart
 DefaultContact=Default kontakt
-AddCompany=Tilføj virksomhed
-AddThirdParty=Tilføj tredjepart
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Slet et selskab
 PersonalInformations=Personoplysninger
 AccountancyCode=Regnskabsmæssig kode
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Leverings adresse etiket
 DeleteDeliveryAddress=Slet en leverings adresse
 ConfirmDeleteDeliveryAddress=Er du sikker på du vil slette denne levering adresse?
 NewDeliveryAddress=Ny leveringsadresse
-AddDeliveryAddress=Tilføj adresse
-AddAddress=Tilføj adresse
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=Ingen alternativ leveringsadresse defineret
 SupplierCategory=Leverandør kategori
 JuridicalStatus200=Uafhængige
@@ -410,5 +411,10 @@ OutstandingBillReached=Maks. for udstående fakturaer er nået
 MonkeyNumRefModelDesc=Retur værdi med format %syymm-nnnn for kunde-kode og %syymm-nnnn for leverandøren kode hvor yy er årstal, MM er måneden og nnnn er en sekvens uden mellemrum og ikke vende tilbage til 0.
 LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til enhver tid ændres.
 ManagingDirectors=Leder(e) navne (CEO, direktør, chef...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 81fbbbf7872..1508bdc2e0f 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Moms indsamlet
 ToPay=At betale
 ToGet=For at komme tilbage
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Skat, sociale bidrag og udbytte område
-SocialContribution=Sociale bidrag
-SocialContributions=Sociale bidrag
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Skatter og udbytter
 MenuSalaries=Salaries
-MenuSocialContributions=Sociale bidrag
-MenuNewSocialContribution=Nye bidrag
-NewSocialContribution=Nye sociale bidrag
-ContributionsToPay=Bidrag til at betale
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Regnskabsmæssig / Treasury område
 AccountancySetup=Regnskabsmæssig setup
 NewPayment=Ny betaling
 Payments=Betalinger
 PaymentCustomerInvoice=Kunden faktura betaling
 PaymentSupplierInvoice=Leverandør faktura betaling
-PaymentSocialContribution=Sociale bidrag betaling
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Moms betaling
 PaymentSalary=Salary payment
 ListPayment=Liste over betalinger
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Moms Betaling
 VATPayments=Momsbetalinger
-SocialContributionsPayments=Sociale bidrag betalinger
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Vis momsbetaling
 TotalToPay=I alt at betale
 TotalVATReceived=Total moms modtaget
@@ -116,11 +116,11 @@ NewCheckDepositOn=Ny tjekke depositum på konto: %s
 NoWaitingChecks=Nr. kontrol venter for indskudsgarantiordninger.
 DateChequeReceived=Check modtagelse input dato
 NbOfCheques=Nb af checks
-PaySocialContribution=Betale sociale bidrag
-ConfirmPaySocialContribution=Er du sikker på at du vil klassificere denne sociale bidrag, som betales?
-DeleteSocialContribution=Slet et socialt bidrag
-ConfirmDeleteSocialContribution=Er du sikker på du vil slette denne sociale bidrag?
-ExportDataset_tax_1=Sociale bidrag og betalinger
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Kalkulations mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index 9c968794352..6698ff840ac 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -4,10 +4,10 @@ About = Om
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Startdato
 CronDtEnd=Slutdato
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metode
 CronModule=Modul
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parametre
 CronSaveSucess=Save succesfully
 CronNote=Kommentar
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index ee1788e025c..86699378ce1 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Søg på objektet
 ECMSectionOfDocuments=Abonnentfortegnelser af dokumenter
 ECMTypeManual=Manual
 ECMTypeAuto=Automatisk
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumenter knyttet til tredjemand
 ECMDocsByProposals=Dokumenter knyttet til forslag
 ECMDocsByOrders=Dokumenter knyttet til kundernes ordrer
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 5714851a089..104116a89be 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index ad2a6324a0f..2576a6637d7 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Årsag
 UserCP=Bruger
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Værdi
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/da_DK/incoterm.lang b/htdocs/langs/da_DK/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/da_DK/incoterm.lang
+++ b/htdocs/langs/da_DK/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index d265352dc80..df4504587f9 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database - SuperUser adgang
 CheckToCreateDatabase=Afkrydsningsfelt, hvis databasen ikke eksisterer og skal være oprettet. <br> I dette tilfælde skal du udfylde login / password for SuperUser konto nederst på denne side.
 CheckToCreateUser=Afkrydsningsfelt, hvis login ikke eksisterer og skal være oprettet. <br> I dette tilfælde skal du udfylde login / password for SuperUser konto nederst på denne side.
 Experimental=(eksperimentel, ikke operationelle)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Log ind på den bruger lov til at oprette nye databaser eller nye brugere, ubrugelige, hvis din database og din database login findes allerede (ligesom når du er vært ved en web hosting provider).
 KeepEmptyIfNoPassword=Efterlad tom, hvis brugeren ikke har nogen adgangskode (undgå dette)
 SaveConfigurationFile=Gem værdier
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index a36180be01b..35d18e78446 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabisk
 Language_ar_SA=Arabisk
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarsk
 Language_bs_BA=Bosnisk
 Language_ca_ES=Catalansk
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi-Arabien)
 Language_en_US=Engelsk (USA)
 Language_en_ZA=Engelsk (Sydafrika)
 Language_es_ES=Spansk
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spansk (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spansk (Honduras)
 Language_es_MX=Spansk (Mexico)
 Language_es_PY=Spansk (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Islandsk
 Language_it_IT=Italiensk
 Language_ja_JP=Japansk
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Litauisk
 Language_lv_LV=Lettisk
 Language_mk_MK=Makedonsk
@@ -64,6 +69,7 @@ Language_sv_SV=Svensk
 Language_sv_SE=Svensk
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakisk
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainsk
 Language_uz_UZ=Usbekisk
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 507d8277dc7..533859bbd8c 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Adviséringer
 NoNotificationsWillBeSent=Ingen e-mail-meddelelser er planlagt for denne begivenhed, og selskabet
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 8d3150d5138..391b505df6c 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Nogle fejl blev fundet. Vi rollback ændri
 ErrorConfigParameterNotDefined=<b>Parameter %s</b> er ikke defineret inde Dolibarr konfigurationsfil <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Kunne ikke finde <b>bruger %s</b> i Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Fejl, der ikke momssatser defineret for land ' %s'.
-ErrorNoSocialContributionForSellerCountry=Fejl, ingen social bidrag type der er defineret for landets %s '.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Fejl, kunne ikke gemme filen.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Enhedspris (netto)
 UnitPriceTTC=Enhedspris
 PriceU=UP
 PriceUHT=UP (netto)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Mængde
 AmountInvoice=Fakturabeløbet
 AmountPayment=Indbetalingsbeløb
@@ -339,6 +339,7 @@ IncludedVAT=Inkluderet moms
 HT=Efter skat
 TTC=Inc. moms
 VAT=Moms
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Momssats
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Ændret ved
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Genberegn
 ResultOk=Succes
 ResultKo=Fejl
@@ -421,7 +424,7 @@ Reportings=Rapportering
 Draft=Udkast
 Drafts=Drafts
 Validated=Valideret
-Opened=Åbnet
+Opened=Open
 New=Ny
 Discount=Discount
 Unknown=Ukendt
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked til en bestemt bruger kontakt
 DeleteAFile=Slet en fil
 ConfirmDeleteAFile=Er du sikker du vil slette filen
 NoResults=Ingen resultater
+SystemTools=System tools
 ModulesSystemTools=Modul værktøjer
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index c0a8555be79..22a07cad51c 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -199,7 +199,8 @@ Entreprises=Virksomheder
 DOLIBARRFOUNDATION_PAYMENT_FORM=For at gøre dit abonnement betaling med en bankoverførsel, se side <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> At betale med kreditkort eller Paypal, klik på knappen nederst på denne side. <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index 472e2f51115..8ce95ff0690 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Leverandør orden
 SuppliersOrders=Suppliers' ordrer
 SuppliersOrdersRunning=Nuværende leverandører ordrer
 CustomerOrder=Kunden for
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Nuværende kundernes ordrer
-CustomersOrdersAndOrdersLines=Kundens ordrer og kendelser 'linjer
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Leverandørens ordre om at behandle
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Annulleret
 StatusOrderDraftShort=Udkast
 StatusOrderValidatedShort=Valideret
@@ -75,8 +75,9 @@ AddToMyOrders=Føj til mine ordrer
 AddToOtherOrders=Føj til andre ordrer
 AddToDraftOrders=Add to draft order
 ShowOrder=Vis for
-NoOpenedOrders=Nr. åbnet ordrer
-NoOtherOpenedOrders=Ingen andre åbnet ordrer
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Andre kendelser
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index b2bf7fc9c7c..9b12e35bd06 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Valider intervention
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Valider regningen
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverandør for godkendt
 Notify_ORDER_SUPPLIER_REFUSE=Leverandør For nægtes
 Notify_ORDER_VALIDATE=Kundeordre valideret
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Tilføj post i kalenderen %s
diff --git a/htdocs/langs/da_DK/printing.lang b/htdocs/langs/da_DK/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/da_DK/printing.lang
+++ b/htdocs/langs/da_DK/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index d87ebdd1741..d9ddbb1b3d1 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produkt eller tjeneste
 ProductsAndServices=Produkter og services
 ProductsOrServices=Produkter eller tjenesteydelser
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Produkter og services statistik
 ProductsStatistics=Produkter statistik
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Intern reference
 LastRecorded=Seneste produkter / ydelser på sælge registreres
@@ -44,7 +44,7 @@ CardProduct1=Service kortet
 CardContract=Kontrakt-kortet
 Warehouse=Warehouse
 Warehouses=Lager
-WarehouseOpened=Warehouse åbnet
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse lukket
 Stock=Stock
 Stocks=Lagre
@@ -71,21 +71,21 @@ SellingPriceTTC=Salgspris (inkl. skat)
 PublicPrice=Offentlige pris
 CurrentPrice=Nuværende pris
 NewPrice=Ny pris
-MinPrice=Minim. salgspris
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere end minimum tilladt for dette produkt ( %s uden skat)
 ContractStatus=Kontrakt status
 ContractStatusClosed=Lukket
-ContractStatusRunning=Kørsel
+ContractStatusRunning=Ongoing
 ContractStatusExpired=udløbet
-ContractStatusOnHold=Ikke kører
-ContractStatusToRun=To get running
-ContractNotRunning=Denne kontrakt er ikke kører
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Et produkt med henvisning %s eksisterer allerede.
 ErrorProductBadRefOrLabel=Forkert værdi for reference eller etiket.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Leverandører
 SupplierRef=Leverandør ref.
 ShowProduct=Vis produkt
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis produktet er en tjeneste med begrænset varighed:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Antal pris
 MultiPriceLevelsName=Pris kategorier
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Oversættelse
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Søg produkt for at tilføje
 AddDel=Tilføj / Slet
 Quantity=Mængde
 NoMatchFound=Ingen match fundet
-ProductAssociationList=Liste over relaterede produkter / tjenesteydelser: navn på produkt / tjeneste (mængde påvirkes)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet et produkt / service
@@ -179,16 +179,41 @@ CloneProduct=Klon vare eller tjenesteydelse
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller <b>tjenesteydelse %s?</b>
 CloneContentProduct=Klon alle de vigtigste informationer af produkt / service
 ClonePricesProduct=Klon vigtigste informationer og priser
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Dette produkt er brugt
 NewRefForClone=Ref. af nye produkter / ydelser
-CustomerPrices=Kunder priser
-SuppliersPrices=Leverandører priser
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Toldkodeksen
 CountryOrigin=Oprindelsesland
 HiddenIntoCombo=Skjult i udvalgte lister
 Nature=Natur
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index feef2677099..68c06ec9b50 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Dette synspunkt præsenterer alle projekter du får lov til a
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Dette synspunkt præsenterer alle projekter (din brugertilladelser give dig tilladelse til at se alt).
 MyTasksDesc=Dette synspunkt er begrænset til projekter eller opgaver, du er en kontaktperson for (hvad der er den type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse.
 TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertilladelser give dig tilladelse til at se alt).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projekter område
 NewProject=Nyt projekt
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Liste over projekter
 ShowProject=Vis projekt
 SetProject=Indstil projekt
 NoProject=Nr. projektet defineret
-NbOpenTasks=Nb af åbnet opgaver
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb af projekter
 TimeSpent=Tid brugt
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Liste over interventioner i forbindelse med proje
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste over aktioner i forbindelse med projektet
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Aktivitet på projektet i denne uge
 ActivityOnProjectThisMonth=Aktivitet på projektet i denne måned
 ActivityOnProjectThisYear=Aktivitet på projektet i år
@@ -95,7 +98,7 @@ DeleteATimeSpent=Slet tid
 ConfirmDeleteATimeSpent=Er du sikker på du vil slette denne tid?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projekter dedikeret til denne tredjepart
 NoTasks=Ingen opgaver for dette projekt
 LinkedToAnotherCompany=Knyttet til tredjemand
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index 4458f52e97a..edb242a3a41 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -4,7 +4,7 @@ Proposal=Kommerciel forslag
 ProposalShort=Forslag
 ProposalsDraft=Udkast til kommercielle forslag
 ProposalDraft=Udkast til kommercielle forslag
-ProposalsOpened=Åbnet kommercielle forslag
+ProposalsOpened=Open commercial proposals
 Prop=Kommerciel forslag
 CommercialProposal=Kommerciel forslag
 CommercialProposals=Kommerciel forslag
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Prospect liste
 DeleteProp=Slet kommercielle forslag
 ValidateProp=Valider kommercielle forslag
-AddProp=Tilføj forslag
+AddProp=Create proposal
 ConfirmDeleteProp=Er du sikker på du vil slette denne kommercielle forslag?
 ConfirmValidateProp=Er du sikker på at du ønsker at validere denne kommercielle forslag?
 LastPropals=Seneste %s forslag
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Beløb af måneden (efter skat)
 NbOfProposals=Antal kommercielle forslag
 ShowPropal=Vis forslag
 PropalsDraft=Drafts
-PropalsOpened=Åbnet
+PropalsOpened=Open
 PropalsNotBilled=Lukket ikke faktureret
 PropalStatusDraft=Udkast (skal valideres)
 PropalStatusValidated=Valideret (forslag er åbnet)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Ikke underskrevet (lukket)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Udkast
 PropalStatusValidatedShort=Valideret
-PropalStatusOpenedShort=Åbnet
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Lukket
 PropalStatusSignedShort=Underskrevet
 PropalStatusNotSignedShort=Ikke underskrevet
@@ -51,12 +51,10 @@ PropalsToClose=Kommercielle forslag til at lukke
 PropalsToBill=Undertegnet kommercielle forslag til lovforslag
 ListOfProposals=Liste over kommercielle forslag
 ActionsOnPropal=Aktioner for forslaget
-NoOpenedPropals=Nr. åbnet kommercielle forslag
-NoOtherOpenedPropals=Ingen andre åbnet kommercielle forslag
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Kommercielle forslag ref
 SendPropalByMail=Send kommercielle forslag mail
-FileNotUploaded=Filen blev ikke uploadet
-FileUploaded=Filen blev uploadet
 AssociatedDocuments=Dokumenter i forbindelse med forslaget:
 ErrorCantOpenDir=Kan ikke åbne mappe
 DatePropal=Dato for forslag
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal %s blev ikke fundet
 Estimate=Skøn:
 EstimateShort=Skøn
 OtherPropals=Andre forslag
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=Opret kommercielle forslag ved at kopiere eksisterende forslag
 CreateEmptyPropal=Opret tom kommercielle forslag vierge eller fra listen over de produkter / ydelser
 DefaultProposalDurationValidity=Default kommercielle forslag gyldighedens løbetid (i dage)
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=Kundekontakt opfølgning forslag
 # Document models
 DocModelAzurDescription=En komplet forslag model (logo. ..)
 DocModelJauneDescription=Jaune forslag model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 5c2efe5957b..7f7bbb81c0b 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simpelt dokument model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Advarsel, ikke produkter som venter på at blive afsendt.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Høvlet leveringsdato
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Dato levering modtaget
 SendShippingByEMail=Send forsendelse via e-mail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 894cd3015e3..2ab6b7a89fb 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Lager
 NewWarehouse=Nyt oplag / Stock område
 WarehouseEdit=Rediger lager
 MenuNewWarehouse=Ny lagerhal
-WarehouseOpened=Warehouse åbnet
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse lukket
 WarehouseSource=Kilde lagerhal
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Vælg lageret skal bruges til lager fald
 SelectWarehouseForStockIncrease=Vælg lageret skal bruges til lager stigning
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index 24d8c97f280..244baab2c54 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Send til leverandører
 ListOfSupplierOrders=Liste over leverandør ordrer
 MenuOrdersSupplierToBill=Leverandør ordrer der kan faktureres
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang
index bb78c2e3d37..93c14af7a7e 100644
--- a/htdocs/langs/da_DK/trips.lang
+++ b/htdocs/langs/da_DK/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Liste over gebyrer
 NewTrip=New expense report
 CompanyVisited=Company / fundament besøgte
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index d18aa0d6e92..c03f4325e7f 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Fjern fra gruppe
 PasswordChangedAndSentTo=Password ændret og sendt <b>til %s.</b>
 PasswordChangeRequestSent=Anmodning om at ændre password <b>for %s</b> sendt <b>til %s.</b>
 MenuUsersAndGroups=Brugere & Grupper
+MenuMyUserCard=My user card
 LastGroupsCreated=Seneste %s oprettet grupper
 LastUsersCreated=Seneste %s brugere oprettet
 ShowGroup=Vis gruppe
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 525dd55f91e..a86a908b1b9 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Betaling af stående ordre %s af banken
diff --git a/htdocs/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
index 0b3cf499945..b717d97c3c6 100644
--- a/htdocs/langs/da_DK/workflow.lang
+++ b/htdocs/langs/da_DK/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow-modul opsætning
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Der er ingen workflow kan du ændre til modul du har aktiveret.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Opret en kundeordre automatisk efter en kommerciel forslag er underskrevet
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Opret en kundefaktura automatisk efter en kommerciel forslag er underskrevet
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Opret en kundefaktura automatisk efter en kontrakt er valideret
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Opret en kundefaktura automatisk efter en kundeordre er lukket
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index fbde76477d8..8cbf5330849 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -49,7 +49,6 @@ Permission256=Eigenes Passwort ändern
 Permission271=CA einsehen
 Permission272=Rechnungen einsehen
 Permission273=Rechnungen erstellen
-Permission291=Tarife einsehen
 Permission292=Festlegen von Berechtigungen für die Tarife
 Permission311=Services einsehen
 Permission312=Services Verträgen zuweisen
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index aa0bd17f452..0de8b848cd7 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Spaltentrennzeichen für die Export-Datei
+ACCOUNTING_EXPORT_DATE=Das Datumsformat für die Exportdatei.
+ACCOUNTING_EXPORT_PIECE=Exportiere eine Anzahl an Teile?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportiere mit Globalen Konto.
+ACCOUNTING_EXPORT_LABEL=Exportiere die Beschriftung?
+ACCOUNTING_EXPORT_AMOUNT=Exportiere den Betrag?
+ACCOUNTING_EXPORT_DEVISE=Exporiere die Konstruktion?
 
 Accounting=Buchhaltung
 Globalparameters=Globale Parameter
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Länge der Partner
 
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal
-ACCOUNTING_BANK_JOURNAL=Bankauszug
-ACCOUNTING_CASH_JOURNAL=Kassenbeleg
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Verschiedenes Journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Sozial-Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto der Transaktion
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index bc7fec76f5f..49def7b7621 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Benutzermenü
 LangFile=Datei .lang
 System=System
 SystemInfo=Systeminformationen
-SystemTools=Systemwerkzeuge
 SystemToolsArea=Systemwerkzeugsübersicht
 SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verwenden Sie das linke Menü zur Auswahl der gesuchten Funktion.
 Purge=Löschen
@@ -232,8 +231,8 @@ Security=Sicherheit
 Passwords=Passwörter
 DoNotStoreClearPassword=Passwörter in der Datenbank nicht im Klartext speichern (Empfohlene Einstellung)
 MainDbPasswordFileConfEncrypted=Datenbankpasswort in der Konfigurationsdatei verschlüsselt speichern (Empfohlene Einstellung)
-InstrucToEncodePass=Um das Passwort in der Konfigurationsdatei <b>conf.php</b> zu verschlüsseln, ersetzen Sie die Zeile <br><b>$dolibarr_main_db_pass="..."</b><br>durch<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Um das Passwort unverschlüsselt (Klartext) in der Konfigurationsdatei <b>conf.php</b> zu speichern, ersetzen Sie die Zeile<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>durch<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=PDF-Dokumentschutz aktivieren (Die Aktivierung ist nicht empfohlen, weil dadurch die Stapelerzeugung von PDFs nicht mehr funktioniert)
 ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass über die Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. aller offenen Rechnungen) nicht mehr funktioniert
 Feature=Funktion
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=So führen Sie die Installation/Aktualisierung des Systems
 ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess:
 StepNb=Schritt %s
 FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s).
-DownloadPackageFromWebSite=Herunterladen des Installationspakets von der Website %s
-UnpackPackageInDolibarrRoot=Entpacken des Pakets in den Stammordner der Systeminstallation <b>%s</b>
+DownloadPackageFromWebSite=Installationspaket herunterladen (z.B. von offizieller Webseite %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Die Installation ist abgeschlossen und das System zur Verwendung der neuen Komponente bereit.
 NotExistsDirect=Kein alternatives Stammverzeichnis definiert.<br>
 InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Legen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "eigenes").<br>
 InfDirExample=<br>Danach in der Datei conf.php deklarieren<br> $dolibarr_main_url_root_alt='http://meinserver/custom'<br>$dolibarr_main_document_root_alt='/pfad/zu/dolibarr/htdocs/custom'<br>*Diese Zeilen sind mit "#" auskommentiert, um sie zu aktivieren, einfach das Zeichen entfernen.
-YouCanSubmitFile=Modul wählen:
+YouCanSubmitFile=Durch diesen Schritt, können Sie das Paket mit diesem Tool senden: Wähle Modul Datei
 CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen gehen Sie zur Seite %s.
 LastStableVersion=Letzte stabile Version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameter-Liste stammt aus einer Tabelle<br>Syntax :
 ExtrafieldParamHelpchkbxlst=Parameter-Liste stammt aus einer Tabelle <br> Syntax: table_name:label_field:id_field::filter<br> Beispiel:c_typent:libelle:id::filter <br><br> Filter kann ein einfacher Test (zB active=1) nur aktive Wert angezeigt, wenn Sie filtern  <br> wenn Sie auf extrafields filtern möchten verwenden Sie syntaxt extra.fieldcode=...  \n\n(wobei fieldcode ist der Code vom extrafield) <br><br> \num die Liste basierend auf einer anderen zu haben<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Verwendete Bibliothek zur PDF-Erzeugung
 WarningUsingFPDF=Achtung: Ihre <b>conf.php</b> enthält <b>$dolibarr_pdf_force_fpdf=1</b> Dies bedeutet, dass Sie die FPDF-Bibliothek verwenden, um PDF-Dateien zu erzeugen. Diese Bibliothek ist alt und unterstützt viele Funktionen nicht (Unicode-, Bild-Transparenz, kyrillische, arabische und asiatische Sprachen, ...), so dass es zu Fehlern bei der PDF-Erstellung kommen kann. <br> Um dieses Problem zu beheben und volle Unterstützung der PDF-Erzeugung zu erhalten, laden Sie bitte die <a href="http://www.tcpdf.org/" target="_blank">TCPDF Bibliothek</a> , dann kommentieren Sie die Zeile <b>$dolibarr_pdf_force_fpdf=1</b> aus oder entfernen diese und fügen statt dessen <b>$dolibarr_lib_TCPDF_PATH='Pfad_zum_TCPDF_Verzeichnisr'</b> ein
-LocalTaxDesc=In einigen Ländern gelten 2 oder 3 Steuern auf jede Rechnungszeile. Wenn dies der Fall ist, wählen Sie Typ für die zweite und dritte Steuer und seine Geschwindigkeit. Mögliche Art sind: <br> 1: Ortstaxe gelten über Produkte und Dienstleistungen, ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet) <br> 2: Ortstaxe gelten für Produkte und Dienstleistungen vor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet) <br> 3: Ortstaxe gelten für Produkte ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet) <br> 4: Ortstaxe gelten für Erzeugnisse, bevor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet) <br> 5: Ortstaxe gelten für Dienstleistungen, ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet) <br> 6: Ortstaxe gelten für Dienstleistungen vor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Geben Sie die anzurufende Telefonnr ein, um einen Link zu zeigen, mit dem die ClickToDial-URL für den Benutzer <strong>%s</strong> getestet werden kann
 RefreshPhoneLink=Aktualisierungslink
@@ -430,8 +429,8 @@ Module20Name=Angebote
 Module20Desc=Angeboteverwaltung
 Module22Name=E-Mail-Kampagnen
 Module22Desc=E-Mail-Kampagnenverwaltung
-Module23Name= Energie
-Module23Desc= Überwachung des Energieverbrauchs
+Module23Name=Energie
+Module23Desc=Überwachung des Energieverbrauchs
 Module25Name=Kundenaufträge
 Module25Desc=Kundenauftragsverwaltung
 Module30Name=Rechnungen
@@ -492,8 +491,8 @@ Module400Name=Projekte / Chancen / Leads
 Module400Desc=Projektmanagement, Aufträge oder Leads. Anschließend können Sie ein beliebiges Element (Rechnung, Bestellung, Angebot, Intervention, ...) einem Projekt zuordnen und eine Queransicht von der Projektanzeige bekommen.
 Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
-Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
-Module500Desc=Steuer-, Sozialbeitrags-, Dividenden- und Lohnverwaltung
+Module500Name=Sonderausgaben
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Löhne
 Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen
 Module520Name=Darlehen
@@ -502,7 +501,7 @@ Module600Name=Benachrichtigungen
 Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert)
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
-Module770Name=Spesenabrechnung
+Module770Name=Expense reports
 Module770Desc=Management Reisen und Spesen  Report (Transport, Essen, ...)
 Module1120Name=Lieferant-Angebote
 Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise
@@ -512,7 +511,7 @@ Module1400Name=Buchhaltung
 Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
 Module1520Name=Dokumente erstellen
 Module1520Desc= Mailings Dokumente erstellen
-Module1780Name=Kategorien
+Module1780Name=Kategorien/#tags
 Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-Editor
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Termine/Aufgaben und Terminplanung
 Module2500Name=Inhaltsverwaltung(ECM)
 Module2500Desc=Speicherung und Verteilung von Dokumenten
-Module2600Name=WebServices
-Module2600Desc=Aktivieren Sie Verwendung von Webservices
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Aktivieren Sie Dolibarr SOAP Server,  unterstütztes API-Service.
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (Client)
 Module2650Desc=Aktiviere den Dolibarr Web Services Client (kann verwendet werden um Daten / Anforderungen an externe Server zu schicken. Nur Lieferantenbestellungen werden derzeit unterstützt)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Produkte/Leistungen erstellen/bearbeiten
 Permission34=Produkte/Leistungen löschen
 Permission36=Projekte/Leistungen exportieren
 Permission38=Produkte exportieren
-Permission41=Projekte/Aufgaben einsehen
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Projekte/Aufgaben erstellen/bearbeiten (Meine)
 Permission44=Projekte löschen
 Permission61=Leistungen ansehen
@@ -599,10 +600,10 @@ Permission86=Kundenaufträge per E-Mail versenden
 Permission87=Kundenaufträge abschließen
 Permission88=Kundenaufträge verwerfen
 Permission89=Kundenaufträge löschen
-Permission91=Steuern/Sozialbeiträge einsehen
-Permission92=Steuern/Sozialbeiträge erstellen/bearbeiten
-Permission93=Steuern/Sozialbeiträge löschen
-Permission94=Sozialbeiträge exportieren
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Buchhaltung einsehen
 Permission101=Auslieferungen einsehen
 Permission102=Auslieferungen erstellen/bearbeiten
@@ -620,9 +621,9 @@ Permission121=Mit Benutzer verbundene Partner einsehen
 Permission122=Mit Benutzer verbundene Partner erstellen/bearbeiten
 Permission125=Mit Benutzer verbundene Partner löschen
 Permission126=Partner exportieren
-Permission141=Aufgaben einsehen
-Permission142=Aufgaben erstellen/bearbeiten
-Permission144=Löschen aller Projekte und Aufgaben (einschließlich privater auch nicht in Verbindung treten)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lieferanten einsehen
 Permission147=Statistiken einsehen
 Permission151=Abbucher einsehen
@@ -688,18 +689,18 @@ Permission281=Kontakte einsehen
 Permission282=Kontakte erstellen/bearbeiten
 Permission283=Kontakte löschen
 Permission286=Kontakte exportieren
-Permission291=Tarife lesen
+Permission291=Tarife einsehen
 Permission292=Berechtigungen der Tarife einstellen
 Permission293=Kundentarife ändern
 Permission300=Barcodes einsehen
 Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
-Permission311=Leistungen lesen
+Permission311=Leistungen einsehen
 Permission312=Leistung/Abonnement einem Vertrag zuordnen
 Permission331=Lesezeichen einsehen
 Permission332=Lesezeichen erstellen/bearbeiten
 Permission333=Lesezeichen löschen
-Permission341=Eigene Berechtigungen lesen
+Permission341=Eigene Berechtigungen einsehen
 Permission342=Eigene Benutzerinformationen erstellen/bearbeiten
 Permission343=Eigenes Passwort ändern
 Permission344=Eigene Berechtigungen bearbeiten
@@ -729,10 +730,10 @@ Permission538=Leistungen exportieren
 Permission701=Spenden einsehen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
-Permission771=Spesenabrechnungen lesen (eigene und die der Untergebenen)
+Permission771=Spesenabrechnungen einsehen (eigene und die der Untergebenen)
 Permission772=Spesenabrechnung erstellen/ändern
 Permission773=Spesenabrechnung löschen
-Permission774=Spesenabrechnungen lesen (Alle Benutzer auch nicht Untergebene)
+Permission774=Spesenabrechnungen einsehen  (Alle Benutzer auch die nicht Untergebenen)
 Permission775=Spesenabrechnung genehmigen
 Permission776=Spesenabrechnung bezahlen
 Permission779=Spesenabrechnung exportieren
@@ -800,7 +801,7 @@ DictionaryCountry=Länder
 DictionaryCurrency=Währungen
 DictionaryCivility=Anredeformen
 DictionaryActions=Liste Arten von Kalenderereignissen
-DictionarySocialContributions=Sozialbeitragstypen
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=MwSt.-Sätze
 DictionaryRevenueStamp=Anzahl der Steuermarken
 DictionaryPaymentConditions=Zahlungsbedingungen
@@ -817,6 +818,9 @@ DictionarySource=Quelle der Angebote/Aufträge
 DictionaryAccountancyplan=Kontenplan
 DictionaryAccountancysystem=Kontenplan Modul
 DictionaryEMailTemplates=Emailvorlage
+DictionaryUnits=Einheiten
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup gespeichert
 BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Wörterbuchübersicht
@@ -936,13 +940,14 @@ CompanyZip=Postleitzahl
 CompanyTown=Stadt
 CompanyCountry=Land
 CompanyCurrency=Hauptwährung
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Nicht anzeigen
 DoNotSuggestPaymentMode=Nicht vorschlagen
 NoActiveBankAccountDefined=Keine aktiven Finanzkonten definiert
 OwnerOfBankAccount=Kontoinhaber %s
 BankModuleNotActive=Finanzkontenmodul nicht aktiv
-ShowBugTrackLink=Zeige Link 'Fehler melden'
+ShowBugTrackLink=Zeige Link  <strong>%s</strong>
 ShowWorkBoard=Zeige 'Aufgabenübersicht' auf der Startseite
 Alerts=Benachrichtigungen
 Delays=Verspätungen
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Dezimalstellen max. für Stückpreise
 MAIN_MAX_DECIMALS_TOT=Dezimalstellen max. für Gesamtsummen
 MAIN_MAX_DECIMALS_SHOWN=Dezimalstellen max. für auf dem Bildschirm angezeigte Preise (Fügen Sie <b>...</b> nach dieser Nummer ein, wenn Sie <b>...</b> sehen wollen, falls ein Bildschirmpreis abgeschnitten wurde.
 MAIN_DISABLE_PDF_COMPRESSION=PDF-Komprimierung für erzeugte PDF-Dokumente verwenden
-MAIN_ROUNDING_RULE_TOT= Rundungseinstellung (für Länder in denen die Rundung nicht auf Basis 10 errechnet wird - selten)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Nettostückpreis
 TotalPriceAfterRounding=Gesamtpreis (Netto/MwSt./Brutto) gerundet
 ParameterActiveForNextInputOnly=Die Einstellungen werden erst bei der nächsten Eingabe wirksam
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Summe aktivierter Module: <b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
 ClassNotFoundIntoPathWarning=Klasse %s nicht innerhalb PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
-OnlyFollowingModulesAreOpenedToExternalUsers=Hinweis: Nur die folgenden Module sind für externe Nutzer verfügbar (unabhängig von der Berechtigung dieser Benutzer):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
 ConditionIsCurrently=Einstellung ist aktuell %s
 YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der beste verfügbare.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max. Anzahl der Produkte in Mehrfachauswahllisten (0
 ConfirmDeleteProductLineAbility=Bestätigung für die Entfernung von Produktzeilen in Formularen
 ModifyProductDescAbility=Produktbeschreibungen in Formularen individuell anpassbar
 ViewProductDescInFormAbility=Anzeige dr Produktbeschreibungen in Formularen (andernfalls als Popup-Tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Anzeige der Produktbeschreibungen in der Sprache des Partners
 UseSearchToSelectProductTooltip=Wenn Sie eine große Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden.
 UseEcoTaxeAbility=Umweltabgaben unterstüzten
 SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
 SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Partner
+UseUnits=Nutze Einheiten
 ProductCodeChecker= Modul für Produktcode-Erstellung und -Überprüfung (Produkt oder Service)
 ProductOtherConf= Konfiguration Produkt-/Services
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode vom Typ UPC
 BarcodeDescISBN=Barcode vom Typ ISBN
 BarcodeDescC39=Barcode vom Typ C39
 BarcodeDescC128=Barcode vom Typ C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar Code Kommandozeilen-Tool (verwendet interne Engine für  einige Barcodetypen)  Muss mit "genbarcode" kompatibel sein. <br> Zum Beispiel: /usr/local/bin/genbarcode
 BarcodeInternalEngine=interne Engine
 BarCodeNumberManager=Manager für die automatische Generierung von Barcode-Nummer
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Möchten Sie diesen Menüeintrag <b>%s</b> wirklich löschen?
 DeleteLine=Zeile löschen
 ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen?
 ##### Tax #####
-TaxSetup=Steuer-, Sozialbeitrags- und Dividendenmodul-Einstellungen
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=MwSt. fällig
 OptionVATDefault=Barbestandsbasis
 OptionVATDebitOption=Rückstellungsbasis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices-Moduleinstellungen
 WebServicesDesc=Über Aktivierung dieses Moduls können Sie dolibarr zur Anbindung an externe Webservices konfigurieren
 WSDLCanBeDownloadedHere=Die WSDL-Datei der verfügbaren Webservices können Sie hier herunterladen
 EndPointIs=SOAP-Clients müssen Ihre Anfragen an den dolibarr-Endpoint unter der folgenden Url stellen
+##### API ####
+ApiSetup=API-Modul-Setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Nur Elemente aus aktiven Modulen sind ungeschützt
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bankmoduleinstellungen
 FreeLegalTextOnChequeReceipts=Freier Rechtstext für Scheckbelege
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekteinstellungenmodul
 ProjectsModelModule=Projektvorlagenmodul
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
 TaskModelModule=Vorlage für Arbeitsberichte
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = EDM-Einstellungen
 ECMAutoTree = Automatischer Baumansicht
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Fiskalisches Jahr öffnen
 CloseFiscalYear=Fiskalisches Jahr schließen
 DeleteFiscalYear=Fiskalisches Jahr löschen
 ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen?
-Opened=Geöffnet
+Opened=geöffnet
 Closed=Geschlossen
 AlwaysEditable=kann immer bearbeitet werden
 MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul i
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
 ConfFileMuseContainCustom=Installation eines externen Modul aus der Anwendung speichern Sie die Modul-Dateien in Verzeichnis <strong>%s</strong>. Zu haben dieses Verzeichnis durch Dolibarr verarbeitet, müssen Sie das Setup Ihrer <strong>conf/conf.php</strong> Option haben <br> - - <strong>$dolibarr_main_url_root_alt</strong> auf <<strong>$dolibarr_main_url_root_alt="/custom"</strong> enabled <strong>= "/custom"</strong> <br> - <strong>$dolibarr_main_document_root_alt</strong>  zu Wert aktiviert <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Drücken Sie F5 auf der Tastatur, nachdem dem Sie diesen Wert geändert haben, damit die Änderungen wirksam ist
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index a817845d128..30f934694c2 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Bestellung %s als bezahlt markieren
 OrderApprovedInDolibarr=Bestellen %s genehmigt
 OrderRefusedInDolibarr=Bestellung %s abgelehnt
 OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status
-OrderCanceledInDolibarr=Auftrag storniert %s
 ProposalSentByEMail=Angebot %s per E-Mail versendet
 OrderSentByEMail=Kundenauftrag %s per E-Mail versendet
 InvoiceSentByEMail=Kundenrechnung %s per E-Mail versendet
@@ -96,3 +95,5 @@ AddEvent=Ereignis erstellen
 MyAvailability=Meine Verfügbarkeit
 ActionType=Ereignistyp
 DateActionBegin=Beginnzeit des Ereignis
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index b8befaf598e..c7840619935 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -94,7 +94,7 @@ Conciliate=Ausgleichen
 Conciliation=Ausgleich
 ConciliationForAccount=Dieses Konto ausgleichen
 IncludeClosedAccount=Geschlossene Konten miteinbeziehen
-OnlyOpenedAccount=Nur geöffnete Konten
+OnlyOpenedAccount=Nur offene Konten
 AccountToCredit=Konto für Gutschrift
 AccountToDebit=Zu belastendes Konto
 DisableConciliation=Zahlungsausgleich für dieses Konto deaktivieren
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Kundenzahlung
 CustomerInvoicePaymentBack=Kunden Rückzahlung
 SupplierInvoicePayment=Lieferantenzahlung
 WithdrawalPayment=Entnahme Zahlung
-SocialContributionPayment=Sozialbeitragszahlung
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Finanzkonto-Journal
 BankTransfer=Kontentransfer
 BankTransfers=Kontentransfer
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 3ee6219c8cb..9b743010407 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Anzahl der Rechnungen
 NumberOfBillsByMonth=Anzahl Rechnungen pro Monat
 AmountOfBills=Anzahl der Rechnungen
 AmountOfBillsByMonthHT=Gesamtbetrag Rechnungen pro Monat (inkl. Steuern)
-ShowSocialContribution=Zeige Sozialbeitrag
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Zeige Rechnung
 ShowInvoice=Zeige Rechnung
 ShowInvoiceReplace=Zeige Ersatzrechnung
@@ -270,7 +270,7 @@ BillAddress=Rechnungsanschrift
 HelpEscompte=Bei diesem Rabatt handelt es sich um einen Skonto.
 HelpAbandonBadCustomer=Dieser Betrag wurde aufgegeben (Kundenverschulden) ist als uneinbringlich zu werten.
 HelpAbandonOther=Dieser Betrag wurde auf Grund eines Fehlers aufgegeben (falsche Rechnung oder an falschen Kunden)
-IdSocialContribution=Sozialbeitrags id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Zahlung id
 InvoiceId=Rechnungs ID
 InvoiceRef=Rechnungs Nr.
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 39fb77901ea..747d2fc2eee 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -4,7 +4,7 @@ ErrorPrefixAlreadyExists=Präfix %s bereits vorhanden. Bitte wählen Sie einen a
 ErrorSetACountryFirst=Wähle zuerst das Land
 SelectThirdParty=Wähle einen Partner
 DeleteThirdParty=Lösche einen Partner
-ConfirmDeleteCompany=Möchten Sie diesen Partner und alle verbundenen Informationen wirklich löschen?
+ConfirmDeleteCompany=Möchten Sie diesen Partner und alle damit verbundenen Informationen wirklich löschen?
 DeleteContact=Löschen Sie einen Kontakt
 ConfirmDeleteContact=Möchten Sie diesen Kontakt und alle verbundenen Informationen wirklich löschen?
 MenuNewThirdParty=Neuer Partner
@@ -30,6 +30,7 @@ ThirdPartyContact=Partnerkontakt
 StatusContactValidated=Status des Kontakts
 Company=Firma
 CompanyName=Firmenname
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Unternehmen
 CountryIsInEEC=Land ist innerhalb der EU
 ThirdPartyName=Name des Partners
@@ -314,14 +315,14 @@ Capital=Kapital
 CapitalOf=Kapital %s
 EditCompany=Unternehmen bearbeiten
 EditDeliveryAddress=Lieferadresse bearbeiten
-ThisUserIsNot=Dieser Benutzer ist kein Lead, Kunde oder Lieferant
+ThisUserIsNot=Dieser Benutzer ist weder ein Lead, Kunde oder Lieferant
 VATIntraCheck=Prüfen
 VATIntraCheckDesc=Der Link <b>%s</b> erlaubt eine Anfrage am Europäischen Mehrwertsteuer-Check-Service. Ein externer Zugang zum Internet-Server ist für diesen Dienst erforderlich.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Überprüfen Sie Intrakommunale MwSt-Website der Europäischen Kommission
 VATIntraManualCheck=Sie können die Überprüfung auch manuell durchführen <a href="%s" target=Sie können auch manuell die eruopäische Website <a href="%s" target="_blank">%s</a> befragen
 ErrorVATCheckMS_UNAVAILABLE=Anfrage nicht möglich. Überprüfungsdienst wird vom Mitgliedsland nicht angeboten (%s).
-NorProspectNorCustomer=sonstige Adresse
+NorProspectNorCustomer=kein Kunde, kein Lead
 JuridicalStatus=Rechtsform
 Staff=Mitarbeiterzahl
 ProspectLevelShort=Potenzial
@@ -412,3 +413,8 @@ LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jede
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
 SearchThirdparty=Partner suchen
 SearchContact=Kontakt suchen
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Partner wurden zusammengelegt
+ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Partners. Bitte überprüfen Sie das Protokoll. Änderungen wurden rückgängig gemacht.
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 249e8bd2daa..5363dcb005f 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -7,7 +7,7 @@ TaxModuleSetupToModifyRules=Im <a href="%s">Steuer-Modul</a> können Sie die Ein
 TaxModuleSetupToModifyRulesLT=Hier können Sie die <a href="%s">Einstellungen</a> für die Berechnungen vornehmen
 OptionMode=Buchhaltungsoptionen
 OptionModeTrue=Option Eingang-Ausgang
-OptionModeVirtual=Option Soll-Haben
+OptionModeVirtual=Option Forderungen-Verbindlichkeiten
 OptionModeTrueDesc=Der Umsatz wird über die Zahlungen (Datum der Zahlungen) berechnet. \nDie Aussagekraft der Zahlen ist nur gewährleistet, wenn die Pflege der Konten (Ein-/Ausgang) nachhaltig korrekt ist.
 OptionModeVirtualDesc=In dieser Option berechnet sich der Umsatz über Zahlungen (Zahlungsdatum).<br> Die Gültigkeit der Zahlen ist nur bei Überprüfung der Zu- und Abgänge auf den Konten über Rechnungen gewährleistet.
 FeatureIsSupportedInInOutModeOnly=Dieses Feautre ist nur in der Soll-Haben-Option verfügbar (siehe Konfiguration des Rechnungswesen-Moduls)
@@ -24,7 +24,7 @@ Accountsparent=Kontohalter
 BillsForSuppliers=Lieferantenrechnungen
 Income=Einnahmen
 Outcome=Ausgaben
-ReportInOut=Einnahmen/Ausgaben
+ReportInOut=Ergebnis / Geschäftsjahr
 ReportTurnover=Umsatz
 PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch keinem Partner verbunden
 PaymentsNotLinkedToUser=Zahlungen mit keinem Benutzer verbunden
@@ -56,23 +56,23 @@ VATCollected=Erhobene MwSt.
 ToPay=Zu zahlen
 ToGet=Zu erhalten
 SpecialExpensesArea=Bereich für alle Sonderzahlungen
-TaxAndDividendsArea=Steuern-, Sozialabgaben- und Dividendenübersicht
-SocialContribution=Sozialbeitrag
-SocialContributions=Sozialbeiträge
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Sonstige Ausgaben
 MenuTaxAndDividends=Steuern und Dividenden
 MenuSalaries=Löhne
-MenuSocialContributions=Sozialbeiträge
-MenuNewSocialContribution=Neuer Beitrag
-NewSocialContribution=Neuer Sozialbeitrag
-ContributionsToPay=Zu zahlende Beiträge
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Rechnungswesen/Vermögensverwaltung
 AccountancySetup=Buchhaltung Einstellungen
 NewPayment=Neue Zahlung
 Payments=Zahlungen
 PaymentCustomerInvoice=Zahlung Kundenrechnung
 PaymentSupplierInvoice=Zahlung Lieferantenrechnung
-PaymentSocialContribution=Zahlung Sozialbeiträge
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=MwSt.-Zahlung
 PaymentSalary=Lohnzahlung
 ListPayment=Liste der Zahlungen
@@ -91,7 +91,7 @@ LT1PaymentES=RE Zahlung
 LT1PaymentsES=RE Zahlungen
 VATPayment=MwSt.-Zahlung
 VATPayments=MwSt-Zahlungen
-SocialContributionsPayments=Sozialbeitragszahlungen
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zeige MwSt. Zahlung
 TotalToPay=Zu zahlender Gesamtbetrag
 TotalVATReceived=Summe vereinnahmte MwSt.
@@ -116,11 +116,11 @@ NewCheckDepositOn=Neue Scheckeinlösung auf Konto: %s
 NoWaitingChecks=Keine Schecks warten auf Einlösung.
 DateChequeReceived=Datum des Scheckerhalts
 NbOfCheques=Anzahl der Schecks
-PaySocialContribution=Sozialbeitragszahlungen
-ConfirmPaySocialContribution=Möchten Sie diesen Sozialbeitrag wirklich als bezahlt markieren?
-DeleteSocialContribution=Sozialbeitrag löschen
-ConfirmDeleteSocialContribution=Möchten Sie diesen Sozialbeitrag wirklich löschen?
-ExportDataset_tax_1=Sozialbeiträge und Zahlungen
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Modus <b>%s Mwst. auf Engagement Rechnungslegung %s</b>.
 CalcModeVATEngagement=Modus <b>%sTVA auf  Einnahmen-Ausgaben%s</b>.
 CalcModeDebt=Modus <b>%sForderungen-Verbindlichkeiten%s</b> sagt <b>Engagement Rechnungslegung.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E
 TurnoverPerProductInCommitmentAccountingNotRelevant=Umsatz Bericht pro Produkt, bei der Verwendung einer <b>Kassabuch Buchhaltung</b>  ist der Modus nicht relevant. Dieser Bericht ist nur bei Verwendung <b>Buchführungsmodus Periodenrechnung</b> (siehe Setup das Modul  Buchhaltung).
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Buchhaltungscode-Journal
-ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
 ACCOUNTING_ACCOUNT_CUSTOMER=Standard Buchhaltungs-Code für Kunden/Debitoren
 ACCOUNTING_ACCOUNT_SUPPLIER=Standard Buchhaltungs-Code für Lieferanten/Kreditoren
-CloneTax=Sozialbeitrag duplizieren
-ConfirmCloneTax=Bestätigung 'Sozialbeitrag duplizieren'
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Für nächsten Monat duplizieren
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index f7e204ab99e..45c22a6fbdb 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -4,10 +4,10 @@ About = Über
 CronAbout = Über Cron
 CronAboutPage = Über cron Seite
 # Right
-Permission23101 = Lese geplante Aufgabe
-Permission23102 = Erstelle/aktualisiere geplante Aufgabe
-Permission23103 = Lösche geplante Aufgabe
-Permission23104 = Führe geplante Aufgabe aus
+Permission23101 = geplante Aufgabe einsehen
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Jobverwaltungs-Konfiguration
 URLToLaunchCronJobs=URL zum Prüfen und Starten von Cronjobs wenn nötig
@@ -26,11 +26,11 @@ CronLastOutput=Ausgabe der letzten Ausführung
 CronLastResult=Letzter Resultatcode
 CronListOfCronJobs=Liste der geplanten Jobs
 CronCommand=Befehl
-CronList=Cronjob Liste
+CronList=Geplante Aufträge
 CronDelete=cronjobs löschen
-CronConfirmDelete=Möchten Sie diesen Cronjob wirklich löschen?
+CronConfirmDelete=Sind Sie sicher, dass Sie diese geplanten Aufträge löschen wollen?
 CronExecute=Starte geplante cronjobs
-CronConfirmExecute=Sind Sie sicher, dass Sie diesen cronjob jetzt ausführen wollen?
+CronConfirmExecute=Sind Sie sicher, dass Sie diese geplante Aufträge  jetzt ausführen möchten?
 CronInfo=Das Schedule Cron-Jobs Module  erlaubt die geplanten Cron-Jobs die programmiert wurden durchzuführen.
 CronWaitingJobs=Wartende Jobs
 CronTask=Job
@@ -39,7 +39,7 @@ CronDtStart=Beginnzeit
 CronDtEnd=Endet
 CronDtNextLaunch=Nächste Ausführung
 CronDtLastLaunch=Letzte Ausführung
-CronFrequency=Häufigkeit
+CronFrequency=Frequenz
 CronClass=Klasse
 CronMethod=Methode
 CronModule=Modul
@@ -55,9 +55,9 @@ CronEach=Jede
 JobFinished=Job gestarted und beendet
 #Page card
 CronAdd= Jobs hinzufügen
-CronHourStart= Startzeit und -datum für Aufgabe
-CronEvery= Und führe Aufgabe aus jeden
-CronObject= Instanz/Objekt zu erstellen
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instanz/Objekt zu erstellen
 CronArgs=Parameter
 CronSaveSucess=Speichern erfolgreich
 CronNote=Kommentar
@@ -76,13 +76,14 @@ CronMethodHelp=Die Objektmethode, um zu starten. <BR> Zum Beispiel um die Method
 CronArgsHelp=Das Methodenargument/Input-Parameter.<BR>  Zum Beispiel um die Methode fetch vom  Dolibarr Produkt Objekt /htdocs/product/class/product.class.php aufzurufen, ist der Input-Parameter-Wert <i>0, RefProduit</i>
 CronCommandHelp=Die auszuführende System-Kommandozeile
 CronCreateJob=Erstelle neuen cronjob
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Aufgaben-Typ
+CronType=Job Typ
 CronType_method=Aufrufmethode einer Dolibarr Class
 CronType_command=Shell-Befehl
 CronMenu=Cron
 CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden
 UseMenuModuleToolsToAddCronJobs=Öffnen Sie das Menü "Start - Module Werkzeuge - Cronjob Liste" auf um geplante Skript-Aufgaben zu sehen und zu verändern.
-TaskDisabled=Aufgabe deaktiviert
+TaskDisabled=Job deaktiviert
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 32b619cc51c..b3621e063db 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Suche nach Objekt
 ECMSectionOfDocuments=Dokumentenordner
 ECMTypeManual=Manuell
 ECMTypeAuto=Automatisch
-ECMDocsBySocialContributions=Mit Sozialabgaben verbundene Dokumente
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Mit Partnern verknüpfte Dokumente
 ECMDocsByProposals=Mit Angeboten verknüpfte Dokumente
 ECMDocsByOrders=Mit Kundenaufträgen verknüpfte Dokumente
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 3bb1a6439ba..ed1232f23e3 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP Client fehlgeschlagen mit Fehler '%s'
 ErrorGlobalVariableUpdater5=Keine globale Variable ausgewählt
 ErrorFieldMustBeANumeric=Feld <b>%s</b> muss ein numerischer Wert sein
 ErrorFieldMustBeAnInteger=Feld <b>%s</b> muss eine ganze Zahl sein
+ErrorMandatoryParametersNotProvided=Erforderliche(r) Parameter wird nicht angeboten
 
 # Warnings
 WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
@@ -190,3 +191,4 @@ WarningNotRelevant=Operation für dieses Daten-Set nicht relevant
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist.
 WarningPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) liegt vor dem Rechnungsdatum (%s) für Rechnung %s.
 WarningTooManyDataPleaseUseMoreFilters=Zu viele Ergebnisse. Bitte nutzen Sie mehr Filter
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 348537fa1a3..a1857c8bc13 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -3,7 +3,7 @@ HRM=PM
 Holidays=Urlaub
 CPTitreMenu=Urlaub
 MenuReportMonth=Monatsauszug
-MenuAddCP=Urlaubs-Antrag einreichen
+MenuAddCP=New leave request
 NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen.
 NotConfigModCP=Sie müssen das Modul Urlaub konfigurieren, um diese Seite zu sehen. Um dies zu tun, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">klicken Sie bitte hier</a>.
 NoCPforUser=Sie haben keinen Anspruch auf Urlaub.
@@ -71,7 +71,7 @@ MotifCP=Grund
 UserCP=Benutzer
 ErrorAddEventToUserCP=Ein Fehler ist aufgetreten beim erstellen des Sonderurlaubs
 AddEventToUserOkCP=Das Hinzufügen des Sonderurlaubs wurde abgeschlossen.
-MenuLogCP=Zeige Logdaten zu Urlaubsanträgen
+MenuLogCP=View change logs
 LogCP=Log der Aktualisierung von verfügbaren Urlaubstagen
 ActionByCP=Ausgeführt von
 UserUpdateCP=Für den Benutzer
@@ -93,6 +93,7 @@ ValueOptionCP=Warenwert
 GroupToValidateCP=Gruppe mit der Berechtigung Urlaub zu bewilligen
 ConfirmConfigCP=Konfiguration bestätigen
 LastUpdateCP=Letzte automatische Aktualisierung von Urlaubstagen
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Erfolgreich bearbeitet.
 ErrorUpdateConfCP=Ein Fehler trat beim Bearbeiten auf, bitte nochmals versuchen.
 AddCPforUsers=Bitte geben Sie die Anzahl Urlaubstage der Benutzer an,  <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">indem Sie hier klicken</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten:
 NoCPforMonth=Kein Urlaub diesen Monat
 nbJours=Anzahl der Tage
 TitleAdminCP=Konfiguration der Urlaube
+NoticePeriod=Notice period
 #Messages
 Hello=Hallo
 HolidaysToValidate=Genehmige Urlaubsanträge
@@ -139,10 +141,11 @@ HolidaysRefused=Anfrage abgelehnt
 HolidaysRefusedBody=Ihr Antrag auf Urlaub von %s bis %s wurde aus folgendem Grund abgelehnt:
 HolidaysCanceled=Urlaubsantrag storniert
 HolidaysCanceledBody=Ihr Antrag auf Urlaub von %s bis %s wurde storniert.
-Permission20000=Eigene Urlaubsanträge einsehen
-Permission20001=Erstellen/Ändern Ihrer Urlaubsanträge
-Permission20002=Anlegen/Ändern der Urlaube für alle
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Urlaubsanträge löschen
-Permission20004=Bestimme die verfügbaren Urlaubstage des Benutzers
-Permission20005=Überprüfung Protokoll geänderte Urlaubsanträge
-Permission20006=Monatlichen Urlaubsbericht einsehen
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/de_DE/incoterm.lang b/htdocs/langs/de_DE/incoterm.lang
index 2396d2acb0e..edeaf252c16 100644
--- a/htdocs/langs/de_DE/incoterm.lang
+++ b/htdocs/langs/de_DE/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Funktion hinzufügen um Incoterms zu verwalten
 IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
+IncotermSetupTitle1=Funktion
 IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetup=Verwaltung von Modul Incoterms / Lieferbedingungen
+IncotermFunctionDesc=Incoterms-Funktion aktivieren (Partner, Angebot, Auftrag, Rechnung, Lieferung , Bestellung)
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 466203312d1..031d71eb328 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabisch
 Language_ar_SA=Arabisch
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarisch
 Language_bs_BA=Bosnisch
 Language_ca_ES=Katalanisch
@@ -21,9 +22,10 @@ Language_en_SA=Englisch (Saudi-Arabien)
 Language_en_US=Englisch (USA)
 Language_en_ZA=Englisch (Südafrika)
 Language_es_ES=Spanisch
-Language_es_DO=Spanisch (Dominikanische Republik)
 Language_es_AR=Spanisch (Argentinien)
 Language_es_CL=Spanisch (Chile)
+Language_es_CO=Spanisch (Kolumbien)
+Language_es_DO=Spanisch (Dominikanische Republik)
 Language_es_HN=Spanisch (Honduras)
 Language_es_MX=Spanisch (Mexiko)
 Language_es_PY=Spanisch (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesisch
 Language_is_IS=Isländisch
 Language_it_IT=Italienisch
 Language_ja_JP=Japanisch
+Language_ka_GE=georgisch
+Language_kn_IN=Kannada
 Language_ko_KR=Koreanisch
+Language_lo_LA=Lao
 Language_lt_LT=Litauisch
 Language_lv_LV=Litauisch
 Language_mk_MK=Mazedonisch
@@ -64,6 +69,7 @@ Language_sv_SV=Schwedisch
 Language_sv_SE=Schwedisch
 Language_sq_AL=Albanisch
 Language_sk_SK=Slovakisch
+Language_sw_SW=Kiswahili
 Language_th_TH=Thailändisch
 Language_uk_UA=Ukrainisch
 Language_uz_UZ=Usbekisch
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index e04d73b5ac9..4d07f86948b 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Lesebestätigung
 YourMailUnsubcribeOK=Die E-Mail-Adresse <b>%s</b> ist korrekt aus der Mailing-Liste ausgetragen.
 MailtoEMail=Verknüpfung zu E-Mail
 ActivateCheckRead=Erlaube den Zugriff auf den "Abmelde"-Link
-ActivateCheckReadKey=Sicherheitsschlüssel für die Verschlüsselung von URLs in der Lesebestätigungs- und bei der Abmeldenfunktion verwendet
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-Mail versandt an %s Empfänger.
 XTargetsAdded=<b>%s</b> Empfänger der Liste zugefügt
 EachInvoiceWillBeAttachedToEmail=Ein Dokument mit der Standard-Vorlage für Rechnungen wird erstellt und an jede E-Mail angehängt.
@@ -128,6 +128,7 @@ TagCheckMail=Öffnen der Mail verfolgen
 TagUnsubscribe=Abmelde Link
 TagSignature=Signatur des Absenders
 TagMailtoEmail=E-Mailadresses des Empfängers
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Benachrichtigungen
 NoNotificationsWillBeSent=Für dieses Ereignis und diesen Partner sind keine Benachrichtigungen geplant
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index f6bf1ec94e8..6cd832730c5 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Einige Fehler wurden gefunden. Änderungen
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> innerhalb der Konfigurationsdatei <b>conf.php.</b> nicht definiert.
 ErrorCantLoadUserFromDolibarrDatabase=Kann Benutzer <b>%s</b> nicht aus der Systemdatenbank laden.
 ErrorNoVATRateDefinedForSellerCountry=Fehler, keine MwSt.-Sätze für Land  '%s' definiert.
-ErrorNoSocialContributionForSellerCountry=Fehler, für Land '%s' wurde kein Sozialbetrag definiert.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Fehler beim Speichern der Datei.
 SetDate=Datum
 SelectDate=Wählen Sie ein Datum
@@ -302,7 +302,7 @@ UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
 PriceUHT=VP (netto)
 AskPriceSupplierUHT=Nettopreis anfordern
-PriceUTTC=VP (brutto)
+PriceUTTC=U.P. (inc. tax)
 Amount=Betrag
 AmountInvoice=Rechnungsbetrag
 AmountPayment=Zahlungsbetrag
@@ -339,6 +339,7 @@ IncludedVAT=inkl. MwSt.
 HT=Netto
 TTC=Brutto
 VAT=MwSt.
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Steuersatz
@@ -413,6 +414,8 @@ Qty=Anz.
 ChangedBy=Geändert von
 ApprovedBy=genehmigt von
 ApprovedBy2=Genehmige von (zweite Genehmigung)
+Approved=genehmigt
+Refused=abgelehnt
 ReCalculate=Neuberechnung
 ResultOk=Erfolg
 ResultKo=Fehlschlag
@@ -421,7 +424,7 @@ Reportings=Berichterstattungen
 Draft=Entwurf
 Drafts=Entwürfe
 Validated=Freigegeben
-Opened=Offen
+Opened=geöffnet
 New=Neu
 Discount=Rabatt
 Unknown=Unbekannt
@@ -514,7 +517,7 @@ ShowLog=Zeige Protokoll
 File=Datei
 Files=Dateien
 NotAllowed=Nicht erlaubt
-ReadPermissionNotAllowed=Sie haben keine Leseberechtigung
+ReadPermissionNotAllowed=Sie haben keine Berechtigung
 AmountInCurrency=Betrag in %s
 Example=Beispiel
 Examples=Beispiele
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Mit Kontakt verknüpft
 DeleteAFile=Datei löschen
 ConfirmDeleteAFile=Sind Sie sicher dass Sie diese Datei löschen möchten?
 NoResults=Keine Ergebnisse
+SystemTools=System tools
 ModulesSystemTools=Module Werkzeuge
 Test=Testen
 Element=Element
@@ -697,12 +701,15 @@ ViewPrivateNote=Zeige Notizen
 XMoreLines=%s Zeile(n) versteckt
 PublicUrl=Öffentliche URL
 AddBox=Box anfügen
-SelectElementAndClickRefresh=Wählen Sie ein Element und clicken Sie Aktualisieren
+SelectElementAndClickRefresh=Wählen Sie einen Eintrag und klicken Sie aktualisieren
 PrintFile=Drucke Datei %s
 ShowTransaction=Transaktion anzeigen
 GoIntoSetupToChangeLogo=Gehen Sie zu Start - Einstellungen - Firma/Stiftung um das Logo zu ändern oder gehen Sie in Start -> Einstellungen -> Anzeige um es zu verstecken.
 Deny=ablehnen
 Denied=abgelehnt
+ListOfTemplates=Liste der Vorlagen
+Genderman=Mann
+Genderwoman=Frau
 # Week day
 Monday=Montag
 Tuesday=Dienstag
@@ -732,3 +739,4 @@ ShortThursday=Do
 ShortFriday=Fr
 ShortSaturday=Sa
 ShortSunday=So
+SelectMailModel=Wähle E-Mail-Vorlage
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index a9076f41d73..af17a782e30 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -106,7 +106,7 @@ ConfirmDeleteSubscription=Möchten Sie dieses Abonnement wirklich löschen?
 Filehtpasswd=htpasswd Datei
 ValidateMember=Mitglied freigeben
 ConfirmValidateMember=Möchten Sie dieses Mitglied wirklich freigeben?
-FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Zugriffskontrolle des Systems geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen.
+FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Dolibarr-Zugriffskontrolle geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen.
 PublicMemberList=Liste öffentlicher Mitglieder
 BlankSubscriptionForm=Leeres Abonnementformular
 BlankSubscriptionFormDesc=Dolibarr Deutschland beitet ihnen eine öffentliche URL an für den externen Besucher an. Falls Sie ein Online-Zahlungsmittel aktiviert haben, werden die notwendigen Unterlagen automatisch zur Verfügung gestellt.
@@ -199,7 +199,8 @@ Entreprises=Unternehmen
 DOLIBARRFOUNDATION_PAYMENT_FORM=Um Ihre Beitragszahlung mit einer Banküberweisung auszuführen, gehen Sie zur Seite: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>Um mittels Kreditkarte zu zahlen, klicken Sie auf den Button am Seitenende.<br>
 ByProperties=nach Eigenschaften
 MembersStatisticsByProperties=Mitgliederstatistik nach Eigenschaften
-MembersByNature=Mitglieder von Natur aus
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Mehrwertsteuersatz für Mitgliedschaften
 NoVatOnSubscription=Kein MwSt. auf Mitgliedschaft.
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail, um zu warnen, wenn Dolibarr erhält eine Bestätigung von einer   validierte Zahlung des Mitglieds
diff --git a/htdocs/langs/de_DE/printing.lang b/htdocs/langs/de_DE/printing.lang
index 3f783f02e08..3432b71d037 100644
--- a/htdocs/langs/de_DE/printing.lang
+++ b/htdocs/langs/de_DE/printing.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direkt drucken
-Module112000Desc=Direkt-Druck-System aktivieren 
+Module64000Name=Direct Printing
+Module64000Desc=Direkt-Druck-System aktivieren 
 PrintingSetup=Direkt-Druck-System einrichten
 PrintingDesc=Dieses Modul fügt einen "Drucken"-Button zu, um Dokumente direkt zu einen Drucker zu senden. Dies erfordert ein Linux-System mit installiertem CUPS.
 ModuleDriverSetup=Modul Treiber einrichten
-PrintingDriverDesc=Configuration variables for printing driver.
+PrintingDriverDesc=Konfigurationsvariablen für den Druck-Treiber.
 ListDrivers=Treiberliste
 PrintTestDesc=Druckerliste
 FileWasSentToPrinter=Datei %s wurde an den Drucker gesendet
@@ -16,9 +16,9 @@ TargetedPrinter=Zieldrucker
 UserConf=Je Nutzer einrichten
 PRINTGCP=Google Cloud Print
 PrintGCPDesc=Dieser Treiber erlaubt das direkte senden zu ein Drucker via Google Cloud Print
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintgcp=Konfigurationsvariablen für den Druck Fahrer Google Cloud Print.
 PrintTestDescprintgcp=Druckerliste für Google Cloud Print
-PRINTGCP_LOGIN=Login für Google Account
+PRINTGCP_LOGIN=Google Benutzerkonto
 PRINTGCP_PASSWORD=Passwort für Google Account
 STATE_ONLINE=Online
 STATE_UNKNOWN=Unbekannt
@@ -35,13 +35,13 @@ GCP_Name=Name
 GCP_displayName=Angezeigter Name
 GCP_Id=Drucker ID
 GCP_OwnerName=Besitzername
-GCP_State=Printer State
-GCP_connectionStatus=Online State
+GCP_State=Druckerstatus
+GCP_connectionStatus=Online-Zustand
 GCP_Type=Druckertyp
 PRINTIPP=PrintIPP Treiber
 PrintIPPSetup=Einstellungen des DirektDruck-Moduls
 PrintIPPDesc=Dieser Treiber erlaubt es Dokumente direkt an einen Drucker zu senden. Es ist dafür erforderlich, ein Linux System mit CUPS installiert zu haben.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
+PrintingDriverDescprintipp=Konfigurationsvariablen für den Druckertreiber PrintIPP.
 PrintTestDescprintipp=Druckerliste für Treiber PrintIPP
 PRINTIPP_ENABLED=Zeige " Direkt drucken" Icon in der Dokumentenliste
 PRINTIPP_HOST=Druckserver
@@ -49,19 +49,18 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Anmeldung
 PRINTIPP_PASSWORD=Passwort
 NoPrinterFound=Keine Drucker gefunden (CUPS-Konfiguration prüfen)
-FileWasSentToPrinter=Datei %s wurde an den Drucker gesendet
 NoDefaultPrinterDefined=Kein Standarddrucker defininert
 DefaultPrinter=Standarddrucker
 Printer=Drucker
 CupsServer=CUPS-Server
 IPP_Uri=Drucker Uri
 IPP_Name=Druckername
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
-IPP_BW=BW
+IPP_State=Druckerstatus
+IPP_State_reason=Status Grund
+IPP_State_reason1=Status Grund 1
+IPP_BW=schwarz und weiß
 IPP_Color=Farbe
-IPP_Device=Device
+IPP_Device=IPP Gerät
 IPP_Media=Druckermedium
 IPP_Supported=Medientyp
 STATE_IPP_idle=Beschäftigt
@@ -69,6 +68,6 @@ STATE_IPP_stopped=Angehalten
 STATE_IPP_paused=Pausiert
 STATE_IPP_toner-low-report=Niedriger Tonerstand
 STATE_IPP_none=Keine
-MEDIA_IPP_stationery=Stationery
+MEDIA_IPP_stationery=warten
 MEDIA_IPP_thermal=Thermisch
 IPP_COLOR_print-black=BW Drucker
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index b277dbaa7d9..a4a6324e1fc 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Menge: %d
 AddDispatchBatchLine=Fügen Sie eine Zeile für Haltbarkeit Dispatching
 BatchDefaultNumber=Nicht definiert
 WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Lot/Seriennr eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden.
-ProductDoesNotUseBatchSerial=Dieses Produkt hat keine Chargen- / Seriennummer.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 1682366a086..fba647548b0 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produkt oder Leistung
 ProductsAndServices=Produkte und Leistungen
 ProductsOrServices=Produkte oder Leistungen
 ProductsAndServicesOnSell=Produkte für Ein- oder Verkauf
-ProductsAndServicesNotOnSell=Produkte/Services weder für Ein- noch Verkauf
+ProductsAndServicesNotOnSell=Produkte/Leistungen nicht für Verkauf
 ProductsAndServicesStatistics=Produkt- und Leistungs-Statistik
 ProductsStatistics=Produktstatistik
 ProductsOnSell=Produkte für Ein- oder Verkauf
 ProductsNotOnSell=Produkte weder für Ein- noch Verkauf
 ProductsOnSellAndOnBuy=Produkte für Ein- und Verkauf
 ServicesOnSell=Leistungen für Ein- oder Verkauf
-ServicesNotOnSell=Leistungen weder für Ein- noch Verkauf
+ServicesNotOnSell=Leistungen nicht für Verkauf
 ServicesOnSellAndOnBuy=Leistungen für Ein- und Verkauf
 InternalRef=Interne Referenz
 LastRecorded=Zuletzt erfasste, verfügbare Produkte/Leistungen
@@ -44,7 +44,7 @@ CardProduct1=Leistungs-Karte
 CardContract=Verträge
 Warehouse=Warenlager
 Warehouses=Warenlager
-WarehouseOpened=Lager aktiv
+WarehouseOpened=Warenlager aktiv
 WarehouseClosed=Lager geschlossen
 Stock=Warenbestand
 Stocks=Warenbestände
@@ -72,20 +72,20 @@ PublicPrice=Öffentlicher Preis
 CurrentPrice=Aktueller Preis
 NewPrice=Neuer Preis
 MinPrice=Mindestverkaufspreis
-MinPriceHT=Mindest-Verkaufspreis (ohne MwSt.)
+MinPriceHT=Mindest-Verkaufspreis (exkl. MwSt.)
 MinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 ContractStatus=Vertragsstatus
 ContractStatusClosed=Geschlossen
-ContractStatusRunning=In Arbeit
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Abgelaufen
-ContractStatusOnHold=Nicht in Arbeit
-ContractStatusToRun=zu bearbeiten
-ContractNotRunning=Dieser Vertrag wird nicht bearbeitet
+ContractStatusOnHold=angehalten
+ContractStatusToRun=Mache laufend
+ContractNotRunning=Dieser Vertrag ist nicht laufend
 ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits.
 ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben.
 ErrorProductClone=Beim Duplizieren des Produkts oder der Leistung ist ein Problem aufgetreten
-ErrorPriceCantBeLowerThanMinPrice=Fehler - Preis darf nicht unter dem Minimalpreis liegen.
+ErrorPriceCantBeLowerThanMinPrice=Fehler, Preis darf nicht unter dem Minimalpreis liegen.
 Suppliers=Lieferanten
 SupplierRef=Lieferanten-Artikelnummer
 ShowProduct=Produkt anzeigen
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ist die Erringung einer Dienstleistung zeitlich beschrän
 MultiPricesAbility=Mehrere Preisstufen pro Produkt/Leistung
 MultiPricesNumPrices=Anzahl Preise
 MultiPriceLevelsName=Preiskategorien
-AssociatedProductsAbility=Untergeordnete Produkte aktivieren
+AssociatedProductsAbility=Aktivieren Sie die Paket Funktion
 AssociatedProducts=verknüpfte Produkte
-AssociatedProductsNumber=Anzahl der Unterprodukte
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Anzahl der übergeordneten Produkte
-IfZeroItIsNotAVirtualProduct=Falls 0 ist das Produkt kein Unterprodukt
-IfZeroItIsNotUsedByVirtualProduct=Falls 0 wird das Produkt von keinem Unterprodukt verwendet
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=Falls 0 wird das Produkt von keinem Produktset verwendet
 EditAssociate=Verbinden
 Translation=Übersetzung
 KeywordFilter=Stichwortfilter
@@ -131,7 +131,7 @@ ProductToAddSearch=Suche hinzuzufügendes Produkt
 AddDel=Hinzufügen/Löschen
 Quantity=Stückzahl
 NoMatchFound=Kein Eintrag gefunden
-ProductAssociationList=Liste der verknüpften Produkte/Leistungen: Name des Produkts/der Leistung (Stückzahl)
+ProductAssociationList=Liste der Produkte/Leistungen die Komponenten von diesem Virtuellen Produkt sind
 ProductParentList=Liste der Produkte/Leistungen mit diesem Produkt als Bestandteil
 ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts
 DeleteProduct=Produkt/Leistung löschen
@@ -169,7 +169,7 @@ PredefinedServicesToPurchase=Vordefinierte Leistungen für Einkauf
 PredefinedProductsAndServicesToPurchase=Vordefinierte Produkte/Leistungen für Einkauf
 GenerateThumb=Erzeuge Vorschaubild
 ProductCanvasAbility=Verwende spezielle "canvas" Add-Ons
-ServiceNb=Leistung #%s
+ServiceNb=Leistung Nr. %s
 ListProductServiceByPopularity=Liste der Produkte/Leistungen nach Beliebtheit
 ListProductByPopularity=Liste der Produkte nach Beliebtheit
 ListServiceByPopularity=Liste der Leistungen nach Beliebtheit
@@ -179,16 +179,41 @@ CloneProduct=Produkt/Leistung duplizieren
 ConfirmCloneProduct=Möchten Sie die Leistung <b>%s</b> wirklich duplizieren?
 CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
 ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
-CloneCompositionProduct=Clone gebündelte Produkte/Services
+CloneCompositionProduct=Dupliziere Produkt-/Leistungs- Zusammenstellung
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
-CustomerPrices=Kundenpreise
-SuppliersPrices=Lieferantenpreise
-SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Leistungen)
+CustomerPrices=Kunden Preise
+SuppliersPrices=Lieferanten Preise
+SuppliersPricesOfProductsOrServices=Lieferantenpreise (von Produkten oder Leistungen)
 CustomCode=Interner Code
 CountryOrigin=Urspungsland
 HiddenIntoCombo=In ausgewählten Listen nicht anzeigen
 Nature=Art
+ShortLabel=Kurzbezeichnung
+Unit=Einheit
+p=u.
+set=set
+se=set
+second=Sekunde
+s=s
+hour=Stunde
+h=h
+day=Tag
+d=d
+kilogram=Kilo
+kg=Kg
+gram=Gramm
+g=g
+meter=Meter
+m=m
+linear Meter = Laufmeter
+lm=lm
+square Meter = Quadratmeter
+m2=m²
+cubic Meter = Kubikmeter
+m3=m³
+liter=Liter
+l=L
 ProductCodeModel=Vorlage für Produktreferenz
 ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
 AddThisProductCard=Produktkarte erstellen
@@ -214,7 +239,7 @@ CostPmpHT=Netto Einkaufspreis
 ProductUsedForBuild=Automatisch für Produktion verbraucht
 ProductBuilded=Produktion fertiggestellt
 ProductsMultiPrice=Produkt Multi-Preis
-ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Leistungen, Multi-Preise)
+ProductsOrServiceMultiPrice=Kundenpreise (von Produkten oder Leistungen, Multi-Preise)
 ProductSellByQuarterHT=Umsatz Produkte pro Quartal
 ServiceSellByQuarterHT=Umsatz Services pro Quartal
 Quarter1=1. Quartal
@@ -240,7 +265,7 @@ PricingRule=Preisregel für Kundenpreise
 AddCustomerPrice=Preis je Kunde hinzufügen
 ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
 PriceByCustomerLog=Preis nach Kunde
-MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein
+MinimumPriceLimit=Mindestpreis darf nicht kleiner als %s sein
 MinimumRecommendedPrice=Minimaler empfohlener Preis: %s
 PriceExpressionEditor=Preis Ausdrucks Editor
 PriceExpressionSelected=Ausgewählter Preis Ausdruck
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=Format {"URL": "http://example.com/urlofws", "V
 UpdateInterval=Update-Intervall (Minuten)
 LastUpdated=zuletzt verändert
 CorrectlyUpdated=erfolgreich aktualisiert
+PropalMergePdfProductActualFile=verwendete Dateien, um in PDF Azur hinzuzufügen sind / ist
+PropalMergePdfProductChooseFile=Wähle PDF-Dateien
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 9adc7b2d380..376223d2710 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Ihnen werden alle Projekte angezeigt bei welchen Sie über Le
 ProjectsPublicTaskDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
 ProjectsDesc=Es werden alle Projekte angezeigt (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen).
 MyTasksDesc=Diese Ansicht ist für Sie beschränkt auf Projekte oder Aufgaben bei welchen Sie als Ansprechpartner eingetragen sind.
-OnlyOpenedProject=Nur geöffnete Projekte sind sichtbar (Projekte im Status Entwurf oder geschlossenen sind nicht sichtbar).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
 TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen).
-AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben des Projektes sind sichtbar, Sie können jedoch nur\ndie Zeit für Aufgaben die Ihnen zugewiesen sind, eingeben.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projektübersicht
 NewProject=Neues Projekt
 AddProject=Projekt erstellen
@@ -29,7 +30,7 @@ ProjectsList=Liste der Projekte
 ShowProject=Zeige Projekt
 SetProject=Projekt setzen
 NoProject=Kein Projekt definiert oder keine Rechte
-NbOpenTasks=Anzahl der offenen Aufgaben
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Anzahl der Projekte
 TimeSpent=Zeitaufwand
 TimeSpentByYou=Dein Zeitaufwand
@@ -41,7 +42,7 @@ TaskTimeSpent=Zeitaufwände für Aufgaben
 TaskTimeUser=Benutzer
 TaskTimeNote=Hinweis
 TaskTimeDate=Datum
-TasksOnOpenedProject=Aufgaben für offenes Projekt
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload nicht definiert
 NewTimeSpent=Neuer Zeitaufwand
 MyTimeSpent=Mein Zeitaufwand
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Liste Eingriffe, die mit diesem Projekt verknüpf
 ListExpenseReportsAssociatedProject=Liste Spesenabrechnungen, die mit diesem Projekt verknüpft sind
 ListDonationsAssociatedProject=Liste Spenden, die mit diesem Projekt verknüpft sind
 ListActionsAssociatedProject=Liste Ereignisse, die mit diesem Projekt verknüpft sind
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche
 ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats
 ActivityOnProjectThisYear=Projektaktivitäten dieses Jahres
@@ -95,7 +98,7 @@ DeleteATimeSpent=Lösche einen Zeitaufwand
 ConfirmDeleteATimeSpent=Möchten Sie diesen Zeitaufwand wirklich löschen?
 DoNotShowMyTasksOnly=Zeige auch die Aufgaben der Anderen
 ShowMyTasksOnly=Zeige nur meine Aufgaben
-TaskRessourceLinks=Ressourcen
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte
 NoTasks=Keine Aufgaben für dieses Projekt
 LinkedToAnotherCompany=Mit Partner verknüpft
@@ -139,8 +142,15 @@ ProjectReferers=Verknüpfte Objekte
 SearchAProject=Projekt suchen
 ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
 ProjectDraft=Projekt-Entwürfe
-FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Eingabe pro Tag
 InputPerWeek=Eingabe pro Woche
 InputPerAction=Eingabe pro Aktion
 TimeAlreadyRecorded=Zeitaufwand für diese Aufgabe/Tag und Benutzer %s bereits aufgenommen
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Aufgaben diesem Benutzer zugeordnet
+ResourceNotAssignedToProject=Zugewiesen zu Projekt
+ResourceNotAssignedToTask= nicht zugewiesen zu Aufgabe
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 5e72aae4e86..b597e556750 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Buchhaltungscode für Bezahlung der Gehälter
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Kontierungs-Code Konto für die Zahlung der Löhne
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Kontierungs-Code Konto für Finanzaufwendungen
 Salary=Lohn
 Salaries=Löhne
 Employee=Angestellter
@@ -8,6 +8,8 @@ NewSalaryPayment=Neue Lohnzahlung
 SalaryPayment=Lohnzahlung
 SalariesPayments=Lohnzahlungen
 ShowSalaryPayment=Zeige Lohnzahlung
-THM=Durchschnittlicher Stundenpreis
-TJM=Durchschnittlicher Tagespreis
-CurrentSalary=Current salary
+THM=Durchschnittlicher Stundensatz
+TJM=Durchschnittlicher Tagessatz
+CurrentSalary=aktueller  Lohn
+THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verbrauchte Zeit eines Anwender zu berechnen, wenn das Modul Projektverwaltung verwendet wird,
+TJMDescription=Dieser Wert ist aktuell nur zu Informationszwecken und wird nicht für eine Berechnung verwendet
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index aba3a7b80d3..2e9112d7424 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Reise- und Fahrtspesen
 TripsAndExpensesStatistics=Reise- und Spesen Statistik
 TripCard=Reisekosten Karte
 AddTrip=Reisekostenabrechnung erstellen
-ListOfTrips=Liste Reisekostenabrechnungen
+ListOfTrips=Liste Reise- und Spesenabrechnungen
 ListOfFees=Liste der Spesen
 NewTrip=neue Reisekostenabrechnung
 CompanyVisited=Besuchter Partner
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Auto
 TF_PEAGE=Mautgebühr
 TF_ESSENCE=Kraftstoff
-TF_HOTEL=Herberge
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Sie haben bereits eine andere Spesenabrechnung in einem ähnliche Datumsbereich erstellt.
-ListTripsAndExpenses=Liste Reise- und Spesenabrechnungen
 AucuneNDF=Keine Spesenabrechnungen für diese Kriterien gefunden
 AucuneLigne=Es wurde noch keine Spesenabrechnung erstellt.
 AddLine=Neue Zeile hinzufügen
@@ -56,12 +55,12 @@ ModePaiement=Zahlungsart
 Note=Hinweis
 Project=Projekt
 
-VALIDATOR=Benutzer über die Genehmigung informieren
+VALIDATOR=verantwortlicher Benutzer für Genehmigung
 VALIDOR=genehmigt durch
 AUTHOR=gespeichert von
-AUTHORPAIEMENT=einbezahlt von
+AUTHORPAIEMENT=Einbezahlt von
 REFUSEUR=abgelehnt durch
-CANCEL_USER=verworfen von
+CANCEL_USER=gelöscht von
 
 MOTIF_REFUS=Grund
 MOTIF_CANCEL=Grund
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Zahlungsdatum
 
 TO_PAID=bezahlen
 BROUILLONNER=entwerfen
-SendToValid=senden zu genehmigen
+SendToValid=Zur Genehmigung einreichen
 ModifyInfoGen=Bearbeiten
 ValidateAndSubmit=Validieren und zur Genehmigung einreichen
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Sie sind nicht berechtigt, diese Spesennabrechnung zu genehmigen
 NOT_AUTHOR=Sie sind nicht der Autor dieser Spesenabrechnung. Vorgang abgebrochen.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Möchten Sie den Status dieser Reisekostenabrechnung auf "Bezahl
 CancelTrip=Abrechen einer Spesenabrechnung
 ConfirmCancelTrip=Möchten Sie diese Spesenabrechnung wirklich abbrechen?
 
-BrouillonnerTrip=Gehen Sie zurück Spesenabrechnung zu Status "Entwurf"
+BrouillonnerTrip=Spesenabrechnung rückgängig, auf den Status "Entwurf"
 ConfirmBrouillonnerTrip=Möchten Sie den Status dieser Reisekostenabrechnung auf "Entwurf" ändern?
 
 SaveTrip=Bestätige Spesenabrechnung
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index d30044c4141..397970af395 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Gruppenzuweisung entfernen
 PasswordChangedAndSentTo=Passwort geändert und an <b>%s</b> gesendet.
 PasswordChangeRequestSent=Kennwort-Änderungsanforderung für <b>%s</b> gesendet an <b>%s</b>.
 MenuUsersAndGroups=Benutzer & Gruppen
+MenuMyUserCard=My user card
 LastGroupsCreated=%s zuletzt erstellte Gruppen
 LastUsersCreated=%s zuletzt erstellte Benutzer
 ShowGroup=Zeige Gruppe
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index e663476014f..9c249c6bd5f 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Datei abbuchen
 SetToStatusSent=Setze in Status "Datei versandt"
 ThisWillAlsoAddPaymentOnInvoice=Dies wird auch Zahlungen auf Rechnungen erstellen und diese als bezahlt markieren
 StatisticsByLineStatus=Statistiken nach Statuszeilen
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Zahlung Abbucher %s an die Bank
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 6fb285f3ad3..afcca4b97fc 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow Moduleinstellungen
-WorkflowDesc=Dieses Modul wurde entwickelt um zu verändern das Verhalten von automatischen Aktionen. Standardmäßig ist die Workflow geöffnet (Sie können alles in Ihrer Reihenfolge erledigen). Sie können automatische Vorgänge aktivieren, falls Sie für Sie von Interesse.
-ThereIsNoWorkflowToModify=Es gibt keine Vorgänge für das aktivierte Modul die Sie ändern können.
+WorkflowDesc=Dieses Modul wurde gestaltet um das Verhalten von automatischen Aktionen in den Anwendung zu verändern. Standardmäßig wird der Prozess offen sein. (Sie können die Dinge in der gewünschten Reihenfolge tun). Sie können die automatische Aktionen, die Sie interessieren aktivieren.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstelle einen Kundenauftrag automatisch, nachdem ein Angebot unterzeichnet wurde
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstelle eine automatische Kundenrechnung, nachdem ein Angebot unterzeichnet wurde
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erstselle eine automatische Kundenrechnung, nachdem ein Vertrag freigegeben wurde
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung, nachdem ein Kundenauftrag geschlossen wurde
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically Erstelle eine Kundenrechnung automatisch, nachdem ein Angebot unterzeichnet wurde
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically Erstelle eine Kundenrechnung automatisch, nachdem ein Vertrag bestätigt wurde
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically Erstelle eine Kundenrechnung automatisch, nachdem ein Kundenauftrag geschlossen wurde
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Kennzeichne verknüpftes Angebot als in Rechnung gestellt, wenn der Kundenauftrag als bezahlt markiert wird
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als verrechnet, wenn die Kundenrechnung als bezahlt markiert wird
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als verrechnet, wenn die Kundenrechnung bestätigt wird
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 684ff2c5215..04445c78676 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Λογιστική
 Globalparameters=Βασικοί Παράμετροι
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτων
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
-ACCOUNTING_BANK_JOURNAL=Τραπεζικό ημερολόγιο
-ACCOUNTING_CASH_JOURNAL=Ημερολόγιο μετρητών
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Διάφορα ημερολόγια
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index c6c64032d7f..7358a1242e9 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Μενού για τους χρήστες
 LangFile=Αρχείο .lang
 System=Σύστημα
 SystemInfo=Πληροφορίες Συστήματος
-SystemTools=Εργαλεία Συστήματος
 SystemToolsArea=Περιοχή Εργαλείων Συστήματος
 SystemToolsAreaDesc=Αυτή η περιοχή παρέχει δυνατότητες διαχείρισης. Χρησιμοποιήστε το μενού για να επιλέξετε τη λειτουργία που ψάχνετε.
 Purge=Εκκαθάριση
@@ -232,8 +231,8 @@ Security=Ασφάλεια
 Passwords=Συνθηματικά
 DoNotStoreClearPassword=Μην αποθηκεύετε αποκρυπτογραφημένους κωδικούς στην βάση δεδομένων, αλλά να αποθηκεύετε μόνο η κρυπτογραφημένη τιμή (προτείνεται να είναι ενεργό)
 MainDbPasswordFileConfEncrypted=Ο κωδικός της βάσης δεδομένων να είναι κρυπτογραφημένος στο conf.php (προτείνεται να είναι ενεργό)
-InstrucToEncodePass=Για να κρυπτογραφήσετε τον κωδικό στο αρχείο <b>conf.php</b>, αντικαταστήστε την γραμμή <br><b>$dolibarr_main_db_pass="..."</b><br>με το <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Για να αφήσετε τον κωδικό χωρίς κρυπτογράφηση στο αρχείο <b>conf.php</b> , αντικαταστήστε τη γραμμή <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>με το <br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Προστασία παραγόμενων αρχείων pdf (Η ενεργοποίηση ΔΕΝ προτείνεται, χαλάει την μαζική δημιουργία pdf)
 ProtectAndEncryptPdfFilesDesc=Η ασφάλεια ενός αρχείου PDF επιτρέπει τα προγράμματα ανάγνωσης PDF να το ανοίξουν και να το εκτυπώσουν.  Παρ' ΄όλα αυτά, η τροποποίηση και η αντιγραφή δεν θα είναι πλέον δυνατά.  Σημειώστε πως αν χρησιμοποιήσετε αυτή την λειτουργία δεν θα μπορούν να δουλέψουν ομαδικά pdf (όπως απλήρωτα τιμολόγια).
 Feature=Δυνατότητα
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να επεξ
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Βήμα %s
 FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s).
-DownloadPackageFromWebSite=Μεταφόρτωση πακέτου %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Dolibarr είναι έτοιμο να χρησιμοποιηθεί με αυτό το νέο στοιχείο.
 NotExistsDirect=Ο εναλλακτικός ριζικός φάκελος δεν έχει ρυθμιστεί.<br>
 InfDirAlt=Από την έκδοση 3 είναι δυνατός ο ορισμός ενός εναλλακτικού ριζικού φακέλου.  Αυτό σας επιτρέπει να αποθηκεύσετε στο ίδιο μέρος πρόσθετες εφαρμογές και μη τυπικά templates.<br>Απλά δημιουργήστε ένα φάκελο στο ριζικό φάκελο του Dolibarr (π.χ.: custom).<br>
 InfDirExample=<br>Κατόπιν δηλώστε το στο αρχείο conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Αυτές οι γραμμές είναι απενεργοποιημένες με χρήση του χαρακτήρα "#", για να της ενεργοποιήσετε απλά αφαιρέστε το χαρακτήρα.
-YouCanSubmitFile=Επιλογή module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Πηγαίνετε στην σελίδα που ενημερώνει την δομή της βάσης δεδομένων και τα δεδομένα: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Λίστα Παραμέτρων που προέρχε
 ExtrafieldParamHelpchkbxlst=Λίστα Παραμέτρων που προέρχεται από έναν πίνακα<br>σύνταξη : table_name:label_field:id_field::filter<br>παράδειγμα: c_typent:libelle:id::filter<br><br>φίλτρο μπορεί να είναι μια απλή δοκιμή (eg active=1) για να εμφανίσετε μόνο μία ενεργό τιμή <br> αν θέλετε να φιλτράρετε extrafields χρησιμοποιήστε τη σύνταξη  extra.fieldcode=... (όπου κωδικός πεδίου είναι ο κωδικός του extrafield)<br><br>Προκειμένου να έχει τον κατάλογο ανάλογα με ένα άλλο :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Βιβλιοθήκη για την δημιουργία PDF
 WarningUsingFPDF=Προειδοποίηση: Το αρχείο <b>conf.php</b> περιλαμβάνει την επιλογή <b>dolibarr_pdf_force_fpdf=1</b>. Αυτό σημαίνει πως χρησιμοποιείτε η βιβλιοθήκη FPDF για να δημιουργούνται τα αρχεία PDF. Αυτή η βιβλιοθήκη είναι παλιά και δεν υποστηρίζει πολλές λειτουργίες (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), οπότε μπορεί να παρουσιαστούν λάθη κατά την δημιουργία των PDF.<br>Για να λυθεί αυτό και να μπορέσετε να έχετε πλήρη υποστήριξη δημιουργίας αρχείων PDF, παρακαλώ κατεβάστε την <a href="http://www.tcpdf.org/" target="_blank">βιβλιοθήκη TCPDF</a>,  και μετά απενεργοποιήστε ή διαγράψτε την γραμμή <b>$dolibarr_pdf_force_fpdf=1</b>, και εισάγετε αντί αυτής την <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη <strong>%s</strong>
 RefreshPhoneLink=Ανανέωση συνδέσμου
@@ -430,8 +429,8 @@ Module20Name=Προτάσεις
 Module20Desc=Διαχείριση προσφορών
 Module22Name=Μαζική αποστολή e-mail
 Module22Desc=Διαχείριση μαζικής αποστολής e-mail
-Module23Name= Ενέργεια
-Module23Desc= Παρακολούθηση κατανάλωσης ενέργειας
+Module23Name=Ενέργεια
+Module23Desc=Παρακολούθηση κατανάλωσης ενέργειας
 Module25Name=Παραγγελίες πελάτη
 Module25Desc=Διαχείριση παραγγελιών πελατών
 Module30Name=Τιμολόγια
@@ -492,8 +491,8 @@ Module400Name=Έργα/Ευκαιρίες/Leads
 Module400Desc=Διαχείριση έργων, ευκαιρίες ή leads. Στη συνέχεια μπορείτε να ορίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, προσφορά, παρέμβαση, ...) σε ένα έργο και να πάρετε μια εγκάρσια όψη από την προβολή του έργου.
 Module410Name=Ημερολόγιο ιστού
 Module410Desc=Διεπαφή ημερολογίου ιστού
-Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα)
-Module500Desc=Διαχείριση των ειδικών δαπανών, όπως οι φόροι, κοινωνικές εισφορές, μερίσματα και μισθούς
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Μισθοί
 Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου σχετικά με ορισμένες Dolibarr επαγγελματικές συναντήσεις σε Πελ./Προμ. (η ρύθμιση ορίζεται από κάθε Πελ./Προμ.)
 Module700Name=Δωρεές
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Ατζέντα
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=Υπηρεσίες Διαδικτύου (πελάτης)
 Module2650Desc=Ενεργοποιήστε το Dolibarr web services client (Μπορεί να χρησιμοποιηθεί για την προώθηση των δεδομένων/αιτήσεις σε εξωτερικούς διακομιστές. Μόνο Παραγγελίες προμηθευτών υποστηρίζονται προς το παρόν)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Χώρες
 DictionaryCurrency=Νόμισμα
 DictionaryCivility=Τίτλος Civility
 DictionaryActions=Τύπο των συμβάντων της ημερήσιας διάταξης
-DictionarySocialContributions=Τύποι κοινωνικών εισφορών
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Τιμές ΦΠΑ ή φόρου επί των πωλήσεων
 DictionaryRevenueStamp=Ποσό των ενσήμων
 DictionaryPaymentConditions=Όροι πληρωμής
@@ -817,6 +818,9 @@ DictionarySource=Προέλευση των προτάσεων/παραγγελι
 DictionaryAccountancyplan=Λογιστικό σχέδιο
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
 DictionaryEMailTemplates=Πρότυπα email
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 BackToModuleList=Πίσω στη λίστα με τα modules
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
@@ -936,13 +940,14 @@ CompanyZip=Τ.Κ.
 CompanyTown=Πόλη
 CompanyCountry=Χώρα
 CompanyCurrency=Βασικό Νόμισμα
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Απόκρυψη
 DoNotSuggestPaymentMode=Χωρίς πρόταση πληρωμής
 NoActiveBankAccountDefined=Δεν έχει οριστεί ενεργός λογαριασμός τράπεζας
 OwnerOfBankAccount=Ιδιοκτήτης του λογαριασμού τράπεζας %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Συναγερμοί
 Delays=Καθυστερήσεις
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Χρήση Δεκαδικών ψηφίων στις τι
 MAIN_MAX_DECIMALS_TOT=μέγιστος αριθμός δεκαδικών στη συνολική πληρωτέα τιμή
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Καθαρή τιμή επί του προϊόντος
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=Μπορείτε να χρησιμοποιήσετε το πρόγραμμα οδήγησης %s που είναι καλύτερος οδηγός που διατίθεται σήμερα.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Οπτικοποίηση των προϊόντων περιγραφών στη γλώσσα άλλους κατασκευαστές
 UseSearchToSelectProductTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό προϊόντων (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά PRODUCT_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other.  αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectProduct=Χρησιμοποιήστε μια φόρμα αναζήτησης για να επιλέξετε ένα προϊόν (αντί για μια αναπτυσσόμενη λίστα).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Διαχειριστής για την αυτόματη αρίθμηση του barcode
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Βάσει μετρητών
 OptionVATDebitOption=Βάσει δεδουλευμένων
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Εργασίες αριθμοδότησης μονάδας
 TaskModelModule=Εργασίες υπόδειγμα εγγράφου αναφορών
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Άνοιγμα οικονομικού έτους
 CloseFiscalYear=Κλείσιμο οικονομικού έτους
 DeleteFiscalYear=Διαγραφή οικονομικού έτους
 ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το οικονομικό έτος;
-Opened=Ανοίξτε
+Opened=Open
 Closed=Κλείστε
 AlwaysEditable=Μπορεί πάντα να επεξεργαστή
 MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index f77c296ab81..26c9ac58e52 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -49,13 +49,12 @@ InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε
 InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου
 InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται
 OrderValidatedInDolibarr=Η παραγγελία %s επικυρώθηκε
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Παραγγελία %s κατατάσσεται παραδοτέα
 OrderCanceledInDolibarr=Παραγγελία %s ακυρώθηκε
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Παραγγελία %s κατατάσσεται χρεωμένη
 OrderApprovedInDolibarr=Παραγγελία %s εγκρίθηκε
 OrderRefusedInDolibarr=Παραγγελία %s απορριφθεί
 OrderBackToDraftInDolibarr=Παραγγελία %s θα επιστρέψει στην κατάσταση σχέδιο
-OrderCanceledInDolibarr=Παραγγελία %s ακυρώθηκε
 ProposalSentByEMail=Η εμπορική πρόταση %s στάλθηκε με e-mail
 OrderSentByEMail=Η παραγγελία του πελάτη %s εστάλη με EMail
 InvoiceSentByEMail=Το τιμολόγιο του πελάτη %s εστάλη με EMail
@@ -94,5 +93,7 @@ WorkingTimeRange=Εύρος χρόνου εργασίας
 WorkingDaysRange=Εύρος ημερών εργασίας
 AddEvent=Δημιουργία συμβάντος
 MyAvailability=Η διαθεσιμότητα μου
-ActionType=Event type
-DateActionBegin=Start event date
+ActionType=Τύπος συμβάντος
+DateActionBegin=Έναρξη ημερομηνίας του συμβάντος
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 12c3becee2d..3a668ee2b10 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Πραγματοποίηση Συναλλαγής
 Conciliation=Πραγματοποίηση Συναλλαγής
 ConciliationForAccount=Πραγματοποίηση Συναλλαγών του Λογαριασμού
 IncludeClosedAccount=Συμπερίληψη Κλειστών Λογαριασμών
-OnlyOpenedAccount=Μόνο Ανοιχτοί Λογαριασμοί
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Πίστωση στον Λογαριασμό
 AccountToDebit=Χρέωση στον Λογαριασμό
 DisableConciliation=Απενεργοποίηση της ιδιότητας συμφωνία από αυτό τον λογαριασμό
 ConciliationDisabled=Η ιδιότητα συμφωνία απενεργοποιήθηκε.
-StatusAccountOpened=Ανοιχτός
+StatusAccountOpened=Open
 StatusAccountClosed=Κλειστός
 AccountIdShort=Αριθμός
 EditBankRecord=Επεξεργασία Εγγραφής
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Πληρωμή Πελάτη
 CustomerInvoicePaymentBack=Επιστροφή πληρωμής Πελάτη
 SupplierInvoicePayment=Πληρωμή Προμηθευτή
 WithdrawalPayment=Ανάκληση πληρωμής
-SocialContributionPayment=Πληρωμή κοινωνικής εισφοράς
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Ημερολόγιο λογιστικού λογαριασμού
 BankTransfer=Τραπεζική Μεταφορά
 BankTransfers=Τραπεζικές Μεταφορές
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index f14f373d887..be14a9cfb36 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Πλήθος τιμολογίων
 NumberOfBillsByMonth=Nb των τιμολογίων ανά μήνα
 AmountOfBills=Ποσό τιμολογίων
 AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
-ShowSocialContribution=Εμφάνιση κοινωνικής εισφοράς
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Εμφάνιση τιμολογίου
 ShowInvoice=Εμφάνιση τιμολογίου
 ShowInvoiceReplace=Εμφάνιση τιμολογίου αντικατάστασης
@@ -270,7 +270,7 @@ BillAddress=Διεύθυνση χρέωσης
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Κωδ. Πληρωμής
 InvoiceId=Κωδ. Τιμολογίου
 InvoiceRef=Κωδ. Τιμολογίου
@@ -430,5 +430,5 @@ NotLastInCycle=Το τιμολόγιο αυτό δεν είναι το τελε
 DisabledBecauseNotLastInCycle=Η επόμενη κατάσταση υπάρχει ήδη.
 DisabledBecauseFinal=Η κατάσταση αυτή είναι οριστική.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=Δεν υπάρχουν ανοιχτές καταστάσεις
+NoSituations=No open situations
 InvoiceSituationLast=Τελικό και γενικό τιμολόγιο
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 45d09637caf..43ed62bb5eb 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Τελευταία συμβόλαια
 BoxLastContacts=Τελευταίες επαφές/διευθύνσεις
 BoxLastMembers=Τελευταία μέλη
 BoxFicheInter=Τελευταίες παρεμβάσεις
-BoxCurrentAccounts=Άνοιξε το υπόλοιπο των λογαριασμών
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Κύκλος εργασιών
 BoxTotalUnpaidCustomerBills=Σύνολο απλήρωτων τιμολογίων πελατών
 BoxTotalUnpaidSuppliersBills=Σύνολο απλήρωτων τιμολογίων προμηθευτών
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Τελευταία %s Μέλη
 BoxTitleLastFicheInter=Τελευταία %s ενημέρωση παρέμβασης
 BoxTitleOldestUnpaidCustomerBills=Παλαιότερα %s ανεξόφλητα τιμολόγια πελατών 
 BoxTitleOldestUnpaidSupplierBills=Παλαιότερα %s ανεξόφλητα τιμολόγια προμηθευτών
-BoxTitleCurrentAccounts=Άνοιξε τα υπόλοιπα των λογαριασμών
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Κύκλος εργασιών των πωλήσεων
 BoxTitleTotalUnpaidCustomerBills=Απλήρωτα τιμολόγια πελατών
 BoxTitleTotalUnpaidSuppliersBills=Απλήρωτα τιμολόγια προμηθευτών
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 44b883b8a0f..2f4373429b8 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-NoCategoryYet=No tag/category of this type created
+Rubrique=Ετικέτα/Κατηγορία
+Rubriques=Ετικέτες/Κατηγορίες
+categories=Ετικέτες/Κατηγορίες
+TheCategorie=Ετικέτα/Κατηγορία
+NoCategoryYet=Δεν έχει δημιουργηθεί τέτοια ετικέτα/κατηγορία
 In=Μέσα
 AddIn=Προσθήκη σε
 modify=αλλαγή
 Classify=Ταξινόμηση
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
+CategoriesArea=Πεδίο Ετικέτες/Κατηγορίες
+ProductsCategoriesArea=Πεδίο Προϊόντα/Υπηρεσίες Ετικέτες/Κατηγορίες
+SuppliersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Προμηθευτή
+CustomersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Πελάτη
+ThirdPartyCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Πελ./Προμ.
+MembersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Μελών
 ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
+MainCats=Βασικές Ετικέτες/Κατηγορίες
 SubCats=Υποκατηγορίες
 CatStatistics=Στατιστικά
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CatList=Λίστα Ετικετών/Κατηγοριών
+AllCats=Όλες οι Ετικέτες / Κατηγορίες
+ViewCat=Εμφάνιση Ετικέτας/Κατηγορίας
+NewCat=Προσθήκη Ετικέτας/ Κατηγορίας
+NewCategory=Νέα Ετικέτα/Κατηγορία
+ModifCat=Τροποποίηση Ετικέτας/Κατηγορίας
+CatCreated=Ετικέτα/Κατηγορία δημιουργήθηκε
+CreateCat=Δημιουργία Ετικέτας/Κατηγορίας
+CreateThisCat=Δημιουργήστε αυτήν την Ετικέτα/Κατηγορία
 ValidateFields=Επικύρωση πεδίων
 NoSubCat=Καμία υποκατηγορία.
 SubCatOf=Υποκατηγορία
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> προστέθηκε με επιτυχία.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Καμία
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Η κατηγορία αυτή υπάρχει ήδη με αυτό το όνομα
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Περιεχόμενα μη ορατά από όλ
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Κατηγορίες Πελατών/Προοπτ
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index c2e78746d67..25dbcfb2e95 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Αντιπρόσωπος στοιχείου
 StatusContactValidated=Κατάσταση αντιπροσώπου
 Company=Εταιρία
 CompanyName=Όνομα εταιρίας
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Εταιρίες
 CountryIsInEEC=Η χώρα βρίσκετε στην Ε.Ε.
 ThirdPartyName=Όνομα Πελ./Προμ.
@@ -410,5 +411,10 @@ OutstandingBillReached=Έφτασε στο όριο. για των εκκρεμ
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
 ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
-SearchThirdparty=Αναζήτηση Πελ./Προμ.
+SearchThirdparty=Search third party
 SearchContact=Αναζήτηση επαφής
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 306b29a9767..1409c0bb986 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=Προς πληρωμή
 ToGet=Προς επιστροφή
 SpecialExpensesArea=Περιοχή για όλες τις ειδικές πληρωμές
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Κοινωνική εισφορά
-SocialContributions=Κοινωνικές εισφορές
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Ειδικά έξοδα
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Μισθοί
-MenuSocialContributions=Κοινωνικές εισφορές
-MenuNewSocialContribution=Νέα εισφορά
-NewSocialContribution=Νέα κοινωνική εισφορά
-ContributionsToPay=Εισφορές προς πληρωμή
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Ρυθμίσεις Λογιστικής
 NewPayment=Νέα Πληρωμή
 Payments=Πληρωμές
 PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
 PaymentSupplierInvoice=Πληρωμή τιμολογίου προμηθευτή
-PaymentSocialContribution=Πληρωμή κοινωνικών υπηρεσιών
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Πληρωμή Φόρου
 PaymentSalary=Πληρωμή μισθού
 ListPayment=Λίστα πληρωμών
@@ -91,7 +91,7 @@ LT1PaymentES=RE Πληρωμής
 LT1PaymentsES=RE Πληρωμές
 VATPayment=Πληρωμή Φόρου
 VATPayments=Πληρωμές Φόρου
-SocialContributionsPayments=Πληρωμές κοινωνικών υπηρεσιών
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Εμφάνιση πληρωμής φόρου
 TotalToPay=Σύνολο πληρωμής
 TotalVATReceived=Σύνολο φόρου που εισπράχθηκε
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=Δεν υπάρχουν επιταγές προς κατάθεση
 DateChequeReceived=Check reception input date
 NbOfCheques=Πλήθος επιταγών
-PaySocialContribution=Πληρωμή κοινωνικής εισφοράς
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Διαγραφή κοινωνικής εισφοράς
-ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε να διαγράψετε την κοινωνική εισφορά;
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Κατάσταση <b>%sΦΠΑ επί των λογιστικών υποχρεώσεων%s</b>
 CalcModeVATEngagement=Κατάσταση <b>%sΦΠΑ επί των εσόδων-έξοδα%s</b>.
 CalcModeDebt=Κατάσταση <b>%sΑπαιτήσεις-Οφειλές%s</b> δήλωσε <b>Λογιστικών υποχρεώσεων</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε
 TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακή λογιστική</b> η λειτουργία δεν είναι σχετική. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστική δέσμευση</b> τρόπος (ανατρέξτε τη Ρύθμιση του module λογιστικής).
 CalculationMode=Τρόπο υπολογισμού
 AccountancyJournal=Λογιστικος Κωδικός περιοδικό
-ACCOUNTING_VAT_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ
 ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτες
 ACCOUNTING_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για τους προμηθευτές
-CloneTax=Κλώνος για μια κοινωνική προσφορά
-ConfirmCloneTax=Επιβεβαιώστε τον κλώνο της κοινωνικής προσφοράς
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Κλώνος για τον επόμενο μήνα
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 738ac49580c..006e7766751 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -4,10 +4,10 @@ About = Πληροφορίες
 CronAbout = Σχετικά με το Cron
 CronAboutPage = Σχετικά με τη σελίδα Cron
 # Right
-Permission23101 = Διαβάστε την προγραμματισμένη εργασία
-Permission23102 = Δημιουργία / ενημέρωση προγραμματισμένης εργασίας
-Permission23103 = Διαγραφή προγραμματισμένης εργασίας
-Permission23104 = Εκτέλεση Προγραμματισμένης εργασίας
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
 URLToLaunchCronJobs=URL για να ελέγξετε και να ξεκινήσει μια περιοδική εργασία, εφόσον απαιτείται
@@ -26,11 +26,11 @@ CronLastOutput=Τελευταία εκτέλεση εξόδου
 CronLastResult=Τελευταίος κωδικός αποτελέσματος
 CronListOfCronJobs=Κατάλογος προγραμματισμένων εργασιών
 CronCommand=Εντολή
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Εργασία
@@ -39,8 +39,8 @@ CronDtStart=Ημερ. έναρξης
 CronDtEnd=Ημερ. τέλους
 CronDtNextLaunch=Επόμενη εκτέλεση
 CronDtLastLaunch=Τελευταία εκτέλεση
-CronFrequency=Συχνότητα
-CronClass=Κατηγορία
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Μέθοδος
 CronModule=Module
 CronAction=Ενέργεια
@@ -55,9 +55,9 @@ CronEach=Κάθε
 JobFinished=Ξεκίνησε και τελείωσε
 #Page card
 CronAdd= Προσθήκη εργασίας
-CronHourStart= Έναρξη ώρας και ημερομηνία αποστολής
-CronEvery= Εκτέλεση εργασίας κάθε
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Παράμετροι
 CronSaveSucess=Επιτυχής αποθήκευση
 CronNote=Σχόλιο
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Πληροφορίες
 # Common
-CronType=Τύπος εργασίας
+CronType=Job type
 CronType_method=Καλέστε τη μέθοδο της κατηγορίας Dolibarr
 CronType_command=Εντολή Shell
 CronMenu=Μενού
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες.
-TaskDisabled=Η εργασία απενεργοποιήθηκε
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index df6466109aa..e74f0571b20 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Χειροκίνητα
 ECMTypeAuto=Αυτόματα
-ECMDocsBySocialContributions=Έγγραφα που συνδέονται με τις κοινωνικές εισφορές
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Έγγραφα συνδεδεμένα με στοιχεία
 ECMDocsByProposals=Έγγραφα που σχετίζονται με τις προτάσεις
 ECMDocsByOrders=Έγγραφα συνδεδεμένα με παραγγελίες πελατών
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 16e711c27c7..5b23656c1eb 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Απενεργοποιημένη λειτουργία όταν οι ρυθμίσεις της οθόνης έχουν προσαρμοστεί για χρήση από άτομα με προβλήματα όρασης ή φυλλομετρητές κειμένου.
 WarningPaymentDateLowerThanInvoiceDate=Η ημερομηνία πληρωμής (%s) είναι νωρίτερα από την ημερομηνία του τιμολογίου (%s) για το τιμολόγιο %s.
 WarningTooManyDataPleaseUseMoreFilters=Πάρα πολλά στοιχεία. Παρακαλούμε χρησιμοποιήστε περισσότερα φίλτρα
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index ec8c78077de..741c9713e23 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Άδειες
 CPTitreMenu=Άδειες
 MenuReportMonth=Μηνιαία αναφορά
-MenuAddCP=Κάντε αίτηση άδειας
+MenuAddCP=New leave request
 NotActiveModCP=Θα πρέπει να ενεργοποιήσετε τις Άδειες module για να δείτε αυτή τη σελίδα.
 NotConfigModCP=Μπορείτε να ρυθμίσετε το module Άδειες για να δείτε αυτή τη σελίδα.Για να το κάνετε αυτό, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> κάντε κλικ εδώ </ a>.
 NoCPforUser=Δεν έχετε διαθέσιμες ημέρες.
@@ -71,7 +71,7 @@ MotifCP=Λόγος
 UserCP=Χρήστης
 ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας.
 AddEventToUserOkCP=Η προσθήκη της έκτακτης άδειας έχει ολοκληρωθεί.
-MenuLogCP=Δείτε τα αρχεία καταγραφών των αιτήσεων άδειας
+MenuLogCP=View change logs
 LogCP=Αρχείο καταγραφής για ενημέρωση των διαθέσιμων ημερών των αδειών
 ActionByCP=Διενεργείται από
 UserUpdateCP=Για το χρήστη
@@ -93,6 +93,7 @@ ValueOptionCP=Αξία
 GroupToValidateCP=Ομάδα με τη δυνατότητα να εγκρίνει τις αιτήσεις αδειών
 ConfirmConfigCP=Επικύρωση της διαμόρφωσης
 LastUpdateCP=Τελευταία αυτόματη ενημέρωση της κατανομής των φύλλων
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Ενημερώθηκε με επιτυχία.
 ErrorUpdateConfCP=Παρουσιάστηκε σφάλμα κατά την ενημέρωση, παρακαλώ προσπαθήστε ξανά.
 AddCPforUsers=Παρακαλώ προσθέστε το υπόλοιπο των φύλλων κατανομής των χρηστών από <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">κλικ εδώ</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Παρουσιάστηκε σφάλμα κατά την απο
 NoCPforMonth=Όχι αυτό το μήνα.
 nbJours=Αριθμός ημερών
 TitleAdminCP=Διαμόρφωση των αδειών
+NoticePeriod=Notice period
 #Messages
 Hello=Γεια σας
 HolidaysToValidate=Επικύρωση των αιτήσεων για τις άδειες
@@ -139,10 +141,11 @@ HolidaysRefused=Αίτηση αρνήθηκε
 HolidaysRefusedBody=Η αίτηση αδείας σας για %s στο %s έχει απορριφθεί για τον ακόλουθο λόγο:
 HolidaysCanceled=Ακυρώθηκε το αίτημα αδείας
 HolidaysCanceledBody=Η αίτηση αδείας σας για %s στο %s έχει ακυρωθεί.
-Permission20000=Διαβάστε τη δική σας αίτηση άδειας
-Permission20001=Δημιουργία/τροποποίηση των αιτήσεων αδειών σας
-Permission20002=Δημιουργία/τροποποίηση των αιτήσεων αδειών για όλους
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Διαγραφή των αιτήσεων άδειας
-Permission20004=Ρύθμιση χρηστών για τις διαθέσιμες ημέρες αδείας
-Permission20005=Αναθεώρηση καταγραφής των τροποποιημένων αιτήσεων άδειας
-Permission20006=Μηνιαία έκθεση αδειών
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/el_GR/incoterm.lang b/htdocs/langs/el_GR/incoterm.lang
index d033be2b50a..eff07ca0e8a 100644
--- a/htdocs/langs/el_GR/incoterm.lang
+++ b/htdocs/langs/el_GR/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Διεθνείς Εμπορικός Όρος
-Module210009Desc=Προσθέστε δυνατότητες για τη διαχείριση του Διεθνή Εμπορικού Όρου
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Διεθνείς Εμπορικοί Όροι
 IncotermSetupTitle1=Χαρακτηριστικό
 IncotermSetupTitle2=Κατάσταση
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index 939e7a72d52..b7c2fb15724 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(Πειραματική)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, useless if your database and your database login already exists (like when you're hosted by a web hosting provider).
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Αποθήκευση τιμών
diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
index 8f3f7ad963a..cb0b04f6544 100644
--- a/htdocs/langs/el_GR/languages.lang
+++ b/htdocs/langs/el_GR/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Αραβικά
 Language_ar_SA=Αραβικά
+Language_bn_BD=Bengali
 Language_bg_BG=Βουλγαρικά
 Language_bs_BA=Βοσνιακά
 Language_ca_ES=Καταλανικά
@@ -21,9 +22,10 @@ Language_en_SA=Αγγλικά (Σαουδική Αραβία)
 Language_en_US=Αγγλικά (Ηνωμένων Πολιτειών)
 Language_en_ZA=Αγγλικά (Νότια Αφρική)
 Language_es_ES=Ισπανικά
-Language_es_DO=Ισπανικά (Δομινικανή Δημοκρατία)
 Language_es_AR=Ισπανικά (Αργεντινή)
 Language_es_CL=Ισπανικά (Χιλή)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Ισπανικά (Δομινικανή Δημοκρατία)
 Language_es_HN=Ισπανικά (Ονδούρα)
 Language_es_MX=Ισπανικά (Μεξικό)
 Language_es_PY=Ισπανικά (Παραγουάη)
@@ -45,7 +47,10 @@ Language_id_ID=Ινδονησίας
 Language_is_IS=Ισλανδικά
 Language_it_IT=Ιταλικά
 Language_ja_JP=Ιαπωνικά
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Κορέας
+Language_lo_LA=Lao
 Language_lt_LT=Λιθουανίας
 Language_lv_LV=Λετονίας
 Language_mk_MK=πΓΔΜ
@@ -64,6 +69,7 @@ Language_sv_SV=Σουηδικά
 Language_sv_SE=Σουηδικά
 Language_sq_AL=Αλβανικά
 Language_sk_SK=Σλοβακική
+Language_sw_SW=Kiswahili
 Language_th_TH=Ταϊλάνδης
 Language_uk_UA=Ουκρανικά
 Language_uz_UZ=Ουζμπεκιστάν
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 37654134875..8fafa27d34a 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Διαβάστε την αποδειξη παραλαβής
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper σύνδεσμο σε email
 ActivateCheckRead=Επιτρέπετε τη χρήση του "Unsubcribe" σύνδεσμου
-ActivateCheckReadKey=Κλειδί χρήσης για την κρυπτογράφηση του URL για "Διαβάστε Παραλαβή" και "Διαγραφή" χαρακτηριστικό
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail αποστέλλονται στους παραλήπτες %s.
 XTargetsAdded=<b>%s</b> παραλήπτες που προστέθηκαν στο κατάλογο των στόχων
 EachInvoiceWillBeAttachedToEmail=Ένα έγγραφο χρησιμοποιώντας το προεπιλεγμένο τιμολόγιο θα δημιουργηθεί και θα επισυνάπτεται σε κάθε email.
@@ -128,6 +128,7 @@ TagCheckMail=Παρακολούθηση άνοιγμα της αλληλογρα
 TagUnsubscribe=link διαγραφής
 TagSignature=Υπογραφή αποστολής χρήστη
 TagMailtoEmail=Email του παραλήπτη
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=Δεν υπάρχουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου που έχουν προγραμματιστεί για αυτό το συμβάν και την εταιρεία
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index c46f6b67559..7698f2505b2 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Εμφανίστηκαν λάθη. Όλε
 ErrorConfigParameterNotDefined=Η παράμετρος <b>%s</b> δεν είναι καθορισμένη στο αρχείο ρυθμίσεων του Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Αποτυχία εύρεσης του χρήστη <b>%s</b> στην βάση δεδομένων του Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν ποσοστά φόρων για την χώρα  '%s'.
-ErrorNoSocialContributionForSellerCountry=Σφάλμα, δεν οριστήκε τύπος κοινωνικής εισφοράς για την χώρα '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου
 SetDate=Ορισμός ημερομηνίας
 SelectDate=Επιλέξτε μια ημερομηνία
@@ -301,8 +301,8 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
 PriceUHT=Τιμή μον.
-AskPriceSupplierUHT=PU ΗΤ Ζητούμενες
-PriceUTTC=Τιμή μον.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
 AmountPayment=Ποσό Πληρωμής
@@ -339,6 +339,7 @@ IncludedVAT=με Φ.Π.Α
 HT=χ. Φ.Π.Α
 TTC=με Φ.Π.Α
 VAT=Φ.Π.Α
+VATs=Sales taxes
 LT1ES=ΑΠΕ
 LT2ES=IRPF
 VATRate=Βαθμός Φ.Π.Α.
@@ -413,6 +414,8 @@ Qty=Ποσ.
 ChangedBy=Τροποποιήθηκε από
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Επανυπολογισμός
 ResultOk=Επιτυχία
 ResultKo=Αποτυχία
@@ -421,7 +424,7 @@ Reportings=Αναφορές
 Draft=Προσχέδιο
 Drafts=Προσχέδια
 Validated=Επικυρωμένο
-Opened=Ανοιγμένο
+Opened=Open
 New=Νέο
 Discount=Έκπτωση
 Unknown=Άγνωστο
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Συνδέεται με μια συγκεκριμένη ε
 DeleteAFile=Διαγραφή ενός αρχείου
 ConfirmDeleteAFile=Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο
 NoResults=Δεν υπάρχουν αποτελέσματα
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Δοκιμή
 Element=Στοιχείο
@@ -703,6 +707,9 @@ ShowTransaction=Εμφάνιση συναλλαγών
 GoIntoSetupToChangeLogo=Πηγαίνετε Αρχική - Ρυθμίσεις - Εταιρία να αλλάξει το λογότυπο ή πηγαίνετε Αρχική - Ρυθμίσεις - Προβολή για απόκρυψη.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
@@ -732,3 +739,4 @@ ShortThursday=Π
 ShortFriday=Π
 ShortSaturday=Σ
 ShortSunday=Κ
+SelectMailModel=Select email template
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 49147dc78f2..de2ad9d4968 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -199,7 +199,8 @@ Entreprises=Εταιρείες
 DOLIBARRFOUNDATION_PAYMENT_FORM=Για να κάνετε την πληρωμή της συνδρομής σας χρησιμοποιώντας μια τραπεζική μεταφορά, δείτε τη σελίδα <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Για να πληρώσετε με πιστωτική κάρτα ή Paypal, κάντε κλικ στο κουμπί στο κάτω μέρος της σελίδας. <br>
 ByProperties=Με χαρακτηριστικά
 MembersStatisticsByProperties=Στατιστικά στοιχεία μελων από τα χαρακτηριστικά
-MembersByNature=Μέλη εκ φύσεως
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Στείλτε e-mail για να προειδοποιήσει όταν Dolibarr λάβετε μια επιβεβαίωση της μια επικυρωμένη πληρωμής για την εγγραφή
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index 38cd385862c..919bfdffd76 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Παραγγελία Προμηθευτή
 SuppliersOrders=Παραγγελίας Προμηθευτών
 SuppliersOrdersRunning=Τρέχουσες παραγγελίες προμηθευτών
 CustomerOrder=Παραγγελία πελάτη
-CustomersOrders=Παραγγελίες πελατών
-CustomersOrdersRunning=Τρέχουσες παραγγελίες πελατών
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Παραγγελίες πελατών για επικύρωση
-OrdersToBill=Παραγγελίες πελατών που παραδίδονται
-OrdersInProcess=Παραγγελίες πελατών σε εξέλιξη
-OrdersToProcess=Παραγγελίες πελατών για επεξεργασία
-SuppliersOrdersToProcess=Παραγγελίες προμηθευτών προς επεξεργασία
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Ακυρωμένη
 StatusOrderDraftShort=Προσχέδιο
 StatusOrderValidatedShort=Επικυρωμένη
@@ -75,8 +75,9 @@ AddToMyOrders=Προσθήκη στις παραγγελίες μου
 AddToOtherOrders=Προσθήκη στις άλλες παραγγελίες
 AddToDraftOrders=Προσθήκη στο σχέδιο παραγγελιας
 ShowOrder=Εμφανιση παραγγελίας
-NoOpenedOrders=Δεν υπάρχουν ανοιχτές παραγγελίες
-NoOtherOpenedOrders=Δεν υπάρχουν άλλες ανοιχτές παραγγελίες
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Δεν υπάρχουν προσχέδια παραγγελιών
 OtherOrders=Άλλες παραγγελίες
 LastOrders=Τελευταίες %s παραγγελίες πελατών
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 4730e410ae4..d2b7f0c3d49 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Παρέμβαση αποστέλλεται μέσω ταχυδρομείου
 Notify_BILL_VALIDATE=Το τιμολόγιο πελάτη επικυρώθηκε
 Notify_BILL_UNVALIDATE=Τιμολόγιο του Πελάτη μη επικυρωμένο
+Notify_ORDER_SUPPLIER_VALIDATE=Παραγγελία του προμηθευτή καταγράφηκε
 Notify_ORDER_SUPPLIER_APPROVE=Η παραγγελία προμηθευτή εγγρίθηκε
 Notify_ORDER_SUPPLIER_REFUSE=Η παραγγελία προμηθευτή απορρίφθηκε
 Notify_ORDER_VALIDATE=Η παραγγελία πελάτη επικυρώθηκε
@@ -203,6 +204,7 @@ ClickHereToGoTo=Κάντε κλικ εδώ για να μεταβείτε στο
 YouMustClickToChange=Θα πρέπει πρώτα να κάνετε κλικ στον παρακάτω σύνδεσμο για να επικυρώσει την αλλαγή του κωδικού πρόσβασης
 ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απλά ξεχάστε αυτό το email. Τα διαπιστευτήριά σας παραμένουν ασφαλή.
 IfAmountHigherThan=Εάν το ποσό υπερβαίνει <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s
diff --git a/htdocs/langs/el_GR/printing.lang b/htdocs/langs/el_GR/printing.lang
index 55bc4ce2747..77afa96bec1 100644
--- a/htdocs/langs/el_GR/printing.lang
+++ b/htdocs/langs/el_GR/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Άμεση εκτύπωση
-Module112000Desc=Ενεργοποίηση άμεσης εκτύπωσης
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Ρύθμιση του συστήματος για την άμεση εκτύπωση
 PrintingDesc=Το module αυτό προσθέτει ένα κουμπί Εκτύπωσης για να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή (χωρίς να ανοίξετε το έγγραφο με μια εφαρμογή).
 ModuleDriverSetup=Ρύθμιση Module οδήγησης
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Είσοδος
 PRINTIPP_PASSWORD=Κωδικός
 NoPrinterFound=Δεν βρέθηκαν εκτυπωτές (Ελέγξτε τις ρυθμίσεις του CUPS)
-FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή
 NoDefaultPrinterDefined=Δεν έχει οριστεί προ επιλεγμένος εκτυπωτής
 DefaultPrinter=Προεπιλογή εκτυπωτή
 Printer=Eκτυπωτής
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index 3175a885086..b3e6f7f8bfb 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Ποσότητα: %d
 AddDispatchBatchLine=Προσθέστε μια γραμμή για Χρόνο Διάρκειας αποστολής
 BatchDefaultNumber=Απροσδιόριστο
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=Αυτό το προϊόν δεν χρησιμοποιεί παρτίδα/σειριακό αριθμό
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 873cc94308a..a7111840140 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Προϊόν ή Υπηρεσία
 ProductsAndServices=Προϊόντα και Υπηρεσίες
 ProductsOrServices=Προϊόντα ή Υπηρεσίες
 ProductsAndServicesOnSell=Προϊόντα και Υπηρεσίες για πώληση ή αγορά
-ProductsAndServicesNotOnSell=Προϊόντα και Υπηρεσίες εκτός πώλησης
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Στατιστικά Προϊόντων και Υπηρεσιών
 ProductsStatistics=Στατιστικά Προϊόντων
-ProductsOnSell=Προϊόν για πώληση ή για αγορά
-ProductsNotOnSell=Προϊόν εκτός πώλησης και εκτός αγοράς
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Προϊόντα προς πώληση και για αγορά
 ServicesOnSell=Υπηρεσίες για πώληση ή αγορά
-ServicesNotOnSell=Υπηρεσίες εκτός πώλησης
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Υπηρεσίες προς πώληση και για αγορά
 InternalRef=Εσωτερική Παραπομπή
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Κάρτα Υπηρεσίας
 CardContract=Κάρτα Επαφής
 Warehouse=Αποθήκη
 Warehouses=Αποθήκες
-WarehouseOpened=Η αποθήκη άνοιξε
+WarehouseOpened=Warehouse open
 WarehouseClosed=Η αποθήκη έκλεισε
 Stock=Απόθεμα
 Stocks=Αποθέματα
@@ -71,21 +71,21 @@ SellingPriceTTC=Τιμή Πώλησης (με Φ.Π.Α)
 PublicPrice=Δημόσια Τιμή
 CurrentPrice=Τρέχουσα Τιμή
 NewPrice=Νέα Τιμή
-MinPrice=Ελάχιστη Τιμή Πώλησης
-MinPriceHT=Ελάχιστη τιμή πώλησης (μετά από φόρους)
-MinPriceTTC=Ελάχιστη τιμή πώλησης (συμπ. Φ.Π.Α)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι μικρότερη από την ορισμένη ελάχιστη τιμή πώλησης (%s χωρίς Φ.Π.Α.)
 ContractStatus=Κατάσταση Συμβολαίου
 ContractStatusClosed=Κλειστό
-ContractStatusRunning=Ενεργό
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Ληγμένο
-ContractStatusOnHold=Ανενεργό
-ContractStatusToRun=Για να πάρετε την εκτέλεση
-ContractNotRunning=Το Συμβόλαιο είναι Ανενεργό
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
 ErrorProductBadRefOrLabel=Λάθος τιμή για την αναφορά ή την ετικέτα.
 ErrorProductClone=Υπήρξε ένα πρόβλημα κατά την προσπάθεια για την κλωνοποίηση του προϊόντος ή της υπηρεσίας.
-ErrorPriceCantBeLowerThanMinPrice=Σφάλμα η τιμή δεν μπορεί να είναι χαμηλότερη από την ελάχιστο τιμή.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Προμηθευτές
 SupplierRef=Κωδ. Προμηθευτή
 ShowProduct=Εμφάνιση προϊόντων
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσί
 MultiPricesAbility=Πολλά επίπεδα των τιμών ανά προϊόν/υπηρεσία
 MultiPricesNumPrices=Αριθμός τιμής
 MultiPriceLevelsName=Κατηγορίες τιμών
-AssociatedProductsAbility=Ενεργοποίηση της δυνατότητας εικονικών πακέτων
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Πακέτο προϊόντων
-AssociatedProductsNumber=Αριθμός προϊόντων που συνθέτουν αυτό το εικονικό προϊόν πακέτο
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Αριθμός μητρικής συσκευασίας προϊόντος
-IfZeroItIsNotAVirtualProduct=Αν 0, το προϊόν αυτό δεν είναι ένα εικονικό προϊόν πακέτο
-IfZeroItIsNotUsedByVirtualProduct=Αν 0, το προϊόν αυτό δεν χρησιμοποιείται από κάθε εικονικό προϊόν πακέτο
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Συσχέτιση
 Translation=Μετάφραση
 KeywordFilter=Φίλτρο λέξης-κλειδιού
@@ -131,7 +131,7 @@ ProductToAddSearch=Εύρεση προϊόντως προς προσθήκη
 AddDel=Προσθήκη/Διαγραφή
 Quantity=Ποσότητα
 NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
-ProductAssociationList=Κατάλογος των σχετικών προϊόντων / υπηρεσιών: το όνομα του προϊόντος / υπηρεσίας (επηρεάζονται ποσότητα)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Λίστα συσκευασίας προϊόντων/υπηρεσιών με αυτό το προϊόν ως συστατικό
 ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
@@ -179,16 +179,41 @@ CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας
 ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσει το προϊόν ή την υπηρεσία <b>%s;</b>
 CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας
 ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές
-CloneCompositionProduct=Κλώνος συσκευασμένου προϊόν/υπηρεσίας
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Τιμές πελατών
-SuppliersPrices=Τιμές προμηθευτών
-SuppliersPricesOfProductsOrServices=Τιμές προμηθευτών (προϊόντων ή υπηρεσιών)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Τελωνειακός Κώδικας
 CountryOrigin=Χώρα προέλευσης
 HiddenIntoCombo=Κρυμμένο σε λίστες επιλογής
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Προϊόν κωδ. Πρότυπο
 ServiceCodeModel=Υπηρεσία κωδ. Πρότυπο
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Προϊόν πολλαπλών-τιμών
-ProductsOrServiceMultiPrice=Τιμές Πελατών (προϊόντων ή υπηρεσιών, πολύ-τιμές)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Προϊόντα του κύκλου εργασιών τριμηνιαία VWAP
 ServiceSellByQuarterHT=Υπηρεσίες του κύκλου εργασιών τριμηνιαία VWAP
 Quarter1=1ο. Τέταρτο
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Ορίστε την αξία barcode για όλα τ
 PriceByCustomer=Διαφορετική τιμή για κάθε πελάτη
 PriceCatalogue=Μοναδική τιμή ανά προϊόν/υπηρεσία
 PricingRule=Κανόνες για τις τιμές των πελατών
-AddCustomerPrice=Προσθέστε τιμή των πελατών
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη
 PriceByCustomerLog=Τιμή ανά πελάτη log
-MinimumPriceLimit=Ελάχιστη τιμή δεν μπορεί να είναι μικρότερη από %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είναι: %s
 PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
 PriceExpressionSelected=Επιλογή συνάρτησης τιμών
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 72026081d47..1017a8d9e90 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έ
 ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να δείτε.
 ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 MyTasksDesc=Η άποψη αυτή περιορίζονται σε έργα ή εργασίες που έχουν μια επαφή για την (όποια είναι ο τύπος).
-OnlyOpenedProject=Μόνο τα έργα που είναι ανοιχτά είναι ορατά (έργα που είναι σχέδιο ή κλειστά δεν είναι ορατά)
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν.
 TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
-AllTaskVisibleButEditIfYouAreAssigned=Όλες οι εργασίες για το συγκεκριμένο έργο είναι ορατές, αλλά μπορείτε να εισάγετε χρόνο μόνο για την εργασία που σας έχει εκχωρηθεί.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Περιοχή Έργων
 NewProject=Νέο Έργο
 AddProject=Δημιουργία έργου
@@ -29,7 +30,7 @@ ProjectsList=Λίστα έργων
 ShowProject=Εμφάνιση έργου
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Αριθμός ανοιχτών εργασιών
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Αριθμός έργων
 TimeSpent=Χρόνος που δαπανήθηκε
 TimeSpentByYou=Χρόνος που δαπανάται από εσάς
@@ -41,7 +42,7 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
-TasksOnOpenedProject=Εργασίες σχετικές με τα ανοικτά έργα
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Ο φόρτος εργασίας δεν ορίζεται
 NewTimeSpent=Νέος χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Κατάλογος των παρεμβάσεων
 ListExpenseReportsAssociatedProject=Λίστα αναφορών των δαπανών που σχετίζονται με το έργο
 ListDonationsAssociatedProject=Λίστα των δωρεών που σχετίζονται με το έργο
 ListActionsAssociatedProject=Κατάλογος των εκδηλώσεων που σχετίζονται με το έργο
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Δραστηριότητα στο έργο αυτή την εβδομάδα
 ActivityOnProjectThisMonth=Δραστηριότητα στο έργο αυτό το μήνα
 ActivityOnProjectThisYear=Δραστηριότητα στο έργο αυτού του έτους
@@ -95,7 +98,7 @@ DeleteATimeSpent=Διαγράψτε το χρόνο που δαπανάται
 ConfirmDeleteATimeSpent=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το χρόνο;
 DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν ανατέθηκαν σε μένα
 ShowMyTasksOnly=Δείτε τα καθήκοντα που σας έχουν ανατεθεί
-TaskRessourceLinks=Πόροι
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Έργα που αφορούν αυτό το στοιχείο
 NoTasks=Δεν υπάρχουν εργασίες για αυτό το έργο
 LinkedToAnotherCompany=Συνδέεται με άλλο τρίτο μέρος
@@ -139,8 +142,15 @@ ProjectReferers=Αναφορές από αντικείμενα
 SearchAProject=Αναζήτηση ένα έργο
 ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
 ProjectDraft=Πρόχειρα έργα
-FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Εισαγωγή ανά ημέρα
 InputPerWeek=Εισαγωγή ανά εβδομάδα
 InputPerAction=Εισαγωγή ανά ενέργεια
 TimeAlreadyRecorded=Ο χρόνος που δαπανάται έχει ήδη καταγραφεί για το έργο/ημέρα και ο χρήστης %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index 8055ab367b0..3c01b692836 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -4,7 +4,7 @@ Proposal=Προσφορά
 ProposalShort=Προσφορά
 ProposalsDraft=Σχέδιο Προσφοράς
 ProposalDraft=Σχέδιο Προσφοράς
-ProposalsOpened=Άνοιγμα Προσφορών
+ProposalsOpened=Open commercial proposals
 Prop=Προσφορές
 CommercialProposal=Προσφορά
 CommercialProposals=Προσφορές
@@ -16,7 +16,7 @@ Prospect=Προοπτική
 ProspectList=Λίστα προοπτικών
 DeleteProp=Διαγραφή Προσφοράς
 ValidateProp=Επικύρωση Προσφοράς
-AddProp=Προσθήκη Προσφοράς
+AddProp=Δημιουργία προσφοράς
 ConfirmDeleteProp=Είστε σίγουροι ότι θέλετε να διαγράψετε την Προσφορά;
 ConfirmValidateProp=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την Προσφορά με <b>%s</b> όνομα;
 LastPropals=Τελευταίες %s Προσφορές
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Ποσό ανά μήνα (μετά από φόρου
 NbOfProposals=Αριθμός Προσφορών
 ShowPropal=Εμφάνιση Προσφοράς
 PropalsDraft=Σχέδιο
-PropalsOpened=Άνοιξε
+PropalsOpened=Open
 PropalsNotBilled=Κλειστή δεν τιμολογείται
 PropalStatusDraft=Προσχέδιο (χρειάζεται επικύρωση)
 PropalStatusValidated=Επικυρωμένη (η Προσφορά είναι ανοιχτή)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Δεν έχει υπογραφεί (κλειστό)
 PropalStatusBilled=Χρεώνεται
 PropalStatusDraftShort=Προσχέδιο
 PropalStatusValidatedShort=Επικυρώθηκε
-PropalStatusOpenedShort=Άνοιξε
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Κλειστό
 PropalStatusSignedShort=Υπογραφή
 PropalStatusNotSignedShort=Δεν έχει υπογραφεί
@@ -51,12 +51,10 @@ PropalsToClose=Προσφορές προς κλείσιμο
 PropalsToBill=Υπογεγραμμένες Προσφορές προς χρέωση
 ListOfProposals=Κατάλογος Προσφορών
 ActionsOnPropal=Εκδηλώσεις σχετικά με την Προσφορά
-NoOpenedPropals=Καμία ανοιχτή Προσφορά
-NoOtherOpenedPropals=Καμία άλλη ανοιχτή Προσφορά
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Εμπορική Προσφορά ref
 SendPropalByMail=Αποστολή Προσφοράς με e-mail
-FileNotUploaded=Το αρχείο δεν έχει μεταφορτωθεί
-FileUploaded=Το αρχείο μεταφορτώθηκε με επιτυχία
 AssociatedDocuments=Τα έγγραφα που σχετίζονται με την Προσφορά:
 ErrorCantOpenDir=Δεν μπορείτε να ανοίξετε τον κατάλογο
 DatePropal=Ημερομηνία της Προσφοράς
@@ -100,3 +98,4 @@ DocModelJauneDescription=Κίτρινο μοντέλο Προσφοράς
 DefaultModelPropalCreate=Δημιουργία προεπιλεγμένων μοντέλων
 DefaultModelPropalToBill=Προεπιλεγμένο πρότυπο όταν κλείνει μια Προσφορά (να τιμολογηθεί)
 DefaultModelPropalClosed=Προεπιλεγμένο πρότυπο όταν κλείνει μια Προσφορά (ατιμολόγητη)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 2f920102746..6a73b2c6d19 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Εμφάνιση μισθοδοσίας
 THM=Η μέση ωριαία τιμή
 TJM=Η μέση ημερήσια τιμή
 CurrentSalary=Τρέχον μισθός
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index 64667754277..64fafbf69eb 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -2,7 +2,7 @@
 RefSending=Ref. αποστολή
 Sending=Αποστολή
 Sendings=Αποστολές
-AllSendings=All Shipments
+AllSendings=Όλες οι αποστολές
 Shipment=Αποστολή
 Shipments=Αποστολές
 ShowSending=Προβολή αποστολής
@@ -53,7 +53,7 @@ DocumentModelSimple=Απλό μοντέλο έγγραφο
 DocumentModelMerou=Mérou A5 μοντέλο
 WarningNoQtyLeftToSend=Προσοχή, δεν υπάρχουν είδη που περιμένουν να σταλούν.
 StatsOnShipmentsOnlyValidated=Στατιστικά στοιχεία σχετικά με τις μεταφορές που πραγματοποιούνται μόνο επικυρωμένες. Χρησιμοποιείστε Ημερομηνία είναι η ημερομηνία της επικύρωσης της αποστολής (προγραμματισμένη ημερομηνία παράδοσης δεν είναι πάντα γνωστή).
-DateDeliveryPlanned=Προγραμματισμένη ημερομηνία παράδοσης
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Παράδοση Ημερομηνία παραλαβής
 SendShippingByEMail=Στείλτε αποστολή με e-mail
 SendShippingRef=Υποβολή της αποστολής %s
@@ -67,7 +67,7 @@ SendingRunning=Προϊόν από εντολή παραγγελιών σε πε
 SuppliersReceiptRunning=Προϊόν από εντολή παραγγελιών σε προμηθευτές
 ProductQtyInCustomersOrdersRunning=Ποσότητα προϊόντων σε ανοιχτές παραγγελίες πελατών
 ProductQtyInSuppliersOrdersRunning=Ποσότητα προϊόντων σε ανοιχτές παραγγελίες προμηθευτών
-ProductQtyInShipmentAlreadySent=Ποσότητα προϊόντων από ανοιγμένες παραγγελίες του πελάτη που έχουν ήδη αποσταλεί
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Ποσότητα προϊόντων από ανοιγμένες παραγγελίες του προμηθευτή που έχουν ήδη ληφθεί
 
 # Sending methods
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index dcb4885791e..836bdc162ae 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Αποθήκες
 NewWarehouse=Νέα αποθήκη / Χρηματιστήριο περιοχή
 WarehouseEdit=Τροποποίηση αποθήκη
 MenuNewWarehouse=Νέα αποθήκη
-WarehouseOpened=Αποθήκη άνοιξε
+WarehouseOpened=Warehouse open
 WarehouseClosed=Αποθήκη κλειστό
 WarehouseSource=Αποθήκη Πηγή
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Επιλέξτε αποθήκη που θα χρ
 SelectWarehouseForStockIncrease=Επιλέξτε αποθήκη που θα χρησιμοποιηθεί για αύξηση των αποθεμάτων
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Επιθυμητο απόθεμα
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Για να παραγγείλετε
 Replenishment=Αναπλήρωση
 ReplenishmentOrders=Αναπλήρωση παραγγελίων
-VirtualDiffersFromPhysical=Σύμφωνα με την την αύξηση/μείωση αποθέματος, φυσικού αποθέματος και εικονικού αποθέματος (φυσική + τρέχουσες παραγγελίες) μπορεί να διαφέρει
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Χρησιμοποιήστε το εικονικό απόθεμα από προεπιλογή, αντί των φυσικών αποθεμάτων, για τη \nλειτουργία αναπλήρωσης
 UseVirtualStock=Χρησιμοποιήστε το εικονικό απόθεμα
 UsePhysicalStock=Χρησιμοποιήστε το φυσικό απόθεμα
-CurentSelectionMode=Επιλογή τρέχουσας κατάστασης
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Εικονικό απόθεμα
 CurentlyUsingPhysicalStock=Φυσικό απόθεμα
 RuleForStockReplenishment=Κανόνας για τα αποθέματα αναπλήρωσης
@@ -112,8 +113,8 @@ AlertOnly= Ειδοποιήσεις μόνο
 WarehouseForStockDecrease=Η αποθήκη <b>%s</b> να να χρησιμοποιηθεί για μείωση αποθεμάτων
 WarehouseForStockIncrease=Η αποθήκη <b>%s</b> θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων
 ForThisWarehouse=Για αυτή την αποθήκη
-ReplenishmentStatusDesc=Αυτή είναι η λίστα όλων των προϊόντων με απόθεμα κάτω από το επιθυμητό απόθεμα (ή χαμηλότερες από την αξία συναγερμού, εφόσον κουτάκι "ειδοποίηση μόνο" είναι επιλεγμένο), και προτείνουμε να δημιουργήσετε παραγγελίες σε προμηθευτές για να αναπληρώσει τη διαφορά.
-ReplenishmentOrdersDesc=Αυτή είναι η λίστα όλων των ανοικτών παραγγελιών προκαθορισμένων προϊόντων σε προμηθευτές. Μόνο ανοιχτές παραγγελίες προκαθορισμένων προϊόντων, παραγγελίες δηλαδή που μπορούν να επηρεάσουν τα αποθέματα, φαίνονται εδώ.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Αναπληρώσεις
 NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
 NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Η εγγραφή μεταφέρθηκε
 ReceivingForSameOrder=Αποδείξεις για αυτή την παραγγελία
 StockMovementRecorded=Οι κινήσεις των αποθεμάτων καταγράφονται
 RuleForStockAvailability=Κανόνες σχετικά με τις απαιτήσεις του αποθέματος
-StockMustBeEnoughForInvoice=Το επίπεδο των αποθεμάτων πρέπει να είναι επαρκής για να προσθέσετε το προϊόν / υπηρεσία στο τιμολόγιο
-StockMustBeEnoughForOrder=Το επίπεδο των αποθεμάτων πρέπει να είναι επαρκής για να προσθέσετε το προϊόν / υπηρεσία για αγορά
-StockMustBeEnoughForShipment= Το επίπεδο των αποθεμάτων πρέπει να είναι επαρκής για να προσθέσετε το προϊόν / υπηρεσία για αποστολή
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Ετικέτα λογιστικής κίνησης
 InventoryCode=Λογιστική κίνηση ή κωδικός απογραφής
 IsInPackage=Περιεχόμενα συσκευασίας
 ShowWarehouse=Εμφάνιση αποθήκης
-MovementCorrectStock=Διόρθωση αποθέματος για το προϊόν %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Μετακίνηση του προϊόντος %s σε μια άλλη αποθήκη
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 66c20c45687..58c4e43f9b2 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Αποστολή σε προμηθευτές
 ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτών
 MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση
 NbDaysToDelivery=Καθυστέρηση παράδοσης σε ημέρες
-DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση εμφανίζετε μεταξύ παραγγελίας και τη λίστα των προϊόντων
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Χρησιμοποιήστε διπλή έγκριση (η δεύτερη έγκριση μπορεί να γίνει από οποιονδήποτε χρήστη με ειδική άδεια)
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index 6d18622fa08..4e2647bfe4a 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Αναφορές εξόδων
 TripsAndExpensesStatistics=Στατιστικές αναφορές εξόδων
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Λίστα φόρων
 NewTrip=New expense report
 CompanyVisited=Έγινε επίσκεψη σε εταιρία/οργανισμό
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Όχημα
 TF_PEAGE=Διόδια
 TF_ESSENCE=Καύσιμα
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 68794752db8..63aa48ea233 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Αφαίρεση από την ομάδα
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Χρήστες και Ομάδες
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Εμφάνιση ομάδας
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 22f8dbb928b..46da6faee67 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα"
 StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Η πληρωμή των πάγιων %s ώστε από την τράπεζα
diff --git a/htdocs/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
index 25b95c360c3..7bf85e6d4e9 100644
--- a/htdocs/langs/el_GR/workflow.lang
+++ b/htdocs/langs/el_GR/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Ροής εργασίας ρύθμιση μονάδας
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Δεν υπάρχει καμία ροή εργασίας μπορείτε να τροποποιήσετε τη μονάδα που έχετε ενεργοποιήσει.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Δημιουργήστε μια παραγγελία του πελάτη αυτόματα μετά από μια προσφορά που έχει υπογραφεί
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Δημιουργήστε ένα τιμολόγιο πελάτη αυτόματα μετά από μια προσφορά που έχει υπογραφεί
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Δημιουργήστε ένα τιμολόγιο πελάτη αυτόματα μετά από μια σύμβαση έχει επικυρωθεί
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Δημιουργήστε ένα τιμολόγιο πελάτη αυτόματα μετά από παραγγελία του πελάτη είναι κλειστό
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Κατατάσσει που συνδέονται με παραγγελία (ες) του πελάτη να χρεωθεί όταν το τιμολόγιο του πελάτη έχει οριστεί να καταβληθεί
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Κατατάσσει που συνδέονται με παραγγελία (ες) του πελάτη να χρεωθεί όταν το τιμολόγιο του πελάτη έχει επικυρωθεί
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index c25fb01f690..1c53b65c99c 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -1,16 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
deleted file mode 100644
index e58cf5e72b5..00000000000
--- a/htdocs/langs/en_GB/banks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - banks
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
deleted file mode 100644
index f1e67a676c3..00000000000
--- a/htdocs/langs/en_GB/bills.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - bills
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
diff --git a/htdocs/langs/en_GB/interventions.lang b/htdocs/langs/en_GB/interventions.lang
deleted file mode 100644
index 84b26b1f95e..00000000000
--- a/htdocs/langs/en_GB/interventions.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - interventions
-PrintProductsOnFichinterDetails=interventions generated from orders
diff --git a/htdocs/langs/en_GB/mails.lang b/htdocs/langs/en_GB/mails.lang
deleted file mode 100644
index 4b5c7e95999..00000000000
--- a/htdocs/langs/en_GB/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang
deleted file mode 100644
index 6d902132a46..00000000000
--- a/htdocs/langs/en_GB/orders.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderOnProcessShort=Ordered
-StatusOrderOnProcess=Ordered - Standby reception
-ApproveOrder=Approve order
-LastOrders=Last %s customer orders
diff --git a/htdocs/langs/en_GB/productbatch.lang b/htdocs/langs/en_GB/productbatch.lang
deleted file mode 100644
index 53edc04d8c4..00000000000
--- a/htdocs/langs/en_GB/productbatch.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - productbatch
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
deleted file mode 100644
index 3a989d45e7d..00000000000
--- a/htdocs/langs/en_GB/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c119a002641..c63ce9f1ddf 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
 Update=Update
 List=List
 Create=Create
+CreateMvts=Create movement
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
 
 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.  
+ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
 ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cdc8c639a20..6d1b24a2bc1 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -492,7 +492,7 @@ Module400Desc=Management of projects, opportunities or leads. You can then assig
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social contribution, dividends)
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -501,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -600,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -801,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -821,6 +821,7 @@ DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -1396,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1453,7 +1454,7 @@ FixedEmailTarget=Fixed email target
 SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
@@ -1511,7 +1512,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due 
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1644,3 +1645,30 @@ ConfFileMuseContainCustom=Installing an external module from application save th
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
 NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page
\ No newline at end of file
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index ac30b5685be..41f182b1456 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -97,3 +97,9 @@ ActionType=Event type
 DateActionBegin=Start event date
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
\ No newline at end of file
diff --git a/htdocs/langs/en_US/askpricesupplier.lang b/htdocs/langs/en_US/askpricesupplier.lang
index 882b2fc2290..0cf337b96e6 100644
--- a/htdocs/langs/en_US/askpricesupplier.lang
+++ b/htdocs/langs/en_US/askpricesupplier.lang
@@ -33,12 +33,14 @@ AskpricesupplierStatusOpened=Validated (request is open)
 AskpricesupplierStatusClosed=Closed
 AskpricesupplierStatusSigned=Accepted
 AskpricesupplierStatusNotSigned=Refused
+AskpricesupplierStatusBilled=Billed
 AskpricesupplierStatusDraftShort=Draft
 AskpricesupplierStatusValidatedShort=Validated
 AskpricesupplierStatusOpenedShort=Open
 AskpricesupplierStatusClosedShort=Closed
 AskpricesupplierStatusSignedShort=Accepted
 AskpricesupplierStatusNotSignedShort=Refused
+AskpricesupplierStatusBilledShort=Billed
 CopyAskFrom=Create price request by copying existing a request
 CreateEmptyAsk=Create blank request
 CloneAsk=Clone price request
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index f363ffa56c6..f98f02ccef0 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
@@ -165,3 +165,8 @@ DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
 StartDate=Start date
 EndDate=End date
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 3e645e84834..4f1512a431d 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 9c3a956727e..81c73356c93 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -108,3 +108,4 @@ CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
+ByDefaultInList=By default in list
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 116b2c52fa8..7ce82448cb5 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,17 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index ff511f00d27..5369859bb8b 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -76,6 +76,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index bbbf2d3a046..96995adc8ac 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 9a878366bc7..4daf1bc590f 100755
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s is assigned to another third
 ErrorFailedToSendPassword=Failed to send password
 ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
 ErrorPasswordDiffers=Passwords differs, please type them again.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
 ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
 ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -191,3 +192,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. 
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index d396746ccad..6c68d6f677e 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -132,3 +132,4 @@ SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
 FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index b693c594f87..bb337c6c67e 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,12 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
 NewByMonth=Added per month
 GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index aaeeb235544..dbfe650102c 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -23,6 +23,7 @@ Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
 Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
@@ -40,6 +41,7 @@ Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
 Language_fr_FR=French
 Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
 Language_he_IL=Hebrew
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index ae766c7a147..66de0fe3eee 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -302,7 +302,7 @@ UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
 AskPriceSupplierUHT=U.P. net Requested
-PriceUTTC=U.P.
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 3593e4c879f..daab8dcc3e5 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 140cbab05d3..8e7a171ac5b 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
 AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 25db18df474..dc6cece9c3b 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -26,6 +26,8 @@ ConfirmDeleteATask=Are you sure you want to delete this task ?
 OfficerProject=Officer project
 LastProjects=Last %s projects
 AllProjects=All projects
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
@@ -77,6 +79,9 @@ ListExpenseReportsAssociatedProject=List of expense reports associated with the
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -92,6 +97,7 @@ ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project ?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
@@ -120,6 +126,10 @@ ProjectCreatedInDolibarr=Project %s created
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
+OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Project leader
 TypeContact_project_external_PROJECTLEADER=Project leader
@@ -139,6 +149,7 @@ PlannedWorkloadShort=Workload
 WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a resource to allocate time
@@ -151,4 +162,23 @@ TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
-AssignTask=Assign
\ No newline at end of file
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
+ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
 AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
 Receivings=Receipts
 SendingsArea=Shipments area
 ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
 QtyReceived=Qty received
 KeepToShip=Remain to ship
 OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
 SendingsForSameOrder=Shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receivings for this order
 SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 69b0027139b..4db67dc6335 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
 RuleForStockManagementIncrease=Rule for stock management increase
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
 ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
 ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index d4e4e8c4359..cc14a66aea5 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -9,6 +9,7 @@ TripCard=Expense report card
 AddTrip=Create expense report
 ListOfTrips=List of expense reports
 ListOfFees=List of fees
+ShowTrip=Show expense report
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
 Kilometers=Kilometers
@@ -76,6 +77,7 @@ BROUILLONNER=Reopen
 SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 40aaf476f72..47b8863cf25 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -87,6 +87,8 @@ StatisticsByLineStatus=Statistics by status of lines
 RUM=RUM
 RUMWillBeGenerated=RUM number will be generated once bank account information are saved
 WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount: 
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications 
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index c25fb01f690..1c53b65c99c 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -1,16 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
deleted file mode 100644
index e58cf5e72b5..00000000000
--- a/htdocs/langs/es_AR/banks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - banks
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang
deleted file mode 100644
index 18d8db06801..00000000000
--- a/htdocs/langs/es_AR/commercial.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - commercial
-ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
deleted file mode 100644
index 36f5cbcff4d..00000000000
--- a/htdocs/langs/es_AR/companies.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-VATIntra=CUIT
-VATIntraShort=CUIT
-VATIntraVeryShort=CUIT
-CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> notas de crédito/anticipos disponibles
diff --git a/htdocs/langs/es_AR/interventions.lang b/htdocs/langs/es_AR/interventions.lang
deleted file mode 100644
index 84b26b1f95e..00000000000
--- a/htdocs/langs/es_AR/interventions.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - interventions
-PrintProductsOnFichinterDetails=interventions generated from orders
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
deleted file mode 100644
index 4b5c7e95999..00000000000
--- a/htdocs/langs/es_AR/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang
deleted file mode 100644
index 6d902132a46..00000000000
--- a/htdocs/langs/es_AR/orders.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderOnProcessShort=Ordered
-StatusOrderOnProcess=Ordered - Standby reception
-ApproveOrder=Approve order
-LastOrders=Last %s customer orders
diff --git a/htdocs/langs/es_AR/other.lang b/htdocs/langs/es_AR/other.lang
deleted file mode 100644
index c50a095e492..00000000000
--- a/htdocs/langs/es_AR/other.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - other
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
-SeeModuleSetup=See setup of module %s
diff --git a/htdocs/langs/es_AR/productbatch.lang b/htdocs/langs/es_AR/productbatch.lang
deleted file mode 100644
index 53edc04d8c4..00000000000
--- a/htdocs/langs/es_AR/productbatch.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - productbatch
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
deleted file mode 100644
index 3a989d45e7d..00000000000
--- a/htdocs/langs/es_AR/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
deleted file mode 100644
index 5213cec4e07..00000000000
--- a/htdocs/langs/es_AR/suppliers.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/es_AR/trips.lang b/htdocs/langs/es_AR/trips.lang
deleted file mode 100644
index f5e6f1a92eb..00000000000
--- a/htdocs/langs/es_AR/trips.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
-NewTrip=New expense report
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
diff --git a/htdocs/langs/es_BO/main.lang b/htdocs/langs/es_BO/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/es_BO/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/es_CL/workflow.lang b/htdocs/langs/es_CL/workflow.lang
index 6f07885c897..3ecd63703b7 100644
--- a/htdocs/langs/es_CL/workflow.lang
+++ b/htdocs/langs/es_CL/workflow.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - workflow
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear un pedido de cliente automáticamente a la firma de una cotización
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente a la firma de una cotización
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar como facturada la cotización cuando el pedido de cliente relacionado se clasifique como pagado
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index c25fb01f690..1c53b65c99c 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -1,16 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
deleted file mode 100644
index e58cf5e72b5..00000000000
--- a/htdocs/langs/es_CO/banks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - banks
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_CO/commercial.lang b/htdocs/langs/es_CO/commercial.lang
deleted file mode 100644
index 18d8db06801..00000000000
--- a/htdocs/langs/es_CO/commercial.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - commercial
-ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index 35eea56e886..991d9bdc7a9 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -26,4 +26,3 @@ AddDeliveryAddress=Añadir la dirección
 ConfirmDeleteFile=¿Está seguro que quiere eliminar este archivo?
 ThirdPartiesArea=Área Terceros
 ManagingDirectors=Administrador(es) (CEO, gerente, director, presidente, etc.)
-SearchThirdparty=Buscar terceros
diff --git a/htdocs/langs/es_CO/interventions.lang b/htdocs/langs/es_CO/interventions.lang
deleted file mode 100644
index 84b26b1f95e..00000000000
--- a/htdocs/langs/es_CO/interventions.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - interventions
-PrintProductsOnFichinterDetails=interventions generated from orders
diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
deleted file mode 100644
index 4b5c7e95999..00000000000
--- a/htdocs/langs/es_CO/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index b77bcb10602..c46dbeb8b31 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -23,25 +23,12 @@ NoRecordFound=No se encontraron registros
 ErrorFileNotUploaded=El archivo no se transifirió. Compruebe que el tamaño no supere el máximo permitido, el espacio libre disponible en el disco y que no hay un archivo con el mismo nombre en el directorio destino.
 ErrorNoRequestRan=No hay petición
 ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Modificaciones sin aplicar.
-ErrorNoSocialContributionForSellerCountry=Error, no hay tipo de carga social definida para el país '%s'.
 SeeHere=Ver aquí
 FileNotUploaded=El archivo no se subió
 FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo".
 SeeAbove=Ver arriba
 InformationToHelpDiagnose=Esta es una información que puede ayudar de diagnóstico
 ValidateAndApprove=Validar y aprobar
-Disapprove=Desaprobar
-NoUserGroupDefined=No hay grupo de usuario definido
-DateAndHour=Fecha y hora
-DateModificationShort=Fecha modificación
-UseLocalTax=Incluir impuestos
-CommercialProposalsShort=Cotizaciones
-RequestAlreadyDone=La solicitud ya ha sido procesada
-NbOfReferers=Número de remitentes
-Currency=Moneda
-SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
-PrintFile=Imprimir archivo %s
-ShowTransaction=Mostrar transacción
 NoUserGroupDefined=No hay grupo de usuario definido
 DateModificationShort=Fecha modificación
 UseLocalTax=Incluir impuestos
@@ -51,3 +38,5 @@ December=diciembre
 NbOfReferers=Número de remitentes
 Currency=Moneda
 SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
+PrintFile=Imprimir archivo %s
+ShowTransaction=Mostrar transacción
diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang
deleted file mode 100644
index 6d902132a46..00000000000
--- a/htdocs/langs/es_CO/orders.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderOnProcessShort=Ordered
-StatusOrderOnProcess=Ordered - Standby reception
-ApproveOrder=Approve order
-LastOrders=Last %s customer orders
diff --git a/htdocs/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang
deleted file mode 100644
index c50a095e492..00000000000
--- a/htdocs/langs/es_CO/other.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - other
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
-SeeModuleSetup=See setup of module %s
diff --git a/htdocs/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang
deleted file mode 100644
index 53edc04d8c4..00000000000
--- a/htdocs/langs/es_CO/productbatch.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - productbatch
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
index 3bdb607f2f9..a9438eb4f66 100644
--- a/htdocs/langs/es_CO/salaries.lang
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -3,4 +3,3 @@ SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable para pagos de salarios
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable para cargo financiero
 THM=Valor de hora promedio
 TJM=Valor día promedio
-CurrentSalary=Salario actual
\ No newline at end of file
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
deleted file mode 100644
index 3a989d45e7d..00000000000
--- a/htdocs/langs/es_CO/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
deleted file mode 100644
index 5213cec4e07..00000000000
--- a/htdocs/langs/es_CO/suppliers.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/es_CO/trips.lang b/htdocs/langs/es_CO/trips.lang
deleted file mode 100644
index f5e6f1a92eb..00000000000
--- a/htdocs/langs/es_CO/trips.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
-NewTrip=New expense report
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
index 9713057f7e2..e25fa00d2ef 100644
--- a/htdocs/langs/es_DO/compta.lang
+++ b/htdocs/langs/es_DO/compta.lang
@@ -24,5 +24,4 @@ RulesVATInServices=- Para los servicios, el informe incluye el ITBIS de los pago
 RulesVATInProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura.
 RulesVATDueServices=- Para los servicios, el informe incluye el ITBIS de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
 RulesVATDueProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura.
-ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido
 ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index b27ba7206ea..dc96b774c1b 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menú para los usuarios
 LangFile=archivo .lang
 System=Sistema
 SystemInfo=Info. sistema
-SystemTools=Utilidades sistema
 SystemToolsArea=Área utilidades del sistema
 SystemToolsAreaDesc=Esta área ofrece distintas funciones de administración. Utilice la menú para elegir la funcionalidad buscada.
 Purge=Purga
@@ -232,8 +231,8 @@ Security=Seguridad
 Passwords=Contraseñas
 DoNotStoreClearPassword=No almacenar la contraseña sin cifrar en la base
 MainDbPasswordFileConfEncrypted=Encriptar la contraseña de la base en el archivo conf.php
-InstrucToEncodePass=Para tener la contraseña de la base de datos codificada en el archivo de configuración <b>conf.php</b>, reemplazar en ese fichero la línea <br><b>$dolibarr_main_db_pass="..."</b><br> por <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Para tener la contraseña de la base de datos descodificada en el archivo de configuración b>conf.php</b>, reemplazar en ese fichero la línea <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> por <br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=Para tener la contraseña codificada en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "...";</b><br>por<br> <b>$dolibarr_main_db_pass = "crypted:%s";</b>
+InstrucToClearPass=Para tener la contraseña decodificada (visible) en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass = "%s";</b>
 ProtectAndEncryptPdfFiles=Protección y encriptación de los pdf generados
 ProtectAndEncryptPdfFilesDesc=La protección de un documento pdf deja el documento libre a la lectura y a la impresión a cualquier lector de PDF. Por el contrario, la modificación y la copia resultan imposibles.
 Feature=Función
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=He aquí el procedimiento a seguir:
 ThisIsAlternativeProcessToFollow=Este es una configuración alternativa para procesar:
 StepNb=Paso %s
 FindPackageFromWebSite=Buscar el paquete que responde a su necesidad (por ejemplo en el sitio web %s)
-DownloadPackageFromWebSite=Descargar paquete %s.
-UnpackPackageInDolibarrRoot=Descomprimir el paquete en el directorio dedicado a los módulos externos: <b>%s</b>
+DownloadPackageFromWebSite=Descargue el paquete (por ejemplo desde el sitio web oficial %s).
+UnpackPackageInDolibarrRoot=Descomprima el archivo del paquete en el directorio del servidor de Dolibarr dedicado a los módulos externos: <b>%s</b>
 SetupIsReadyForUse=La instalación ha finalizado y Dolibarr está disponible con el nuevo componente.
 NotExistsDirect=No existe el directorio alternativo.<br>
 InfDirAlt=Desde la versión 3 es posible definir un directorio root alternativo, esto le permite almacenar en el mismo lugar módulos y temas personalizados.<br>Basta con crear un directorio en el raíz de Dolibarr (por ejemplo: custom).<br>
 InfDirExample=<br>Seguidamente se declara en el archivo conf.php:<br> $dolibarr_main_url_root_alt='http://miservidor/custom'<br>$dolibarr_main_document_root_alt='/directorio/de/dolibarr/htdocs/custom'<br>*Estas lineas vienen comentadas con un "#", para descomentarlas solo hay que retirar el caracter.
-YouCanSubmitFile=Seleccione paquete:
+YouCanSubmitFile=Para este paso, puede enviar el paquete usando esta herramienta: Seleccionar el archivo del módulo
 CurrentVersion=Versión actual de Dolibarr
 CallUpdatePage=Llamar a la página de actualización de la estructura y datos de la base de datos %s.
 LastStableVersion=Última versión estable disponible
@@ -430,8 +429,8 @@ Module20Name=Presupuestos
 Module20Desc=Gestión de presupuestos/propuestas comerciales
 Module22Name=E-Mailings
 Module22Desc=Administración y envío de E-Mails masivos
-Module23Name= Energía
-Module23Desc= Realiza el seguimiento del consumo de energías
+Module23Name=Energía
+Module23Desc=Realiza el seguimiento del consumo de energías
 Module25Name=Pedidos de clientes
 Module25Desc=Gestión de pedidos de clientes
 Module30Name=Facturas y abonos
@@ -492,8 +491,8 @@ Module400Name=Proyectos/Oportunidades/Leads
 Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
-Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
-Module500Desc=Gestión de los gastos especiales como impuestos, gastos sociales, dividendos y salarios
+Module500Name=Pagos especiales
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salarios
 Module510Desc=Gestión de salarios y pagos
 Module520Name=Crédito
@@ -502,7 +501,7 @@ Module600Name=Notificaciones
 Module600Desc=Envío de notificaciones por e-mail en algunos eventos de negocio de Dolibarr a contactos de terceros (configurado en cada tercero)
 Module700Name=Donaciones
 Module700Desc=Gestión de donaciones
-Module770Name=Informe de gastos
+Module770Name=Expense reports
 Module770Desc=Gestión de informes de gastos (transporte, dietas, etc.)
 Module1120Name=Presupuesto de proveedor
 Module1120Desc=Solicitud presupuesto y precios a proveedor
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Gestión de la agenda y de las acciones
 Module2500Name=Gestión Electrónica de Documentos
 Module2500Desc=Permite administrar una base de documentos
-Module2600Name=WebServices
-Module2600Desc=Activa los servicios de servidor web services de Dolibarr
+Module2600Name=Servicios API (Servicios web SOAP)
+Module2600Desc=Habilitar los servicios Dolibarr SOAP proporcionando servicios API
+Module2610Name=Servicios API (Servicios web REST)
+Module2610Desc=Habilitar los servicios Dolibarr REST proporcionando servicios API
 Module2650Name=WebServices (cliente)
 Module2650Desc=Habilitar los servicios web cliente de Dolibarr (puede ser utilizado para grabar datos/solicitudes de servidores externos. De momento solo se soporta pedidos a proveedor)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Crear/modificar productos
 Permission34=Eliminar productos
 Permission36=Ver/gestionar los productos ocultos
 Permission38=Exportar productos
-Permission41=Consultar proyectos y tareas (compartidos o soy contacto)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Crear/modificar proyectos y tareas (compartidos o soy contacto)
 Permission44=Eliminar proyectos y tareas (compartidos o soy contacto)
 Permission61=Consultar intervenciones
@@ -599,10 +600,10 @@ Permission86=Enviar pedidos de clientes
 Permission87=Cerrar pedidos de clientes
 Permission88=Anular pedidos de clientes
 Permission89=Eliminar pedidos de clientes
-Permission91=Consultar impuestos e IVA
-Permission92=Crear/modificar impuestos e IVA
-Permission93=Eliminar impuestos e IVA
-Permission94=Exportar impuestos
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Consultar balances y resultados
 Permission101=Consultar expediciones
 Permission102=Crear/modificar expediciones
@@ -620,9 +621,9 @@ Permission121=Consultar empresas
 Permission122=Crear/modificar empresas
 Permission125=Eliminar empresas
 Permission126=Exportar las empresas
-Permission141=Consultar todos los proyectos y tareas (incluyendo los privados de los que no sea contacto)
-Permission142=Crear/modificar todos los proyectos y tareas (incluyendo los privados de los que no sea contacto)
-Permission144=Eliminar todos los proyectos y tareas (incluyendo los privados de los que no sea contacto)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Consultar proveedores
 Permission147=Consultar estadísticas
 Permission151=Consultar domiciliaciones
@@ -800,7 +801,7 @@ DictionaryCountry=Países
 DictionaryCurrency=Monedas
 DictionaryCivility=Títulos de cortesía
 DictionaryActions=Tipos de eventos de la agenda
-DictionarySocialContributions=Tipos de cargas sociales
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Tasa de IVA (Impuesto sobre ventas en EEUU)
 DictionaryRevenueStamp=Importes de sellos fiscales
 DictionaryPaymentConditions=Condiciones de pago
@@ -817,6 +818,9 @@ DictionarySource=Orígenes de presupuestos/pedidos
 DictionaryAccountancyplan=Plan contable
 DictionaryAccountancysystem=Modelos de planes contables
 DictionaryEMailTemplates=Plantillas E-Mails
+DictionaryUnits=Unidades
+DictionaryProspectStatus=Estado cliente potencial
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Configuración guardada
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
@@ -936,13 +940,14 @@ CompanyZip=Código postal
 CompanyTown=Población
 CompanyCountry=País
 CompanyCurrency=Divisa principal
+CompanyObject=Objeto de la empresa
 Logo=Logo
 DoNotShow=No mostrar
 DoNotSuggestPaymentMode=No sugerir
 NoActiveBankAccountDefined=Ninguna cuenta bancaria activa definida
 OwnerOfBankAccount=Titular de la cuenta %s
 BankModuleNotActive=Módulo cuentas bancarias no activado
-ShowBugTrackLink=Mostrar vínculo "Señalar un bug"
+ShowBugTrackLink=Mostrar enlace "<strong>%s</strong>"
 ShowWorkBoard=Mostrar panel de información en la página principal
 Alerts=Alertas
 Delays=Plazos
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Decimales máximos para los precios unitarios
 MAIN_MAX_DECIMALS_TOT=Decimales máximos para los precios totales
 MAIN_MAX_DECIMALS_SHOWN=Decimales máximos para los importes mostrados en pantalla (Poner <b>...</b> después del máximo si quiere ver <b>...</b> cuando el número se trunque al mostrarlo en pantalla)
 MAIN_DISABLE_PDF_COMPRESSION=Utilizar la compresión PDF para los archivos PDF generados
-MAIN_ROUNDING_RULE_TOT= Tamaño rango para el redondeo (para algunos países que redondean sobre otra base que no sea base 10)
+MAIN_ROUNDING_RULE_TOT=Salto de rango de redondeo (para países donde el redondeo se realiza diferente a base 10. Por ejemplo, ponga 0.05 si el redondeo se hace en saltos de 0.05)
 UnitPriceOfProduct=Precio unitario sin IVA de un producto
 TotalPriceAfterRounding=Precio total después del redondeo
 ParameterActiveForNextInputOnly=Parámetro efectivo solamente a partir de las próximas sesiones
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
 YesInSummer=Sí en verano
-OnlyFollowingModulesAreOpenedToExternalUsers=Tenga en cuenta que sólo los módulos siguientes están abiertos a usuarios externos (sean cuales sean los permisos de los usuarios):
+OnlyFollowingModulesAreOpenedToExternalUsers=Atención: únicamente los módulos siguientes están disponibles a usuarios externos (sea cual sea el permiso de dichos usuarios):
 SuhosinSessionEncrypt=Almacenamiento de sesiones cifradas por Suhosin
 ConditionIsCurrently=Actualmente la condición es %s
 YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver disponible.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Nº de productos máx. en las listas (0=sin límite)
 ConfirmDeleteProductLineAbility=Confirmación de eliminación de una línea de producido en los formularios
 ModifyProductDescAbility=Personalización de las descripciones de los productos en los formularios
 ViewProductDescInFormAbility=Visualización de las descripciones de los productos en los formularios
+MergePropalProductCard=Activar en el producto/servicio la pestaña Documentos una opción para fusionar documentos PDF de productos al presupuesto PDF azur si el producto/servicio se encuentra en el presupuesto
 ViewProductDescInThirdpartyLanguageAbility=Visualización de las descripciones de productos en el idioma del tercero
 UseSearchToSelectProductTooltip=También si usted tiene una gran cantidad de producto (> 100 000), puede aumentar la velocidad mediante el establecimiento PRODUCT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 UseSearchToSelectProduct=Utilice un formulario de búsqueda para elegir un producto (en lugar de una lista desplegable).
 UseEcoTaxeAbility=Asumir ecotasa (DEEE)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defecto para los productos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por defecto para los terceros
+UseUnits=Unidades disponibles
 ProductCodeChecker= Módulo para la generación y comprobación del código de un producto o servicio
 ProductOtherConf= Configuración de productos/servicios
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Códigos de barras tipo UPC
 BarcodeDescISBN=Códigos de barras tipo ISBN
 BarcodeDescC39=Códigos de barras tipo C39
 BarcodeDescC128=Códigos de barras tipo C128
+BarcodeDescDATAMATRIX=Códigos de barras tipo Datamatrix
+BarcodeDescQRCODE=Códigos de barras tipo código QR
 GenbarcodeLocation=Herramienta de generación de códigos de barras en consola (usad por el motor interno para determinados tipos de códigos de barras). Debe de ser compatible con "genbarcode".<br>Por ejemplo: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Gestor para auto definir números de código de barras 
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Está seguro de querer eliminar la entrada de menú <b>%s</b>
 DeleteLine=Eliminación de línea
 ConfirmDeleteLine=¿Está seguro de querer eliminar esta línea?
 ##### Tax #####
-TaxSetup=Configuración del módulo Impuestos, cargas sociales y dividendos
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Opción de carga de IVA
 OptionVATDefault=Criterio de caja
 OptionVATDebitOption=Criterio de devengo
@@ -1552,6 +1561,15 @@ WebServicesSetup=Configuración del módulo Web services
 WebServicesDesc=Mediante la activación de este módulo, Dolibarr se convierte en servidor de servicios web ofreciendo diversos servicios web.
 WSDLCanBeDownloadedHere=La descripción WSDL de los servicios prestados se pueden recuperar aquí
 EndPointIs=Los clientes SOAP deberán enviar sus solicitudes al punto final en la URL Dolibarr
+##### API ####
+ApiSetup=Configuración del módulo API
+ApiDesc=Mediante la activación de este módulo, Dolibarr se convierte en un servidor REST ofreciendo diversos servicios web.
+KeyForApiAccess=Clave para usar la API (parámetro "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=Puede acceder a la API en la url
+ApiExporerIs=Puede explorar la API en la url
+OnlyActiveElementsAreExposed=Sólo son expuestos los elementos de los módulos activos
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Configuración del módulo Banco
 FreeLegalTextOnChequeReceipts=Mención complementaria en las remesas de cheques
@@ -1581,6 +1599,7 @@ ProjectsSetup=Configuración del módulo Proyectos
 ProjectsModelModule=Modelo de documento para informes de proyectos
 TasksNumberingModules=Módulo numeración de tareas
 TaskModelModule=Módulo de documentos informes de tareas
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Configuración del módulo GED
 ECMAutoTree = El árbol automático está disponible
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Abrir año fiscal
 CloseFiscalYear=Cerrar año fiscal
 DeleteFiscalYear=Eliminar año fiscal
 ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
-Opened=Abierto
+Opened=Activo
 Closed=Cerrado
 AlwaysEditable=Puede editarse siempre
 MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios. 
 InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
 ConfFileMuseContainCustom=La instalación de módulos externos desde la aplicación guarda los archivos de los módulos en el directorio <strong>%s</strong>. Para disponer de este directorio en Dolibarr, debe configurar el archivo <strong>conf/conf.php</strong> para tener la opción <br>- <strong>$dolibarr_main_url_root_alt</strong> activada al valor <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> activa al valor <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
+PressF5AfterChangingThis=Una vez cambiado este valor, pulse F5 en el teclado para hacerlo efectivo
+NotSupportedByAllThemes=Funciona con el tema eldy, pero no es soportado por todos los temas
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 3c21ca04654..192a3f85463 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Pedido %s clasificado como facturado
 OrderApprovedInDolibarr=Pedido %s aprobado
 OrderRefusedInDolibarr=Pedido %s rechazado
 OrderBackToDraftInDolibarr=Pedido %s devuelto a borrador
-OrderCanceledInDolibarr=Pedido %s anulado
 ProposalSentByEMail=Presupuesto %s enviado por e-mail
 OrderSentByEMail=Pedido de cliente %s enviado por e-mail
 InvoiceSentByEMail=Factura a cliente %s enviada por e-mail
@@ -96,3 +95,5 @@ AddEvent=Crear evento
 MyAvailability=Mi disponibilidad
 ActionType=Tipo de evento
 DateActionBegin=Fecha de inicio del evento
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 03cdf7b835f..a35b5dedc3a 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -94,7 +94,7 @@ Conciliate=Conciliar
 Conciliation=Conciliación
 ConciliationForAccount=Conciliaciones en esta cuenta
 IncludeClosedAccount=Incluir cuentas cerradas
-OnlyOpenedAccount=Solamente cuentas abiertas
+OnlyOpenedAccount=Sólo cuentas abiertas
 AccountToCredit=Cuenta de crédito
 AccountToDebit=Cuenta de débito
 DisableConciliation=Desactivar la función de conciliación para esta cuenta
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Cobro a cliente
 CustomerInvoicePaymentBack=Reembolso a cliente
 SupplierInvoicePayment=Pago a proveedor
 WithdrawalPayment=Cobro de domiciliación
-SocialContributionPayment=Pago carga social
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Diario de tesorería de la cuenta
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index ae658582b63..6cbaa8ebf6e 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nº de facturas
 NumberOfBillsByMonth=Nº de facturas por mes
 AmountOfBills=Importe de las facturas
 AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IVA)
-ShowSocialContribution=Ver contribución social
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Ver factura
 ShowInvoice=Ver factura
 ShowInvoiceReplace=Ver factura rectificativa
@@ -270,7 +270,7 @@ BillAddress=Dirección de facturación
 HelpEscompte=Un <b>descuento</b> es un descuento acordado sobre una factura dada, a un cliente que realizó su pago mucho antes del vencimiento.
 HelpAbandonBadCustomer=Este importe se abandonó (cliente juzgado como moroso) y se considera como una pérdida excepcional.
 HelpAbandonOther=Este importe se abandonó este importe ya que se trataba de un error de facturación (mala introducción de datos, factura sustituida por otra).
-IdSocialContribution=ID carga social
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID pago
 InvoiceId=Id factura
 InvoiceRef=Ref. factura
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index f86ea312ac3..5b007667ae8 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Contacto tercero
 StatusContactValidated=Estado del contacto
 Company=Empresa
 CompanyName=Razón social
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Empresas
 CountryIsInEEC=País de la Comunidad Económica Europea
 ThirdPartyName=Nombre del tercero
@@ -412,3 +413,8 @@ LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Pue
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 SearchThirdparty=Buscar tercero
 SearchContact=Buscar contacto
+MergeOriginThirdparty=Tercero duplicado (tercero que debe eliminar)
+MergeThirdparties=Fusionar terceros
+ConfirmMergeThirdparties=¿Está seguro de que quiere fusionar este tercero con el actual? Todos los objetos relacionados (facturas, pedidos, etc.) se moverán al tercero actual, por lo que será capaz de eliminar el duplicado.
+ThirdpartiesMergeSuccess=Los terceros han sido fusionados
+ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor, compruebe el log. Los cambios han sido anulados.
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 45438f35375..fb374626778 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -56,23 +56,23 @@ VATCollected=IVA recuperado
 ToPay=A pagar
 ToGet=A devolver
 SpecialExpensesArea=Area para todos los pagos especiales
-TaxAndDividendsArea=Área impuestos, cargas sociales y dividendos
-SocialContribution=Carga social
-SocialContributions=Cargas sociales
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Pagos especiales
 MenuTaxAndDividends=Impuestos y cargas
 MenuSalaries=Salarios
-MenuSocialContributions=Cargas sociales
-MenuNewSocialContribution=Nueva carga
-NewSocialContribution=Nueva carga social
-ContributionsToPay=Cargas a pagar
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Área contabilidad/tesorería
 AccountancySetup=Configuración contabilidad
 NewPayment=Nuevo pago
 Payments=Pagos
 PaymentCustomerInvoice=Cobro factura a cliente
 PaymentSupplierInvoice=Pago factura de proveedor
-PaymentSocialContribution=Pago carga social
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Pago IVA
 PaymentSalary=Pago salario
 ListPayment=Listado de pagos
@@ -91,7 +91,7 @@ LT1PaymentES=Pago de RE
 LT1PaymentsES=Pagos de RE
 VATPayment=Pago IVA
 VATPayments=Pagos IVA
-SocialContributionsPayments=Pagos cargas sociales
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Ver pagos IVA
 TotalToPay=Total a pagar
 TotalVATReceived=Total IVA percibido
@@ -116,11 +116,11 @@ NewCheckDepositOn=Crear nueva remesa en la cuenta: %s
 NoWaitingChecks=No hay cheques en espera de ingresar.
 DateChequeReceived=Fecha recepción del cheque
 NbOfCheques=Nº de cheques
-PaySocialContribution=Pagar una carga social
-ConfirmPaySocialContribution=¿Está seguro de querer clasificar esta carga social como pagada?
-DeleteSocialContribution=Eliminar carga social
-ConfirmDeleteSocialContribution=¿Está seguro de querer eliminar esta carga social?
-ExportDataset_tax_1=Cargas sociales y pagos
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Modo <b>%sIVA sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVA sobre facturas cobradas%s</b>.
 CalcModeDebt=Modo <b>%sCréditos-Deudas%s</b> llamada <b>contabilidad de compromiso</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a
 TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo <b>contabilidad de caja</b> no es relevante. Este informe sólo está disponible cuando se utiliza en modo <b>contabilidad de compromiso</b> (consulte la configuración del módulo de contabilidad).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
-ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes
 ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores
-CloneTax=Clonar una carga social
-ConfirmCloneTax=Confirme la clonación de la carga social
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clonarla para el próximo mes
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 57f77f36616..786c3d1252a 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -4,10 +4,10 @@ About = Acerca de
 CronAbout = Acerca de Cron
 CronAboutPage = Acerca de Cron
 # Right
-Permission23101 = Leer tareas programadas
-Permission23102 = Crear/actualizar tareas programadas
-Permission23103 = Borrar tarea programada
-Permission23104 = Ejecutar tarea programada
+Permission23101 = Consultar Tarea programada
+Permission23102 = Crear/actualizar Tarea programada
+Permission23103 = Borrar Tarea Programada
+Permission23104 = Ejecutar Taraea programada
 # Admin
 CronSetup= Configuración del módulo Programador
 URLToLaunchCronJobs=URL para ejecutar tareas Cron
@@ -26,11 +26,11 @@ CronLastOutput=Res. ult. ejec.
 CronLastResult=Últ. cód. res.
 CronListOfCronJobs=Lista de tareas programadas
 CronCommand=Comando
-CronList=Tarea programada
+CronList=Tareas programadas
 CronDelete=Borrar tareas programadas
 CronConfirmDelete=¿Está seguro de querer eliminar esta tarea programada?
 CronExecute=Lanzar tareas programadas
-CronConfirmExecute=¿Está seguro de querer ejecutar esta tarea ahora?
+CronConfirmExecute=¿Está seguro de querer ejecutar esta tarea programada ahora?
 CronInfo=Tareas programadas le permite ejecutar tareas que han sido programadas
 CronWaitingJobs=Trabajos en espera
 CronTask=Tarea
@@ -40,7 +40,7 @@ CronDtEnd=Fecha fin
 CronDtNextLaunch=Sig. ejec.
 CronDtLastLaunch=Últ. ejec.
 CronFrequency=Frecuencia
-CronClass=Class
+CronClass=Clase
 CronMethod=Metodo
 CronModule=Modulo
 CronAction=Accion
@@ -55,9 +55,9 @@ CronEach=Toda(s)
 JobFinished=Tareas lanzadas y finalizadas
 #Page card
 CronAdd= Tarea Nueva
-CronHourStart= Fecha y hora de inicio de la tarea
-CronEvery= Y ejecutar la tarea cada
-CronObject= Instancia/Objeto a crear
+CronHourStart= Fecha y hora inicial de la tarea
+CronEvery=Ejecutar la tarea cada
+CronObject=Instancia/Objeto a crear
 CronArgs=Parametros
 CronSaveSucess=Guardado con exito
 CronNote=Comentario
@@ -76,6 +76,7 @@ CronMethodHelp=El métpdp a lanzar. <BR> Por ejemplo para realizar un fetch del
 CronArgsHelp=Los argumentos del método. <BR> Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, los valores pueden ser <i>0, ProductRef</i>
 CronCommandHelp=El comando en línea del sistema a ejecutar.
 CronCreateJob=Crear nueva tarea programada
+CronFrom=From
 # Info
 CronInfoPage=Información
 # Common
@@ -85,4 +86,4 @@ CronType_command=Comando Shell
 CronMenu=Programador
 CronCannotLoadClass=No se puede cargar la clase %s u objeto %s
 UseMenuModuleToolsToAddCronJobs=Ir a "Inicio - Utilidades módulos - Lista de tareas Cron" para ver y editar tareas programadas.
-TaskDisabled=Tarea deshabilitada
+TaskDisabled=Tarea desactivada
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index ea37f35c3ef..55107fc490e 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Buscar por objeto
 ECMSectionOfDocuments=Directorios de documentos
 ECMTypeManual=Manual
 ECMTypeAuto=Automático
-ECMDocsBySocialContributions=Documentos asociados a cargas sociales
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documentos asociados a terceros
 ECMDocsByProposals=Documentos asociados a presupuestos
 ECMDocsByOrders=Documentos asociados a pedidos
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 08a4bf1c7f4..3fa2c1ba7fc 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=El cliente SOAP ha fallado con el error '%s'
 ErrorGlobalVariableUpdater5=Sin variable global seleccionada
 ErrorFieldMustBeANumeric=El campo <b>%s</b> debe contener un valor numérico
 ErrorFieldMustBeAnInteger=El campo <b>%s</b> debe de ser un entero
+ErrorMandatoryParametersNotProvided=Los parámetro(s) obligatorio(s) no están todavía definidos
 
 # Warnings
 WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
@@ -190,3 +191,4 @@ WarningNotRelevant=Operación irrelevante para este conjunto de datos
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalidad desactivada cuando la configuración de visualización es optimizada para personas ciegas o navegadores de texto.
 WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha (%s) de la factura %s.
 WarningTooManyDataPleaseUseMoreFilters=Demasiados datos. Utilice más filtros
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index c0fc36fcada..65bcede3274 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -3,7 +3,7 @@ HRM=RRHH
 Holidays=Días libres
 CPTitreMenu=Días libres
 MenuReportMonth=Estado mensual
-MenuAddCP=Realizar una petición de días libres
+MenuAddCP=New leave request
 NotActiveModCP=Debe activar el módulo Días libres retribuidos para ver esta página
 NotConfigModCP=Debe configurar el módulo Días libres retribuidos para ver esta página. Para configurarlo, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">haga clic aquí</a>.
 NoCPforUser=No tiene peticiones de días libres.
@@ -71,7 +71,7 @@ MotifCP=Motivo
 UserCP=Usuario
 ErrorAddEventToUserCP=Se ha producido un error en la asignación del permiso excepcional.
 AddEventToUserOkCP=Se ha añadido el permiso excepcional.
-MenuLogCP=Ver el historial de días libres
+MenuLogCP=View change logs
 LogCP=Historial de actualizaciones de días libres
 ActionByCP=Realizado por
 UserUpdateCP=Para el usuario
@@ -93,6 +93,7 @@ ValueOptionCP=Valor
 GroupToValidateCP=Grupo con posibilidad de aprobar los días libres
 ConfirmConfigCP=Validar la configuración
 LastUpdateCP=Última actualización automática de días libres
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Actualización efectuada correctamente.
 ErrorUpdateConfCP=Se ha producido un error durante la actualización, vuélvalo a intentar.
 AddCPforUsers=Añada los saldos de días libres de los usuarios <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">haciendo clic aquí</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Se ha producido un error en el envío del e-mail :
 NoCPforMonth=Sin días libres este mes.
 nbJours=Número de días
 TitleAdminCP=Configuración de los días libres retribuidos
+NoticePeriod=Notice period
 #Messages
 Hello=Hola
 HolidaysToValidate=Días libres retribuidos a validar
@@ -139,10 +141,11 @@ HolidaysRefused=Días libres retribuidos denegados
 HolidaysRefusedBody=Su solicitud de días libres retribuidos desde el %s al %s ha sido denegada por el siguiente motivo :
 HolidaysCanceled=Días libres retribuidos cancelados
 HolidaysCanceledBody=Su solicitud de días libres retribuidos desde el %s al %s ha sido cancelada.
-Permission20000=Leer sus propios días libres retribuidos
-Permission20001=Crear/modificar sus días libres retribuidos
-Permission20002=Crear/modificar días libres retribuidos para todos
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Eliminar peticiones de días libres retribuidos
-Permission20004=Configurar días libres retribuidos de usuarios
-Permission20005=Consultar el historial de modificaciones de días libres retribuídos
-Permission20006=Leer informe mensual de días libres retribuidos
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
new file mode 100644
index 00000000000..d7e67bde4aa
--- /dev/null
+++ b/htdocs/langs/es_ES/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Préstamo
+Loans=Préstamos
+NewLoan=Nuevo Préstamo
+ShowLoan=Ver Préstamo
+PaymentLoan=Pago de préstamo
+ShowLoanPayment=Ver Pago de Préstamo
+Capital=Capital
+Insurance=Seguro
+Interest=Interés
+Nbterms=Plazos
+LoanAccountancyCapitalCode=Código contable del Capital
+LoanAccountancyInsuranceCode=Código contable del seguro
+LoanAccountancyInterestCode=Código contable del interés
+LoanPayment=Pago del préstamo
+ConfirmDeleteLoan=¿Está seguro de querer eliminar este préstamo?
+LoanDeleted=Préstamo eliminado correctamente
+ConfirmPayLoan=¿Esa seguro de querer clasificar como pagado este préstamo?
+LoanPaid=Préstamo pagado
+ErrorLoanCapital=El importe del préstamo debe ser numérico y mayor que cero.
+ErrorLoanLength=El plazo de amortización del préstamo tiene que ser numérico y mayor que cero.
+ErrorLoanInterest=El interés anual debe de ser numérico y mayor que cero.
+# Calc
+LoanCalc=Calculadora de préstamos bancarios
+PurchaseFinanceInfo=Información de Compras y Financiamiento
+SalePriceOfAsset=Precio de venta del Capital
+PercentageDown=Porcentaje
+LengthOfMortgage=Plazo de amortización
+AnnualInterestRate=Interés anual
+ExplainCalculations=Explicación de los cálculos
+ShowMeCalculationsAndAmortization=Mostrar los cálculos y amortización
+MortgagePaymentInformation=Información sobre hipoteca
+DownPayment=Depósito
+DownPaymentDesc=El <b>pago inicial</b> = Precio inicial multiplicado por el porcentaje inicial dividido por 100 (para un inicial de 5% se convierte en 5/100 o 0.05)
+InterestRateDesc=La <b>tasa de interés</b> = El porcentaje de interés anual dividido por 100
+MonthlyFactorDesc=El <b>factor mensual</b> = El resultado de la siguiente fórmula
+MonthlyInterestRateDesc=La <b>tasa de interés mensual</b> = La tasa de interés anual dividido por 12 (para los 12 meses en un año)
+MonthTermDesc=El <b>plazo en meses</b> del préstamo = El número de años del préstamo multiplicado por 12
+MonthlyPaymentDesc=El pago mensual se calcula utilizando la siguiente fórmula
+AmortizationPaymentDesc=La <a href="#amortization">amortización</a> desglosa la cantidad de su pago mensual, tanto del interés como del capital.
+AmountFinanced=Importe financiado
+AmortizationMonthlyPaymentOverYears=Amortización para pago mensual <b>%s</b> sobre %s años
+Totalsforyear=Totales por año
+MonthlyPayment=Pago mensual
+LoanCalcDesc=Esta <b>calculadora financiera</b> puede ser usada para calcular el pago mensual de un préstamo hipotecario, basado en el precio de venta de la casa, el plazo del préstamo deseado, el porcentaje del pago inicial y la tasa de interés del préstamo. <br> La calculadora incluye un SPP (seguro de protección de pagos) para los préstamos en los que menos del 20% se pone como pago inicial. También toma en cuenta los impuestos inmobiliarios y su efecto sobre el total del pago mensual de la hipoteca.<br>
+GoToInterest=%s se destinará al INTERÉS
+GoToPrincipal=%s se destinará al PRINCIPAL
+YouWillSpend=Gastará %s en su casa en el año %s
+# Admin
+ConfigLoan=Configuración del módulo préstamos
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Código contable del capital por defecto
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Código contable por defecto para el interés
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Código contable por defecto para el seguro
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 7d8d6f9fa16..5f42505842d 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Confirmación de lectura
 YourMailUnsubcribeOK=El correo electrónico <b>%s</b> es correcta desuscribe.
 MailtoEMail=mailto email (hyperlink)
 ActivateCheckRead=Activar confirmación de lectura y opción de desuscripción
-ActivateCheckReadKey=Clave usada para encriptar la URL de la confirmación de lectura y la función de desuscripción
+ActivateCheckReadKey=Clave usada para cifrar la URL utilizada para la función de "Darse de baja"
 EMailSentToNRecipients=E-Mail enviado a %s destinatarios.
 XTargetsAdded=<b>%s</b> destinatarios agregados a la lista
 EachInvoiceWillBeAttachedToEmail=Se creará y adjuntará a cada e-mail un documento usando el modelo de factura por defecto.
@@ -128,6 +128,7 @@ TagCheckMail=Seguimiento de la apertura del email
 TagUnsubscribe=Link de desuscripción
 TagSignature=Firma del usuario remitente
 TagMailtoEmail=Email del destinatario
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notificaciones
 NoNotificationsWillBeSent=Ninguna notificación por e-mail está prevista para este evento y empresa
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index ebdc89f8d85..66622fc27aa 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Modificaci
 ErrorConfigParameterNotDefined=El parámetro <b>%s</b> no está definido en el archivo de configuración Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Imposible encontrar el usuario <b>%s</b> en la base de datos Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para el país '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de carga social definida para el país '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, el registro del archivo falló.
 SetDate=Fijar fecha
 SelectDate=Seleccione una fecha
@@ -301,8 +301,8 @@ UnitPriceHT=Precio base
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
-AskPriceSupplierUHT=P.U. solicitado
-PriceUTTC=P.U. Total
+AskPriceSupplierUHT=P.U. neto solicitado
+PriceUTTC=U.P. (inc. tax)
 Amount=Importe
 AmountInvoice=Importe factura
 AmountPayment=Importe pago
@@ -339,6 +339,7 @@ IncludedVAT=IVA incluido
 HT=Sin IVA
 TTC=IVA incluido
 VAT=IVA
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tasa IVA
@@ -413,6 +414,8 @@ Qty=Cant.
 ChangedBy=Modificado por
 ApprovedBy=Aprobado por
 ApprovedBy2=Aprobado por (segunda aprobación)
+Approved=Aprobado
+Refused=Rechazado
 ReCalculate=Recalcular
 ResultOk=Éxito
 ResultKo=Error
@@ -421,7 +424,7 @@ Reportings=Informes
 Draft=Borrador
 Drafts=Borradores
 Validated=Validado
-Opened=Abierto
+Opened=Activo
 New=Nuevo
 Discount=Descuento
 Unknown=Desconocido
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Enlazado a un contacto de usuario particular
 DeleteAFile=Eliminación de archivo
 ConfirmDeleteAFile=Confirme la eliminación del archivo
 NoResults=Ningún resultado
+SystemTools=Utilidades sistema
 ModulesSystemTools=Utilidades módulos
 Test=Prueba
 Element=Elemento
@@ -703,6 +707,9 @@ ShowTransaction=Ver transacción
 GoIntoSetupToChangeLogo=Vaya a Inicio->Configuración->Empresa/Institución para cambiar el logo o vaya a Inicio->Configuración->Entorno para ocultarlo
 Deny=Denegar
 Denied=Denegada
+ListOfTemplates=Listado de plantillas
+Genderman=Hombre
+Genderwoman=Mujer
 # Week day
 Monday=Lunes
 Tuesday=Martes
@@ -732,3 +739,4 @@ ShortThursday=J
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
+SelectMailModel=Seleccione una plantilla de e-mail
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index afff6708e0d..96655f7093f 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -199,7 +199,8 @@ Entreprises=Empresas
 DOLIBARRFOUNDATION_PAYMENT_FORM=Para realizar el pago de su cotización por transferencia bancaria, visite la página <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Para pagar con tarjeta de crédito o PayPal, haga clic en el botón en la parte inferior de esta página.<br><br>
 ByProperties=Por características
 MembersStatisticsByProperties=Estadísticas de los miembros por características
-MembersByNature=Miembros por naturaleza
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Tasa de IVA para las afiliaciones
 NoVatOnSubscription=Sin IVA para en las afiliaciones
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail para advertir en caso de recepción de confirmación de un pago validado de una afiliación
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index c46ff18e246..a006b7f7b50 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Producto o servicio
 ProductsAndServices=Productos y servicios
 ProductsOrServices=Productos o servicios
 ProductsAndServicesOnSell=Productos y Servicios a la venta o en compra
-ProductsAndServicesNotOnSell=Productos y Servicios fuera de venta
+ProductsAndServicesNotOnSell=Producto y servicios no a la venta
 ProductsAndServicesStatistics=Estadísticas productos y servicios
 ProductsStatistics=Estadísticas productos
-ProductsOnSell=Producto en venta o en compra
-ProductsNotOnSell=Producto fuera de venta y fuera de compra
+ProductsOnSell=Producto a la venta o a la compra
+ProductsNotOnSell=Producto ni a la venta ni a la compra
 ProductsOnSellAndOnBuy=Productos en venta o en compra
 ServicesOnSell=Servicios a la venta o en compra
-ServicesNotOnSell=Servicios fuera de venta
+ServicesNotOnSell=Servicios no a la venta
 ServicesOnSellAndOnBuy=Servicios a la venta o en compra
 InternalRef=Referencia interna
 LastRecorded=Ultimos productos/servicios en venta registrados
@@ -71,21 +71,21 @@ SellingPriceTTC=PVP con IVA
 PublicPrice=Precio público
 CurrentPrice=Precio actual
 NewPrice=Nuevo precio
-MinPrice=Precio de venta min.
-MinPriceHT=Precio mín. de venta (a.i.)
-MinPriceTTC=Precio mín de venta (i.i.)
+MinPrice=Precio de venta mín.
+MinPriceHT=Precio de venta mín. (base imponible)
+MinPriceTTC=Precio de venta mín. (base imponible)
 CantBeLessThanMinPrice=El precio de venta no debe ser inferior al mínimo para este producto (%s sin IVA). Este mensaje puede estar causado por un descuento muy grande.
 ContractStatus=Estado de contrato
 ContractStatusClosed=Cerrado
-ContractStatusRunning=En servicio
+ContractStatusRunning=En marcha
 ContractStatusExpired=Expirado
-ContractStatusOnHold=Fuera de servicio
-ContractStatusToRun=A iniciar
-ContractNotRunning=Este contrato no está en servicio
+ContractStatusOnHold=En espera
+ContractStatusToRun=Poner en marcha
+ContractNotRunning=Este contrato no se encuentra en marcha
 ErrorProductAlreadyExists=Un producto con la referencia %s ya existe.
 ErrorProductBadRefOrLabel=El valor de la referencia o etiqueta es incorrecto
 ErrorProductClone=Ha ocurrido un error al intentar clonar el producto o servicio.
-ErrorPriceCantBeLowerThanMinPrice=Error el Precio no puede ser menor que el precio mínimo.
+ErrorPriceCantBeLowerThanMinPrice=Error, el precio no puede ser menor que el precio mínimo.
 Suppliers=Proveedores
 SupplierRef=Ref. producto proveedor
 ShowProduct=Mostrar producto
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Si el servicio es de duración limitada :
 MultiPricesAbility=Varios niveles de precio por producto/servicio
 MultiPricesNumPrices=Nº de precios
 MultiPriceLevelsName=Categoría de precios
-AssociatedProductsAbility=Activar la funcionalidad de productos compuestos
+AssociatedProductsAbility=Activar productos compuestos
 AssociatedProducts=Producto compuesto
-AssociatedProductsNumber=Nº de productos que componen este producto
+AssociatedProductsNumber=Nº de productos que componen a este producto
 ParentProductsNumber=Nº de productos que este producto compone
 IfZeroItIsNotAVirtualProduct=Si 0, este producto no es un producto compuesto
-IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no puede ser usado por ningún producto compuesto
+IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no está siendo usado por algún producto compuesto
 EditAssociate=Componer
 Translation=Traducción
 KeywordFilter=Filtro por clave
@@ -131,7 +131,7 @@ ProductToAddSearch=Buscar productos a adjuntar
 AddDel=Adjuntar/Retirar
 Quantity=Cantidad
 NoMatchFound=No se han encontrado resultados
-ProductAssociationList=Listado de productos/servicios componentes de este producto : el número entre paréntesis es la cantidad afectada en esta composición
+ProductAssociationList=Listado de productos/servicios que componen este producto compuesto
 ProductParentList=Listado de productos/servicios con este producto como componente
 ErrorAssociationIsFatherOfThis=Uno de los productos seleccionados es padre del producto en curso
 DeleteProduct=Eliminar un producto/servicio
@@ -179,16 +179,41 @@ CloneProduct=Clonar producto/servicio
 ConfirmCloneProduct=¿Está seguro de querer clonar el producto o servicio <b>%s</b>?
 CloneContentProduct=Clonar solamente la información general del producto/servicio
 ClonePricesProduct=Clonar la información general y los precios
-CloneCompositionProduct=Clonar productos/servicios compuestos
+CloneCompositionProduct=Clonar producto/servicio compuesto
 ProductIsUsed=Este producto es utilizado
 NewRefForClone=Ref. del nuevo producto/servicio
-CustomerPrices=Precios clientes
-SuppliersPrices=Precios proveedores
-SuppliersPricesOfProductsOrServices=Precios proveedores (productos o servicios)
+CustomerPrices=Precios a clientes
+SuppliersPrices=Precios de proveedores
+SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicios)
 CustomCode=Código aduanero
 CountryOrigin=País de origen
 HiddenIntoCombo=Oculto en las listas
 Nature=Naturaleza
+ShortLabel=Etiqueta corta
+Unit=Unidad
+p=u.
+set=conjunto
+se=conjunto
+second=segundo
+s=s
+hour=hora
+h=h
+day=día
+d=d
+kilogram=kilogramo
+kg=Kg
+gram=gramo
+g=g
+meter=metro
+m=m
+linear metro=metro lineal
+lm=ml
+square metro= metro cuadrado
+m2=m²
+cubic metro=metro cúbico
+m3=m³
+liter=litro
+l=L
 ProductCodeModel=Modelo de ref. de producto
 ServiceCodeModel=Modelo de ref. de servicio
 AddThisProductCard=Crear ficha producto
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Definir códigos de barras para todos los registros (m
 PriceByCustomer=Precio diferente para cada cliente
 PriceCatalogue=Precio único por producto/servicio
 PricingRule=Reglas para precios a clientes
-AddCustomerPrice=Añadir precio por clientes
+AddCustomerPrice=Añadir precio a cliente
 ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clientes
 PriceByCustomerLog=Log de precios por clientes
-MinimumPriceLimit=El precio mínimo no puede ser menor de %s
+MinimumPriceLimit=El precio mínimo no puede ser menor que %s
 MinimumRecommendedPrice=El precio mínimo recomendado es: %s
 PriceExpressionEditor=Editor de expresión de precios
 PriceExpressionSelected=Expresión de precios seleccionada
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=el formato es  {"URL": "http://example.com/urlo
 UpdateInterval=Intervalo de actualización (minutos)
 LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
+PropalMergePdfProductActualFile=Archivos que se usan para añadir en el PDF Azur son
+PropalMergePdfProductChooseFile=Seleccione los archivos PDF
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 0f9ad15ba40..ddaa1b05977 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene
 ProjectsPublicTaskDesc=Esta vista muestra todos los proyectos a los que tiene derecho a visualizar.
 ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
 MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un contacto afectado en al menos una tarea (cualquier tipo).
-OnlyOpenedProject=Solamente son visibles los proyectos abiertos (los proyectos con estado borrador o cerrado no son visibles)
+OnlyOpenedProject=Sólo los proyectos abiertos son visibles (los proyectos en estado borrador cerrado no son visibles).
 TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
 TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
-AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para dichos proyectos son visibles, pero introducir tiempos sólo para la tarea que tenga asignada.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Área proyectos
 NewProject=Nuevo proyecto
 AddProject=Crear proyecto
@@ -29,7 +30,7 @@ ProjectsList=Listado de proyectos
 ShowProject=Ver proyecto
 SetProject=Definir proyecto
 NoProject=Ningún proyecto definido
-NbOpenTasks=Nº tareas abiertas
+NbOpenTasks=Nº de tareas abiertas
 NbOfProjects=Nº de proyectos
 TimeSpent=Tiempo dedicado
 TimeSpentByYou=Tiempo dedicado por usted
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto
 ListExpenseReportsAssociatedProject=Listado de informes de gastos asociados al proyecto
 ListDonationsAssociatedProject=Listado de donaciones asociadas al proyecto
 ListActionsAssociatedProject=Lista de eventos asociados al proyecto
+ListTaskTimeUserProject=Listado de tiempos en tareas del proyecto
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Actividad en el proyecto esta semana
 ActivityOnProjectThisMonth=Actividad en el proyecto este mes
 ActivityOnProjectThisYear=Actividad en el proyecto este año
@@ -95,7 +98,7 @@ DeleteATimeSpent=Eliminación de tiempo dedicado
 ConfirmDeleteATimeSpent=¿Está seguro de querer eliminar este tiempo dedicado?
 DoNotShowMyTasksOnly=Ver también tareas no asignadas a mí
 ShowMyTasksOnly=Ver solamente tareas asignadas a mí
-TaskRessourceLinks=Recursos afectados
+TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero
 NoTasks=Ninguna tarea para este proyecto
 LinkedToAnotherCompany=Enlazado a otra empresa
@@ -139,8 +142,15 @@ ProjectReferers=Objetos vinculados
 SearchAProject=Buscar un proyecto
 ProjectMustBeValidatedFirst=El proyecto debe validarse primero
 ProjectDraft=Proyectos borrador
-FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido
+FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempos
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
 InputPerAction=Entrada por acción
 TimeAlreadyRecorded=Tiempo dedicado ya registrado para esta tarea/día y usuario %s
+ProjectsWithThisUserAsContact=Proyectos con este usuario como contacto
+TasksWithThisUserAsContact=Tareas asignadas a este usuario
+ResourceNotAssignedToProject=No asignado al proyecto
+ResourceNotAssignedToTask=No asignado a la tarea
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index ab3c7a47402..7083f393204 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -44,7 +44,6 @@ TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Ha declarado otro gasto en un rango similar de fechas.
-ListTripsAndExpenses=Listado de gastos
 AucuneNDF=No se han encontrado gastos con este criterio
 AucuneLigne=No hay gastos declarados
 AddLine=Añadir una línea
@@ -56,12 +55,12 @@ ModePaiement=Modo de pago
 Note=Nota
 Project=Proyecto
 
-VALIDATOR=Usuario a informar para la aprobación
+VALIDATOR=Usuario responsable para aprobación
 VALIDOR=Aprobado por
 AUTHOR=Registrado por
 AUTHORPAIEMENT=Pagado por
 REFUSEUR=Denegado por
-CANCEL_USER=Cancelado por
+CANCEL_USER=Eliminado por
 
 MOTIF_REFUS=Razón
 MOTIF_CANCEL=Razón
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Fecha de pago
 
 TO_PAID=Pagar
 BROUILLONNER=Reabrir
-SendToValid=Enviar para aprobar
+SendToValid=Enviado para aprobar
 ModifyInfoGen=Modificar
 ValidateAndSubmit=Validar y enviar para aprobar
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=No está autorizado para aprobar este gasto
 NOT_AUTHOR=No es el autor de este gasto. Operación cancelada.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=¿Está seguro de querer cambiar el estado de este gasto a "Paga
 CancelTrip=Cancelar gasto
 ConfirmCancelTrip=¿Está seguro de querer cancelar este gasto?
 
-BrouillonnerTrip=Devolver gasto al estado "Borrador"
+BrouillonnerTrip=Devolver el gasto al estado "Borrador"
 ConfirmBrouillonnerTrip=¿Está seguro de querer devolver este gasto al estado "Borrador"?
 
 SaveTrip=Validar gasto
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index b5e6bd3cdee..a25cf5d7d88 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas
 StatisticsByLineStatus=Estadísticas por estados de líneas
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index 8f97c568178..6f0b361d169 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Configuración del módulo Flujo de trabajo
-WorkflowDesc=Este módulo le permite cambiar el comportamiento de las acciones automáticas en la aplicación. De forma predeterminada, el workflow está abierto (configure según sus necesidades). Active las acciones automáticas que le interesen.
-ThereIsNoWorkflowToModify=No hay workflow modificable para los módulos que tiene activados.
+WorkflowDesc=Este módulo está diseñado para modificar el comportamiento de acciones automáticas en la aplicación. Por defecto, el flujo de trabajo está abierto (se pueden hacer cosas en el orden que se desee). Puede activar las acciones automáticas que le interesen.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear un pedido de cliente automáticamente a la firma de un presupuesto
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente a la firma de un presupuesto
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente a la validación de un contrato
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente al cierre de un pedido de cliente
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically Crear una factura a cliente automáticamente a la firma de un presupuesto
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically Crear una factura a cliente automáticamente a la validación de un contrato
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically Crear una factura a cliente automáticamente al cierre de un pedido de cliente
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar como facturado el presupuesto cuando el pedido de cliente relacionado se clasifique como pagado
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar como facturados los pedidos cuando la factura relacionada se clasifique como pagada
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar como facturados los pedidos de cliente relacionados cuando la factura sea validada
diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
index 9fede56fc29..f4cc556f604 100644
--- a/htdocs/langs/es_HN/compta.lang
+++ b/htdocs/langs/es_HN/compta.lang
@@ -19,4 +19,3 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del ISV repercutido y paga
 VATReportByQuartersInDueDebtMode=Informe por tasa del ISV repercutido y pagado (ISV debido)
 SeeVATReportInInputOutputMode=Ver el informe <b>%sISV pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver el informe <b>%sISV debido%s</b> para un modo de cálculo con la opción sobre lo debido
-ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV")
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index cc346f1b38c..1c53b65c99c 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -1,18 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-MAIN_ROUNDING_RULE_TOT=Size of rounding range (for rare countries where rounding is done on something else than base 10)
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
deleted file mode 100644
index e58cf5e72b5..00000000000
--- a/htdocs/langs/es_MX/banks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - banks
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
deleted file mode 100644
index f1e67a676c3..00000000000
--- a/htdocs/langs/es_MX/bills.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - bills
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
diff --git a/htdocs/langs/es_MX/commercial.lang b/htdocs/langs/es_MX/commercial.lang
deleted file mode 100644
index 18d8db06801..00000000000
--- a/htdocs/langs/es_MX/commercial.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - commercial
-ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_MX/cron.lang b/htdocs/langs/es_MX/cron.lang
deleted file mode 100644
index 3f755fc725d..00000000000
--- a/htdocs/langs/es_MX/cron.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
diff --git a/htdocs/langs/es_MX/interventions.lang b/htdocs/langs/es_MX/interventions.lang
deleted file mode 100644
index 84b26b1f95e..00000000000
--- a/htdocs/langs/es_MX/interventions.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - interventions
-PrintProductsOnFichinterDetails=interventions generated from orders
diff --git a/htdocs/langs/es_MX/mails.lang b/htdocs/langs/es_MX/mails.lang
deleted file mode 100644
index 4b5c7e95999..00000000000
--- a/htdocs/langs/es_MX/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
diff --git a/htdocs/langs/es_MX/orders.lang b/htdocs/langs/es_MX/orders.lang
deleted file mode 100644
index 6d902132a46..00000000000
--- a/htdocs/langs/es_MX/orders.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderOnProcessShort=Ordered
-StatusOrderOnProcess=Ordered - Standby reception
-ApproveOrder=Approve order
-LastOrders=Last %s customer orders
diff --git a/htdocs/langs/es_MX/other.lang b/htdocs/langs/es_MX/other.lang
deleted file mode 100644
index c50a095e492..00000000000
--- a/htdocs/langs/es_MX/other.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - other
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
-SeeModuleSetup=See setup of module %s
diff --git a/htdocs/langs/es_MX/productbatch.lang b/htdocs/langs/es_MX/productbatch.lang
deleted file mode 100644
index 53edc04d8c4..00000000000
--- a/htdocs/langs/es_MX/productbatch.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - productbatch
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/es_MX/suppliers.lang b/htdocs/langs/es_MX/suppliers.lang
deleted file mode 100644
index 5213cec4e07..00000000000
--- a/htdocs/langs/es_MX/suppliers.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/es_MX/trips.lang b/htdocs/langs/es_MX/trips.lang
deleted file mode 100644
index f5e6f1a92eb..00000000000
--- a/htdocs/langs/es_MX/trips.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
-NewTrip=New expense report
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang
index 00857e477f6..bd421eb4772 100644
--- a/htdocs/langs/es_PE/compta.lang
+++ b/htdocs/langs/es_PE/compta.lang
@@ -19,4 +19,3 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del IGV repercutido y paga
 VATReportByQuartersInDueDebtMode=Informe por tasa del IGV repercutido y pagado (IGV debido)
 SeeVATReportInInputOutputMode=Ver el informe <b>%sIGV pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver el informe <b>%sIGV debido%s</b> para un modo de cálculo con la opción sobre lo debido
-ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV")
diff --git a/htdocs/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang
index f5e1dc17fce..363917cb469 100644
--- a/htdocs/langs/es_PR/compta.lang
+++ b/htdocs/langs/es_PR/compta.lang
@@ -19,4 +19,3 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del IVU repercutido y paga
 VATReportByQuartersInDueDebtMode=Informe por tasa del IVU repercutido y pagado (IVU debido)
 SeeVATReportInInputOutputMode=Ver el informe <b>%sIVU pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver el informe <b>%sIVU debido%s</b> para un modo de cálculo con la opción sobre lo debido
-ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU")
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index ae0443ccffb..fbc76a0aa02 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Kasutajatele mõeldud menüü
 LangFile=File. Lang
 System=Süsteem
 SystemInfo=Süsteemi info
-SystemTools=Süsteemi tööriistad
 SystemToolsArea=Süsteemi tööriistade ala
 SystemToolsAreaDesc=Selles alas on administreerimise vahendid. Kasuta menüüd, et leida soovitud tööriist.
 Purge=Tühjenda
@@ -232,8 +231,8 @@ Security=Turvalisus
 Passwords=Paroolid
 DoNotStoreClearPassword=Ära säilita paroole andmebaasis avatud tekstis, vaid ainult krüpteeritud väärtusi (soovitatav aktiveeritud).
 MainDbPasswordFileConfEncrypted=Andmebaasi parool on conf.php failis krüpteeritud (soovitatav aktiveeritud).
-InstrucToEncodePass=Salasõna kodeerimiseks <b>conf.php</b>failis asenda rida<br><b>$dolibarr_main_db_pass="..."</b><br>alljärgnevaga:<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Avatud tekstis (puhta) parooli kasutamiseks<b>conf.php</b>failis asenda rida<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>alljärgnevaga:<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Automaatselt loodud PDF failide kaitse (soovitatav välja lülitatud, kuna vastasel juhul ei tööta PDFide hulgi loomine)
 ProtectAndEncryptPdfFilesDesc=PDF dokumendi kaitse võimaldab seda ikkagi iga PDFi lugejaga vaadata ja printida. Kahjuks ei ole selle järel enam võimalik faili toimetamine ja kopeerimine. Pane tähele, et seda funktsionaalsust kasutades pole enam võimalik luua kokkuliidetud PDF faile (näiteks tasutamata arved).
 Feature=Funktsionaalsus
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=See on seadistatud töötlema üksust:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Samm %s
 FindPackageFromWebSite=Leia pakett, mis võimaldab soovitud funktsionaalsuse (näiteks ametlikul veebilehel %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Paigaldamine on lõpetatud ja Dolibarr on valmis kasutama uut komponenti.
 NotExistsDirect=Alternatiivset juurkausta pole määratletud.<br>
 InfDirAlt=Alates versioonist 3 on võimalik määratleda alternatiivne juurkaust. See võimaldab samas kohas säilitada liidesed ja enda loodud mallid.<br>Lihtsalt loo Dolibarri juurkausta lisakataloog (näiteks: custom).<br>
 InfDirExample=<br>Seejärel määratle seadistusfails conf.php parameetrid<br>$dolibarr_main_url_root_alt='http://minuserver/custom'<br>$dolibarr_main_document_root_alt='/rada//dolibarr/htdocs/custom'<br>*Need read on välja kommenteeritud sümboliga "#", kasutamiseks eemalda trellid.
-YouCanSubmitFile=Vali moodul:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarri praegune versioo
 CallUpdatePage=Mine lehele, mis uuendab andmebaasi struktuuri ja andmed: %s.
 LastStableVersion=Viimane stabiilne versioon
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameetrite nimekiri on määratletud tabelis<br>Sü
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=PDFide loomiseks kasutatav teek
 WarningUsingFPDF=Hoiatus: <b>conf.php</b> sisaldab direktiivi <b>dolibarr_pdf_force_fpdf=1</b>. See tähendab, et PDF failide loomiseks kasutatakse FPDF teeki. FPDF teek on vananenud ja ei toeta paljusid võimalusi (Unicode, läbipaistvad pildid, kirillitsa, araabia ja aasia märgistikke jne), seega võib PDFi loomise ajal tekkida vigu.<br>Probleemide vältimiseks ja täieliku PDFi loomise toe jaoks palun lae alla <a href="http://www.tcpdf.org/" target="_blank">TCPDF teek</a> ning seejärel kommenteeri välja või kustuta rida <b>$dolibarr_pdf_force_fpdf=1</b> ja lisa rida <b>$dolibarr_lib_TCPDF_PATH='TCPDF_kausta_rada'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Sisesta telefoninumber, millele kasutaja helistab ClickToDial nupu testimisel <strong>%s</strong>
 RefreshPhoneLink=Värskenda linki
@@ -430,8 +429,8 @@ Module20Name=Pakkumised
 Module20Desc=Pakkumiste haldamine
 Module22Name=Masspostitus
 Module22Desc=Masspostituse haldamine
-Module23Name= Energia
-Module23Desc= Energiatarbimise järelevalve
+Module23Name=Energia
+Module23Desc=Energiatarbimise järelevalve
 Module25Name=Klientide tellimused
 Module25Desc=Klientide tellimuste haldamine
 Module30Name=Arved
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
-Module500Name=Erikulud (maksud, sotsiaalmaks, dividendid)
-Module500Desc=Erikulude: nt maksude, sotsiaalmaksude, dividendide ja palkade haldamine
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Palgad
 Module510Desc=Töötajate palkade ja palkade maksmise haldamine
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Teated
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Annetused
 Module700Desc=Annetuste haldamine
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Päevakava
 Module2400Desc=Tegevuste/ülesannete ja päevakava haldamine
 Module2500Name=Dokumendihaldus
 Module2500Desc=Salvesta ja jaga dokumente
-Module2600Name=Veebiteenused
-Module2600Desc=Lülita Dolibarri veebiteenuste server sisse
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Toodete loomine/muutmine
 Permission34=Toodete kustutamine
 Permission36=Peidetud toodete vaatamine/haldamine
 Permission38=Toodete eksport
-Permission41=Projektide vaatamine (jagatud projektid ja projekt, mille kontaktiks on kasutaja)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Projektide loomine/muutmine (jagatud projektid ja projektid, mille kontaktiks on kasutaja)
 Permission44=Projektide kustutamine (jagatud projekt ja projektid, mille kontaktiks on kasutaja)
 Permission61=Sekkumiste vaatamine
@@ -599,10 +600,10 @@ Permission86=Müügitellimuste saatmine
 Permission87=Müügitellimuste sulgemine
 Permission88=Müügitellimuste tühistamine
 Permission89=Müügitellimuste kustutamine
-Permission91=Sotsiaal- ja käibemaksu vaatamine
-Permission92=Sotsiaal- ja käibemaksu loomine/muutmine
-Permission93=Sotsiaal- ja käibemaksu kustutamine
-Permission94=Sotsiaalmaksu eksport
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Aruannete vaatamine
 Permission101=Saatmiste vaatamine
 Permission102=Saatmiste loomine/muutmine
@@ -620,9 +621,9 @@ Permission121=Kasutajaga seotud kolmandate isikute vaatamine
 Permission122=Kasutajaga seotud kolmandate isikute loomine/muutmine
 Permission125=Kasutajaga seotud kolmandate isikute kustutamine
 Permission126=Kolmandate isikute eksport
-Permission141=Projektide vaatamine (ka privaatsed, mille kontakt kasutaja ei ole)
-Permission142=Projektide loomine/muutmine (ka privaatsed, mille kasutaja kontakt ei ole)
-Permission144=Projektide kustutamine (ka privaatsed, mille kontakt kasutaja ei ole)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Pakkujate vaatamine
 Permission147=Statistika vaatamine
 Permission151=Püsikorralduste vaatamine
@@ -800,7 +801,7 @@ DictionaryCountry=Riigid
 DictionaryCurrency=Valuutad
 DictionaryCivility=Tiitel
 DictionaryActions=Päevakava sündmuste tüüp
-DictionarySocialContributions=Sotsiaalmaksude liigid
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Käibe- või müügimaksumäärad
 DictionaryRevenueStamp=Maksumärkide kogus
 DictionaryPaymentConditions=Maksetingimused
@@ -817,6 +818,9 @@ DictionarySource=Pakkumiste/tellimuste päritolu
 DictionaryAccountancyplan=Kontode graafik
 DictionaryAccountancysystem=Kontoplaani mudelid
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Seadistused salvestatud
 BackToModuleList=Tagasi moodulite nimekirja
 BackToDictionaryList=Tagasi sõnastike nimekirja
@@ -936,13 +940,14 @@ CompanyZip=Postiindeks
 CompanyTown=Linn
 CompanyCountry=Riik
 CompanyCurrency=Põhivaluuta
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Ära näita
 DoNotSuggestPaymentMode=Ära soovita
 NoActiveBankAccountDefined=Aktiivset pangakontot pole määratletud
 OwnerOfBankAccount=Pangakonto %s omani
 BankModuleNotActive=Pangakontode moodul pole sisse lülitatud
-ShowBugTrackLink=Näita linki "Teata veast"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Näita kodulehel "töölauda"
 Alerts=Häired
 Delays=Hilinemised
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Maks kümnendkohti ühikuhindades
 MAIN_MAX_DECIMALS_TOT=Maks kümnendkohti kogusummades
 MAIN_MAX_DECIMALS_SHOWN=Max kümnendkohti ekraanil näidatavate hindade jaoks (lisa <b>...</b> pärast seda parameetrit, kui tahad, et arvude kärpimisel näidatakse nendel järel <b>...</b>)
 MAIN_DISABLE_PDF_COMPRESSION=Kasuta loodud PDF-failide jaoks PDFi pakkimist.
-MAIN_ROUNDING_RULE_TOT= Ümardamise suurus (nende harvade riikide jaoks, kus ümardatakse millegi muu kui 10 alusel)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Toote neto ühikuhind
 TotalPriceAfterRounding=Koguhind (neto/km/km-ga) pärast ümardamist
 ParameterActiveForNextInputOnly=Parameeter kehtib vaid järgmise sisestuse ajal
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Aktiveeritud mooduleid kokku: <b>%s</b>
 YouMustEnableOneModule=Pead vähemalt 1 mooduli sisse lülitama
 ClassNotFoundIntoPathWarning=Klassi %s ei ole PHP rajas
 YesInSummer=Suviti 'jah'
-OnlyFollowingModulesAreOpenedToExternalUsers=Märkus: välised kasutajad saavad kasutada vaid neid mooduleid (hoolimata nende kasutaja õigustest):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Sessiooni andmehoidla krüpteeritud Suhosini poolt
 ConditionIsCurrently=Olek on hetkel %s
 YouUseBestDriver=Kasutad draiverit %s, mis on hetkel saadaolevatest parim.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Maksimaalne toodete arv liitbokside nimekirjades (0=
 ConfirmDeleteProductLineAbility=Küsi vormides tooteridade eemaldamisel kinnitust
 ModifyProductDescAbility=Toodete kirjeldusi on vormides võimalik muuta
 ViewProductDescInFormAbility=Toodete kirjelduste visualiseerimine vormides (hüpikaknas)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Toodete kirjelduste visualiseerimine kolmanda isiku keeles
 UseSearchToSelectProductTooltip=Suure toodete arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi PRODUCT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 UseSearchToSelectProduct=Kasuta toote valimiseks otsinguvormi (rippmenüü asemel).
 UseEcoTaxeAbility=Eco-Taxe (WEEE) tugi
 SetDefaultBarcodeTypeProducts=Vaikimisi vöötkoodi tüüp toodetel
 SetDefaultBarcodeTypeThirdParties=Vaikimisi vöötkoodi tüüpi kolmandatel isikutel
+UseUnits=Support units
 ProductCodeChecker= Tootekoodide (tooted või teenused) genereerimiseks kasutatav moodul
 ProductOtherConf= Toodete/teenuste seadistamine
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=UPC tüüpi vöötkood
 BarcodeDescISBN=ISBN tüüpi vöötkood
 BarcodeDescC39=C39 tüüpi vöötkood
 BarcodeDescC128=C128 tüüpi vöötkood
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Sisemine mootor
 BarCodeNumberManager=Automaatselt määratletud vöötkoodide haldamine
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Kas oled täiesti kindel, et soovid kustutada menüükande <b>
 DeleteLine=Kustuta rida
 ConfirmDeleteLine=Kas oled täiesti kindel, et soovid selle rea kustutada?
 ##### Tax #####
-TaxSetup=Maksude, sotsiaalkindlustusmaksete ja dividendide mooduli seadistamine
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=KM kuupäev
 OptionVATDefault=Kassapõhine
 OptionVATDebitOption=Tekkepõhine
@@ -1552,6 +1561,15 @@ WebServicesSetup=Veebiteenuste mooduli seadistamine
 WebServicesDesc=Selle mooduli võimaldamisel muutub Dolibarr veebiteenuse serveriks ning pakub erinevaid veebiteenuseid.
 WSDLCanBeDownloadedHere=Pakutavate teenuste WSDL kirjeldusfaile saab alla laadida siit
 EndPointIs=SOAP kliendid peavad oma päringud saatma Dolibarri peavad saatma oma taotlused Dolibarri lõppsõlme, mis on saadaval URLil
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Pangamooduli seadistamine
 FreeLegalTextOnChequeReceipts=Vaba tekst tšekikviitungitel
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projektide mooduli seadistamine
 ProjectsModelModule=Projektiaruannete dokumendi mudel
 TasksNumberingModules=Ülesannete numeratsiooni moodu
 TaskModelModule=Ülesannete aruande dokumendi mudel
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED seadistamine
 ECMAutoTree = Automaatmne kaustapuu ja dokument
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Ava majandusaasta
 CloseFiscalYear=Sulge majandusaasta
 DeleteFiscalYear=Kustuta majandusaasta
 ConfirmDeleteFiscalYear=Kas oled kindel, et soovid selle majandusaasta kustutada?
-Opened=Avatud
+Opened=Open
 Closed=Suletud
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 1d95135c3c3..693dcdb7ef0 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Tellimus %s on heaks kiidetud
 OrderRefusedInDolibarr=Tellimus %s on tagasi lükatud
 OrderBackToDraftInDolibarr=Tellimus %s on muudetud mustandiks
-OrderCanceledInDolibarr=Tellimus %s on tühistatud
 ProposalSentByEMail=Pakkumine %s on saadetud e-postiga
 OrderSentByEMail=Tellimus %s on saadetud e-postiga
 InvoiceSentByEMail=Arve %s on saadetud e-postiga
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 740d08009c4..f826da356b0 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Vii vastavusse
 Conciliation=Vastavusse viimine
 ConciliationForAccount=Vii see konto vastavusse
 IncludeClosedAccount=Sh suletud tehingute summad
-OnlyOpenedAccount=Ainult avatud tehingud
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Krediteeritav konto
 AccountToDebit=Debiteeritav konto
 DisableConciliation=Keela sellel kontol vastavusse viimise funktsioonid
 ConciliationDisabled=Vastavusse viimine on keelatud
-StatusAccountOpened=Avatud
+StatusAccountOpened=Open
 StatusAccountClosed=Suletud
 AccountIdShort=Number
 EditBankRecord=Muuda kannet
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Kliendi laekumi
 CustomerInvoicePaymentBack=Tagasimakse kliendile
 SupplierInvoicePayment=Hankija makse
 WithdrawalPayment=Väljamakse
-SocialContributionPayment=Sotsiaalmaksu makse
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Finantskontode päevaraamat
 BankTransfer=Pangaülekanne
 BankTransfers=Pangaülekanded
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index bc5ccc57a44..a242ed0da9f 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Arve
 Bills=Arved
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Kliendi arved
+BillsCustomer=Kliendi arve
+BillsSuppliers=Ostuarved
+BillsCustomersUnpaid=Tasumata müügiarved
 BillsCustomersUnpaidForCompany=Tasumata müügiarved ühikuga %s
 BillsSuppliersUnpaid=Tasumata ostuarved
 BillsSuppliersUnpaidForCompany=Tasumata ostuarved ühikuga %s
 BillsLate=Hilinenud maksed
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Müügiiarvete statistika
+BillsStatisticsSuppliers=Ostuarvete statistika
 DisabledBecauseNotErasable=Blokeeritud, sest ei saa kustutada
 InvoiceStandard=Standardne arve
 InvoiceStandardAsk=Standardne arve
@@ -74,7 +74,7 @@ PaymentsAlreadyDone=Juba tehtud maksed
 PaymentsBackAlreadyDone=Juba tehtud tagasimaksed
 PaymentRule=Maksereegel
 PaymentMode=Makse liik
-PaymentTerm=Payment term
+PaymentTerm=Maksetähtaeg
 PaymentConditions=Payment terms
 PaymentConditionsShort=Payment terms
 PaymentAmount=Makse summa
@@ -178,7 +178,7 @@ NumberOfBills=Arveid
 NumberOfBillsByMonth=Arveid kuus
 AmountOfBills=Arvete summa
 AmountOfBillsByMonthHT=Arvete summa kuus (maksudeta)
-ShowSocialContribution=Näita sotsiaalmaksu
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Näita arvet
 ShowInvoice=Näita arvet
 ShowInvoiceReplace=Näita asendusarvet
@@ -270,7 +270,7 @@ BillAddress=Arve aadress
 HelpEscompte=Kliendile anti see soodustus, kuna ta maksis enne tähtaega.
 HelpAbandonBadCustomer=Sellest summast on loobutud (kuna tegu olevat halva kliendiga) ning on loetud erandlikuks kaotuseks.
 HelpAbandonOther=Sellest summast on loobutud, kuna tegu oli veaga (näiteks: vale klient või arve on asendatud teisega).
-IdSocialContribution=Sotsiaalmaksu ID
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Makse ID
 InvoiceId=Arve ID
 InvoiceRef=Arve viide
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Kohene
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index a7801245f45..c07f6be14c8 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Viimased lepingud
 BoxLastContacts=Viimased kontaktid/aadressid
 BoxLastMembers=Viimased liikmed
 BoxFicheInter=Viimased sekkumised
-BoxCurrentAccounts=Avatud kontode saldo
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Müügikäive
 BoxTotalUnpaidCustomerBills=Kokku tasumata müügiarveid
 BoxTotalUnpaidSuppliersBills=Kokku maksmata ostuarveid
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Viimased %s muudetud sekkumist
 BoxTitleOldestUnpaidCustomerBills=Vanemad %s maksmata klientide arved
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Avatud kontode saldod
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Müügikäive
 BoxTitleTotalUnpaidCustomerBills=Maksmata klientide arved
 BoxTitleTotalUnpaidSuppliersBills=Maksmata tarnijate arved
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index 441c62cb002..723ce63a9b2 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> edukalt lisatud.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Puudub
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Sellise viitega kategooria on juba olemas
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Sisu ei ole kõigile nähtav
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Kliendi-/Huvil kategooriad
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index aafc764f97b..e1d1860cfad 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Kolmanda isiku kontakt/aadress
 StatusContactValidated=Kontakti/aadressi staatus
 Company=Ettevõte
 CompanyName=Ettevõtte nimi
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Ettevõtted
 CountryIsInEEC=Riik on Euroopa Majandusühenduse liige
 ThirdPartyName=Kolmanda isiku nimi
@@ -410,5 +411,10 @@ OutstandingBillReached=Jõudis maksmata summa maksimumini
 MonkeyNumRefModelDesc=Tagasta arv formaadiga %syymm-nnnn kliendikoodi jaoks ja %syymm-nnnn hankija koodi jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestuseta jada, mille väärtus pole kunagi 0.
 LeopardNumRefModelDesc=Kood on vaba, seda saab igal ajal muuta.
 ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...)
-SearchThirdparty=Otsi kolmandat isikut
+SearchThirdparty=Search third party
 SearchContact=Otsi kontakti
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 8eef9586af4..766da55424d 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -56,23 +56,23 @@ VATCollected=KM kogutud
 ToPay=Maksta
 ToGet=Tagasi saada
 SpecialExpensesArea=Kõigi erimaksete ala
-TaxAndDividendsArea=Maksude, sotsiaalmaksu ja dividendide ala
-SocialContribution=Sotsiaalmaks
-SocialContributions=Sotsiaalmaksud
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Erikulud
 MenuTaxAndDividends=Maksud ja dividendid
 MenuSalaries=Palgad
-MenuSocialContributions=Sotsiaalmaksud
-MenuNewSocialContribution=Uus sotsiaalmaks
-NewSocialContribution=Uus sotsiaalmaks
-ContributionsToPay=Sotsiaalmaksu maksta
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Raamatupidamise/vara ala
 AccountancySetup=Raamatupidamise seadistamine
 NewPayment=Uus makse
 Payments=Maksed
 PaymentCustomerInvoice=Müügiarve makse
 PaymentSupplierInvoice=Ostuarve makse
-PaymentSocialContribution=Sotsiaalmaksu makse
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=KM makse
 PaymentSalary=Palga makse
 ListPayment=Maksete nimekiri
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Käibemaksu makse
 VATPayments=Käibemaksu maksed
-SocialContributionsPayments=Sotsiaalmaksu maksed
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näita käibemaksu makset
 TotalToPay=Kokku maksta
 TotalVATReceived=Kokku KM saadud
@@ -116,11 +116,11 @@ NewCheckDepositOn=Loo kviitung kontole deponeerimise eest: %s
 NoWaitingChecks=Pole ühtki tšekki deponeerida.
 DateChequeReceived=Tšeki vastuvõtmise kuupäev
 NbOfCheques=Tšekke
-PaySocialContribution=Maksa sotsiaalmaksu
-ConfirmPaySocialContribution=Kas oled täiesti kindel, et tahad selle sotsiaalmaksu liigitada makstuks?
-DeleteSocialContribution=Kustuta sotsiaalmaks
-ConfirmDeleteSocialContribution=Kas oled täiesti kindel, et soovid kustutada selle sotsiaalmaksu?
-ExportDataset_tax_1=Sotsiaalmaksud ja maksed
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režiim <b>%stekkepõhise raamatupidamise KM%s</b>.
 CalcModeVATEngagement=Režiim <b>%stulude-kulude KM%s</b>.
 CalcModeDebt=Režiim <b>%sNõuded-Võlad%s</b> nõuab <b>tekkepõhist raamatupidamist</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=vastavalt hankijale, vali sobiv meetod sama reegli r
 TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, <b>kassapõhist raamatupidamist</b> kasutades pole režiim oluline. See aruanne on saadaval vaid <b>tekkepõhist raamatupidamist</b> kasutades (vaata raamatupidamise mooduli seadistust).
 CalculationMode=Arvutusrežiim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 477e601a0d6..96909ea5459 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -4,10 +4,10 @@ About = Mooduli kohta
 CronAbout = Cron mooduli kohta
 CronAboutPage = Croni info kohta
 # Right
-Permission23101 = Loe plaanitud tegevus
-Permission23102 = Loo/uuenda plaanitud tegevust
-Permission23103 = Kustuta plaanitud tegevus
-Permission23104 = Käivita plaanitud tegevus
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Plaanitavata programmide haldamise seadistamine
 URLToLaunchCronJobs=Croni poolt kontrollitavate ja käivitatavate programmide jaoks vajalik URL
@@ -26,11 +26,11 @@ CronLastOutput=Viimase käivituse väljund
 CronLastResult=Viimane vastuse kood
 CronListOfCronJobs=Käivitatavate tööde nimekiri
 CronCommand=Käsk
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Tegevus
@@ -39,8 +39,8 @@ CronDtStart=Alguskuupäev
 CronDtEnd=Lõppkuupäev
 CronDtNextLaunch=Järgmine käivitus
 CronDtLastLaunch=Viimane käivitus
-CronFrequency=Sagedus
-CronClass=Klass
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Meetod
 CronModule=Moodul
 CronAction=Tegevus
@@ -55,9 +55,9 @@ CronEach=Iga
 JobFinished=Tegevus käivitatud ja lõpetatud
 #Page card
 CronAdd= Lisa programme
-CronHourStart= Tegevuse algusaeg ja -kuupäev
-CronEvery= Ja käivita iga tegevus
-CronObject= Instants/objekt, mis luuakse
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instants/objekt, mis luuakse
 CronArgs=Parameetrid
 CronSaveSucess=Salvestamine õnnestus
 CronNote=Kommentaar
@@ -76,13 +76,14 @@ CronMethodHelp=Kasutatava objekti korral käivitatav meetod. <BR> Näiteks Dolib
 CronArgsHelp=Meetodile antavad argumendid. <BR> Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla <i>0, ProductRef</i>.
 CronCommandHelp=Käivitatav süsteemi käsk.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informatsioon
 # Common
-CronType=Tegevuse tüüp
+CronType=Job type
 CronType_method=Dolibarri klassi väljakutsutav meetod
 CronType_command=Käsurea käsk
 CronMenu=Cro
 CronCannotLoadClass=Klassi %s või objekti %s laadimine ebaõnnestus
 UseMenuModuleToolsToAddCronJobs=Mine menüüsse "Kodu - Moodulite tööriistad - Tegevuste nimekiri" planeeritud tegevuste vaatamiseks ja muutmiseks.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
index 54aed27c612..be53ded2701 100644
--- a/htdocs/langs/et_EE/ecm.lang
+++ b/htdocs/langs/et_EE/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Otsi objekti järgi
 ECMSectionOfDocuments=Dokumentide kaustad
 ECMTypeManual=Käsitsi
 ECMTypeAuto=Automaatne
-ECMDocsBySocialContributions=Sotsiaalmaksudega seotud dokumendid
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Kolmandate isikutega seotud dokumendid
 ECMDocsByProposals=Pakkumistega seotud dokumendid
 ECMDocsByOrders=Müügitellimustega seotud dokumendid
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 86106217529..ac11e5d8962 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata
@@ -190,3 +191,4 @@ WarningNotRelevant=Selle andmehulga juures ei ole see tegevus otstarbekas
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index c1b981dc57d..15bbb0a81b4 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -3,7 +3,7 @@ HRM=Personalihaldus
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Kuu aruanne
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Põhjus
 UserCP=Kasutaja
 ErrorAddEventToUserCP=Erakorralise puhkuse lisamisel tekkis viga
 AddEventToUserOkCP=Erakorralise puhkuse lisamine edukalt lõpetatud.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Sooritas
 UserUpdateCP=Kasutajale
@@ -93,6 +93,7 @@ ValueOptionCP=Väärtus
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Valideeri seadistus
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Edukalt uuendatud.
 ErrorUpdateConfCP=Uuendamise ajal tekkis viga, palun proovi uuesti.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=E-kirja saatmisel tekkis viga:
 NoCPforMonth=Sellel kuul pole puhkusi.
 nbJours=Päevade arv
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Tere
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/et_EE/incoterm.lang b/htdocs/langs/et_EE/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/et_EE/incoterm.lang
+++ b/htdocs/langs/et_EE/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang
index effb7253522..1893f2e4d07 100644
--- a/htdocs/langs/et_EE/languages.lang
+++ b/htdocs/langs/et_EE/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Araabia
 Language_ar_SA=Araabia
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgaaria
 Language_bs_BA=Bosnia
 Language_ca_ES=Katalaani
@@ -21,9 +22,10 @@ Language_en_SA=Inglise (Saudi Araabia)
 Language_en_US=Inglise (Ameerika Ühendriigid)
 Language_en_ZA=Inglise (Lõuna-Aafrika)
 Language_es_ES=Hispaania
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Hispaania (Argentiina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Hispaania (Honduras)
 Language_es_MX=Hispaania (Mehhiko)
 Language_es_PY=Hispaania (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Islandi
 Language_it_IT=Itaalia
 Language_ja_JP=Jaapani
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korea
+Language_lo_LA=Lao
 Language_lt_LT=Leedu
 Language_lv_LV=Läti
 Language_mk_MK=Makedoonia
@@ -64,6 +69,7 @@ Language_sv_SV=Rootsi
 Language_sv_SE=Rootsi
 Language_sq_AL=Albanian
 Language_sk_SK=Slovaki
+Language_sw_SW=Kiswahili
 Language_th_TH=Tai
 Language_uk_UA=Ukraina
 Language_uz_UZ=Usbeki
diff --git a/htdocs/langs/et_EE/loan.lang b/htdocs/langs/et_EE/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/et_EE/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 2098f500988..ea6f33becbc 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Vaata kviitungit
 YourMailUnsubcribeOK=E-posti aadress <b>%s</b> on edukalt oma tellimuse meililistist eemaldanud
 MailtoEMail=E-kirja hüperlink
 ActivateCheckRead=Luba "Tühista tellimus" lingi kasutamine
-ActivateCheckReadKey="Vaata kviitungit" ja "Tühista tellimus" linkide URLi krüpteerimiseks kasutatav võti
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-kiri saadetud %s aadressile.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Jälgi kirjade avamist
 TagUnsubscribe=Tellimuse tühistamise link
 TagSignature=Saatnud kasutaja allkiri
 TagMailtoEmail=Saaja e-posti aadress
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Teated
 NoNotificationsWillBeSent=Selle tegevuse ja ettevõttega ei ole plaanis saata ühtki e-kirja teadet
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 37257f3cb9c..a9b927e3613 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Töö käigus tekkisid mõned vead. Tehtud
 ErrorConfigParameterNotDefined=Parameeter <b>%s</b> ei ole Dolibarri seadistusfailis <b>conf.php</b> määratletud.
 ErrorCantLoadUserFromDolibarrDatabase=Kasutajat <b>%s</b> ei leitud Dolibarri andmebaasist.
 ErrorNoVATRateDefinedForSellerCountry=Viga: riigi '%s' jaoks ei ole käibemaksumäärasid määratletud.
-ErrorNoSocialContributionForSellerCountry=Viga: riigi '%s' jaoks ei ole määratletud sotsiaalmaksu määrasid.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Viga: faili salvestamine ebaõnnestus.
 SetDate=Sea kuupäev
 SelectDate=Vali kuupäev
@@ -301,8 +301,8 @@ UnitPriceHT=Ühiku hind (neto)
 UnitPriceTTC=Ühiku hind
 PriceU=ÜH
 PriceUHT=ÜH (neto)
-AskPriceSupplierUHT=P.U. HT nõutud
-PriceUTTC=ÜH
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Arve summa
 AmountPayment=Makse summa
@@ -339,6 +339,7 @@ IncludedVAT=Sisse arvestatud maksud
 HT=Ilma maksudeta
 TTC=Koos maksudega
 VAT=KM
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Maksumäär
@@ -413,6 +414,8 @@ Qty=Kogus
 ChangedBy=Muutis
 ApprovedBy=Kiitis heaks
 ApprovedBy2=Kiitis heaks (teine nõusolek)
+Approved=Approved
+Refused=Refused
 ReCalculate=Arvuta uuesti
 ResultOk=Õnnestumine
 ResultKo=Viga
@@ -421,7 +424,7 @@ Reportings=Aruandlus
 Draft=Mustand
 Drafts=Mustandid
 Validated=Kinnitatud
-Opened=Avatud
+Opened=Open
 New=Uus
 Discount=Allahindlus
 Unknown=Tundmatu
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Seostatud kindla kasutaja kontaktiga
 DeleteAFile=Kustuta fail
 ConfirmDeleteAFile=Kas oled kindel, et soovid kustutada faili
 NoResults=Vasteid ei leitud
+SystemTools=System tools
 ModulesSystemTools=Moodulite tööriistad
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Näita tehingut
 GoIntoSetupToChangeLogo=Mine Kodu - Seadistamine - Ettevõte logo muutmiseks või mine Kodu - Seadistamine - Kuva logo peitmiseks.
 Deny=Lükka tagasi
 Denied=Tagasi lükatud
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
@@ -732,3 +739,4 @@ ShortThursday=N
 ShortFriday=R
 ShortSaturday=L
 ShortSunday=P
+SelectMailModel=Select email template
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 7eeb8340553..eb1f129127c 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -199,7 +199,8 @@ Entreprises=Ettevõtted
 DOLIBARRFOUNDATION_PAYMENT_FORM=Liikmemaksu tasumiseks pangaülekande abil vaata lehte <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>Krediitkaardi või Paypali makse tegemiseks klõpsa lehe allosas asuval nupul.<br>
 ByProperties=Karakteristikute alusel
 MembersStatisticsByProperties=Liikmete statistika karakteristikute alusel
-MembersByNature=Liikmed loomuse alusel
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Liikmemaksude jaoks kasutatav KM määr
 NoVatOnSubscription=Liikmemaksudel ei ole KM
 MEMBER_PAYONLINE_SENDEMAIL=E-posti aadress, kuhu saadetakse hoiatus, kui Dolibarr on saanud liikmemaksu tasumise kinnituse
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index f886109879c..e9032112719 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Ostutellimus
 SuppliersOrders=Ostutellimus
 SuppliersOrdersRunning=Praegused ostutellimused
 CustomerOrder=Müügitellimus
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Praegused müügitellimused
-CustomersOrdersAndOrdersLines=Müügitellimused ja tellimuste read
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Töötlemist vajavad ostutellimused
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Tühistatud
 StatusOrderDraftShort=Mustand
 StatusOrderValidatedShort=Kinnitatud
@@ -75,8 +75,9 @@ AddToMyOrders=Lisa minu tellimustele
 AddToOtherOrders=Lisa muudele tellimustele
 AddToDraftOrders=Lisa tellimuse mustandile
 ShowOrder=Näita tellimust
-NoOpenedOrders=Pole ühtki avatud tellimust
-NoOtherOpenedOrders=Pole ühtki muud avatud tellimust
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Ühtki tellimuse mustandit ei ole
 OtherOrders=Muud tellimused
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index ec294842f2b..c89032a204b 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Sekkumine kinnitatud
 Notify_FICHINTER_SENTBYMAIL=Sekkumine saadetud postiga
 Notify_BILL_VALIDATE=Müügiarve kinnitatud
 Notify_BILL_UNVALIDATE=Müügiarve avatud
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Ostutellimus heaks kiidetud
 Notify_ORDER_SUPPLIER_REFUSE=Ostutellimus tagasi lükatud
 Notify_ORDER_VALIDATE=Müügitellimus kinnitatud
@@ -203,6 +204,7 @@ ClickHereToGoTo=Klõpsa siia, et minna %s
 YouMustClickToChange=Esmalt pead klõpsa järgneval lingil, et kinnitada salasõna muutmine
 ForgetIfNothing=Kui Sina ei palunud seda muudatust, siis ignoreeri antud kirja ja mingeid muudatusi ei toimu.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Lisa kirje kalendrisse %s
diff --git a/htdocs/langs/et_EE/printing.lang b/htdocs/langs/et_EE/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/et_EE/printing.lang
+++ b/htdocs/langs/et_EE/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index f04f73b02f5..be6678f39d9 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Toode või teenus
 ProductsAndServices=Tooted ja teenused
 ProductsOrServices=Tooted või teenused
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Toodete ja teenuste statistika
 ProductsStatistics=Toodete statistika
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Sisemine viide
 LastRecorded=Viimased salvestatud müügil olevad tooted/teenused
@@ -44,7 +44,7 @@ CardProduct1=Teenuse kaart
 CardContract=Lepingu kaart
 Warehouse=Ladu
 Warehouses=Laod
-WarehouseOpened=Ladu avatud
+WarehouseOpened=Warehouse open
 WarehouseClosed=Ladu suletud
 Stock=Laojääk
 Stocks=Laojäägid
@@ -71,21 +71,21 @@ SellingPriceTTC=Müügihinna (km-ga)
 PublicPrice=Avalik hind
 CurrentPrice=Praegune hind
 NewPrice=Uus hind
-MinPrice=Min müügihind
-MinPriceHT=Minim. müügihind (ilma maksuta)
-MinPriceTTC=Minim. müügihind (maksuga)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Müügihind ei saa olla madalam kui selle toote minimaalne lubatud hind (%s km-ta). Antud sõnumit näidatakse ka siis, kui sisestad liiga suure allahindluse.
 ContractStatus=Lepingu staatus
 ContractStatusClosed=Suletud
-ContractStatusRunning=Aktiivne
+ContractStatusRunning=Ongoing
 ContractStatusExpired=aegunud
-ContractStatusOnHold=Mitteaktiivne
-ContractStatusToRun=To get running
-ContractNotRunning=Käesolev leping ei ole aktiivne
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Toode viitega %s on juba olemas.
 ErrorProductBadRefOrLabel=Vale viite või nime väärtus.
 ErrorProductClone=Toote või teenuse kloonimisel tekkis probleem.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Hankijad
 SupplierRef=Hankija toote viide
 ShowProduct=Näita toodet
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Kui toode on piiratud kestusega teenus:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Hindasid
 MultiPriceLevelsName=Kategooriate hinnad
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Seosta
 Translation=Tõlge
 KeywordFilter=Märksõnade filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Otsi lisamiseks toodet
 AddDel=Lisa/kustuta
 Quantity=Kogus
 NoMatchFound=Ühtki vastet ei leitud
-ProductAssociationList=Seotud toodete/teenuste nimekiri: toote/teenuse nimi (mõjutatud kogusest)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Üks valitud toodetest kasutab antud toodet
 DeleteProduct=Kustuta toode/teenus
@@ -179,16 +179,41 @@ CloneProduct=Klooni toode või teenus
 ConfirmCloneProduct=Kas oled täiesti kindel, et soovid kloonida toote või teenuse <b>%s</b>?
 CloneContentProduct=Klooni toote/teenuse kogu põhiline info
 ClonePricesProduct=Klooni põhiline info ja hinnad
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Seda toodet kasutatakse
 NewRefForClone=Uue toote/teenuse viide
-CustomerPrices=Klientide hinnad
-SuppliersPrices=Hankijate hinnad
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Tolli kood
 CountryOrigin=Päritolumaa
 HiddenIntoCombo=Peida valitud nimekirjades
 Nature=Olemus
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Loo toote kaart
@@ -214,7 +239,7 @@ CostPmpHT=Neto kokku VWAP
 ProductUsedForBuild=Automaatne tootmise kul
 ProductBuilded=Tootmine lõpetatud
 ProductsMultiPrice=Toote mitmikhind
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Toodete müügikäive kvartalis VWAP
 ServiceSellByQuarterHT=Teenuste müügikäive kvartalis VWAP
 Quarter1=1. kvartal
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Uuendamise intervall (minutities)
 LastUpdated=Viimati uuendatud
 CorrectlyUpdated=Õigesti uuendatud
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index a5aeb31e5a9..749a99d339a 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=See vaade esitab kõik projektid, mida sul on lubatud vaadata
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=See vaade näitab kõiki projekte (sinu kasutajaõigused annavad ligipääsu kõigele)
 MyTasksDesc=Selles vaates näidatakse vaid neid projekte või ülesandeid, mille kontaktiks oled märgitud (hoolimata liigist)
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
 TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõigused annavad ligipääsu kõigele)
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projektide ala
 NewProject=Uus projekt
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Projektide nimekir
 ShowProject=Kuva projekt
 SetProject=Määra projekt
 NoProject=Ühtki projekti pole määratletud või ei oma ühtki projekt
-NbOpenTasks=Avatud ülesandeid
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Projekte
 TimeSpent=Aega kulutatud
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Ülesannetel kulutatud aeg
 TaskTimeUser=Kasutaja
 TaskTimeNote=Märkus
 TaskTimeDate=Kuupäev
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Aeg kulutatud uuesti
 MyTimeSpent=Minu poolt kulutatud aeg
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Antud projektiga seotud sekkumiste nimekiri
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Antud projektiga seotud tegevuste nimekiri
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Projekti aktiivsus sellel nädalal
 ActivityOnProjectThisMonth=Projekti aktiivsus sellel kuul
 ActivityOnProjectThisYear=Projekti aktiivsus sellel aastal
@@ -95,7 +98,7 @@ DeleteATimeSpent=Kustuta kulutatud aeg
 ConfirmDeleteATimeSpent=Kas oled kindel, et soovid selle kulutatud aja kustutada?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressursid
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Selle kolmanda isikuga seotud projektid
 NoTasks=Selle projektiga ei ole seotud ühtki ülesannet
 LinkedToAnotherCompany=Seotud muu kolmanda isikuga
@@ -139,8 +142,15 @@ ProjectReferers=Viitavad objektid
 SearchAProject=Otsi projekti
 ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama
 ProjectDraft=Projektide mustandid
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/et_EE/propal.lang b/htdocs/langs/et_EE/propal.lang
index c7a320ce8c4..83d959ea4cc 100644
--- a/htdocs/langs/et_EE/propal.lang
+++ b/htdocs/langs/et_EE/propal.lang
@@ -4,7 +4,7 @@ Proposal=Pakkumine
 ProposalShort=Pakkumine
 ProposalsDraft=Koosta pakkumiste mustandeid
 ProposalDraft=Koosta pakkumise mustand
-ProposalsOpened=Avatud pakkumised
+ProposalsOpened=Open commercial proposals
 Prop=Pakkumised
 CommercialProposal=Pakkumine
 CommercialProposals=Pakkumised
@@ -16,7 +16,7 @@ Prospect=Huviline
 ProspectList=Huviliste nimekiri
 DeleteProp=Kustuta pakkumine
 ValidateProp=Kinnita pakkumine
-AddProp=Lisa pakkumine
+AddProp=Create proposal
 ConfirmDeleteProp=Kas oled täiesti kindel, et soovid selle pakkumise kustutada?
 ConfirmValidateProp=Kas oled täiesti kindel, et soovid selle pakkumise kinnitada nimega <b>%s</b> ?
 LastPropals=Viimased %s pakkumist
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Arv kuus (km-ta)
 NbOfProposals=Pakkumisi
 ShowPropal=Näita pakkumist
 PropalsDraft=Mustandid
-PropalsOpened=Avatud
+PropalsOpened=Open
 PropalsNotBilled=Suletud, arve esitamata
 PropalStatusDraft=Mustand (vajab kinnitamist)
 PropalStatusValidated=Kinnitatud (pakkumine lahti)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Allkirjastamata (suletud)
 PropalStatusBilled=Arve esitatud
 PropalStatusDraftShort=Mustand
 PropalStatusValidatedShort=Kinnitatud
-PropalStatusOpenedShort=Avatud
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Suletud
 PropalStatusSignedShort=Allkirjastatud
 PropalStatusNotSignedShort=Allkirjastamata
@@ -51,12 +51,10 @@ PropalsToClose=Pakkumisi sulgeda
 PropalsToBill=Allkirjastatud pakkumisi, mille kohta tuleb arve esitada
 ListOfProposals=Pakkumiste nimekiri
 ActionsOnPropal=Tegevused pakkumisel
-NoOpenedPropals=Pole ühtki lahtist pakkumist
-NoOtherOpenedPropals=Pole ühtki muud lahtist pakkumist
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Pakkumise viide
 SendPropalByMail=Saada pakkumine kirja teel
-FileNotUploaded=Faili ei laetud üles
-FileUploaded=Fail on edukalt üles laetud
 AssociatedDocuments=Pakkumisega seotud dokumendid:
 ErrorCantOpenDir=Ei saa kausta avada
 DatePropal=Pakkumise kuupäev
@@ -100,3 +98,4 @@ DocModelJauneDescription=Kollane pakkumise mudel
 DefaultModelPropalCreate=Vaikimisi mudeli loomine
 DefaultModelPropalToBill=Vaikimisi mall pakkumise sulgemiseks (arve esitada)
 DefaultModelPropalClosed=Vaikimisi mall pakkumise sulgemiseks (arvet ei esitata)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index a694b60850e..bf229ba4d85 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Näita palga makset
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index 9daa227665a..b424d1b3903 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Lihtsa dokumendi mudel
 DocumentModelMerou=Merou A5 mudel
 WarningNoQtyLeftToSend=Hoiatus: pole ühtki lähetamise ootel kaupa.
 StatsOnShipmentsOnlyValidated=Statistika põhineb vaid kinnitatud saadetistel. Kasutatavaks kuupäevaks on saadetise kinnitamise kuupäev (plaanitav kohaletoimetamise aeg ei ole alati teada).
-DateDeliveryPlanned=Plaanitud kohaletoimetamise aeg
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Saadetise kättesaamise kuupäev
 SendShippingByEMail=Saada saadetis e-postiga
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 34bab60106b..a0ed7afed62 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Laod
 NewWarehouse=Uus ladu/laojäägi ala
 WarehouseEdit=Muuda ladu
 MenuNewWarehouse=Uus ladu
-WarehouseOpened=Ladu avatud
+WarehouseOpened=Warehouse open
 WarehouseClosed=Ladu suletud
 WarehouseSource=Lähteladu
 WarehouseSourceNotDefined=Ühtki ladu pole määratletud.
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Vali laojäägi vähendamiseks kasutatav ladu
 SelectWarehouseForStockIncrease=Vali laojäägi suurendamiseks kasutatav ladu
 NoStockAction=Laojäägi tegevust ei ole
 LastWaitingSupplierOrders=Vastuvõtmist ootavad tellimused
-DesiredStock=Soovitud laojääk
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Tellida
 Replenishment=Värskendamine
 ReplenishmentOrders=Tellimuste värskendamine
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Kasuta virtuaalset ladu
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Laojäägi värskendamise reegel
@@ -112,8 +113,8 @@ AlertOnly= Ainult hoiatused
 WarehouseForStockDecrease=Laojäägi vähendamiseks kasutatakse ladu <b>%s</b>
 WarehouseForStockIncrease=Laojäägi suurendamiseks kasutatakse ladu <b>%s</b>
 ForThisWarehouse=Antud lao tarbeks
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Värskendamised
 NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s)
 NbOfProductAfterPeriod=Toote %s laojääk pärast valitud perioodi (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Registreeri ülekanne
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index e5f5685505d..d7f46de1200 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Saadetud hankijatele
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index 1aba2f539ee..8c25e607952 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List tasude
 NewTrip=New expense report
 CompanyVisited=Äriühingu/ühenduse külastas
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index bae0b660b1f..3c9c55c5717 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Eemalda grupist
 PasswordChangedAndSentTo=Salasõna muudetud ja saadetud aadressile <b>%s</b>.
 PasswordChangeRequestSent=Kasutaja <b>%s</b> salasõna muutmise plave saadetud aadressile <b>%s</b>.
 MenuUsersAndGroups=Kasutajad ja grupid
+MenuMyUserCard=My user card
 LastGroupsCreated=Viimased %s loodud gruppi
 LastUsersCreated=Viimased %s loodud kasutajat
 ShowGroup=Näita gruppi
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 5500f69422b..28f623a6794 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Väljamaksete fail
 SetToStatusSent=Märgi staatuseks 'Fail saadetud'
 ThisWillAlsoAddPaymentOnInvoice=See rakendub ka arvetega seotud maksetele ja liigitab nad "Makstud"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Otsekorralduse makse %s panga poolt
diff --git a/htdocs/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
index dbbd2ac7611..9a6eb3cf9cf 100644
--- a/htdocs/langs/et_EE/workflow.lang
+++ b/htdocs/langs/et_EE/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Töövoo mooduli seaded
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Hetkel aktiveeritud moodulite jaoks ei ole ühtki muudetavat töövoogu.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Pärast pakkumise allkirjastamast loo automaatselt uus tellimus
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Pärast pakkumise allkirjastamist loo automaatselt uus arve
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Pärast lepingu kinnitamast loo automaatselt uus arve
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Pärast tellimuse sulgemist loo automaatselt uus arve
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Pärast tellimusega seotud makse laekumist määra tellimusega seotud pakkumise staatuseks 'Arve esitatud'
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kui müügiarve staatuseks on määratud 'Makstud', siis määra seotud tellimus(t)e staatuseks 'Arve esitatud'
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kui müügiarve on kinnitatud, siis määra seotud tellimus(t)e staatuseks 'Arve esitatud'
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 6c71d93825a..f130ff8dc47 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Erabiltzaileentzat menua
 LangFile=.lang fitxategia
 System=Sistema
 SystemInfo=Sistemaren informazioa
-SystemTools=Sistemaren tresnak
 SystemToolsArea=Sistemaren tresnen gunea
 SystemToolsAreaDesc=Gune honek kudeaketarako aukerak eskaintzen ditu. Bilatzen ari zarena aukeratzeko menua erabili.
 Purge=Garbitu
@@ -232,8 +231,8 @@ Security=Segurtasuna
 Passwords=Pasahitzak
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Aukera
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=%s pausua
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Modulua aukeratu:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr-en uneko bertsioa
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Azkeneko bertsio egonkorra
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=PDF-ak sortzeko erabilitako liburutegia
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Esteka freskatu
@@ -430,8 +429,8 @@ Module20Name=Proposamenak
 Module20Desc=Proposamen komertzialak kudeatzea
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energia
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energia
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Bezeroen Eskaerak
 Module25Desc=Bezeroen eskaerak kudeatzea
 Module30Name=Fakturak
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web-egutegia
 Module410Desc=Web-egutegiaren integrazioa
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Jakinarazpenak
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Diru-emateak
 Module700Desc=Diru-emateak kudeatzea
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Gertaera/Atazak eta agenda kudeatzea
 Module2500Name=Electronic Content Management
 Module2500Desc=Dokumentuak gorde eta partekatu
-Module2600Name=Web-zerbitzuak
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Produktuak ezabatu
 Permission36=See/manage hidden products
 Permission38=Produktuak esportatu
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=UPC motako barra-kodea
 BarcodeDescISBN=ISBN motako barra-kodea
 BarcodeDescC39=C39 motako barra-kodea
 BarcodeDescC128=C128 motako barra-kodea
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Barne-eragilea
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index a0a43605c44..588cf90ed38 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index b0f031dd02a..d0501c37c19 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Faktura kopurua
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Faktura erakutsi
 ShowInvoice=Faktura erakutsi
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index e51242ae01b..e670d6e25ca 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index c9f25039854..992addfe944 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informazioa
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/eu_ES/ecm.lang b/htdocs/langs/eu_ES/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/eu_ES/ecm.lang
+++ b/htdocs/langs/eu_ES/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/eu_ES/incoterm.lang b/htdocs/langs/eu_ES/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/eu_ES/incoterm.lang
+++ b/htdocs/langs/eu_ES/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index 726aeb8863b..382ad44f608 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Katalana
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=Ingelesa (Estatu Batuak)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Gaztelania
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Gaztelania (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italiera
 Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/eu_ES/loan.lang b/htdocs/langs/eu_ES/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/eu_ES/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 1c18ac46f16..553a9a0f20a 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 5adafa00c76..f952789d6ac 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/eu_ES/printing.lang b/htdocs/langs/eu_ES/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/eu_ES/printing.lang
+++ b/htdocs/langs/eu_ES/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/eu_ES/propal.lang b/htdocs/langs/eu_ES/propal.lang
index d17bc952b7d..d10dbb15122 100644
--- a/htdocs/langs/eu_ES/propal.lang
+++ b/htdocs/langs/eu_ES/propal.lang
@@ -1,102 +1,101 @@
 # Dolibarr language file - Source file is en_US - propal
-# Proposals=Commercial proposals
-# Proposal=Commercial proposal
-# ProposalShort=Proposal
-# ProposalsDraft=Draft commercial proposals
-# ProposalDraft=Draft commercial proposal
-# ProposalsOpened=Opened commercial proposals
-# Prop=Commercial proposals
-# CommercialProposal=Commercial proposal
-# CommercialProposals=Commercial proposals
-# ProposalCard=Proposal card
-# NewProp=New commercial proposal
-# NewProposal=New commercial proposal
-# NewPropal=New proposal
-# Prospect=Prospect
-# ProspectList=Prospect list
-# DeleteProp=Delete commercial proposal
-# ValidateProp=Validate commercial proposal
-# AddProp=Add proposal
-# ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-# ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-# LastPropals=Last %s proposals
-# LastClosedProposals=Last %s closed proposals
-# LastModifiedProposals=Last %s modified proposals
-# AllPropals=All proposals
-# LastProposals=Last proposals
-# SearchAProposal=Search a proposal
-# ProposalsStatistics=Commercial proposal's statistics
-# NumberOfProposalsByMonth=Number by month
-# AmountOfProposalsByMonthHT=Amount by month (net of tax)
-# NbOfProposals=Number of commercial proposals
-# ShowPropal=Show proposal
-# PropalsDraft=Drafts
-# PropalsOpened=Opened
-# PropalsNotBilled=Closed not billed
-# PropalStatusDraft=Draft (needs to be validated)
-# PropalStatusValidated=Validated (proposal is open)
-# PropalStatusOpened=Validated (proposal is open)
-# PropalStatusClosed=Closed
-# PropalStatusSigned=Signed (needs billing)
-# PropalStatusNotSigned=Not signed (closed)
-# PropalStatusBilled=Billed
-# PropalStatusDraftShort=Draft
-# PropalStatusValidatedShort=Validated
-# PropalStatusOpenedShort=Opened
-# PropalStatusClosedShort=Closed
-# PropalStatusSignedShort=Signed
-# PropalStatusNotSignedShort=Not signed
-# PropalStatusBilledShort=Billed
-# PropalsToClose=Commercial proposals to close
-# PropalsToBill=Signed commercial proposals to bill
-# ListOfProposals=List of commercial proposals
-# ActionsOnPropal=Events on proposal
-# NoOpenedPropals=No opened commercial proposals
-# NoOtherOpenedPropals=No other opened commercial proposals
-# RefProposal=Commercial proposal ref
-# SendPropalByMail=Send commercial proposal by mail
-# FileNotUploaded=The file was not uploaded
-# FileUploaded=The file was successfully uploaded
-# AssociatedDocuments=Documents associated with the proposal:
-# ErrorCantOpenDir=Can't open directory
-# DatePropal=Date of proposal
-# DateEndPropal=Validity ending date
-# DateEndPropalShort=Date end
-# ValidityDuration=Validity duration
-# CloseAs=Close with status
-# ClassifyBilled=Classify billed
-# BuildBill=Build invoice
-# ErrorPropalNotFound=Propal %s not found
-# Estimate=Estimate :
-# EstimateShort=Estimate
-# OtherPropals=Other proposals
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
-# CopyPropalFrom=Create commercial proposal by copying existing proposal
-# CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-# DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-# UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-# ClonePropal=Clone commercial proposal
-# ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-# ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-# ProposalsAndProposalsLines=Commercial proposal and lines
-# ProposalLine=Proposal line
-# AvailabilityPeriod=Availability delay
-# SetAvailability=Set availability delay
-# AfterOrder=after order
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalDraft=Draft commercial proposal
+ProposalsOpened=Open commercial proposals
+Prop=Commercial proposals
+CommercialProposal=Commercial proposal
+CommercialProposals=Commercial proposals
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewProposal=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+ProspectList=Prospect list
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
+LastPropals=Last %s proposals
+LastClosedProposals=Last %s closed proposals
+LastModifiedProposals=Last %s modified proposals
+AllPropals=All proposals
+LastProposals=Last proposals
+SearchAProposal=Search a proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (net of tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalsNotBilled=Closed not billed
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusOpened=Validated (proposal is open)
+PropalStatusClosed=Closed
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
+PropalStatusOpenedShort=Open
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+AssociatedDocuments=Documents associated with the proposal:
+ErrorCantOpenDir=Can't open directory
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+DateEndPropalShort=Date end
+ValidityDuration=Validity duration
+CloseAs=Close with status
+ClassifyBilled=Classify billed
+BuildBill=Build invoice
+ErrorPropalNotFound=Propal %s not found
+Estimate=Estimate :
+EstimateShort=Estimate
+OtherPropals=Other proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+ClonePropal=Clone commercial proposal
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
 ##### Availability #####
-# AvailabilityTypeAV_NOW=Immediate
-# AvailabilityTypeAV_1W=1 week
-# AvailabilityTypeAV_2W=2 weeks
-# AvailabilityTypeAV_3W=3 weeks
-# AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
-# TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-# TypeContact_propal_external_BILLING=Customer invoice contact
-# TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 # Document models
-# DocModelAzurDescription=A complete proposal model (logo...)
-# DocModelJauneDescription=Jaune proposal model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=A complete proposal model (logo...)
+DocModelJauneDescription=Jaune proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index 98551e32117..3a5c7b07796 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Soldataren ordainketa erakutsi
 THM=Batezbesteko orduko prezioa
 TJM=Batezbesteko eguneko prezioa
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index a39886daeb8..dc4bbe5a778 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Bisitatutako konpania/erakundea
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/eu_ES/workflow.lang b/htdocs/langs/eu_ES/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/eu_ES/workflow.lang
+++ b/htdocs/langs/eu_ES/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 0ab1934d707..fc7924a99b9 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=منو برای کاربران
 LangFile=فایل زبان
 System=سیستم
 SystemInfo=اطلاعات سیستم
-SystemTools=ابزار های سیستم
 SystemToolsArea=ابزار های سیستم منطقه
 SystemToolsAreaDesc=این منطقه فراهم می کند ویژگی های دولت. با استفاده از منوی را انتخاب کنید از ویژگی های شما دنبال آن هستید.
 Purge=پالایش
@@ -232,8 +231,8 @@ Security=امنیت
 Passwords=کلمه عبور
 DoNotStoreClearPassword=آیا بدون رمز عبور روشن ذخیره در پایگاه داده، اما ذخیره تنها مقدار رمز شده (فعال توصیه می شود)
 MainDbPasswordFileConfEncrypted=رمز عبور پایگاه داده را در conf.php رمز شده (فعال توصیه می شود)
-InstrucToEncodePass=برای داشتن رمز عبور کد گذاری شده به فایل <b>conf.php،</b> جایگزین خط <br> <b>$ dolibarr_main_db_pass = "..."</b> <br> توسط <br> <b>$ dolibarr_main_db_pass = "crypted:٪ s"</b>
-InstrucToClearPass=برای داشتن رمز عبور رمز گشایی (روشن) را در فایل <b>conf.php،</b> جایگزین خط <br> <b>$ dolibarr_main_db_pass = "crypted: ..."</b> <br> توسط <br> <b>$ dolibarr_main_db_pass = "٪ s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=حفاظت از فایل های پی دی اف ایجاد شده (فعال توصیه نمی شود، می شکند نسل پی دی اف توده)
 ProtectAndEncryptPdfFilesDesc=محافظت از یک سند PDF آن را نگه می دارد قابل مطالعه و چاپ با هر مرورگر PDF. با این حال، ویرایش و کپی امکان پذیر نیست. توجه داشته باشید که با استفاده از این ویژگی ساختمان از پی دی اف انباشت شده و متراکم جهانی کار نمی کند (مثل صورت حساب های پرداخت نشده).
 Feature=خصیصه
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=این راه اندازی به فرآیند است:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=مرحله٪ s را
 FindPackageFromWebSite=پیدا کردن یک بسته است که ویژگی فراهم می کند شما می خواهید (به عنوان مثال در وب سایت رسمی٪ بازدید کنندگان).
-DownloadPackageFromWebSite=دانلود بسته %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=نصب به پایان رسید و Dolibarr آماده استفاده است با این بخش جدید است.
 NotExistsDirect=ریشه جایگزین تعریف نشده است. <br>
 InfDirAlt=از آنجا که نسخه 3 این امکان وجود دارد که تعریف کند directory.This ریشه جایگزین شما اجازه می دهد برای ذخیره، همان محل، پلاگین ها و قالب های سفارشی. <br> (: سفارشی به عنوان مثال) فقط یک پوشه در ریشه Dolibarr ایجاد کنید. <br>
 InfDirExample=<br> سپس آن را در conf.php فایل اعلام <br> $ dolibarr_main_url_root_alt = 'http://myserver/custom' <br> $ dolibarr_main_document_root_alt = '/ راه / از / dolibarr / htdocs / سفارشی' <br> * این خطوط با "#" نظر، به کامنت فقط حذف شخصیت.
-YouCanSubmitFile=ماژول را انتخاب کنید:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=نسخه فعلی Dolibarr
 CallUpdatePage=برو به صفحه ای که به روز رسانی ساختار بانک اطلاعاتی و دادهها:٪ است.
 LastStableVersion=آخرین نسخه پایدار
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=لیست پارامترها می آید از یک ج
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=کتابخانه مورد استفاده برای ساخت PDF
 WarningUsingFPDF=اخطار: <b>conf.php</b> شما شامل <b>dolibarr_pdf_force_fpdf</b> بخشنامه <b>= 1.</b> این به این معنی شما استفاده از کتابخانه FPDF برای تولید فایل های PDF. این کتابخانه قدیمی است و بسیاری از ویژگی های (یونیکد، شفافیت تصویر، زبان سیریلیک، عربی و آسیایی، ...) را پشتیبانی نمی کند، بنابراین شما ممکن است خطا در PDF نسل را تجربه کنند. <br> برای حل این و دارای پشتیبانی کامل از PDF نسل، لطفا دانلود کنید <a href="http://www.tcpdf.org/" target="_blank">کتابخانه TCPDF</a> ، پس از آن اظهار نظر و یا حذف خط <b>$ dolibarr_pdf_force_fpdf = 1،</b> و اضافه کردن به جای <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=شماره تلفن را وارد کنید تماس بگیرید برای نشان دادن یک لینک برای تست آدرس ClickToDial برای <strong>کاربر٪ s را</strong>
 RefreshPhoneLink=تازه کردن لینک
@@ -430,8 +429,8 @@ Module20Name=پیشنهادات
 Module20Desc=مدیریت طرح های تجاری
 Module22Name=توده E-نامههای پستی
 Module22Desc=توده E-پستی مدیریت
-Module23Name= انرژی
-Module23Desc= نظارت بر مصرف انرژی
+Module23Name=انرژی
+Module23Desc=نظارت بر مصرف انرژی
 Module25Name=سفارشات مشتری
 Module25Desc=مدیریت سفارش مشتری
 Module30Name=صورت حساب
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=ادغام Webcalendar
-Module500Name=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام)
-Module500Desc=مدیریت هزینه های خاص مانند مالیات، مشارکت اجتماعی، سود سهام و حقوق
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=حقوق
 Module510Desc=مدیریت کارکنان حقوق و پرداخت
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=اطلاعیه ها
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=کمک های مالی
 Module700Desc=مدیریت کمک مالی
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=دستور کار
 Module2400Desc=رویدادهای / وظایف و مدیریت برنامه
 Module2500Name=الکترونیکی مدیریت محتوا
 Module2500Desc=ذخیره و به اشتراک اسناد
-Module2600Name=سرویس دهنده وب
-Module2600Desc=فعال کردن Dolibarr خدمات وب سرور
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=وب سروسی ها ( کلاینت)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar در
@@ -578,7 +579,7 @@ Permission32=ایجاد / تغییر محصول
 Permission34=حذف محصول
 Permission36=مشاهده / مدیریت محصولات مخفی
 Permission38=محصولات صادراتی
-Permission41=خوانده شده پروژه (پروژه مشترک و پروژه های I تماس با هستم)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=ایجاد / تغییر پروژه (پروژه مشترک و پروژه های I تماس با هستم)
 Permission44=حذف پروژه (پروژه مشترک و پروژه های I تماس با هستم)
 Permission61=خوانده شده مداخله
@@ -599,10 +600,10 @@ Permission86=ارسال سفارشات مشتریان
 Permission87=سفارشات نزدیک مشتریان
 Permission88=لغو سفارشات مشتریان
 Permission89=حذف مشتریان سفارشات
-Permission91=خوانده شده مشارکتهای اجتماعی و مالیات بر ارزش افزوده
-Permission92=ایجاد / تغییر مشارکتهای اجتماعی و مالیات بر ارزش افزوده
-Permission93=حذف کمک های اجتماعی و مالیات بر ارزش افزوده
-Permission94=کمک های اجتماعی صادرات
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=دفعات بازدید: گزارش
 Permission101=خوانده شده sendings
 Permission102=ایجاد / تغییر sendings
@@ -620,9 +621,9 @@ Permission121=خوانده شده اشخاص ثالث مرتبط به کاربر
 Permission122=ایجاد / تغییر اشخاص ثالث مرتبط به کاربر
 Permission125=حذف اشخاص ثالث مرتبط به کاربر
 Permission126=صادرات اشخاص ثالث
-Permission141=خوانده شده پروژه (همچنین به خصوصی من به تماس نیست)
-Permission142=ایجاد / تغییر پروژه های (همچنین به خصوصی من به تماس نیست)
-Permission144=حذف پروژه (همچنین به خصوصی من به تماس نیست)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=خوانده شده ارائه دهندگان
 Permission147=دفعات بازدید: آمار
 Permission151=خوانده شده سفارشات ایستاده
@@ -800,7 +801,7 @@ DictionaryCountry=کشورها
 DictionaryCurrency=واحد پول
 DictionaryCivility=عنوان تمدن
 DictionaryActions=نوع حوادث در دستور کار
-DictionarySocialContributions=انواع کمک های اجتماعی
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=نرخ مالیات بر ارزش افزوده و یا فروش نرخ مالیات
 DictionaryRevenueStamp=مقدار تمبر درآمد
 DictionaryPaymentConditions=شرایط پرداخت
@@ -817,6 +818,9 @@ DictionarySource=منبع از پیشنهادات / سفارشات
 DictionaryAccountancyplan=نمودار حساب
 DictionaryAccountancysystem=مدل برای نمودار حساب
 DictionaryEMailTemplates=الگوهای ایمیل
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=راه اندازی نجات داد
 BackToModuleList=بازگشت به لیست ماژول ها
 BackToDictionaryList=برگشت به فهرست واژه نامه ها
@@ -936,13 +940,14 @@ CompanyZip=زیپ
 CompanyTown=شهر
 CompanyCountry=کشور
 CompanyCurrency=ارز اصلی
+CompanyObject=Object of the company
 Logo=لوگو
 DoNotShow=را نشان نمی
 DoNotSuggestPaymentMode=آیا نشان نمی
 NoActiveBankAccountDefined=بدون حساب بانکی فعال تعریف
 OwnerOfBankAccount=صاحب حساب بانکی از٪ s
 BankModuleNotActive=ماژول حساب بانکی فعال نیست
-ShowBugTrackLink=نمایش لینک "گزارش خرابی"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=نمایش "میز کار" در صفحه اصلی
 Alerts=تصویر، موسیقی
 Delays=تاخیر
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=حداکثر اعشار برای قیمت واحد
 MAIN_MAX_DECIMALS_TOT=حداکثر اعشار برای کل قیمت
 MAIN_MAX_DECIMALS_SHOWN=حداکثر اعشار برای قیمت نشان داده شده بر روی صفحه نمایش (اضافه کردن <b>...</b> بعد از این شماره اگر شما می خواهید برای دیدن <b>...</b> وقتی که تعداد ناقص است که بر روی صفحه نمایش نشان داده شده است)
 MAIN_DISABLE_PDF_COMPRESSION=استفاده از PDF فشرده سازی برای فایل های PDF تولید شده است.
-MAIN_ROUNDING_RULE_TOT= حجم از محدوده گرد کردن (برای کشورهای نادر که در آن گرد کردن بر روی چیز دیگری از پایه 10 انجام می شود)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=قیمت واحد خالص محصول
 TotalPriceAfterRounding=قیمت کل (خالص مالیاتی / مالیات بر ارزش افزوده / نرم) پس از گرد کردن
 ParameterActiveForNextInputOnly=پارامتر برای ورودی بعدی موثر تنها
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=مجموع ماژول ها از ویژگی های
 YouMustEnableOneModule=شما باید حداقل قادر می سازد 1 ماژول
 ClassNotFoundIntoPathWarning=کلاس٪ s ​​را به مسیر PHP یافت نشد
 YesInSummer=بله در فصل تابستان
-OnlyFollowingModulesAreOpenedToExternalUsers=توجه داشته باشید، فقط ماژول های زیر را به کاربران خارجی (هر چه باشد اجازه چنین کاربران) باز:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=ذخیره سازی جلسه رمز شده توسط Suhosin
 ConditionIsCurrently=وضعیت در حال حاضر از٪ s
 YouUseBestDriver=شما با استفاده از راننده٪ است که بهترین راننده های موجود در حال حاضر.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=تعداد حداکثر از محصولات در com
 ConfirmDeleteProductLineAbility=تأییدیه زمانی که از بین بردن خطوط تولید در اشکال
 ModifyProductDescAbility=شخصی از توصیف محصول در اشکال
 ViewProductDescInFormAbility=تجسم از توصیف محصول در اشکال (در غیر این صورت به عنوان دوست پنجره)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=تجسم از محصولات توصیف در زبان thirdparty
 UseSearchToSelectProductTooltip=همچنین اگر شما تعداد زیادی از محصول (> 100 000)، شما می توانید سرعت با تنظیم PRODUCT_DONOTSEARCH_ANYWHERE ثابت به 1 در راه اندازی-> دیگر افزایش دهد. جست و جو خواهد شد و سپس محدود به شروع از رشته است.
 UseSearchToSelectProduct=استفاده از یک فرم جستجو برای انتخاب یک محصول (و نه از لیست کشویی).
 UseEcoTaxeAbility=پشتیبانی سازگار با محیط زیست Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=فرض نوع بارکد استفاده برای محصولات
 SetDefaultBarcodeTypeThirdParties=فرض نوع بارکد استفاده برای اشخاص ثالث
+UseUnits=Support units
 ProductCodeChecker= ماژول برای تولید کد محصول و چک کردن (محصول یا خدمات)
 ProductOtherConf= پیکربندی محصولات / خدمات
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=بارکد از نوع UPC
 BarcodeDescISBN=بارکد از نوع ISBN
 BarcodeDescC39=بارکد از نوع C39
 BarcodeDescC128=بارکد از نوع C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=موتور داخلی
 BarCodeNumberManager=مدیر به صورت خودکار تعریف اعداد بارکد
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=آیا مطمئن هستید که می خواهید منو و
 DeleteLine=حذف خط
 ConfirmDeleteLine=آیا مطمئن هستید که می خواهید این خط را حذف کنید؟
 ##### Tax #####
-TaxSetup=مالیات، مشارکت اجتماعی و سود سهام راه اندازی ماژول
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=مالیات بر ارزش افزوده به دلیل
 OptionVATDefault=مبنای نقدی
 OptionVATDebitOption=مبنای تعهدی
@@ -1552,6 +1561,15 @@ WebServicesSetup=راه اندازی ماژول Webservices
 WebServicesDesc=با فعال کردن این ماژول، Dolibarr تبدیل شدن به یک سرور خدمات وب به ارائه خدمات وب متفرقه.
 WSDLCanBeDownloadedHere=فایل توصیف WSDL از خدمات ارائه شده را می توان به دانلود در اینجا
 EndPointIs=مشتریان SOAP باید درخواست خود را به نقطه پایانی Dolibarr در آدرس ارسال دسترس
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=راه اندازی ماژول بانک
 FreeLegalTextOnChequeReceipts=متن رایگان در چک رسید
@@ -1581,6 +1599,7 @@ ProjectsSetup=راه اندازی ماژول پروژه
 ProjectsModelModule=گزارش پروژه مدل سند
 TasksNumberingModules=ماژول وظایف شماره
 TaskModelModule=گزارش کارهای سند مدل
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = راه اندازی GED
 ECMAutoTree = پوشه درخت به صورت خودکار و سند
@@ -1594,7 +1613,7 @@ OpenFiscalYear=سال مالی گسترش
 CloseFiscalYear=بستن سال مالی
 DeleteFiscalYear=حذف سال مالی
 ConfirmDeleteFiscalYear=آیا مطمئن هستید این سال مالی را حذف کنید؟
-Opened=افتتاح شد
+Opened=Open
 Closed=بسته
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index a264cc8804c..b3b06d4261d 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=منظور از٪ s را تایید
 OrderRefusedInDolibarr=منظور از٪ s را رد کرد
 OrderBackToDraftInDolibarr=منظور از٪ s به بازگشت به پیش نویس وضعیت
-OrderCanceledInDolibarr=منظور از٪ s را لغو
 ProposalSentByEMail=پیشنهاد تجاری٪ s ارسال با ایمیل
 OrderSentByEMail=سفارش مشتری٪ s ارسال با ایمیل
 InvoiceSentByEMail=صورت حساب به مشتری٪ s ارسال با ایمیل
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index fb73c087b53..0caf7dd8359 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -94,12 +94,12 @@ Conciliate=وفق دادن
 Conciliation=مصالحه
 ConciliationForAccount=آشتی دادن اين حساب کاربری
 IncludeClosedAccount=شامل حساب های بسته شده
-OnlyOpenedAccount=حساب های تنها باز
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=حساب به اعتبار
 AccountToDebit=حساب به بدهی
 DisableConciliation=غیر فعال کردن ویژگی های آشتی برای این حساب
 ConciliationDisabled=از ویژگی های آشتی غیر فعال است
-StatusAccountOpened=باز شده
+StatusAccountOpened=Open
 StatusAccountClosed=بسته شده
 AccountIdShort=شماره
 EditBankRecord=ویرایش رکورد
@@ -113,7 +113,7 @@ CustomerInvoicePayment=پرداخت با مشتری
 CustomerInvoicePaymentBack=پرداخت به مشتری برگشت
 SupplierInvoicePayment=پرداخت کننده
 WithdrawalPayment=پرداخت برداشت
-SocialContributionPayment=پرداخت مشارکت های اجتماعی
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=مجله حساب مالی
 BankTransfer=انتقال بانک
 BankTransfers=نقل و انتقالات بانکی
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index a3f3768a280..ee86f705fd6 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb و از فاکتورها
 NumberOfBillsByMonth=Nb و از فاکتورها در ماه
 AmountOfBills=مقدار فاکتورها
 AmountOfBillsByMonthHT=مقدار فاکتورها توسط ماه (خالص از مالیات)
-ShowSocialContribution=نمایش مشارکت های اجتماعی
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=نمایش فاکتور
 ShowInvoice=نمایش فاکتور
 ShowInvoiceReplace=نمایش جایگزین فاکتور
@@ -270,7 +270,7 @@ BillAddress=آدرس بیل
 HelpEscompte=این تخفیف تخفیف اعطا شده به مشتری است، زیرا پرداخت آن قبل از واژه ساخته شده است.
 HelpAbandonBadCustomer=این مقدار متوقف شده (مشتری گفته می شود یک مشتری بد) است و به عنوان یک شل استثنایی در نظر گرفته.
 HelpAbandonOther=این مقدار متوقف شده از آن خطا بود (مشتری اشتباه و یا فاکتور های دیگر به عنوان مثال به جای)
-IdSocialContribution=شناسه مشارکت های اجتماعی
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=شناسه پرداخت
 InvoiceId=شناسه فاکتور
 InvoiceRef=کد عکس فاکتور.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=فوری
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 9be03f59ea7..a7d32e6e263 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=تاریخ و زمان آخرین قرارداد
 BoxLastContacts=تاریخ و زمان آخرین تماس / آدرس
 BoxLastMembers=آخرین عضو
 BoxFicheInter=تاریخ و زمان آخرین مداخلات
-BoxCurrentAccounts=افتتاح موجودی حساب
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=گردش مالی فروش
 BoxTotalUnpaidCustomerBills=فاکتورها مجموع مشتری پرداخت نشده است
 BoxTotalUnpaidSuppliersBills=فاکتورها مجموع عرضه کننده کالا پرداخت نشده است
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=تاریخ و زمان آخرین٪ s را مداخله اصلاح شده
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=مانده حساب باز است
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=گردش مالی فروش
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index b3684bac87e..7337b35f5bc 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>٪ s</b> با <b>موفقیت</b> اضافه شد.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=هیچ یک
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=این رده در حال حاضر با این کد عکس وجود دارد
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=مطالب توسط همه قابل رویت نیس
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=مشتریان مشخصات. / Prosp. مجموعه ها
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
@@ -107,4 +107,4 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته پدر و مادر مرتبط است که با اضافه کردن به زیرشاخه
 AddProductServiceIntoCategory=افزودن پیگیری محصول/سرویس
-ShowCategory=نمایش دسته
\ No newline at end of file
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index ed26730f90b..a353a5dc680 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=شخص ثالث تماس با ما / آدرس
 StatusContactValidated=وضعیت تماس / آدرس
 Company=شرکت
 CompanyName=نام شرکت
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=شرکت
 CountryIsInEEC=کشور است در داخل جامعه اقتصادی اروپا
 ThirdPartyName=نام و نام خانوادگی شخص ثالث
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=تخفیف مطلق در دسترس
 DiscountNone=هیچ یک
 Supplier=تامین کننده
 CompanyList=لیست شرکت
-AddContact=اضافه کردن تماس
-AddContactAddress=اضافه کردن تماس / آدرس
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=ویرایش مخاطب
 EditContactAddress=ویرایش مخاطب / آدرس
 Contact=تماس با
@@ -268,8 +269,8 @@ ContactsAddresses=تماس / آدرس
 NoContactDefinedForThirdParty=بدون تماس تعریف شده برای این حزب سوم
 NoContactDefined=بدون تماس تعریف
 DefaultContact=پیش فرض تماس با ما / آدرس
-AddCompany=اضافه کردن شرکت
-AddThirdParty=اضافه کردن شخص ثالث
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=حذف یک شرکت
 PersonalInformations=اطلاعات شخصی
 AccountancyCode=کد حسابداری
@@ -379,8 +380,8 @@ DeliveryAddressLabel=تحویل برچسب آدرس
 DeleteDeliveryAddress=حذف یک آدرس تحویل
 ConfirmDeleteDeliveryAddress=آیا مطمئن هستید که می خواهید این آدرس تحویل را حذف کنید؟
 NewDeliveryAddress=آدرس تحویل جدید
-AddDeliveryAddress=اضافه کردن آدرس
-AddAddress=اضافه کردن آدرس
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=بدون آدرس های تحویل جایگزین تعریف
 SupplierCategory=طبقه بندی کننده
 JuridicalStatus200=مستقل
@@ -410,5 +411,10 @@ OutstandingBillReached=رسیدم حداکثر. برای لایحه برجسته
 MonkeyNumRefModelDesc=numero بازگشت با فرمت syymm-NNNN برای کد مشتری و٪ syymm-NNNN برای کد منبع که در آن YY سال است٪، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است.
 LeopardNumRefModelDesc=کد آزاد است. این کد را می توان در هر زمان تغییر یافتهاست.
 ManagingDirectors=مدیر (بازدید کنندگان) نام (مدیر عامل شرکت، مدیر، رئيس جمهور ...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index f6f134faec3..5e2d1a7a7b1 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -56,23 +56,23 @@ VATCollected=مالیات بر ارزش افزوده جمع آوری
 ToPay=به پرداخت
 ToGet=به عقب بر گردیم
 SpecialExpensesArea=منطقه برای تمام پرداخت های ویژه
-TaxAndDividendsArea=مالیات، مشارکت اجتماعی و سود سهام منطقه
-SocialContribution=مشارکت های اجتماعی
-SocialContributions=مشارکت های اجتماعی
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=هزینه های ویژه
 MenuTaxAndDividends=مالیات و سود سهام
 MenuSalaries=حقوق
-MenuSocialContributions=مشارکت های اجتماعی
-MenuNewSocialContribution=سهم های جدید
-NewSocialContribution=نقش های جدید اجتماعی
-ContributionsToPay=مشارکت به پرداخت
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=منطقه حسابداری / خزانه داری
 AccountancySetup=راه اندازی حسابداری
 NewPayment=پرداخت جدید
 Payments=پرداخت
 PaymentCustomerInvoice=پرداخت صورت حساب به مشتری
 PaymentSupplierInvoice=پرداخت صورتحساب تامین کننده
-PaymentSocialContribution=پرداخت مشارکت های اجتماعی
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=پرداخت مالیات بر ارزش افزوده
 PaymentSalary=پرداخت حقوق و دستمزد
 ListPayment=فهرست پرداخت
@@ -91,7 +91,7 @@ LT1PaymentES=پرداخت RE
 LT1PaymentsES=RE پرداخت
 VATPayment=مالیات بر ارزش افزوده پرداخت
 VATPayments=پرداخت مالیات بر ارزش افزوده
-SocialContributionsPayments=کمک های اجتماعی پرداخت
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=نمایش پرداخت مالیات بر ارزش افزوده
 TotalToPay=مجموع به پرداخت
 TotalVATReceived=مالیات بر ارزش افزوده دریافت شده
@@ -116,11 +116,11 @@ NewCheckDepositOn=ایجاد رسید سپرده در حساب:٪ s را
 NoWaitingChecks=بدون چک انتظار برای سپرده.
 DateChequeReceived=تاریخ دریافت چک
 NbOfCheques=Nb در چک
-PaySocialContribution=پرداخت کمک های اجتماعی
-ConfirmPaySocialContribution=آیا مطمئن هستید که می خواهید برای طبقه بندی این کمک های اجتماعی به عنوان پرداخت می شود؟
-DeleteSocialContribution=حذف مشارکت های اجتماعی
-ConfirmDeleteSocialContribution=آیا مطمئن هستید که می خواهید این مشارکت اجتماعی را حذف کنید؟
-ExportDataset_tax_1=مشارکت اجتماعی و پرداخت
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=<b>حالت٪ SVAT در تعهد حسابداری٪ است.</b>
 CalcModeVATEngagement=<b>حالت٪ SVAT در درآمد، هزینه٪ است.</b>
 CalcModeDebt=<b>حالت٪ sClaims-بدهی٪ گفت حسابداری تعهد.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م
 TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت <b>حسابداری نقدی</b> مربوط نیست. این گزارش که با استفاده از <b>تعامل</b> حالت <b>حسابداری</b> (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است.
 CalculationMode=حالت محاسبه
 AccountancyJournal=کد حسابداری مجله
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 8483a8ed71f..bdd36eddb74 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -4,10 +4,10 @@ About = در حدود
 CronAbout = درباره cron را
 CronAboutPage = cron را در مورد صفحه
 # Right
-Permission23101 = به نشانه خوانده شدن برنامه ریزی شده کار
-Permission23102 = ایجاد / بروز رسانی برنامه ریزی شده کار
-Permission23103 = حذف کار برنامه ریزی شده
-Permission23104 = اجرای کار برنامه ریزی شده
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= برنامه ریزی راه اندازی مدیریت کار
 URLToLaunchCronJobs=URL برای بررسی و راه اندازی کارهای cron در صورت لزوم
@@ -26,11 +26,11 @@ CronLastOutput=تاریخ و زمان آخرین خروجی اجرا
 CronLastResult=آخرین نتیجه
 CronListOfCronJobs=لیست شغل ها برنامه ریزی شده
 CronCommand=فرمان
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=کار
@@ -39,8 +39,8 @@ CronDtStart=تاریخ شروع
 CronDtEnd=تاریخ پایان
 CronDtNextLaunch=اعدام بعدی
 CronDtLastLaunch=تاریخ و زمان آخرین اعدام
-CronFrequency=Frequancy
-CronClass=CLASSE
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=روش
 CronModule=واحد
 CronAction=عمل
@@ -55,9 +55,9 @@ CronEach=هر
 JobFinished=کار راه اندازی به پایان رسید و
 #Page card
 CronAdd= اضافه کردن شغل
-CronHourStart= شروع ساعت و تاریخ کار
-CronEvery= و وظیفه هر یک از اجرا
-CronObject= به عنوان مثال / شی برای ایجاد
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=به عنوان مثال / شی برای ایجاد
 CronArgs=پارامترها
 CronSaveSucess=صرفه جویی در موفقیت
 CronNote=توضیح
@@ -76,13 +76,14 @@ CronMethodHelp=روش شی برای راه اندازی. <BR> برای exemple 
 CronArgsHelp=استدلال از روش. <BR> برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، مقدار پارامترهای می تواند <i>0، ProductRef</i>
 CronCommandHelp=خط فرمان سیستم را اجرا کند.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=اطلاعات
 # Common
-CronType=نوع کار
+CronType=Job type
 CronType_method=روش تماس از یک کلاس Dolibarr
 CronType_command=فرمان شل
 CronMenu=cron را
 CronCannotLoadClass=آیا می توانم کلاس٪ s ​​را بار نیست و یا شی از٪ s
 UseMenuModuleToolsToAddCronJobs=برو به منوی "صفحه اصلی - ماژول ابزار - فهرست فرصت های شغلی" برای دیدن و ویرایش کار برنامه ریزی شده.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index 2f10c713737..ebfa445f36d 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=جستجو توسط شی
 ECMSectionOfDocuments=راهنماها اسناد
 ECMTypeManual=دستی
 ECMTypeAuto=اتوماتیک
-ECMDocsBySocialContributions=اسناد مربوط به کمک های اجتماعی
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=اسناد مربوط به اشخاص ثالث
 ECMDocsByProposals=اسناد مربوط به طرح
 ECMDocsByOrders=اسناد مربوط به سفارشات مشتریان
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 27b8070130f..5900e02b53e 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده
@@ -190,3 +191,4 @@ WarningNotRelevant=عملیات بی ربط برای این مجموعه داد
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=قابلیت غیر فعال زمانی که راه اندازی صفحه نمایش برای فرد نابینا یا از مرورگرهای متن بهینه شده است.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index 238eb5a9f12..d156682cc50 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=بیانیه ماهانه
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=دلیل
 UserCP=کاربر
 ErrorAddEventToUserCP=در حالی که با اضافه کردن مرخصی استثنایی خطایی رخ داد.
 AddEventToUserOkCP=علاوه بر این از مرخصی استثنایی کامل شده است.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=انجام شده توسط
 UserUpdateCP=برای کاربر
@@ -93,6 +93,7 @@ ValueOptionCP=ارزش
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=اعتبارسنجی پیکربندی
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=به روز رسانی با موفقیت.
 ErrorUpdateConfCP=خطا در به روز رسانی رخ داد، لطفا دوباره سعی کنید.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=در حالی که ارسال ایمیل یک خطا رخ دا
 NoCPforMonth=بدون این ماه را ترک کنند.
 nbJours=شماره روز
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=سلام
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/fa_IR/incoterm.lang b/htdocs/langs/fa_IR/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/fa_IR/incoterm.lang
+++ b/htdocs/langs/fa_IR/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 0b4f81b7903..60c445cb70c 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=بانک اطلاعات سرور - دسترسی به ک
 CheckToCreateDatabase=جعبه چک کنید اگر پایگاه داده وجود ندارد و باید ایجاد شود. <br> در این مورد، شما باید وارد شوید / رمز عبور برای نام کاربر مدیر در پایین این صفحه را پر کنید.
 CheckToCreateUser=جعبه چک کنید اگر صاحب پایگاه داده وجود ندارد و باید ایجاد شود. <br> در این مورد، شما باید نام کاربری و رمز عبور خود را انتخاب کنید و همچنین ورود / رمز عبور در پایین این صفحه را پر کنید برای حساب کاربر مدیر. اگر این جعبه خالی، پایگاه داده مالک و کلمه عبور خود را باید وجود داشته باشد.
 Experimental=(تجربی)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=ورود از کاربر مجاز به ایجاد پایگاه داده جدید و یا کاربران جدید، اجباری اگر بانک اطلاعاتی شما و یا صاحب آن می کند در حال حاضر وجود ندارد.
 KeepEmptyIfNoPassword=دیدگاهتان را خالی اگر کاربر هیچ رمز عبور (جلوگیری از این)
 SaveConfigurationFile=صرفه جویی در مقدار
diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
index 898762b5717..a7845765c10 100644
--- a/htdocs/langs/fa_IR/languages.lang
+++ b/htdocs/langs/fa_IR/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=عربی
 Language_ar_SA=عربی
+Language_bn_BD=Bengali
 Language_bg_BG=بلغاری
 Language_bs_BA=بوسنی
 Language_ca_ES=کاتالانی
@@ -21,9 +22,10 @@ Language_en_SA=انگلیسی عربستان سعودی
 Language_en_US=انگلیسی آمریکا
 Language_en_ZA=انگلیسی آفریقای جنوبی
 Language_es_ES=اسپانیایی
-Language_es_DO=اسپانیایی (جمهوری دومینیکن)
 Language_es_AR=اسپانیایی آرژانتین
 Language_es_CL=اسپانیایی (شیلی)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=اسپانیایی (جمهوری دومینیکن)
 Language_es_HN=اسپانیایی (هندوراس)
 Language_es_MX=اسپانیایی (مکزیک)
 Language_es_PY=اسپانیایی پروگوئه
@@ -45,7 +47,10 @@ Language_id_ID=اندونزی
 Language_is_IS=ایسلندی
 Language_it_IT=ایتالیایی
 Language_ja_JP=ژاپنی
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=کره ای
+Language_lo_LA=Lao
 Language_lt_LT=زبان لیتوانی
 Language_lv_LV=لتونی
 Language_mk_MK=مقدونی
@@ -64,6 +69,7 @@ Language_sv_SV=سوئدی
 Language_sv_SE=سوئدی
 Language_sq_AL=آلبانی
 Language_sk_SK=اسلواکی
+Language_sw_SW=Kiswahili
 Language_th_TH=تایلندی
 Language_uk_UA=اوکراین
 Language_uz_UZ=ازبک
diff --git a/htdocs/langs/fa_IR/loan.lang b/htdocs/langs/fa_IR/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/fa_IR/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index ad218124678..2fce9fd1c12 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -77,7 +77,7 @@ CheckRead=خوانده شده رسید
 YourMailUnsubcribeOK=ایمیل <b>به٪ s</b> درست را از لیست پستی unsubcribe است
 MailtoEMail=لینک بیش از حد به ایمیل
 ActivateCheckRead=اجازه به استفاده از "Unsubcribe" لینک
-ActivateCheckReadKey=استفاده از کلید برای رمزگذاری استفاده URL برای "خوانده شده دریافت" و "Unsubcribe" ویژگی
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=ارسال به٪ s را دریافت کنندگان ارسال می شود.
 XTargetsAdded=<b>٪ s را</b> دریافت کنندگان اضافه به لیست هدف
 EachInvoiceWillBeAttachedToEmail=یک سند با استفاده از پیش فرض فاکتور قالب سند ایجاد شده و متصل به هر یک از ایمیل.
@@ -128,6 +128,7 @@ TagCheckMail=پیگیری پست الکترونیکی باز
 TagUnsubscribe=لینک لغو عضویت
 TagSignature=امضاء ارسال کاربر
 TagMailtoEmail=ایمیل دریافت کننده
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=اطلاعیه ها
 NoNotificationsWillBeSent=بدون اطلاعیه ها ایمیل ها برای این رویداد و شرکت برنامه ریزی
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index aeac14cf35b..0aa1e890116 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=برخی از خطاهای یافت شد.
 ErrorConfigParameterNotDefined=<b>پارامتر٪ s</b> در داخل Dolibarr فایل پیکربندی <b>conf.php</b> تعریف نشده است.
 ErrorCantLoadUserFromDolibarrDatabase=برای پیدا کردن <b>کاربر٪ s در</b> پایگاه داده Dolibarr شکست خورده است.
 ErrorNoVATRateDefinedForSellerCountry=خطا، هیچ نرخ مالیات بر ارزش افزوده تعریف شده برای این کشور شد '٪ s'.
-ErrorNoSocialContributionForSellerCountry=خطا، هیچ نوع کمک اجتماعی تعریف شده برای این کشور شد '٪ s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=خطا، موفق به صرفه جویی در فایل.
 SetDate=تاریخ تنظیم
 SelectDate=یک تاریخ را انتخاب کنید
@@ -301,8 +301,8 @@ UnitPriceHT=قیمت واحد (خالص)
 UnitPriceTTC=قیمت واحد
 PriceU=UP
 PriceUHT=UP (خالص)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=مقدار
 AmountInvoice=مقدار فاکتور
 AmountPayment=مقدار پرداخت
@@ -339,6 +339,7 @@ IncludedVAT=شامل مالیات
 HT=خالص از مالیات
 TTC=مالیات بر شرکت
 VAT=مالیات بر فروش کالا
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=نرخ مالیات
@@ -413,6 +414,8 @@ Qty=تعداد
 ChangedBy=تغییر توسط
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=دوباره حساب کردن
 ResultOk=موفقیت
 ResultKo=شکست
@@ -421,7 +424,7 @@ Reportings=گزارش
 Draft=پیش نویس
 Drafts=نوعی بازی چکرز
 Validated=اعتبار
-Opened=افتتاح شد
+Opened=Open
 New=جدید
 Discount=تخفیف
 Unknown=ناشناخته
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=لینک به تماس با کاربر خاص
 DeleteAFile=حذف یک فایل
 ConfirmDeleteAFile=آیا مطمئن هستید که می خواهید به حذف فایل
 NoResults=هیچ نتیجه ای
+SystemTools=System tools
 ModulesSystemTools=ماژول ابزار
 Test=تست
 Element=عنصر
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index d9b24f6e89b..a9833331406 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -199,7 +199,8 @@ Entreprises=شرکت
 DOLIBARRFOUNDATION_PAYMENT_FORM=برای پرداخت اشتراک خود را با استفاده از یک انتقال بانکی، صفحه را ببینید <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> برای پرداخت با استفاده از یک کارت اعتباری یا پی پال، بر روی دکمه در پایین این صفحه کلیک کنید. <br>
 ByProperties=با ویژگی
 MembersStatisticsByProperties=آمار کاربران توسط ویژگی
-MembersByNature=کاربران از طبیعت
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=نرخ مالیات بر ارزش افزوده برای استفاده از اشتراک ها
 NoVatOnSubscription=بدون TVA برای اشتراک
 MEMBER_PAYONLINE_SENDEMAIL=ایمیل برای هشدار دادن به هنگام Dolibarr دریافت تایید از پرداخت اعتبار برای اشتراک
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index 93046ff0b3e..0bdf46d9cf6 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=منظور تامین کننده
 SuppliersOrders=سفارشات تولید کنندگان
 SuppliersOrdersRunning=سفارشات تامین کنندگان کنونی
 CustomerOrder=سفارش مشتری
-CustomersOrders=Customers orders
-CustomersOrdersRunning=مشتری فعلی
-CustomersOrdersAndOrdersLines=مشتری و خطوط سفارش
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=سفارشات تامین کننده به پردازش
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=لغو شد
 StatusOrderDraftShort=پیش نویس
 StatusOrderValidatedShort=اعتبار
@@ -75,8 +75,9 @@ AddToMyOrders=اضافه کردن به سفارشات من
 AddToOtherOrders=اضافه کردن به دیگر سفارشات
 AddToDraftOrders=اضافه کردن به پیش نویس منظور
 ShowOrder=نمایش جهت
-NoOpenedOrders=بدون سفارشات باز
-NoOtherOpenedOrders=بدون دیگر سفارشات باز
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=بدون پیش نویس سفارشات
 OtherOrders=دیگر سفارشات
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 2b1d9928099..817e117f606 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=مداخله اعتبار
 Notify_FICHINTER_SENTBYMAIL=مداخله با پست
 Notify_BILL_VALIDATE=صورت حساب به مشتری اعتبار
 Notify_BILL_UNVALIDATE=صورت حساب به مشتری unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=منظور تامین کننده تایید
 Notify_ORDER_SUPPLIER_REFUSE=منظور تامین کننده خودداری کرد
 Notify_ORDER_VALIDATE=سفارش مشتری معتبر
@@ -203,6 +204,7 @@ ClickHereToGoTo=برای رفتن به٪ s اینجا را کلیک کنید
 YouMustClickToChange=با این حال شما باید اول بر روی لینک زیر کلیک کنید تا اعتبار این تغییر رمز عبور
 ForgetIfNothing=اگر شما این تغییر را درخواست نکرده، فقط این ایمیل را فراموش کرده ام. اعتبار نامه های شما امن نگهداری می شود.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=اضافه کردن ورودی در تقویم از٪ s
diff --git a/htdocs/langs/fa_IR/printing.lang b/htdocs/langs/fa_IR/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/fa_IR/printing.lang
+++ b/htdocs/langs/fa_IR/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 620e7121399..b24a107c259 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -23,14 +23,14 @@ ProductOrService=محصولات و خدمات
 ProductsAndServices=محصولات و خدمات
 ProductsOrServices=محصولات و خدمات
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=محصولات و خدمات آمار
 ProductsStatistics=آمار محصولات
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=مرجع داخلی
 LastRecorded=آخرین محصولات / خدمات در فروش ثبت
@@ -44,7 +44,7 @@ CardProduct1=کارت خدمات
 CardContract=کارت قرارداد
 Warehouse=مخزن
 Warehouses=ساختمان و ذخیره سازی
-WarehouseOpened=انبار را باز کرد
+WarehouseOpened=Warehouse open
 WarehouseClosed=انبار بسته شده
 Stock=موجودی
 Stocks=سهام
@@ -71,21 +71,21 @@ SellingPriceTTC=قیمت فروش (مالیات شرکت)
 PublicPrice=قیمت عمومی
 CurrentPrice=قیمت کنونی
 NewPrice=قیمت های جدید
-MinPrice=هر چیز کوچک. قیمت فروش
-MinPriceHT= قيمت فروش. هر چيز کوچک (خالص از ماليات)
-MinPriceTTC=قيمت فروش. هر چيز کوچک (ماليات شرکت)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=قیمت فروش نمی تواند کمتر از حداقل مجاز برای این محصول (٪ بدون مالیات). این پیام همچنین می تواند به نظر می رسد اگر شما نوع تخفیف بیش از حد مهم است.
 ContractStatus=وضعیت قرارداد
 ContractStatusClosed=بسته
-ContractStatusRunning=در حال اجرا
+ContractStatusRunning=Ongoing
 ContractStatusExpired=سپری
-ContractStatusOnHold=در حال اجرا نیست
-ContractStatusToRun=To get running
-ContractNotRunning=این قرارداد در حال اجرا نیست
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=محصول با مرجع٪ s در حال حاضر وجود دارد.
 ErrorProductBadRefOrLabel=ارزش اشتباه به عنوان مرجع و یا برچسب.
 ErrorProductClone=یک مشکل وجود دارد در حالی که تلاش برای کلون کردن محصول و یا خدمات.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=تولید کنندگان
 SupplierRef=کد عکس محصول تامین کننده است.
 ShowProduct=نمایش محصول
@@ -117,12 +117,12 @@ ServiceLimitedDuration=اگر محصول یک سرویس با مدت زمان م
 MultiPricesAbility=سطح بسیاری از قیمت هر محصول / خدمات
 MultiPricesNumPrices=تعداد قیمت
 MultiPriceLevelsName=مقوله های قیمت
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=وابسته
 Translation=ترجمه
 KeywordFilter=فیلتر کلمه کلیدی
@@ -131,7 +131,7 @@ ProductToAddSearch=جستجو محصول برای اضافه کردن
 AddDel=اضافه کردن / حذف
 Quantity=مقدار
 NoMatchFound=هیچ بازی یافت
-ProductAssociationList=فهرست محصولات مرتبط / خدمات: نام محصول / خدمات (مقدار تحت تاثیر قرار)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=یکی از محصول انتخاب پدر و مادر با محصول فعلی است
 DeleteProduct=حذف یک محصول / خدمات
@@ -179,16 +179,41 @@ CloneProduct=محصول کلون یا خدمات
 ConfirmCloneProduct=آیا مطمئن هستید که می خواهید به کلون کردن محصول و یا خدمات <b>از٪ s؟</b>
 CloneContentProduct=کلون تمام اطلاعات اصلی محصول / خدمات
 ClonePricesProduct=اطلاعات اصلی کلون و قیمت
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=این محصول مورد استفاده قرار گیرد
 NewRefForClone=کد عکس. محصول جدید / خدمات
-CustomerPrices=مشتریان قیمت
-SuppliersPrices=تولید کنندگان قیمت
-SuppliersPricesOfProductsOrServices=قيمت توليد کنندگان (محصولات و خدمات)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=کد آداب و رسوم
 CountryOrigin=کشور مبدا
 HiddenIntoCombo=پنهان به لیست انتخاب کنید
 Nature=طبیعت
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=قالب کد عکس محصول
 ServiceCodeModel=قالب کد عکس خدمات
 AddThisProductCard=ایجاد کارت محصول
@@ -214,7 +239,7 @@ CostPmpHT=خالص VWAP کل
 ProductUsedForBuild=خودکار مصرف شده توسط تولید
 ProductBuilded=تولید کامل
 ProductsMultiPrice=محصولات چند قیمت
-ProductsOrServiceMultiPrice=قيمت مشتريان( از محصولات يا خدمات، چند قيمته)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=گردش مالی محصولات VWAP سه ماهه
 ServiceSellByQuarterHT=خدمات گردش مالی VWAP سه ماهه
 Quarter1=1. یک چهارم
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=تعريف ارزش بارکد برای همه سوا
 PriceByCustomer=Different price for each customer
 PriceCatalogue=قيمت منحصر به فرد در هر محصول / خدمات
 PricingRule=Rules for customer prices
-AddCustomerPrice=اضافه کردن قيمت های مشتريان
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=همان قيمت تعيين شده در شرکت های تابعه مشتری
 PriceByCustomerLog=قيمت های ورود مشتری
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 042df9b5617..901b04345aa 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=این دیدگاه ارائه تمام پروژه ها به
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=این دیدگاه ارائه تمام پروژه (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
 MyTasksDesc=این دیدگاه به پروژه ها و یا کارهای شما تماس برای (هر چه باشد نوع) می باشد محدود است.
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن.
 TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=منطقه پروژه ها
 NewProject=پروژه های جدید
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=لیست پروژه ها
 ShowProject=نمایش پروژه
 SetProject=تنظیم پروژه
 NoProject=هیچ پروژه تعریف شده و یا متعلق به
-NbOpenTasks=NB از وظایف باز
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb در پروژه
 TimeSpent=زمان صرف شده
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=مدت زمان صرف شده در کارها
 TaskTimeUser=کاربر
 TaskTimeNote=یادداشت
 TaskTimeDate=تاریخ
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=زمان جدید به سر برد
 MyTimeSpent=وقت من صرف
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=فهرست مداخلات مرتبط با پرو
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=فهرست رویدادی به این پروژه
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=فعالیت در پروژه این هفته
 ActivityOnProjectThisMonth=فعالیت در پروژه این ماه
 ActivityOnProjectThisYear=فعالیت در پروژه سال جاری
@@ -95,7 +98,7 @@ DeleteATimeSpent=زمان صرف شده حذف
 ConfirmDeleteATimeSpent=آیا مطمئن هستید که می خواهید به حذف این زمان صرف شده؟
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=پروژه ها اختصاص داده شده به این شخص ثالث
 NoTasks=بدون وظایف برای این پروژه
 LinkedToAnotherCompany=لینک به دیگر شخص ثالث
@@ -139,8 +142,15 @@ ProjectReferers=مراجعه اشیاء
 SearchAProject=جستجوی یک پروژه
 ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد
 ProjectDraft=پروژه های پیش نویس
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang
index 1d521324941..87fbc7c474d 100644
--- a/htdocs/langs/fa_IR/propal.lang
+++ b/htdocs/langs/fa_IR/propal.lang
@@ -4,7 +4,7 @@ Proposal=پیشنهاد تجاری
 ProposalShort=پیشنهاد
 ProposalsDraft=طرح تجاری پیش نویس
 ProposalDraft=پیش نویس طرح تجاری
-ProposalsOpened=طرح های تجاری افتتاح شد
+ProposalsOpened=Open commercial proposals
 Prop=طرح های تجاری
 CommercialProposal=پیشنهاد تجاری
 CommercialProposals=طرح های تجاری
@@ -16,12 +16,12 @@ Prospect=چشم انداز
 ProspectList=لیست چشم انداز
 DeleteProp=حذف طرح تجاری
 ValidateProp=اعتبار طرح های تجاری
-AddProp=اضافه کردن پیشنهاد
+AddProp=Create proposal
 ConfirmDeleteProp=آیا مطمئن هستید که می خواهید این پیشنهاد تجاری را حذف کنید؟
-ConfirmValidateProp=آیا مطمئن هستید که می خواهید به اعتبار این پیشنهاد تجاری تحت <b>نام%s را؟</b>
+ConfirmValidateProp=آیا مطمئن هستید که می خواهید به اعتبار این پیشنهاد تجاری تحت <b>نام٪ s را؟</b>
 LastPropals=پیشنهادات و زمان آخرین٪ بازدید کنندگان
-LastClosedProposals=تاریخ و زمان آخرین%s را پیشنهاد بسته
-LastModifiedProposals=تاریخ و زمان آخرین%s را پیشنهاد اصلاح
+LastClosedProposals=تاریخ و زمان آخرین٪ s را پیشنهاد بسته
+LastModifiedProposals=تاریخ و زمان آخرین٪ s را پیشنهاد اصلاح
 AllPropals=تمام طرح های پیشنهادی
 LastProposals=آخرین پیشنهادات
 SearchAProposal=جستجوی یک پیشنهاد
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=مقدار در ماه (خالص از مالیات)
 NbOfProposals=تعداد طرح های تجاری
 ShowPropal=نمایش پیشنهاد
 PropalsDraft=نوعی بازی چکرز
-PropalsOpened=افتتاح شد
+PropalsOpened=Open
 PropalsNotBilled=بسته در صورتحساب یا لیست نمی
 PropalStatusDraft=پیش نویس (نیاز به تایید می شود)
 PropalStatusValidated=اعتبار (پیشنهاد باز است)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=امضا نشده (بسته شده)
 PropalStatusBilled=ثبت شده در صورتحساب یا لیست
 PropalStatusDraftShort=پیش نویس
 PropalStatusValidatedShort=اعتبار
-PropalStatusOpenedShort=افتتاح شد
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=بسته
 PropalStatusSignedShort=امضاء شده
 PropalStatusNotSignedShort=امضا نشده
@@ -51,12 +51,10 @@ PropalsToClose=طرح تجاری برای بستن
 PropalsToBill=طرح تجاری امضا به لایحه
 ListOfProposals=فهرست طرح های تجاری
 ActionsOnPropal=رویدادهای پیشنهاد
-NoOpenedPropals=طرح های تجاری بدون باز
-NoOtherOpenedPropals=هیچ طرح تجاری باز
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=کد عکس طرح تجاری
 SendPropalByMail=ارسال پیشنهاد تجاری از طریق پست
-FileNotUploaded=فایل آپلود نشد
-FileUploaded=فایل با موفقیت آپلود شد
 AssociatedDocuments=اسناد مرتبط با طرح:
 ErrorCantOpenDir=آیا می توانم دایرکتوری باز نمی شود
 DatePropal=تاریخ پیشنهاد
@@ -66,7 +64,7 @@ ValidityDuration=مدت اعتبار
 CloseAs=نزدیک با وضعیت
 ClassifyBilled=طبقه بندی صورتحساب
 BuildBill=ساخت فاکتور
-ErrorPropalNotFound=Propal%s را یافت نشد
+ErrorPropalNotFound=Propal٪ s را یافت نشد
 Estimate=برآورد:
 EstimateShort=تخمین
 OtherPropals=طرح های دیگر
@@ -77,8 +75,8 @@ CreateEmptyPropal=ایجاد خالی طرح تجاری vierge و یا از لی
 DefaultProposalDurationValidity=پیش فرض طول مدت اعتبار پیشنهاد های تجاری (در روز)
 UseCustomerContactAsPropalRecipientIfExist=اگر به جای آدرس شخص ثالث به عنوان آدرس دریافت کننده پیشنهاد تعریف شده استفاده از آدرس ارتباط با مشتری
 ClonePropal=پیشنهاد تجاری کلون
-ConfirmClonePropal=آیا مطمئن هستید که می خواهید به کلون های تجاری پیشنهاد <b>شده%s؟</b>
-ConfirmReOpenProp=آیا مطمئن هستید که می خواهید برای باز کردن پشت تجاری پیشنهاد <b>شده%s؟</b>
+ConfirmClonePropal=آیا مطمئن هستید که می خواهید به کلون های تجاری پیشنهاد <b>شده٪ s؟</b>
+ConfirmReOpenProp=آیا مطمئن هستید که می خواهید برای باز کردن پشت تجاری پیشنهاد <b>شده٪ s؟</b>
 ProposalsAndProposalsLines=پیشنهاد تجاری و خطوط
 ProposalLine=خط پیشنهاد
 AvailabilityPeriod=تاخیر در دسترس
@@ -100,3 +98,4 @@ DocModelJauneDescription=مدل پیشنهاد Jaune
 DefaultModelPropalCreate=ایجاد مدل پیش فرض
 DefaultModelPropalToBill=قالب پیش فرض هنگام بستن یک طرح کسب و کار (به صورتحساب می شود)
 DefaultModelPropalClosed=قالب پیش فرض هنگام بستن یک طرح کسب و کار (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
index 63b2ea6e372..004ce47f74c 100644
--- a/htdocs/langs/fa_IR/salaries.lang
+++ b/htdocs/langs/fa_IR/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=نمایش پرداخت حقوق و دستمزد
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index 530ad3a8b6b..45384d2f781 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=سند مدل ساده
 DocumentModelMerou=مدل Merou A5
 WarningNoQtyLeftToSend=اخطار، محصولات در حال انتظار برای حمل شود.
 StatsOnShipmentsOnlyValidated=آمار انجام شده بر روی محموله تنها به اعتبار. تاریخ استفاده از تاریخ اعتبار از حمل و نقل (تاریخ تحویل برنامه ریزی همیشه شناخته نشده است) است.
-DateDeliveryPlanned=تاریخ ورقه زایمان
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=تاریخ تحویل
 SendShippingByEMail=ارسال محموله از طریق ایمیل
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index bdbb1715140..09e1b608823 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=ساختمان و ذخیره سازی
 NewWarehouse=جدید منطقه انبار / سهام
 WarehouseEdit=اصلاح انبار
 MenuNewWarehouse=انبار جدید
-WarehouseOpened=انبار را باز کرد
+WarehouseOpened=Warehouse open
 WarehouseClosed=انبار بسته شده
 WarehouseSource=انبار منبع
 WarehouseSourceNotDefined=بدون انبار تعریف شده است،
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=انتخاب انبار استفاده برای
 SelectWarehouseForStockIncrease=انتخاب انبار استفاده برای افزایش سهام
 NoStockAction=بدون عمل سهام
 LastWaitingSupplierOrders=سفارشات در انتظار پذیرایی
-DesiredStock=سهام مورد نظر
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=برای سفارش
 Replenishment=دوباره پر کردن
 ReplenishmentOrders=سفارشات دوباره پر کردن
-VirtualDiffersFromPhysical=با توجه به افزایش / کاهش گزینه های سهام، سهام جسمی و سهام مجازی (سفارشات فیزیکی + فعلی) ممکن است متفاوت
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=استفاده از سهام مجازی به طور پیش فرض، به جای سهام فیزیکی، برای قابلیت دوباره پر کردن
 UseVirtualStock=استفاده از سهام مجازی
 UsePhysicalStock=استفاده از سهام فیزیکی
-CurentSelectionMode=حالت انتخاب های برون مرزی جاری
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=سهام مجازی
 CurentlyUsingPhysicalStock=سهام فیزیکی
 RuleForStockReplenishment=حکومت برای سهام دوباره پر کردن
@@ -112,8 +113,8 @@ AlertOnly= فقط هشدارها
 WarehouseForStockDecrease=<b>انبار٪ خواهد</b> شد برای سهام کاهش استفاده
 WarehouseForStockIncrease=<b>انبار٪ خواهد</b> شد برای افزایش سهام استفاده
 ForThisWarehouse=برای این انبار
-ReplenishmentStatusDesc=این لیست از همه محصول با سهام پایین تر از سهام مورد نظر (یا کمتر از ارزش هشدار اگر گزینه "هشدار تنها" بررسی می شود)، و نشان می دهد به شما برای ایجاد سفارشات منبع برای پر کردن تفاوت است.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=پر کردن
 NbOfProductBeforePeriod=تعداد محصول٪ s را در انبار قبل از دوره (<٪) انتخاب
 NbOfProductAfterPeriod=تعداد محصول٪ s را در سهام بعد از دوره زمانی انتخاب شده (>٪ بازدید کنندگان)
@@ -124,16 +125,16 @@ RecordMovement=رکورد ی انتقال
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=جنبش های سهام ثبت شده
 RuleForStockAvailability=قوانین مورد نیاز سهام
-StockMustBeEnoughForInvoice=سطح سهام باید به اندازه کافی برای اضافه کردن محصول / خدمات را به صورت حساب است
-StockMustBeEnoughForOrder=سطح سهام باید به اندازه کافی برای اضافه کردن محصول / خدمات به منظور شود
-StockMustBeEnoughForShipment= سطح سهام باید به اندازه کافی برای اضافه کردن محصول / خدمات را به حمل و نقل است
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 34c369e9eea..a20b9f1d4c1 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=ارسال شده به تامین کنندگان
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
index 920831df475..901a1e68d8f 100644
--- a/htdocs/langs/fa_IR/trips.lang
+++ b/htdocs/langs/fa_IR/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=فهرست هزینه ها
 NewTrip=New expense report
 CompanyVisited=شرکت / بنیاد بازدید کردند
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index b33a2ba9e1e..95948e942af 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=پاک کردن از گروه
 PasswordChangedAndSentTo=تغییر رمز عبور و ارسال <b>به٪ s.</b>
 PasswordChangeRequestSent=درخواست تغییر رمز عبور <b>برای٪ s ارسال به٪ s.</b>
 MenuUsersAndGroups=کاربران و گروهها
+MenuMyUserCard=My user card
 LastGroupsCreated=تاریخ و زمان آخرین٪ گروه های ایجاد شده
 LastUsersCreated=تاریخ و زمان آخرین٪ کاربران ایجاد شده
 ShowGroup=نمایش گروه
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 7f2492a9295..8ffccd34055 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=فایل برداشت
 SetToStatusSent=تنظیم به وضعیت "فایل ارسال شد"
 ThisWillAlsoAddPaymentOnInvoice=این نیز خواهد پرداخت به فاکتورها اعمال می شود و آنها را طبقه بندی به عنوان "پرداخت"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=پرداخت سفارش ثابت٪ توسط بانک
diff --git a/htdocs/langs/fa_IR/workflow.lang b/htdocs/langs/fa_IR/workflow.lang
index 957a2fecf37..f4280e2896d 100644
--- a/htdocs/langs/fa_IR/workflow.lang
+++ b/htdocs/langs/fa_IR/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=راه اندازی ماژول گردش کار
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=هیچ گردش کار شما می توانید برای ماژول شما فعال شده است را تغییر دهید وجود دارد.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=ایجاد یک سفارش مشتری به طور خودکار پس از یک طرح تجاری امضا شده است
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=ایجاد یک فاکتور مشتری به طور خودکار پس از یک طرح تجاری امضا شده است
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=ایجاد یک فاکتور مشتری به طور خودکار پس از یک قرارداد معتبر است
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=ایجاد یک فاکتور به مشتری به صورت خودکار پس از سفارش مشتری بسته است
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=طبقه بندی پیشنهاد منبع مربوط به صورتحساب در هنگام سفارش مشتری به پرداخت مجموعه
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=طبقه بندی مرتبط با سفارش مشتری منبع (بازدید کنندگان) صورتحساب زمانی که صورت حساب مشتری به پرداخت مجموعه
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=طبقه بندی مرتبط با سفارش مشتری منبع (بازدید کنندگان) صورتحساب زمانی که صورت حساب به مشتری اعتبار است
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index bf1d3b9765c..53ead1cfde4 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Valikko käyttäjille
 LangFile=File. Lang
 System=System
 SystemInfo=Järjestelmän tiedot
-SystemTools=Kehitysresurssit
 SystemToolsArea=Kehitysresurssit alueella
 SystemToolsAreaDesc=Tämä alue tarjoaa hallinnon ominaisuuksia. Käytä valikosta valita ominaisuus, jota etsit.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Turvallisuus
 Passwords=Salasanat
 DoNotStoreClearPassword=Onko mitään salasanoja vuonna selväksi tietokantaan
 MainDbPasswordFileConfEncrypted=Tietokannan salasana salattu conf.php
-InstrucToEncodePass=Jos haluat salasanan koodattu <b>conf.php</b> tiedosto korvaa linja <br> <b>$ Dolibarr_main_db_pass ="..."</b> <br> mennessä <br> <b>$ Dolibarr_main_db_pass = "salataan: %s"</b>
-InstrucToClearPass=Jos haluat salasanan dekoodata (poista) osaksi <b>conf.php</b> tiedosto korvaa linja <br> <b>$ Dolibarr_main_db_pass = "salataan :..."</b> <br> mennessä <br> <b>$ Dolibarr_main_db_pass = "%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Suojaaminen syntyy pdf-tiedostoja (ei recommandd, taukoja massa pdf sukupolvi)
 ProtectAndEncryptPdfFilesDesc=Suojaaminen PDF asiakirja pitää saatavilla lukea ja tulostaa kaikki PDF-selaimella. Kuitenkin, editointi ja kopiointi ei ole mahdollista enää. Huomaa, että käyttäessäsi tätä ominaisuutta tehdä rakentaa maailmanlaajuinen kumuloida pdf ei toimi (kuten maksamattomat laskut).
 Feature=Ominaisuus
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Tämä on asetettu käsitellä:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Vaihe %s
 FindPackageFromWebSite=Etsi paketti, joka sisältää haluamasi toiminnon (esimerkiksi www-sivuston %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Asenna on päättynyt ja Dolibarr on valmis käyttämään tätä uutta komponenttia.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr nykyinen versio
 CallUpdatePage=Siirry sivun päivitykset tietokannan rakennetta ja datas %s.
 LastStableVersion=Viimeisin vakaa versio
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Ehdotukset
 Module20Desc=Kaupalliset ehdotuksia hallinto -
 Module22Name=E-postitusten
 Module22Desc=E-postitusten hallinto
-Module23Name= Energia
-Module23Desc= Seuranta kulutus energialähteiden
+Module23Name=Energia
+Module23Desc=Seuranta kulutus energialähteiden
 Module25Name=Asiakas Tilaukset
 Module25Desc=Asiakas tilaa hallinto
 Module30Name=Laskut
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Ilmoitukset
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Lahjoitukset
 Module700Desc=Lahjoitukset hallinto
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Toimet / tehtävät ja esityslistan hallinta
 Module2500Name=Sähköinen Content Management
 Module2500Desc=Tallentaa ja jakaa asiakirjoja
-Module2600Name=WebServices
-Module2600Desc=Ota Dolibarr verkkopalvelut palvelimen
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Luoda / muuttaa tuotetta / palvelua
 Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
 Permission38=Vientituotteen
-Permission41=Lue hankkeet ja tehtävät
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Luoda / muuttaa hankkeita, muokata tehtäviä minun hankkeiden
 Permission44=Poista hankkeiden
 Permission61=Lue interventioiden
@@ -599,10 +600,10 @@ Permission86=Lähetä asiakkaiden tilauksia
 Permission87=Sulje asiakkaiden tilauksia
 Permission88=Peruuta asiakkaiden tilauksia
 Permission89=Poista asiakkaiden tilauksia
-Permission91=Lue sosiaaliturvamaksut ja alv
-Permission92=Luoda / muuttaa sosiaaliturvamaksut ja alv
-Permission93=Poista sosiaaliturvamaksut ja alv
-Permission94=Vienti sosiaaliturvamaksut
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Lue raportit
 Permission101=Lue sendings
 Permission102=Luoda / muuttaa sendings
@@ -620,9 +621,9 @@ Permission121=Lue kolmannen osapuolen liittyy käyttäjän
 Permission122=Luoda / muuttaa kolmansien osapuolten liittyy käyttäjän
 Permission125=Poista kolmansien osapuolten liittyy käyttäjän
 Permission126=Vienti kolmansiin osapuoliin
-Permission141=Lue tehtävät
-Permission142=Luo / muuta tehtävien
-Permission144=Poista tehtäviä
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lue tarjoajien
 Permission147=Lue stats
 Permission151=Lue pysyvän tilaukset
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup tallennettu
 BackToModuleList=Palaa moduulien luetteloon
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Postinumero
 CompanyTown=Kaupunki
 CompanyCountry=Maa
 CompanyCurrency=Main valuutta
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Älä näytä
 DoNotSuggestPaymentMode=Eivät viittaa siihen,
 NoActiveBankAccountDefined=Ei aktiivisia pankkitilille määritelty
 OwnerOfBankAccount=Omistajan pankkitilille %s
 BankModuleNotActive=Pankkitilit moduuli ei ole käytössä
-ShowBugTrackLink=Näytä linkki "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Näytä "työpöytä" on etusivu
 Alerts=Vahtipalvelu
 Delays=Viivästykset
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max desimaalitarkkuuksia yksikkökohtaiseen hinnat
 MAIN_MAX_DECIMALS_TOT=Max desimaalitarkkuuksia kokonaistyöllisyyttä hinnat
 MAIN_MAX_DECIMALS_SHOWN=Max desimaalitarkkuuksia hinnat näkyvät näytöllä (Lisää <b>...</b> sen jälkeen, kun tämä numero, jos haluat nähdä <b>...</b> kun numero on katkaistu, kun näkyy näytössä)
 MAIN_DISABLE_PDF_COMPRESSION=Käytä PDF kompressiota varten luotu PDF-tiedostoina.
-MAIN_ROUNDING_RULE_TOT= Koko pyöristämistä alue (harvinaisia maita, joissa pyöristäminen tapahtuu jotain muuta kuin perusvuonna 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net yksikköhinta tuotteen
 TotalPriceAfterRounding=Kokonaishinta (netto / vat / sis. alv) pyöristämisen jälkeen
 ParameterActiveForNextInputOnly=Parametri tehokas Seuraavan vain tuloa
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=Max
 ConfirmDeleteProductLineAbility=Vahvistus poisto linja tuottaa lomakkeet
 ModifyProductDescAbility=Mukauttaminen kuvausten tuotettu lomakkeet
 ViewProductDescInFormAbility=Visualisointi tuotteen kuvaukset lomakkeiden (toisin kuin popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualisointi tuotteiden kuvausten thirdparty kielellä
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Tuki Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Oletus viivakoodi tyyppi käyttää tuotteita
 SetDefaultBarcodeTypeThirdParties=Oletus viivakoodi tyyppi käyttämään kolmansien osapuolten
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Viivakoodi tyypin UPC
 BarcodeDescISBN=Viivakoodi tyypin ISBN
 BarcodeDescC39=Viivakoodi tyypin C39
 BarcodeDescC128=Viivakoodi tyypin C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Oletko varma, että haluat poistaa <b>Valikosta %s?</b>
 DeleteLine=Poista rivi
 ConfirmDeleteLine=Oletko varma, että haluat poistaa tämän viivan?
 ##### Tax #####
-TaxSetup=Verot, sosiaaliturvamaksut ja osingot moduulin asetukset
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Vaihtoehto d'exigibilit de TVA
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices moduulin asetukset
 WebServicesDesc=Antamalla tämän moduulin, Dolibarr tullut verkkopalvelun palvelin antaa erilaiset web-palveluja.
 WSDLCanBeDownloadedHere=WSDL avainsana tiedosto jos serviceses voi ladata täältä
 EndPointIs=SOAP asiakkaille on toimitettava osallistumispyynnöt on Dolibarr päätetapahtuma saatavilla Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Pankki-moduulin asetukset
 FreeLegalTextOnChequeReceipts=Vapaa teksti sekkiä kuitit
@@ -1581,6 +1599,7 @@ ProjectsSetup=Hankkeen moduuli setup
 ProjectsModelModule=Hankkeen raportti asiakirjan malli
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index 867498a3bfa..c5535cb7518 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Tilaa %s hyväksytty
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Tilaa %s palata luonnos tila
-OrderCanceledInDolibarr=Tilaus %s peruutettu
 ProposalSentByEMail=Liiketoimintaehdotukset %s lähetetään sähköpostilla
 OrderSentByEMail=Asiakas tilaa %s lähetetään sähköpostilla
 InvoiceSentByEMail=Asiakas lasku %s lähetetään sähköpostilla
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index b3062b5b0ae..43be7122606 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Sovita
 Conciliation=Yhteensovita
 ConciliationForAccount=Hyvitellä tämän tilin
 IncludeClosedAccount=Sisällytä suljettu tilit
-OnlyOpenedAccount=Vain avatut tilit
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Luottotili
 AccountToDebit=Käteistili
 DisableConciliation=Poista sovittelu ominaisuus tämän tilin
 ConciliationDisabled=Sovittelukomitea ominaisuus pois päältä
-StatusAccountOpened=Avattu
+StatusAccountOpened=Open
 StatusAccountClosed=Suljettu
 AccountIdShort=Numero
 EditBankRecord=Muokkaa
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Asiakasmaksu
 CustomerInvoicePaymentBack=Asiakasmaksu takaisin
 SupplierInvoicePayment=Toimittajan maksu
 WithdrawalPayment=Hyvitysmaksu
-SocialContributionPayment=Sosiaaliturvamaksujen maksamisesta
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Rahoitustase journal
 BankTransfer=Pankkisiirto
 BankTransfers=Pankkisiirrot
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 42f4b5eb341..e3d908b56b7 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb laskuista
 NumberOfBillsByMonth=Nb laskuista kuukausittain
 AmountOfBills=Määrä laskuista
 AmountOfBillsByMonthHT=Määrä laskut kuukausittain (verojen jälkeen)
-ShowSocialContribution=Näytä yhteiskunnallinen
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Näytä lasku
 ShowInvoice=Näytä lasku
 ShowInvoiceReplace=Näytä korvaa lasku
@@ -270,7 +270,7 @@ BillAddress=Bill osoite
 HelpEscompte=Tämä alennus on alennus myönnetään asiakas, koska sen paiement tehtiin ennen aikavälillä.
 HelpAbandonBadCustomer=Tämä määrä on luovuttu (asiakas sanoi olla huono asiakas), ja se on pidettävä exceptionnal väljä.
 HelpAbandonOther=Tämä määrä on luovuttu, koska se oli virhe (väärä asiakas-tai laskunumeroa korvata toinen esimerkki)
-IdSocialContribution=Yhteiskunnallinen id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Maksu-id
 InvoiceId=Laskun numero
 InvoiceRef=Laskun ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Välittömät
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index 0caf66cfaf7..e9c476ea35b 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Viimeisimmät sopimukset
 BoxLastContacts=Viimeisimmät kontaktit/osoitteet
 BoxLastMembers=Viimeisimmät jäsenet
 BoxFicheInter=Viimeisimmät väliintulot
-BoxCurrentAccounts=Avattujen tilien saldo
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Myynnin liikevaihto
 BoxTotalUnpaidCustomerBills=Maksamattomia asiakkaiden laskuja yhteensä
 BoxTotalUnpaidSuppliersBills=Maksamattomia toimittajan laskuja yhteensä
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Viimeisimmät %s muokkaamat väliintulot
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Avattujen tilien saldot
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Myynnin liikevaihto
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index c78728f3f83..830b42b580d 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b> %s</b> on lisätty onnistuneesti.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Ei mitään
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Tämä luokka on jo olemassa samassa paikassa
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Sisältö ei näy kaikissa
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / prosp. luokat
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 213d6d299c2..0cbcd606af8 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Kolmannen osapuolen yhteystiedot/osoitteet
 StatusContactValidated=Yhteystietojen/osoitteiden tila
 Company=Yritys
 CompanyName=Yrityksen nimi
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Yritykset
 CountryIsInEEC=Maa kuuluu EU:hun
 ThirdPartyName=Kolmannen osapuolen nimi
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absoluuttinen alennuksia saatavilla
 DiscountNone=Ei mitään
 Supplier=Toimittaja
 CompanyList=Yritysluettelo
-AddContact=Lisää yhteystieto
-AddContactAddress=Lisää kontakti / osoite
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Muokkaa yhteystiedot / osoite
 EditContactAddress=Edit contact/address
 Contact=Yhteydenotto
@@ -268,8 +269,8 @@ ContactsAddresses=Yhteystiedot / Osoitteet
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=Ei yhteystietoja määritelty tämän kolmannen osapuolen
 DefaultContact=Oletus kontakti / osoite
-AddCompany=Lisää yritys
-AddThirdParty=Lisää kolmas osapuoli
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Poista yrityksen
 PersonalInformations=Henkilötiedot
 AccountancyCode=Kirjanpito-koodi
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Toimitusosoite etiketti
 DeleteDeliveryAddress=Poista toimitusosoite
 ConfirmDeleteDeliveryAddress=Oletko varma, että haluat poistaa tämän toimitusosoite?
 NewDeliveryAddress=Uusi toimitusosoite
-AddDeliveryAddress=Lisää osoite
-AddAddress=Lisää osoite
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=Mitään vaihtoehtoista toimitusosoite määritelty
 SupplierCategory=Toimittajan tuoteryhmä
 JuridicalStatus200=Independent
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Paluu numero on muodossa %syymm-nnnn asiakkaan koodi ja %syymm-nnnn luovuttajalle koodi jos VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0.
 LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi voidaan muuttaa milloin tahansa.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index fdbf7890faa..fbb6d365c63 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Alv
 ToPay=Maksaa
 ToGet=Palatakseni
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Vero-, sosiaali-ja osingot alueella
-SocialContribution=Yhteiskunnallinen
-SocialContributions=Sosiaaliturvamaksut
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Veroja ja osinkoja
 MenuSalaries=Salaries
-MenuSocialContributions=Sosiaaliturvamaksut
-MenuNewSocialContribution=Uusi rahoitusosuus
-NewSocialContribution=Uusi yhteiskunnallinen
-ContributionsToPay=Osallistuminen maksaa
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Kirjanpito / Treasury alueella
 AccountancySetup=Kirjanpidon setup
 NewPayment=Uusi maksu
 Payments=Maksut
 PaymentCustomerInvoice=Asiakas laskun maksu
 PaymentSupplierInvoice=Toimittajan laskun maksu
-PaymentSocialContribution=Sosiaaliturvamaksujen maksamisesta
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=ALV-maksu
 PaymentSalary=Salary payment
 ListPayment=Luettelo maksut
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Alv maksutoimisto
 VATPayments=Alv-maksut
-SocialContributionsPayments=Sosiaaliturvamaksut maksut
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näytä arvonlisäveron maksaminen
 TotalToPay=Yhteensä maksaa
 TotalVATReceived=Yhteensä ALV
@@ -116,11 +116,11 @@ NewCheckDepositOn=Uusi tarkistaa talletuksen huomioon: %s
 NoWaitingChecks=N: o tarkastusten odottaa talletus.
 DateChequeReceived=Cheque vastaanotto panos päivämäärä
 NbOfCheques=Nb Sekkien
-PaySocialContribution=Maksa yhteiskunnallinen
-ConfirmPaySocialContribution=Oletko varma, että haluat luokitella tämä yhteiskunnallinen osallistuminen maksetaan?
-DeleteSocialContribution=Poista yhteiskunnallinen
-ConfirmDeleteSocialContribution=Oletko varma, että haluat poistaa tämän yhteiskunnallinen?
-ExportDataset_tax_1=Sosiaaliturvamaksut ja maksut
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index 62cdc0a8183..381ac00b7a5 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -4,10 +4,10 @@ About = Yleisesti
 CronAbout = Yleisesti Cronista
 CronAboutPage = Cron yleisesti sivu
 # Right
-Permission23101 = Hae ajastetut tehtävät
-Permission23102 = Luo/päivitä ajastettu tehtävä
-Permission23103 = Poista ajastettu tehtävä
-Permission23104 = Suorita ajastettu tehtävä
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Ajastettujen tehtävien asetusten hallinta
 URLToLaunchCronJobs=URL-osoite ajastettujen tehtävien tarkistamiseen ja ajamiseen tarvittaessa
@@ -26,11 +26,11 @@ CronLastOutput=Viimeisen ajon tulostus
 CronLastResult=Viimeisen tuloksen koodi
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Aloituspäivämäärä
 CronDtEnd=Lopetuspäivä
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Menetelmä
 CronModule=Moduuli
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parametrit
 CronSaveSucess=Save succesfully
 CronNote=Kommentti
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
index e724f7748e3..9cceed4280c 100644
--- a/htdocs/langs/fi_FI/ecm.lang
+++ b/htdocs/langs/fi_FI/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Etsi objekti
 ECMSectionOfDocuments=Hakemistot asiakirjoja
 ECMTypeManual=Manuaalinen
 ECMTypeAuto=Automaattinen
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Asiakirjat liittyy kolmansien osapuolten
 ECMDocsByProposals=Asiakirjat liittyvät ehdotukset
 ECMDocsByOrders=Asiakirjat liittyvät asiakkaiden tilauksia
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index b845435f001..c8753068377 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index 67fd6390553..bcb20fa661f 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Syy
 UserCP=Käyttäjä
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/fi_FI/incoterm.lang b/htdocs/langs/fi_FI/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/fi_FI/incoterm.lang
+++ b/htdocs/langs/fi_FI/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 80b688dca44..2a665cedb46 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Tietokanta - SuperUser pääsy
 CheckToCreateDatabase=Valintaruutu, jos tietokanta ei ole olemassa, ja ne on luotu. <br> Tässä tapauksessa sinun täytyy täyttää tunnus / salasana SuperUser huomioon alareunassa tällä sivulla.
 CheckToCreateUser=Valintaruutu, jos kirjautuminen ei ole olemassa, ja ne on luotu. <br> Tässä tapauksessa sinun täytyy täyttää tunnus / salasana SuperUser huomioon alareunassa tällä sivulla.
 Experimental=(kokeellinen, ei käytössä)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Kirjaudu että käyttäjä voi luoda uusia tietokantoja tai uusia käyttäjiä, hyödytön, jos tietokanta ja tietokanta on jo olemassa (kuten silloin, kun olet isännöi Web hosting-palvelujen tarjoaja).
 KeepEmptyIfNoPassword=Jätä tyhjä, jos käyttäjä ei ole salasanaa (välttää)
 SaveConfigurationFile=Tallenna arvot
diff --git a/htdocs/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang
index d8fbb8da847..a96ba965b0f 100644
--- a/htdocs/langs/fi_FI/languages.lang
+++ b/htdocs/langs/fi_FI/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabia
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarialainen
 Language_bs_BA=Bosnian
 Language_ca_ES=Katalaani
@@ -21,9 +22,10 @@ Language_en_SA=Englanti (Saudi-Arabia)
 Language_en_US=Englanti (Yhdysvallat)
 Language_en_ZA=Englanti (Etelä-Afrikka)
 Language_es_ES=Espanjalainen
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Espanja (Argentiina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Espanja (Honduras)
 Language_es_MX=Espanja (Meksiko)
 Language_es_PY=Espanja (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Islannin
 Language_it_IT=Italialainen
 Language_ja_JP=Japanin kieli
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korealainen
+Language_lo_LA=Lao
 Language_lt_LT=Liettualainen
 Language_lv_LV=Latvialainen
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Ruotsi
 Language_sv_SE=Ruotsi
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thaimaalainen
 Language_uk_UA=Ukrainalainen
 Language_uz_UZ=Uzbekki
diff --git a/htdocs/langs/fi_FI/loan.lang b/htdocs/langs/fi_FI/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/fi_FI/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index a1f6062735d..56d2d681e0c 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Ilmoitukset
 NoNotificationsWillBeSent=Ei sähköposti-ilmoituksia on suunniteltu tähän tapahtumaan ja yritys
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 2632df0ec4b..6645f2f45d2 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Joitakin virheitä ei löytynyt. Meidän p
 ErrorConfigParameterNotDefined=<b>Parametri %s</b> ei ole määritelty sisällä Dolibarr config file <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Ei onnistunut löytämään <b>käyttäjän %s</b> Dolibarr tietokantaan.
 ErrorNoVATRateDefinedForSellerCountry=Virhe ei alv määritellään maa ' %s'.
-ErrorNoSocialContributionForSellerCountry=Virhe, ei sosiaaliturvamaksujen tyyppi määritellään maan %s ".
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Virhe, ei tallenna tiedosto.
 SetDate=Aseta päivä
 SelectDate=Valitse päivä
@@ -301,8 +301,8 @@ UnitPriceHT=Yksikköhinta (netto)
 UnitPriceTTC=Yksikköhinta
 PriceU=UP
 PriceUHT=UP (netto)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Määrä
 AmountInvoice=Laskun summa
 AmountPayment=Maksun summa
@@ -339,6 +339,7 @@ IncludedVAT=Mukana alv
 HT=Veroton
 TTC=Sis. alv
 VAT=Alv
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Veroaste
@@ -413,6 +414,8 @@ Qty=Kpl
 ChangedBy=Muuttanut
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Laske uudelleen
 ResultOk=Onnistuminen
 ResultKo=Virhe
@@ -421,7 +424,7 @@ Reportings=Raportointi
 Draft=Vedos
 Drafts=Vedokset
 Validated=Vahvistetut
-Opened=Avoinna
+Opened=Open
 New=Uusi
 Discount=Alennus
 Unknown=Tuntematon
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linkitetty käyttäjätietoon
 DeleteAFile=Poista tiedosto
 ConfirmDeleteAFile=Haluatko varmasti poistaa tiedoston
 NoResults=Ei tuloksia
+SystemTools=System tools
 ModulesSystemTools=Moduuli työkalut
 Test=Testi
 Element=Osa
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
@@ -732,3 +739,4 @@ ShortThursday=TO
 ShortFriday=PE
 ShortSaturday=LA
 ShortSunday=SU
+SelectMailModel=Select email template
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index ea028ebe4eb..7bd634c5f7b 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -199,7 +199,8 @@ Entreprises=Yritykset
 DOLIBARRFOUNDATION_PAYMENT_FORM=Voit tehdä tilauksen maksun avulla pankkisiirrolla sivulla <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Voit maksaa luottokortilla tai PayPal, klikkaa painiketta sivun alalaidassa. <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index 680d42db1c7..a6de6a63253 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Toimittaja jotta
 SuppliersOrders=Toimittajien tilaukset
 SuppliersOrdersRunning=Nykyinen toimittajien tilaukset
 CustomerOrder=Asiakas jotta
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Nykyisten asiakkaiden tilausten
-CustomersOrdersAndOrdersLines=Asiakkaan tilaukset ja tilaukset "linjat
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Toimittajan tilauksia käsitellä
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Peruutettu
 StatusOrderDraftShort=Vedos
 StatusOrderValidatedShort=Validoidut
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my tilaukset
 AddToOtherOrders=Lisää muut tilaukset
 AddToDraftOrders=Add to draft order
 ShowOrder=Näytä jotta
-NoOpenedOrders=N: o avataan tilaukset
-NoOtherOpenedOrders=Mikään muu avataan tilaukset
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Muut tilaukset
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index d49a1e3d5e1..c96d7454d53 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate interventioelimen
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Validate bill
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Toimittaja jotta hyväksytty
 Notify_ORDER_SUPPLIER_REFUSE=Toimittaja jotta evätty
 Notify_ORDER_VALIDATE=Asiakas tilaa validoitu
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Lisää merkintä kalenteri %s
diff --git a/htdocs/langs/fi_FI/printing.lang b/htdocs/langs/fi_FI/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/fi_FI/printing.lang
+++ b/htdocs/langs/fi_FI/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 42b86221dca..05bf4b5e855 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Tuote tai palvelu
 ProductsAndServices=Tuotteet ja palvelut
 ProductsOrServices=Tuotteet tai palvelut
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Tuotteiden ja Palveluiden tilastot
 ProductsStatistics=Tuotteiden tilastot
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Sisäinen viite
 LastRecorded=Uusimmat tuotteet / palvelut myydä kirjataan
@@ -44,7 +44,7 @@ CardProduct1=Palvelukortti
 CardContract=Sopimus-kortti
 Warehouse=Varasto
 Warehouses=Varastot
-WarehouseOpened=Varasto avattu
+WarehouseOpened=Warehouse open
 WarehouseClosed=Varasto suljettu
 Stock=Kanta
 Stocks=Varastot
@@ -71,21 +71,21 @@ SellingPriceTTC=Myyntihinta (sis. alv)
 PublicPrice=Julkiset hinta
 CurrentPrice=Nykyinen hinta
 NewPrice=Uusi hinta
-MinPrice=Puolinuotti. myyntihinta
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Myyntihinta ei voi olla pienempi kuin pienin sallittu tämän tuotteen ( %s ilman veroja)
 ContractStatus=Sopimus asema
 ContractStatusClosed=Suljettu
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=lakkaa
-ContractStatusOnHold=Ole käynnissä
-ContractStatusToRun=To get running
-ContractNotRunning=Tämä sopimus ei ole käynnissä
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Tuotteen viitaten %s on jo olemassa.
 ErrorProductBadRefOrLabel=Väärä arvo viite-tai etiketissä.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Tavarantoimittajat
 SupplierRef=Toimittaja ref.
 ShowProduct=Näytä tuote
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jos tuote on palvelu, rajoitettu kesto:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Lukumäärä hinta
 MultiPriceLevelsName=Hintakategorioissa
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Käännös
 KeywordFilter=Hakusanalla suodatin
@@ -131,7 +131,7 @@ ProductToAddSearch=Hae tuote lisätä
 AddDel=Lisää / Poista
 Quantity=Määrä
 NoMatchFound=Ei hakutuloksia löytyi
-ProductAssociationList=Luettelo niihin liittyvät tuotteet / palvelut: nimi tuotteen / palvelun (määrä vaikuta)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Yksi valittu tuote on vanhempi nykyinen tuote
 DeleteProduct=Poista tuotteen / palvelun
@@ -179,16 +179,41 @@ CloneProduct=Klooni tuotteen tai palvelun
 ConfirmCloneProduct=Oletko varma, että haluat klooni tuotteen tai <b>palvelun %s?</b>
 CloneContentProduct=Klooni kaikki tärkeimmät tiedot tuotteen / palvelun
 ClonePricesProduct=Klooni tärkeimmät tiedot ja hinnat
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Tämä tuote on käytetty
 NewRefForClone=Ref. uuden tuotteen tai palvelun
-CustomerPrices=Asiakkaat hinnat
-SuppliersPrices=Toimittajat hinnat
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Tullikoodeksi
 CountryOrigin=Alkuperä maa
 HiddenIntoCombo=Piilotettu osaksi valitse listat
 Nature=Luonto
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 94a28050ab0..68d8f230e60 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Tämä näkemys esitetään kaikki hankkeet sinulla voi lukea
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Tämä näkemys esitetään kaikki hankkeet (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
 MyTasksDesc=Tämä näkemys on vain hankkeisiin tai tehtäviä olet yhteyshenkilö (mikä on tyyppi).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät sinulla voi lukea.
 TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projektit alueella
 NewProject=Uusi projekti
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Luettelo hankkeista
 ShowProject=Näytä hankkeen
 SetProject=Aseta hankkeen
 NoProject=Ei hanke määritellään
-NbOpenTasks=Nb on avattu tehtävät
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb hankkeiden
 TimeSpent=Käytetty aika
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Uusi käytetty aika
 MyTimeSpent=Oma käytetty aika
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Luettelo toimien hankkeeseen liittyvän
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Luettelo toimia, jotka liittyvät hankkeen
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Toiminta hanke tällä viikolla
 ActivityOnProjectThisMonth=Toiminta hankkeen tässä kuussa
 ActivityOnProjectThisYear=Toiminta hanke tänä vuonna
@@ -95,7 +98,7 @@ DeleteATimeSpent=Poista käytetty aika
 ConfirmDeleteATimeSpent=Oletko varma että haluat poistaa tämän aika?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Hankkeet omistettu tälle kolmannelle
 NoTasks=Ei tehtävät hankkeen
 LinkedToAnotherCompany=Liittyy muihin kolmannen osapuolen
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang
index 63cfef75e7a..45cf0bc951c 100644
--- a/htdocs/langs/fi_FI/propal.lang
+++ b/htdocs/langs/fi_FI/propal.lang
@@ -4,7 +4,7 @@ Proposal=Kaupalliset ehdotus
 ProposalShort=Ehdotus
 ProposalsDraft=Luonnos kaupallinen ehdotuksia
 ProposalDraft=Luonnos kaupallinen ehdotus
-ProposalsOpened=Avoinna kaupallinen ehdotuksia
+ProposalsOpened=Open commercial proposals
 Prop=Kaupalliset ehdotuksia
 CommercialProposal=Kaupalliset ehdotus
 CommercialProposals=Kaupalliset ehdotuksia
@@ -16,7 +16,7 @@ Prospect=Esitetilaus
 ProspectList=Esitetilaus luettelo
 DeleteProp=Poista kaupallinen ehdotus
 ValidateProp=Validate kaupallinen ehdotus
-AddProp=Lisää ehdotus
+AddProp=Create proposal
 ConfirmDeleteProp=Oletko varma, että haluat poistaa tämän kaupallisen ehdotusta?
 ConfirmValidateProp=Oletko varma, että haluat vahvistaa kaupallista ehdotusta?
 LastPropals=Viimeisin %s ehdotuksia
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Määrä kuukausittain (ilman veroja)
 NbOfProposals=Numero kaupallisten ehdotuksia
 ShowPropal=Näytä ehdotus
 PropalsDraft=Drafts
-PropalsOpened=Avoinna
+PropalsOpened=Open
 PropalsNotBilled=Suljettu ei laskuteta
 PropalStatusDraft=Luonnos (on vahvistettu)
 PropalStatusValidated=Validoidut (ehdotus on avattu)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Ei ole kirjautunut (suljettu)
 PropalStatusBilled=Laskutetun
 PropalStatusDraftShort=Vedos
 PropalStatusValidatedShort=Validoidut
-PropalStatusOpenedShort=Avoinna
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Suljettu
 PropalStatusSignedShort=Allekirjoitettu
 PropalStatusNotSignedShort=Ei ole kirjautunut
@@ -51,12 +51,10 @@ PropalsToClose=Kaupalliset ehdotuksia lähellä
 PropalsToBill=Allekirjoitettu kaupallinen ehdotuksia bill
 ListOfProposals=Luettelo kaupallisista ehdotuksia
 ActionsOnPropal=Toimia, ehdotus
-NoOpenedPropals=N: o avataan kaupalliseen ehdotuksia
-NoOtherOpenedPropals=Mikään muu avataan kaupalliseen ehdotuksia
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Kaupalliset ehdotus ref
 SendPropalByMail=Lähetä kaupallinen ehdotus postitse
-FileNotUploaded=Tiedosto ei ole ladattu
-FileUploaded=Tiedosto on siirretty onnistuneesti
 AssociatedDocuments=Asiakirjat kanssa assosioituneet ehdotus:
 ErrorCantOpenDir=Ei voi avata hakemistoon
 DatePropal=Päiväys Ehdotuksen
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal %s ei löydy
 Estimate=Arvio:
 EstimateShort=Arvio
 OtherPropals=Muut ehdotukset
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=Luo kaupallinen ehdotus kopioimalla olemassa olevan ehdotuksen
 CreateEmptyPropal=Luo tyhjä kaupallinen ehdotuksia vierge tai luettelo tuotteet / palvelut
 DefaultProposalDurationValidity=Oletus kaupallinen ehdotus voim. kesto (päivinä)
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=Asiakas ottaa yhteyttä seurantaan ehdotus
 # Document models
 DocModelAzurDescription=Täydellinen ehdotus malli (logo. ..)
 DocModelJauneDescription=Jaune ehdotus malli
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 0701b49d469..fa5e296d529 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Yksinkertaisen mallin
 DocumentModelMerou=Merou A5 malli
 WarningNoQtyLeftToSend=Varoitus, ei tuotteet odottavat lähettämistä.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Höylätty toimituspäivämäärä
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Päivämäärä toimitus sai
 SendShippingByEMail=Lähetä lähetys sähköpostitse
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index ae6cf714dc5..863972bacd8 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Varastot
 NewWarehouse=Uusi varasto / Kanta-alue
 WarehouseEdit=Muokkaa varasto
 MenuNewWarehouse=Uusi varasto
-WarehouseOpened=Warehouse avattu
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse suljettu
 WarehouseSource=Lähde varasto
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Valitse varasto käyttää varastossa laskua
 SelectWarehouseForStockIncrease=Valitse varasto käyttää varastossa lisätä
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index ba88216b66a..a43d95c7e5f 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
index de170b586d4..6b536fe40e8 100644
--- a/htdocs/langs/fi_FI/trips.lang
+++ b/htdocs/langs/fi_FI/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Luettelo palkkiot
 NewTrip=New expense report
 CompanyVisited=Yritys / säätiö vieraili
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index 21b0e410dd3..d19aa511967 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Poista ryhmästä
 PasswordChangedAndSentTo=Salasana muutettu ja <b>lähetetään %s.</b>
 PasswordChangeRequestSent=Pyynnön vaihtaa <b>salasana %s lähetetään %s.</b>
 MenuUsersAndGroups=Käyttäjät & ryhmät
+MenuMyUserCard=My user card
 LastGroupsCreated=Viimeisin %s luonut ryhmiä
 LastUsersCreated=Viimeisin %s käyttäjät luotu
 ShowGroup=Näytä ryhmä
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 029f4b2a20b..6a9d4541c69 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Maksaminen kestotilaus %s pankin
diff --git a/htdocs/langs/fi_FI/workflow.lang b/htdocs/langs/fi_FI/workflow.lang
index 57bedccdd48..b1aef324e28 100644
--- a/htdocs/langs/fi_FI/workflow.lang
+++ b/htdocs/langs/fi_FI/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow-moduuli asennus
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Ei työnkulkua voi muokata moduulien olet aktivoinut.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Luominen asiakkaan tilauksen automaattisesti kaupallinen ehdotus on allekirjoitettu
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Luo asiakkaalle laskun automaattisesti kaupallinen ehdotus on allekirjoitettu
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Luo asiakkaalle laskun automaattisesti sopimus on vahvistettu
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Luo asiakkaalle laskun automaattisesti asiakkaan tilauksen suljetaan
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
new file mode 100644
index 00000000000..1c53b65c99c
--- /dev/null
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - admin
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index cc346f1b38c..1c53b65c99c 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -1,18 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-MAIN_ROUNDING_RULE_TOT=Size of rounding range (for rare countries where rounding is done on something else than base 10)
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
deleted file mode 100644
index e58cf5e72b5..00000000000
--- a/htdocs/langs/fr_CA/banks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - banks
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
deleted file mode 100644
index f1e67a676c3..00000000000
--- a/htdocs/langs/fr_CA/bills.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - bills
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
diff --git a/htdocs/langs/fr_CA/commercial.lang b/htdocs/langs/fr_CA/commercial.lang
deleted file mode 100644
index 18d8db06801..00000000000
--- a/htdocs/langs/fr_CA/commercial.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - commercial
-ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
deleted file mode 100644
index 3f755fc725d..00000000000
--- a/htdocs/langs/fr_CA/cron.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
diff --git a/htdocs/langs/fr_CA/interventions.lang b/htdocs/langs/fr_CA/interventions.lang
deleted file mode 100644
index 84b26b1f95e..00000000000
--- a/htdocs/langs/fr_CA/interventions.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - interventions
-PrintProductsOnFichinterDetails=interventions generated from orders
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
deleted file mode 100644
index 4b5c7e95999..00000000000
--- a/htdocs/langs/fr_CA/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
diff --git a/htdocs/langs/fr_CA/orders.lang b/htdocs/langs/fr_CA/orders.lang
deleted file mode 100644
index 6d902132a46..00000000000
--- a/htdocs/langs/fr_CA/orders.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderOnProcessShort=Ordered
-StatusOrderOnProcess=Ordered - Standby reception
-ApproveOrder=Approve order
-LastOrders=Last %s customer orders
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
deleted file mode 100644
index c50a095e492..00000000000
--- a/htdocs/langs/fr_CA/other.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - other
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
-SeeModuleSetup=See setup of module %s
diff --git a/htdocs/langs/fr_CA/productbatch.lang b/htdocs/langs/fr_CA/productbatch.lang
deleted file mode 100644
index 53edc04d8c4..00000000000
--- a/htdocs/langs/fr_CA/productbatch.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - productbatch
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
deleted file mode 100644
index 5213cec4e07..00000000000
--- a/htdocs/langs/fr_CA/suppliers.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
deleted file mode 100644
index f5e6f1a92eb..00000000000
--- a/htdocs/langs/fr_CA/trips.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
-NewTrip=New expense report
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
new file mode 100644
index 00000000000..1c53b65c99c
--- /dev/null
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - admin
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
diff --git a/htdocs/langs/fr_CH/bills.lang b/htdocs/langs/fr_CH/bills.lang
deleted file mode 100644
index 9dc2a1947cf..00000000000
--- a/htdocs/langs/fr_CH/bills.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - bills
-AlreadyPaidNoCreditNotesNoDeposits=Déjà réglé (hors notes de crédit et acomptes)
-ShowDiscount=Visualiser la note de crédit
-CreditNote=Note de crédit
-CreditNotes=Notes de crédit
-DiscountFromCreditNote=Remise issue de la note de crédit %s
-CreditNoteConvertedIntoDiscount=Cette note de crédit ou acompte a été converti en %s
-TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et %syymm-nnnn pour les notes de crédit où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index 6b54a4fde3e..2e691473326 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -2,20 +2,20 @@
 DIRECTION=ltr
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
-SeparatorDecimal=,
-SeparatorThousand=None
-FormatDateShort=%d-%m-%Y
-FormatDateShortInput=%d-%m-%Y
-FormatDateShortJava=dd-MM-yyyy
-FormatDateShortJavaInput=dd-MM-yyyy
-FormatDateShortJQuery=dd-mm-yy
-FormatDateShortJQueryInput=dd-mm-yy
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d-%m-%Y %H:%M
-FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index c931ab45d5b..70b6f62f2d2 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Séparateur de colonnes pour le fichier exporté
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Comptabilité
 Globalparameters=Paramètres globaux
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
-ACCOUNTING_BANK_JOURNAL=Journal de banque
-ACCOUNTING_CASH_JOURNAL=Journal de caisse
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Journal de paie
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de tranfert
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index e364c5c2961..b5679ba0b35 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -10,7 +10,7 @@ VersionUnknown=Inconnue
 VersionRecommanded=Recommandé
 FileCheck=Intégrité des fichiers
 FilesMissing=Fichiers manquants
-FilesUpdated=Mettre à jour les fichiers
+FilesUpdated=Fichiers modifiés
 FileCheckDolibarr=Vérifier l'intégrité des fichiers
 XmlNotFound=Fichier Xml d'intégrité de Dolibarr non trouvé
 SessionId=ID Session
@@ -149,7 +149,6 @@ MenuForUsers=Menu pour les utilisateurs
 LangFile=Fichier .lang
 System=Système
 SystemInfo=Infos Système
-SystemTools=Outils Système
 SystemToolsArea=Espace outils systèmes
 SystemToolsAreaDesc=Cet espace offre des fonctions d'administration diverses. Utilisez le menu pour choisir la fonctionnalité recherchée.
 Purge=Purger
@@ -232,8 +231,8 @@ Security=Sécurité
 Passwords=Mots de passe
 DoNotStoreClearPassword=Ne pas stocker de mots de passe en clair dans la base (Activation recommandée)
 MainDbPasswordFileConfEncrypted=Chiffrer le mot de passe de la base dans le fichier conf.php (Activation recommandée)
-InstrucToEncodePass=Pour chiffrer le mot de passe de la base dans le fichier de configuration <b>conf.php</b>, remplacer la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>par<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=Pour avoir le mot de passe de la base encodé dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>par<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection des PDF générés (Activation NON recommandée, rend inopérante la génération de PDF de masse)
 ProtectAndEncryptPdfFilesDesc=La protection d'un document PDF laisse le document libre à la lecture et à l'impression avec tout logiciel de lecture PDF. Par contre, la modification et la copie deviennent impossible. Notez que, de plus, l'utilisation de cette option empêche la génération de PDF cumulés (comme pour le PDF global des impayés).
 Feature=Fonction
@@ -269,7 +268,6 @@ MAIN_MAIL_EMAIL_FROM=Adresse email de l'émetteur pour l'envoi d'emails automati
 MAIN_MAIL_ERRORS_TO=Adresse email utilisée pour les retours d'erreurs des emails envoyés
 MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée des emails envoyés à
 MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Envoyer systématiquement une copie cachée des propositions envoyées par email à
-MAIN_MAIL_AUTOCOPY_ASKPRICESUPPLIER_TO= Envoyer systématiquement une copie cachée des demandes de prix envoyées par email à
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Envoyer systématiquement une copie cachée des commandes envoyées par emails à
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Envoyer systématiquement une copie cachée des factures envoyées par email à
 MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode test ou démos)
@@ -301,13 +299,13 @@ ThisIsProcessToFollow=Voici la procédure à suivre :
 ThisIsAlternativeProcessToFollow=Voici une procédure de configuration alternative 
 StepNb=Étape %s
 FindPackageFromWebSite=Recherche le paquet qui répond à votre besoin (par exemple sur le site web %s).
-DownloadPackageFromWebSite=Télécharger le package %s.
-UnpackPackageInDolibarrRoot=Décompresser le paquet dans le répertoire dédié aux modules externes : <b>%s</b>
+DownloadPackageFromWebSite=Télécharger le package (par exemple depuis le site web officiel %s)
+UnpackPackageInDolibarrRoot=Décompressez le fichier du package dans le répertoire du serveur Dolibarr dédié aux modules externes: <b>%s</b>
 SetupIsReadyForUse=L'installation est terminée et Dolibarr est prêt à être utilisé avec le nouveau composant.
 NotExistsDirect=Il n'y a pas répertoire alternatif.<br>
 InfDirAlt=Depuis la version 3, il est possible de définir un répertoire alternatif qui vous permet de stocker dans le même endroit les modules et thèmes personnalisés.<br>Il suffit de créer un répertoire à la racine de Dolibarr (par exemple : custom).<br>
 InfDirExample=<br>Ensuite, déclarer dans le fichier conf.php:<br> $dolibarr_main_url_root_alt='http://monserveur/custom'<br>$dolibarr_main_document_root_alt='/repertoire/de/dolibarr/htdocs/custom'<br>*Ces lignes sont commentées par "#". Pour les décommenter, il suffit de supprimer le caractère.
-YouCanSubmitFile=Sélectionner le module :
+YouCanSubmitFile=Pour cette étape, vous pouvez soumettre votre package en utilisant cet outil: Sélectionner le fichier du module
 CurrentVersion=Version actuelle de Dolibarr
 CallUpdatePage=Aller à la page de mise à jour de la structure et des données de la base : %s.
 LastStableVersion=Dernière version stable disponible
@@ -396,10 +394,10 @@ ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur<br><br> pa
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpsellist=La liste vient d'une table<br>Syntaxe: <br>nom_de_table:nom_de_champ:id_champ::filtre<br>Exemple : <br>c_typent:libelle:id::filter<br><br>filter peux être un test simple (exemple active=1 pour ne proposer que les valeur active)<br>si vous voulez faire un filtre sur des attributs supplémentaires, utilisez la syntax extra.champ=... (où champ est la code de l'attribut supplémentaire)<br><br>Pour que la liste soit dépendante d'une autre :<br>c_typent:libelle:id:code_liste_parent|colonne_parent:filter
-ExtrafieldParamHelpchkbxlst=Les cases à cocher viennent d'une table<br>Syntaxe: <br>nom_de_table:nom_de_champ:id_champ::filtre<br>Exemple : <br>c_typent:libelle:id::filter<br><br>filter peux être un test simple (exemple active=1 pour ne proposer que les valeur active)<br>si vous voulez faire un filtre sur des attributs supplémentaires, utilisez la syntax extra.champ=... (où champ est la code de l'attribut supplémentaire)<br><br>Pour que la liste soit dépendante d'une autre :<br>c_typent:libelle:id:code_liste_parent|colonne_parent:filter
+ExtrafieldParamHelpchkbxlst=La liste vient d'une table<br>Syntaxe: nom_de_table:nom_de_champ:id_champ::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>filter peux être un test simple (exemple active=1 pour ne proposer que les valeur active)<br>si vous voulez faire un filtre sur des attributs supplémentaires, utilisez la syntax extra.champ=... (où champ est la code de l'attribut supplémentaire)<br><br>Pour que la liste soit dépendante d'une autre :<br>c_typent:libelle:id:code_liste_parent|colonne_parent:filter
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
 WarningUsingFPDF=Attention : votre fichier <b>conf.php</b> contient la directive <b>dolibarr_pdf_force_fpdf=1</b>. Cela signifie que vous utilisez la librairie FPDF pour générer vos fichiers PDF. Cette librairie est ancienne et ne couvre pas de nombreuses fonctionnalités (Unicode, transparence des images, langues cyrilliques, arabes ou asiatiques...), aussi vous pouvez rencontrer des problèmes durant la génération des PDF.<br>Pour résoudre cela et avoir une prise en charge complète de PDF, vous pouvez télécharger la <a href="http://www.tcpdf.org/" target="_blank">bibliothèque TCPDF</a> puis commenter ou supprimer la ligne <b>$dolibarr_pdf_force_fpdf=1</b>, et ajouter à la place <b>$dolibarr_lib_TCPDF_PATH='chemin_vers_TCPDF'</b>
-LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant tva (la taxe locale est appliquée sur le montant + tva)<br>3 : taxe locale uniquement sur les produits hors tva (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant tva (la taxe locale est calculée sur le montant + tva)<br>5 : taxe locale uniquement sur les services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant tva (la taxe locale est calculée sur le montant + tva)
+LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant tva (la taxe locale est calculée sur le montant + tva)<br>3 : taxe locale uniquement sur les produits hors tva (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant tva (la taxe locale est calculée sur le montant + tva)<br>5 : taxe locale uniquement sur les services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant tva (la taxe locale est calculée sur le montant + tva)
 SMS=SMS
 LinkToTestClickToDial=Entrez un numéro de téléphone à appeler pour tester le lien d'appel « ClickToDial » pour l'utilisateur <strong>%s</strong>
 RefreshPhoneLink=Rafraichir lien
@@ -431,8 +429,8 @@ Module20Name=Propositions commerciales
 Module20Desc=Gestion des devis/propositions commerciales
 Module22Name=Emailing
 Module22Desc=Administration et envoi d'emails en masse
-Module23Name= Énergie
-Module23Desc= Suivi de la consommation des énergies
+Module23Name=Énergie
+Module23Desc=Suivi de la consommation des énergies
 Module25Name=Commandes clients
 Module25Desc=Gestion des commandes clients
 Module30Name=Factures et avoirs
@@ -493,8 +491,8 @@ Module400Name=Projets/Opportunités/Affaires
 Module400Desc=Gestion des projets, opportunités ou affaires. Vous pouvez ensuite assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis cette vue projet.
 Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
-Module500Name=Dépenses spéciales (taxes, charges, dividendes)
-Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes
+Module500Name=Dépenses spéciales
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaires
 Module510Desc=Gestion des paiements des salaires des employés
 Module520Name=Emprunt
@@ -503,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Envoi de notifications Email sur certains événements métiers Dolibarr, aux contacts de tiers (configuration réalisé sur chaque tiers)
 Module700Name=Dons
 Module700Desc=Gestion des dons
-Module770Name=Note de frais
+Module770Name=Expense reports
 Module770Desc=Gestion et déclaration des notes de frais (transports, repas, ...)
 Module1120Name=Propositions commerciales founisseurs
 Module1120Desc=Demander des devis et tarifs aux fournisseurs
@@ -525,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Gestion des actions (événements et tâches) et de l'agenda
 Module2500Name=Gestion électronique de documents
 Module2500Desc=Permet de stocker et administrer une base de documents
-Module2600Name=WebServices
-Module2600Desc=Active le serveur de Web Services de Dolibarr
+Module2600Name=Services API (Web services SOAP)
+Module2600Desc=Active le server SOAP Dolibarr fournissant des services API
+Module2610Name=Services API (Web services REST)
+Module2610Desc=Active le server REST Dolibarr fournissant des services API
 Module2650Name=WebServices (client)
 Module2650Desc=Activez les Web services client (Peut être utilisé pour pousser données/requêtes vers des serveurs externes. Commandes fournisseurs prises en charge seulement pour le moment)
 Module2700Name=Gravatar
@@ -579,7 +579,7 @@ Permission32=Créer/modifier les produits
 Permission34=Supprimer les produits
 Permission36=Voir/gérer les produits cachés
 Permission38=Exporter les produits
-Permission41=Consulter les projets et tâches (partagés ou dont je suis contact)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Créer/modifier les projets et tâches (partagés ou dont je suis contact)
 Permission44=Supprimer les projets et tâches (partagés ou dont je suis contact)
 Permission61=Consulter les interventions
@@ -600,10 +600,10 @@ Permission86=Envoyer les commandes clients
 Permission87=Clôturer les commandes clients
 Permission88=Annuler les commandes clients
 Permission89=Supprimer les commandes clients
-Permission91=Consulter les charges et la TVA
-Permission92=Créer/modifier les charges et la TVA
-Permission93=Supprimer les charges et la TVA
-Permission94=Exporter les charges
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Consulter CA, bilans et résultats
 Permission101=Consulter les expéditions
 Permission102=Créer/modifier les expéditions
@@ -621,9 +621,9 @@ Permission121=Consulter les tiers (sociétés) liés à l'utilisateur
 Permission122=Créer/modifier les tiers (sociétés) liés à l'utilisateur
 Permission125=Supprimer les tiers (sociétés) liés à l'utilisateur
 Permission126=Exporter les tiers (sociétés)
-Permission141=Consulter tous les projets et tâches (y compris privés dont je ne suis pas contact)
-Permission142=Créer/modifier tous les projets et tâches (y compris privés dont je ne suis pas contact)
-Permission144=Supprimer tous les projets et tâches (y compris privés dont je ne suis pas contact)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Consulter les fournisseurs
 Permission147=Consulter les stats
 Permission151=Consulter les prélèvements
@@ -718,14 +718,9 @@ Permission512=Créer/modifier les salaires
 Permission514=Supprimer les salaires
 Permission517=Exporter les salaires
 Permission520=Consulter les emprunts
-<<<<<<< HEAD
-Permission522=Créer/modifier les emprunts
-Permission524=Supprimer les emprunts
-=======
 Permission522=Créer/Modifier les emprunts
 Permission524=Supprimer les emprunts
 Permission525=Utiliser le calculateur d'emprunts
->>>>>>> refs/remotes/origin/3.7
 Permission527=Exporter les emprunts
 Permission531=Consulter les services
 Permission532=Créer/modifier les services
@@ -806,7 +801,7 @@ DictionaryCountry=Pays
 DictionaryCurrency=Monnaies
 DictionaryCivility=Titres de civilité
 DictionaryActions=Liste des types d'événements de l'agenda
-DictionarySocialContributions=Types de charges sociales
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Taux de TVA ou de Taxes de Ventes
 DictionaryRevenueStamp=Montants des timbres fiscaux
 DictionaryPaymentConditions=Conditions de règlement
@@ -823,6 +818,9 @@ DictionarySource=Origines des propales/commandes
 DictionaryAccountancyplan=Plan comptable
 DictionaryAccountancysystem=Modèles de plan comptable
 DictionaryEMailTemplates=Modèles des courriels
+DictionaryUnits=Unités
+DictionaryProspectStatus=Statuts de prospection
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Configuration sauvegardée
 BackToModuleList=Retour liste des modules
 BackToDictionaryList=Retour liste des dictionnaires
@@ -942,13 +940,14 @@ CompanyZip=Code postal
 CompanyTown=Ville
 CompanyCountry=Pays
 CompanyCurrency=Devise principale
+CompanyObject=L'objet de la société
 Logo=Logo
 DoNotShow=Ne pas afficher
 DoNotSuggestPaymentMode=Ne pas suggérer
 NoActiveBankAccountDefined=Aucun compte bancaire actif défini
 OwnerOfBankAccount=Propriétaire du compte %s
 BankModuleNotActive=Module comptes bancaires non activé
-ShowBugTrackLink=Afficher le lien "Signaler un défaut"
+ShowBugTrackLink=Afficher lien <strong>"%s"</strong>
 ShowWorkBoard=Affiche le tableau de bord de travail sur la page accueil
 Alerts=Alertes
 Delays=Délais
@@ -1015,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Nombre de décimales maximum pour les prix unitaires
 MAIN_MAX_DECIMALS_TOT=Nombre de décimales maximum pour les prix totaux
 MAIN_MAX_DECIMALS_SHOWN=Nombre de décimales maximum pour les montant affichés à l'écran (Mettre <b>...</b> après ce nombre max si vous voulez voir <b>...</b> quand le nombre est tronqué à l'affichage écran)
 MAIN_DISABLE_PDF_COMPRESSION=Utiliser la compression PDF pour les fichiers PDF générés.
-MAIN_ROUNDING_RULE_TOT= Taille du pas des arrondis (pour les très rares pays qui arrondissent sur une autre base que la base 10)
+MAIN_ROUNDING_RULE_TOT=Pas de la plage d'arrondi (pour les pays où l'arrondi se fait sur autre chose que la base 10. Par exemple, mettre 0,05 si l'arrondi se fait par pas de 0,05)
 UnitPriceOfProduct=Prix unitaire HT d'un produit
 TotalPriceAfterRounding=Prix total (HT/TVA/TTC) après arrondis
 ParameterActiveForNextInputOnly=Paramètre effectif pour les prochaines saisies uniquement
@@ -1083,7 +1082,7 @@ TotalNumberOfActivatedModules=Nombre total de modules fonctionnels activés: <b>
 YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
 ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
 YesInSummer=Oui en été
-OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles que soient les permissions de ces utilisateurs) :
+OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles qu'en soient les permissions de ces utilisateurs):
 SuhosinSessionEncrypt=Stockage des sessions chiffrées par Suhosin
 ConditionIsCurrently=La condition est actuellement %s
 YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuellement.
@@ -1390,12 +1389,14 @@ NumberOfProductShowInSelect=Nombre maximum de produits dans les listes déroulan
 ConfirmDeleteProductLineAbility=Confirmation de suppression d'une ligne produit dans les formulaires
 ModifyProductDescAbility=Personnalisation des descriptions produits dans les formulaires
 ViewProductDescInFormAbility=Visualisation des descriptions produits dans les formulaires (sinon en tant que bulle d'aide)
+MergePropalProductCard=Ajoute dans l'onglet Fichiers joints des produits/services, une option pour fusionner le document PDF du produit au PDF des propositions Azur si le produit/services est inclut dans la proposition.
 ViewProductDescInThirdpartyLanguageAbility=Visualisation des descriptions produits dans la langue du tiers
 UseSearchToSelectProductTooltip=Si vous avez un nombre important de produits (>100 000), vous pourrez améliorer les performances en positionnant la constante PRODUCT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 UseSearchToSelectProduct=Utilisez un champ avec auto-complétion pour choisir les produits (plutôt qu'une liste déroulante).
 UseEcoTaxeAbility=Prise en charge des éco-taxes (DEEE)
 SetDefaultBarcodeTypeProducts=Type de code-barre utilisé par défaut pour les produits
 SetDefaultBarcodeTypeThirdParties=Type de code-barre utilisé par défaut pour les tiers
+UseUnits=Support des unités
 ProductCodeChecker= Modèles de numérotation des produits / services
 ProductOtherConf= Paramètres des produits / services
 ##### Syslog #####
@@ -1426,6 +1427,8 @@ BarcodeDescUPC=code-barres de type UPC
 BarcodeDescISBN=code-barres de type ISBN
 BarcodeDescC39=code-barres de type C39
 BarcodeDescC128=code-barres de type C128
+BarcodeDescDATAMATRIX=Code barre de type Datamatrix
+BarcodeDescQRCODE=Code-barre de type QR code
 GenbarcodeLocation=Outil de génération de code-barres en ligne de commande (utilisé par le moteur interne pour certains types de codes-barres). Doit être compatible avec "genbarcode".<br>Par exemple: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Moteur interne
 BarCodeNumberManager=Gestionnaire pour la génération automatique de numéro de code-barre
@@ -1508,7 +1511,7 @@ ConfirmDeleteMenu=Êtes-vous sûr de vouloir supprimer l'entrée de menu <b>%s</
 DeleteLine=Suppression de ligne
 ConfirmDeleteLine=Êtes-vous sûr de vouloir effacer cette ligne ?
 ##### Tax #####
-TaxSetup=Configuration du module Taxes, charges sociales et dividendes
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Option d'exigibilité de TVA par défaut
 OptionVATDefault=Standard
 OptionVATDebitOption=Option services sur Débit
@@ -1558,6 +1561,15 @@ WebServicesSetup=Configuration du module Webservices
 WebServicesDesc=En activant ce module, Dolibarr devient aussi serveur de web services offrant des web services divers.
 WSDLCanBeDownloadedHere=Les descripteurs WSDL des services fournis peuvent être récupéré ici
 EndPointIs=Les clients SOAP doivent envoyer leur requêtes vers le point de sortie Dolibarr à l'URL
+##### API ####
+ApiSetup=Configuration du module API REST
+ApiDesc=En activant ce module, Dolibarr devient aussi serveur de services API de type REST
+KeyForApiAccess=Clé pour utiliser les API (paramètre "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=Vous pouvez accéder aux API par l'URL
+ApiExporerIs=Vous pouvez consulter la liste des API par l'URL
+OnlyActiveElementsAreExposed=Seuls les éléments en rapport avec un module actif sont présentés.
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Configuration du module Banque
 FreeLegalTextOnChequeReceipts=Mention complémentaire sur les bordereaux de remises de chèques
@@ -1587,6 +1599,7 @@ ProjectsSetup=Configuration du module Projets
 ProjectsModelModule=Modèles de document de rapport projets
 TasksNumberingModules=Modèles de numérotation des références tâches
 TaskModelModule=Modèles de document de rapport tâches
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Configuration du module GED
 ECMAutoTree = L'arborescence automatique est disponible
@@ -1600,7 +1613,7 @@ OpenFiscalYear=Ouvrir année fiscale
 CloseFiscalYear=Fermer année fiscale
 DeleteFiscalYear=Effacer année fiscale
 ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cette année fiscale ?
-Opened=Ouverte
+Opened=Ouvert
 Closed=Clôturé
 AlwaysEditable=Peut toujours être édité
 MAIN_APPLICATION_TITLE=Forcer la valeur visible du nom de l'application (attention : positionner ici son propre nom rendra inopérante la fonction de remplissage automatique de l'identifiant lorsque vous utilisez l'application mobile DoliDroid)
@@ -1628,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impo
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est uniquement une série de manipulations que seul un utilisateur ayant des droits privilégiés peut faire
 InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
 ConfFileMuseContainCustom=Installé un module externe pour l'application enregistre les fichiers de module dans le répertoire <strong>%s</strong>. Pour avoir ce répertoire vu par Dolibarr, vous devez configurer votre <strong>conf/conf.php</strong> d'avoir l'option <br> - <strong>$dolibarr_main_url_root_alt</strong> activé à la valeur <strong>$dolibarr_main_url_root_alt="/custom"</strong><br> - <strong>$dolibarr_main_document_root_alt</strong> activé à la valeur <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de la table lorsque la souris passe au-dessus
+PressF5AfterChangingThis=Appuyez sur F5 sur le clavier après avoir modifié cette valeur pour que le changement soit effectif
+NotSupportedByAllThemes=Fonctionne avec le thème eldy mais n'est pas pris en charge par tous les thèmes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 3290a930d37..bac4c0700ba 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Commande %s classée Facturée
 OrderApprovedInDolibarr=Commande %s approuvée
 OrderRefusedInDolibarr=Commande %s refusée
 OrderBackToDraftInDolibarr=Commande %s repassée en brouillon
-OrderCanceledInDolibarr=Commande %s annulée
 ProposalSentByEMail=Proposition commerciale %s envoyée par email
 OrderSentByEMail=Commande client %s envoyée par email
 InvoiceSentByEMail=Facture client %s envoyée par eMail
@@ -96,5 +95,5 @@ AddEvent=Créer un événement
 MyAvailability=Ma disponibilité
 ActionType=Type événement
 DateActionBegin=Date début événément
-CloneAction=Cloner événement
-ConfirmCloneAction=Êtes-vous sûr de vouloir cloner l'événement <b>%s</b> ?
\ No newline at end of file
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 2f25040691d..d928232d646 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -94,7 +94,7 @@ Conciliate=Rapprocher
 Conciliation=Rapprochement
 ConciliationForAccount=Rapprochements sur ce compte
 IncludeClosedAccount=Inclure comptes fermés
-OnlyOpenedAccount=Uniquement comptes ouverts
+OnlyOpenedAccount=Seulement les comptes ouverts
 AccountToCredit=Compte à créditer
 AccountToDebit=Compte à débiter
 DisableConciliation=Désactiver la fonction de rapprochement pour ce compte
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Règlement client
 CustomerInvoicePaymentBack=Remboursement client
 SupplierInvoicePayment=Règlement fournisseur
 WithdrawalPayment=Règlement bon de prélèvement
-SocialContributionPayment=Règlement charge sociale
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Journal de trésorerie du compte
 BankTransfer=Virement bancaire
 BankTransfers=Virements bancaire
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 1df8154d4ba..c05aaf7bb73 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb de factures
 NumberOfBillsByMonth=Nb de factures par mois
 AmountOfBills=Montant de factures
 AmountOfBillsByMonthHT=Montant de factures par mois (HT)
-ShowSocialContribution=Afficher charge sociale
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Afficher facture
 ShowInvoice=Afficher facture
 ShowInvoiceReplace=Afficher facture de remplacement
@@ -270,7 +270,7 @@ BillAddress=Adresse de facturation
 HelpEscompte=Un <b>escompte</b> est une remise accordée, sur une facture donnée, à un client car ce dernier a réalisé son règlement bien avant l'échéance.
 HelpAbandonBadCustomer=Ce montant a été abandonné (client jugé mauvais payeur) et est considéré comme une perte exceptionnelle.
 HelpAbandonOther=Ce montant a été abandonné car il s'agissait d'une erreur de facturation (saisie mauvais client, facture remplacée par une autre).
-IdSocialContribution=Id charge sociale
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Id paiement
 InvoiceId=Id facture
 InvoiceRef=Réf. facture
@@ -430,5 +430,5 @@ NotLastInCycle=Cette facture n'est pas la dernière dans le cycle et ne doit pas
 DisabledBecauseNotLastInCycle=Une facture de situation suivante existe
 DisabledBecauseFinal=Cette situation est la dernière
 CantBeLessThanMinPercent=La progression ne peut être inférieure à la valeur de progression du point de situation précédent
-NoSituations=Pas de point de situation ouvert
+NoSituations=Pas de situations ouvertes
 InvoiceSituationLast=Dernière facture
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 6894764e394..6211bf17b36 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Derniers contrats
 BoxLastContacts=Derniers contacts/adresses
 BoxLastMembers=Derniers adhérents modifiés
 BoxFicheInter=Dernières fiches d'intervention modifiées
-BoxCurrentAccounts=Soldes Comptes ouverts
+BoxCurrentAccounts=Balance des comptes ouverts
 BoxSalesTurnover=Chiffre d'affaires
 BoxTotalUnpaidCustomerBills=Total des factures clients impayées
 BoxTotalUnpaidSuppliersBills=Total des factures fournisseurs impayées
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Les %s derniers adhérents
 BoxTitleLastFicheInter=Les %s dernières fiche d'intervention modifiée
 BoxTitleOldestUnpaidCustomerBills=Les %s plus anciennes factures clients impayées
 BoxTitleOldestUnpaidSupplierBills=Les %s plus anciennes factures fournisseurs impayées
-BoxTitleCurrentAccounts=Soldes des comptes ouverts
+BoxTitleCurrentAccounts=Balances des comptes ouverts
 BoxTitleSalesTurnover=Le chiffre d'affaires réalisé
 BoxTitleTotalUnpaidCustomerBills=Factures clients impayées
 BoxTitleTotalUnpaidSuppliersBills=Factures fournisseurs impayées
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 65943bd8c2a..e921570c653 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible d'ajouter le(a) tag/catégorie
 ImpossibleAssociateCategory=Impossible d'associer le(a) tag/catégorie à
 WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à ce(tte) tag/catégorie
-CategorySuccessfullyCreated=Ce(tte) tag/catégorie %s a été ajouté avec succès
-ProductIsInCategories=Produit/service appartient aux tags/catégories suivant(e)s
-SupplierIsInCategories=Tiers appartient aux libellés/catégories fournisseurs suivant(e)s:
-CompanyIsInCustomersCategories=Ce tiers appartient aux tags/catégories de clients/prospects suivant(e)s
-CompanyIsInSuppliersCategories=Ce tiers appartient aux tags/catégories de fournisseurs suivant(e)s
-MemberIsInCategories=Ce membre appartient aux tags/catégories suivant(e)s
-ContactIsInCategories=Ce contact appartient aux tags/catégories suivant(e)s
+CategorySuccessfullyCreated=Ce tag/catégorie %s a été ajouté(e) avec succès
+ProductIsInCategories=Le produit/service a les tags/catégories suivant(e)s
+SupplierIsInCategories=Ce tiers a les tags/catégories fournisseurs suivant(e)s:
+CompanyIsInCustomersCategories=Ce tiers a les tags/catégories de clients/prospects suivant(e)s
+CompanyIsInSuppliersCategories=Ce tiers a les tags/catégories de fournisseurs suivant(e)s
+MemberIsInCategories=Ce membre a les tags/catégories suivant(e)s
+ContactIsInCategories=Ce contact a les tags/catégories suivant(e)s
 ProductHasNoCategory=Ce produit/service n'appartient à aucun(e) tag/catégorie
 SupplierHasNoCategory=Ce fournisseur n'appartient à aucun(e) tag/catégorie
-CompanyHasNoCategory=Ce tiers n'appartient à aucun tag/catégorie
+CompanyHasNoCategory=Ce tiers n'a aucun tag/catégorie
 MemberHasNoCategory=Ce membre n'appartient à aucun(e) tag/catégorie
 ContactHasNoCategory=Ce contact n'appartient à aucun(e) tag/catégorie
-ClassifyInCategory=Classer dans le(a) tag/catégorie
+ClassifyInCategory=Ajouter tag/catégorie
 NoneCategory=Aucune
 NotCategorized=Sans tag/catégorie
 CategoryExistsAtSameLevel=Ce tag existe déjà avec cette référence
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 689206b9a24..0d7013a03c1 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Contact tiers
 StatusContactValidated=État du contact
 Company=Société
 CompanyName=Raison sociale
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Sociétés
 CountryIsInEEC=Pays de la Communauté Économique Européenne
 ThirdPartyName=Nom du tiers
@@ -410,5 +411,10 @@ OutstandingBillReached=Montant encours autorisé dépassé
 MonkeyNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn pour les codes clients et %syymm-nnnn pour les codes fournisseurs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
 LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment.
 ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...)
-SearchThirdparty=Rechercher tiers
+SearchThirdparty=Sélectionner tiers
 SearchContact=Rechercher contact
+MergeOriginThirdparty=Tiers en doublon (le tiers que vous voulez supprimer)
+MergeThirdparties=Fursion de tiers
+ConfirmMergeThirdparties=Etes-vous sûr que vous voulez fusionner ce tiers dans l'actuel ? Tous les objets liés (factures, commandes, ...) seront déplacés sur le tiers en cours de sorte que vous serez en mesure de supprimer le doublon.
+ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
+ErrorThirdpartiesMerge=Il y a eu une erreur lors de la suppression du tiers. Aucune modification n'a été enregistrée.
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 544cf775e70..0375895b966 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -56,23 +56,23 @@ VATCollected=TVA récupérée
 ToPay=A payer
 ToGet=À rembourser
 SpecialExpensesArea=Espace des paiements particuliers
-TaxAndDividendsArea=Espace taxes, charges sociales et dividendes
-SocialContribution=Charge sociale
-SocialContributions=Charges sociales
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Dépenses spéciales
 MenuTaxAndDividends=Taxes et charges
 MenuSalaries=Salaires
-MenuSocialContributions=Charges sociales
-MenuNewSocialContribution=Nouvelle charge
-NewSocialContribution=Nouvelle charge sociale
-ContributionsToPay=Charges à payer
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Espace comptabilité/trésorerie
 AccountancySetup=Configuration compta
 NewPayment=Nouveau règlement
 Payments=Règlements
 PaymentCustomerInvoice=Règlement facture client
 PaymentSupplierInvoice=Règlement facture fournisseur
-PaymentSocialContribution=Règlement charge sociale
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Règlement TVA
 PaymentSalary=Paiement Salaire
 ListPayment=Liste des règlements
@@ -91,7 +91,7 @@ LT1PaymentES=Règlement RE
 LT1PaymentsES=Règlements RE
 VATPayment=Règlement TVA
 VATPayments=Règlements TVA
-SocialContributionsPayments=Règlements charges sociales
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Affiche paiement TVA
 TotalToPay=Total à payer
 TotalVATReceived=Total TVA perçue
@@ -116,11 +116,11 @@ NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s
 NoWaitingChecks=Pas de chèque en attente de dépôt.
 DateChequeReceived=Date réception chèque
 NbOfCheques=Nb de chèques
-PaySocialContribution=Payer une charge sociale
-ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale à payée ?
-DeleteSocialContribution=Effacer charge sociale
-ConfirmDeleteSocialContribution=Êtes-vous sûr de vouloir supprimer cette charge sociale ?
-ExportDataset_tax_1=Charges sociales et paiements
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sTVA sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%sTVA sur encaissement%s</b>.
 CalcModeDebt=Mode <b>%sCréances-Dettes%s</b> dit <b>comptabilité d'engagement</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse
 TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaires par produit, dans une comptabilité en mode <b>comptabilité de caisse</b> n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit <b>comptabilité d'engagement</b> (voir la configuration du module de comptabilité).
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptabilité
-ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients
 ACCOUNTING_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs
-CloneTax=Cloner une charge sociale
-ConfirmCloneTax=Confirmer le clonage de la charge sociale
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Cloner pour le mois suivant
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index b009c0b54d6..3983628a569 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -4,10 +4,10 @@ About = À propos
 CronAbout = À propos de Cron
 CronAboutPage = Page à propos de Cron
 # Right
-Permission23101 = Voir les travaux planifiés
-Permission23102 = Créer/modifier des travaux planifiés
-Permission23103 = Supprimer un travail planifiée
-Permission23104 = Lancer un travail planifié
+Permission23101 = Voir les tâches planifiées
+Permission23102 = Créer/Modifier des tâches planifiées
+Permission23103 = Supprimer une tâche planifiée
+Permission23104 = Exécuter une tâche planifiée
 # Admin
 CronSetup= Page de configuration du module - Gestion des travaux programmés
 URLToLaunchCronJobs=URL pour vérifier et lancer les travaux programmés actifs
@@ -26,14 +26,14 @@ CronLastOutput=Sortie du dernier lancement
 CronLastResult=Dernier code de retour
 CronListOfCronJobs=Liste des travaux planifiés
 CronCommand=Commande
-CronList=Travaux planifiées
+CronList=Travaux planifiés
 CronDelete=Effacer les travaux planifiés
-CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ce travail planifié ?
+CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ces travaux planifiées?
 CronExecute=Lancer les travaux planifiés
-CronConfirmExecute=Êtes-vous sûr de vouloir exécuter ce travail planifié maintenant?
+CronConfirmExecute=Etes-vous sûr que vous voulez exécuter ces travaux planifiées maintenant?
 CronInfo=Le module des travaux planifiés permet d'exécuter des opérations qui ont été programmées
 CronWaitingJobs=Travaux en attente
-CronTask=Tâche
+CronTask=Travail planifié
 CronNone=Aucun(e)
 CronDtStart=Date de début
 CronDtEnd=Date de fin
@@ -52,12 +52,12 @@ CronPriority=Priorité
 CronLabel=Description
 CronNbRun=Nb. exec.
 CronEach=Tous les
-JobFinished=Tâche lancée et terminée
+JobFinished=Travail lancé et terminé
 #Page card
 CronAdd= Ajoutez des travaux
-CronHourStart= Jour et heure de début de la tâche
-CronEvery= Puis exécution toutes les
-CronObject= Instance/objet à créer
+CronHourStart= Date et heure de démarrage de la tâche 
+CronEvery=Exécuter chaque tâche
+CronObject=Instance/objet à créer
 CronArgs=Paramètres
 CronSaveSucess=Enregistrement effectué
 CronNote=Commentaire
@@ -76,13 +76,14 @@ CronMethodHelp=La méthode à lancer. <BR> Par exemple pour appeler la méthode
 CronArgsHelp=Les arguments de la méthode. <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur des arguments pourrait être <i>0, RefProduit</i>
 CronCommandHelp=La commande système a exécuter.
 CronCreateJob=Créer un nouveau travail planifié
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Type de tâche
+CronType=Type de travail planifié
 CronType_method=Méthode d'appel d'une classe Dolibarr
 CronType_command=Commande terminal
 CronMenu=Cron
 CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s
 UseMenuModuleToolsToAddCronJobs=Aller dans le menu "Accueil - Outils modules - Liste des travaux" pour voir et éditer les travaux planifiés.
-TaskDisabled=Tâche désactivée
+TaskDisabled=Travail non programmé
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 52bf048b551..59191d64432 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Recherche par objet
 ECMSectionOfDocuments=Répertoires des documents
 ECMTypeManual=Manuel
 ECMTypeAuto=Automatique
-ECMDocsBySocialContributions=Documents associés à des charges sociales
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents associés aux tiers
 ECMDocsByProposals=Documents associés aux propositions
 ECMDocsByOrders=Documents associés aux commandes
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 0ae2f924c69..968f97c4e6f 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=Le client SOAP a échoué avec l'erreur '%s'
 ErrorGlobalVariableUpdater5=Pas de variable globale
 ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être un numérique
 ErrorFieldMustBeAnInteger=Le champ <b>%s</b> doit être un numérique
+ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fournis
 
 # Warnings
 WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
@@ -190,3 +191,4 @@ WarningNotRelevant=Opération non pertinente pour cet ensemble de données
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivé quand l'affichage est en mode optimisé pour les personnes aveugles ou les navigateurs textes.
 WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturation (%s) de la facture %s.
 WarningTooManyDataPleaseUseMoreFilters=Trop de données. Utilisez des filtres plus précis.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 30595470a20..2a0f120529d 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -3,7 +3,7 @@ HRM=GRH
 Holidays=Congés
 CPTitreMenu=Congés
 MenuReportMonth=État mensuel
-MenuAddCP=Créer demande de congés
+MenuAddCP=New leave request
 NotActiveModCP=Vous devez activer le module Congés pour afficher cette page.
 NotConfigModCP=Vous devez configurer le module Congés pour afficher cette page. Pour effectuer cette opération, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">cliquer ici</a>.
 NoCPforUser=Vous n'avez plus de jours disponibles
@@ -71,7 +71,7 @@ MotifCP=Motif
 UserCP=Utilisateur
 ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel.
 AddEventToUserOkCP=L'ajout du congé exceptionnel à bien été effectué.
-MenuLogCP=Voir journal des demandes
+MenuLogCP=View change logs
 LogCP=Historique de la mise à jours de jours de congés disponibles
 ActionByCP=Réalisée par
 UserUpdateCP=Pour l'utilisateur
@@ -93,6 +93,7 @@ ValueOptionCP=Valeur
 GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés
 ConfirmConfigCP=Valider la configuration
 LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Mise à jour effectuée avec succès.
 ErrorUpdateConfCP=Une erreur à eu lieu durant la mise à jour, merci de réessayer.
 AddCPforUsers=Veuillez ajouter le solde des congés des utilisateurs en <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cliquant ici</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Une erreur est survenue lors de l'envoi de l'email :
 NoCPforMonth=Aucun congé ce mois-ci.
 nbJours=Nombre jours
 TitleAdminCP=Configuration du module congés
+NoticePeriod=Notice period
 #Messages
 Hello=Bonjour
 HolidaysToValidate=Valider les demandes de congés
@@ -139,10 +141,11 @@ HolidaysRefused=Accès refusé
 HolidaysRefusedBody=Votre demande de congés payés %s à %s vient d'être refusée pour le motif suivant :
 HolidaysCanceled=Abandonner la demande de congés
 HolidaysCanceledBody=Votre demande de congés du %s au %s a été annulée.
-Permission20000=Lire ses propres demandes de congés
-Permission20001=Créer/modifier une demande de congés
-Permission20002=Créer/modifier les congés pour tout le monde
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Supprimer la demande de Congés
-Permission20004=Configuration des jours disponibles
-Permission20005=Voir l'historique des demandes de congés
-Permission20006=Accéder au rapport mensuel des congés
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/fr_FR/incoterm.lang b/htdocs/langs/fr_FR/incoterm.lang
index 5706403aec3..7a78eee849d 100644
--- a/htdocs/langs/fr_FR/incoterm.lang
+++ b/htdocs/langs/fr_FR/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=incoterm
-Module210009Desc=Ajouts pour incoterm
+Module62000Name=Incoterm
+Module62000Desc=Ajouts de fonctionnalités pour gérer les incoterms
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Fonction
 IncotermSetupTitle2=État
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 5cfb51fa42c..afcbbb093c6 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Serveur de base de données - Accès super utilisateur
 CheckToCreateDatabase=Cochez cette option si la base de données n'existe pas et doit être créée.<br>Dans ce cas, il faut renseigner identifiant et mot de passe du super-utilisateur au bas de cette page.
 CheckToCreateUser=Cochez cette option si l'utilisateur propriétaire n'existe pas et doit être créé.<br>Dans ce cas, il faut renseigner l'identifiant et mot de passe du propriétaire à créer ainsi que l'identifiant et mot de passe du super-utilisateur au bas de cette page. Si la case n'est pas cochée, l'identifiant et le mot de passe du propriétaire doivent exister.
 Experimental=(expérimental)
+Deprecated=(Obsolète)
 DatabaseRootLoginDescription=Identifiant de l'utilisateur de la base ayant les droits de création de bases de données ou de comptes pour la base, requis si la base ou son propriétaire n'existent pas déjà et doivent être créés.
 KeepEmptyIfNoPassword=Laissez vide si l'administrateur n'a pas de mot de passe
 SaveConfigurationFile=Enregistrement du fichier de configuration
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 4a90977022c..985013d1288 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabe
 Language_ar_SA=Arabe
+Language_bn_BD=Bengalais
 Language_bg_BG=Bulgare
 Language_bs_BA=Bosniaque
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=Anglais (Arabie Saoudite)
 Language_en_US=Anglais (Etats-Unis)
 Language_en_ZA=Anglais (Afrique du Sud)
 Language_es_ES=Espagnol
-Language_es_DO=Espagnol (République dominicaine)
 Language_es_AR=Espagnol (Argentine)
 Language_es_CL=Espagnol (Chili)
+Language_es_CO=Espagnol (Colombie)
+Language_es_DO=Espagnol (République dominicaine)
 Language_es_HN=Espagnol (Honduras)
 Language_es_MX=Espagnol (Mexique)
 Language_es_PY=Espagnol (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonésien
 Language_is_IS=Islandais
 Language_it_IT=Italien
 Language_ja_JP=Japonais
+Language_ka_GE=Géorgien
+Language_kn_IN=Kannada
 Language_ko_KR=Corée
+Language_lo_LA=Laotien
 Language_lt_LT=Lituanien
 Language_lv_LV=Léton
 Language_mk_MK=Macédonien
@@ -64,6 +69,7 @@ Language_sv_SV=Suédois
 Language_sv_SE=Suédois
 Language_sq_AL=Albanais
 Language_sk_SK=Slovaque
+Language_sw_SW=Kiswahili
 Language_th_TH=Thaï
 Language_uk_UA=Ukrainien
 Language_uz_UZ=Ouzbek
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index 0a5c6320d5b..5ec36422cf7 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -2,23 +2,52 @@
 Loan=Emprunt
 Loans=Emprunts
 NewLoan=Nouvel emprunt
-ShowLoan=Voir emprunt
-PaymentLoan=Règlement d'emprunt
+ShowLoan=Montrer emprunt
+PaymentLoan=Paiement emprunt
+ShowLoanPayment=Montrer paiement de l'emprunt
 Capital=Capital
 Insurance=Assurance
 Interest=Intérêt
-Nbterms=Nombre d'échéances
+Nbterms=Nombre de termes
 LoanAccountancyCapitalCode=Compte comptable capital
 LoanAccountancyInsuranceCode=Compte comptable assurance
-LoanAccountancyInterestCode=Compte comptable intérêts
-LoanPayment=Règlement emprunt
-ConfirmDeleteLoan=Confirmation de supression de cet emprunt
-ConfirmPayLoan=Confirmation que cet emprunt est classé comme payé
-ErrorLoanCapital=<font color=red>Le capital de l'emprunt</font> doit être au format numérique et supérieur à zéro.
-ErrorLoanLength=<font color=red>La durée de l'emprunt</font> doit être au format numérique et supérieur à zéro.
-ErrorLoanInterest=<font color=red>Les intérêts d'emprunt</font> doivent être au format numérique et supérieur à zéro.
+LoanAccountancyInterestCode=Compte comptable intérêt
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirmer la suppression de cet emprunt ?
+LoanDeleted=Emprunt supprimé avec succès
+ConfirmPayLoan=Classer cet emprunt comme payé
+LoanPaid=Emprunt payé
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
 # Admin
-ConfigLoan=Configuration du module emprunt
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable capital par défaut
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable intérêts par défaut
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable assurance par défaut
\ No newline at end of file
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 403b09310c6..d3b95a7abf8 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -128,6 +128,7 @@ TagCheckMail=Suivre l'ouverture de l'email
 TagUnsubscribe=Lien de désinscription
 TagSignature=Signature utilisateur émetteur
 TagMailtoEmail=Email destinataire
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=Aucune notification par email n'est prévue pour cet événement et société
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index fe465c31883..d78cb66c684 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Des erreurs ont été trouvées. On rollba
 ErrorConfigParameterNotDefined=Le paramètre <b>%s</b> n'est pas défini dans le fichier de configuration Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossible de trouver l'utilisateur <b>%s</b> dans la base Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux tva défini pour le pays '%s'.
-ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué.
 SetDate=Définir date
 SelectDate=Sélectionnez une date
@@ -301,8 +301,8 @@ UnitPriceHT=Prix unitaire HT
 UnitPriceTTC=Prix unitaire TTC
 PriceU=P.U.
 PriceUHT=P.U. HT
-AskPriceSupplierUHT=P.U. HT. demandé
-PriceUTTC=P.U. TTC
+AskPriceSupplierUHT=Prix unitaire net requis
+PriceUTTC=U.P. (inc. tax)
 Amount=Montant
 AmountInvoice=Montant facture
 AmountPayment=Montant paiement
@@ -339,6 +339,7 @@ IncludedVAT=Dont TVA
 HT=HT
 TTC=TTC
 VAT=TVA
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Taux TVA
@@ -413,6 +414,8 @@ Qty=Qté
 ChangedBy=Modifié par
 ApprovedBy=Approuvé par
 ApprovedBy2=Approuvé par (deuxième approbation)
+Approved=Approuvé
+Refused=Refusé
 ReCalculate=Recalculer
 ResultOk=Succès
 ResultKo=Échec
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Liés à un contact utilisateur particulier
 DeleteAFile=Suppression de fichier
 ConfirmDeleteAFile=Confirmez-vous la suppression du fichier
 NoResults=Aucun résultat
+SystemTools=Outils système
 ModulesSystemTools=Outils Modules
 Test=Test
 Element=Élément
@@ -703,6 +707,9 @@ ShowTransaction=Afficher transaction
 GoIntoSetupToChangeLogo=Allez dans Accueil - Configuration - Société/institution pour changer le  logo ou aller dans Accueil - Configuration - Affichage pour le cacher.
 Deny=Refuser
 Denied=Refusé
+ListOfTemplates=Liste des modèles
+Genderman=Homme
+Genderwoman=Femme
 # Week day
 Monday=Lundi
 Tuesday=Mardi
@@ -732,3 +739,4 @@ ShortThursday=J
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
+SelectMailModel=Sélectionner un modèle de courriels
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index c04ae00f474..f74a0f028a2 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -199,7 +199,8 @@ Entreprises=Entreprises
 DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consultez la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquez sur le bouton au bas de cette page.<br>
 ByProperties=Par caractéristiques
 MembersStatisticsByProperties=Statistiques des adhérents par caractéristiques
-MembersByNature=Adhérents par nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Taux de TVA pour les adhésions
 NoVatOnSubscription=Pas de TVA sur les adhésions
 MEMBER_PAYONLINE_SENDEMAIL=Email à avertir en cas de retour de paiement validé pour une cotisation
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 7be9c72e53a..7a80eeb68a9 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -18,10 +18,10 @@ SuppliersOrdersRunning=Commandes fournisseurs en cours
 CustomerOrder=Commande client
 CustomersOrders=Commandes clients
 CustomersOrdersRunning=Commandes clients en cours
-CustomersOrdersAndOrdersLines=Commandes clients et lignes de commandes
-OrdersToValid=Commandes clients à valider
-OrdersToBill=Commandes clients traitées
-OrdersInProcess=Commandes clients en cours
+CustomersOrdersAndOrdersLines=Commandes clients et ligne de commandes
+OrdersToValid=Commandes client à valider
+OrdersToBill=Commandes clients à délivrer
+OrdersInProcess=Commandes clients en traitement
 OrdersToProcess=Commandes clients à traiter
 SuppliersOrdersToProcess=Commandes fournisseurs à traiter
 StatusOrderCanceledShort=Annulée
@@ -75,8 +75,9 @@ AddToMyOrders=Ajouter à mes commandes
 AddToOtherOrders=Ajouter aux autres commandes
 AddToDraftOrders=Ajouter à commande brouillon
 ShowOrder=Afficher commande
+OrdersOpened=Commandes à traiter
 NoOpenedOrders=Pas de commande ouvertes
-NoOtherOpenedOrders=Pas d'autre commandes ouvertes
+NoOtherOpenedOrders=Pas d'autres commande ouvertes
 NoDraftOrders=Pas de commandes brouillons
 OtherOrders=Autres commandes
 LastOrders=Les %s dernières commandes clients
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 84973f468e4..9c63ec04665 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -204,6 +204,7 @@ ClickHereToGoTo=Cliquez ici pour aller sur %s
 YouMustClickToChange=Vous devez toutefois auparavant cliquer sur le lien suivant, afin de valider ce changement de mot de passe
 ForgetIfNothing=Si vous n'êtes pas à l'origine de cette demande, ignorez simplement ce message. Vos identifiants restent sécurisés.
 IfAmountHigherThan=Si le montant est supérieur à <strong>%s</strong>
+SourcesRepository=Répertoire pour les sources
 
 ##### Calendar common #####
 AddCalendarEntry=Ajouter entrée dans le calendrier %s
diff --git a/htdocs/langs/fr_FR/printing.lang b/htdocs/langs/fr_FR/printing.lang
index b65b22a5659..083e259d8ef 100644
--- a/htdocs/langs/fr_FR/printing.lang
+++ b/htdocs/langs/fr_FR/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Impressions Directe
-Module112000Desc=Activer le système d'impression Directe
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Réglages du module Impression Directe
 PrintingDesc=Ce module ajoute un bouton Imprimer afin d'envoyer directement les documents à une imprimante (sans ouvrir le document dans une application).
 ModuleDriverSetup=Configuration des drivers impression
@@ -18,7 +18,7 @@ PRINTGCP=Impression Google Cloud Print
 PrintGCPDesc=Ce driver permet d'envoyer des documents directement à l'imprimante via Google Cloud Print
 PrintingDriverDescprintgcp=Paramètres de configuration pour l'impression Google Cloud Print
 PrintTestDescprintgcp=Liste des imprimantes pour Google Cloud Print
-PRINTGCP_LOGIN=Compte login google
+PRINTGCP_LOGIN=Identifiant Compte Google
 PRINTGCP_PASSWORD=Mot de passe compte Google
 STATE_ONLINE=En ligne
 STATE_UNKNOWN=Inconnu
@@ -46,10 +46,9 @@ PrintTestDescprintipp=Liste des imprimantes du driver PrintIPP
 PRINTIPP_ENABLED=Afficher l'icône « Impression directe » dans les listes de documents
 PRINTIPP_HOST=Serveur d'impression
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
+PRINTIPP_USER=Identifiant
 PRINTIPP_PASSWORD=Mot de passe
 NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration CUPS)
-FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante
 NoDefaultPrinterDefined=Il n'y a pas d'imprimante définie par défaut
 DefaultPrinter=Imprimante par défaut
 Printer=Imprimante
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index d2e004231ac..9427500524e 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qté: %d
 AddDispatchBatchLine=Ajouter une ligne pour la répartition par durée de conservation
 BatchDefaultNumber=Non défini
 WhenProductBatchModuleOnOptionAreForced=Quand le module Lot/Série est activé, le mode incrémentation/décrémentation des stocks est forcé sur le dernier choix et ne peut pas être édité. D'autres options peuvent être définies comme vous le voulez.
-ProductDoesNotUseBatchSerial=Ce produit n'utilise pas les numéros de lots/série
+ProductDoesNotUseBatchSerial=Ce produit n'utilise pas les numéros de lot/série
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 0c14a9a44c3..b1bb18289cc 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produit ou Service
 ProductsAndServices=Produits et Services
 ProductsOrServices=Produits ou Services
 ProductsAndServicesOnSell=Produits et Services en vente ou en achat
-ProductsAndServicesNotOnSell=Produits et Services hors vente
+ProductsAndServicesNotOnSell=Produits et services non en vente
 ProductsAndServicesStatistics=Statistiques produits et services
 ProductsStatistics=Statistiques produits
-ProductsOnSell=Produits actifs, en vente ou en achat
-ProductsNotOnSell=Produits hors vente et hors achat
+ProductsOnSell=Produit en vente ou en achat
+ProductsNotOnSell=Produit hors vente et hors achat
 ProductsOnSellAndOnBuy=Produits en vente et en achat
 ServicesOnSell=Services en vente ou en achat
-ServicesNotOnSell=Services hors vente
+ServicesNotOnSell=Service hors vente
 ServicesOnSellAndOnBuy=Services en vente et en achat
 InternalRef=Référence interne
 LastRecorded=Derniers produits/services en vente enregistrés
@@ -77,11 +77,11 @@ MinPriceTTC=Prix de vente min. (TTC)
 CantBeLessThanMinPrice=Le prix de vente ne doit pas être inférieur au minimum pour ce produit (%s HT). Ce message peut aussi être provoqué par une remise trop importante.
 ContractStatus=État du contrat
 ContractStatusClosed=Clôturé
-ContractStatusRunning=En service
+ContractStatusRunning=En cours
 ContractStatusExpired=expiré
-ContractStatusOnHold=Hors service
+ContractStatusOnHold=Suspendu
 ContractStatusToRun=A activer
-ContractNotRunning=Ce contrat n'est pas en service
+ContractNotRunning=Ce contrat n'est pas actif
 ErrorProductAlreadyExists=Un produit avec la référence %s existe déjà.
 ErrorProductBadRefOrLabel=La valeur de la référence ou du libellé est incorrecte.
 ErrorProductClone=Il y a eu un problème lors de la tentative de clonage du produit ou du service.
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Si produit de type service à durée limitée :
 MultiPricesAbility=Plusieurs niveaux de prix par produit/service
 MultiPricesNumPrices=Nombre de prix
 MultiPriceLevelsName=Catégorie de prix
-AssociatedProductsAbility=Prise en charge des produits virtuels/packs
+AssociatedProductsAbility=Pris en charge des packages
 AssociatedProducts=Produit virtuel/package
-AssociatedProductsNumber=Nbre de sous-produits constituant ce produit virtuel/package
+AssociatedProductsNumber=Nombre de produits packages composant ce package
 ParentProductsNumber=Nbre de produits virtuels/packages parent
-IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un produit virtuel/package
-IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est pas utilisé par un produit virtuel/package
+IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas utilisé par un produit package
+IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est pas un produit package
 EditAssociate=Composer comme produit virtuel
 Translation=Traduction
 KeywordFilter=Filtre par mot-clé
@@ -131,7 +131,7 @@ ProductToAddSearch=Recherche des produits à ajouter
 AddDel=Ajouter/Retirer
 Quantity=Quantité
 NoMatchFound=Aucun résultat n'a été trouvé
-ProductAssociationList=Liste des produits/services composant ce produit virtuel: Le nombre entre parenthèse est la quantité affectée dans cette composition.
+ProductAssociationList=Liste des produits/services constituant ce produit package
 ProductParentList=Liste des produits/services virtuels/packages avec ce produit comme composante
 ErrorAssociationIsFatherOfThis=L'un des produits sélectionnés est parent du produit en cours
 DeleteProduct=Supprimer un produit/service
@@ -179,16 +179,41 @@ CloneProduct=Cloner produit/service
 ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner le produit ou service <b>%s</b> ?
 CloneContentProduct=Cloner les informations générales du produit/service
 ClonePricesProduct=Cloner les informations générales et les prix
-CloneCompositionProduct=Cloner les produits/services composant ce produit
+CloneCompositionProduct=Cloner le produits packagés
 ProductIsUsed=Ce produit est utilisé
 NewRefForClone=Réf. du nouveau produit/service
 CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
-SuppliersPricesOfProductsOrServices=Prix fournisseurs (de produits ou services)
+SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
 CustomCode=Code douane
 CountryOrigin=Pays d'origine
 HiddenIntoCombo=Caché dans les listes
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Masque pour les produits
 ServiceCodeModel=Masque pour les services
 AddThisProductCard=Créer fiche produit
@@ -214,7 +239,7 @@ CostPmpHT=Cout à l'achat HT
 ProductUsedForBuild=Consommé automatiquement par la fabrication
 ProductBuilded=Fabrication terminée
 ProductsMultiPrice=Produits multi-prix
-ProductsOrServiceMultiPrice=Prix clients (des produits ou services, mode multi-prix)
+ProductsOrServiceMultiPrice=Prix clients (des produits ou services, multi-prix)
 ProductSellByQuarterHT=Chiffre d'affaire des produits par trimestre
 ServiceSellByQuarterHT=Chiffre d'affaire des services par trimestre
 Quarter1=1er trimestre
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Définir la valeur de code-barres pour tous les enregi
 PriceByCustomer=Prix différents pour chaque client
 PriceCatalogue=Un seul prix unique par produit/service
 PricingRule=Règles pour les prix clients
-AddCustomerPrice=Ajouter prix par clients
+AddCustomerPrice=Ajouter prix par client
 ForceUpdateChildPriceSoc=Définir le même prix sur les filiales des clients
 PriceByCustomerLog=Trace des prix par clients
-MinimumPriceLimit=Le prix minimum ne peut être inférieur à %s
+MinimumPriceLimit=Le prix ​​minimum ne peut pas être inférieure à %s
 MinimumRecommendedPrice=Prix minimum recommandé : %s
 PriceExpressionEditor=Éditeur d'expression de prix
 PriceExpressionSelected=Expression de prix sélectionnée
@@ -267,3 +292,8 @@ GlobalVariableUpdaterHelpFormat1=Le format est {"URL": "http://example.com/urlof
 UpdateInterval=Intervale de mise à jour (minutes)
 LastUpdated=Dernière mise à jour
 CorrectlyUpdated=Mise à jour avec succès
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+DefaultUnitToShow=Default unit to show
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 3aea8365f9e..b04f53809a1 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes
 ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
 MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
-OnlyOpenedProject=Seules les projets ouverts sont visibles (les projets avec le statut brouillon et fermé ne sont pas affichés)
+OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
 TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
-AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches de ce projet sont visibles, mais vous pouvez entrer le temps seulement pour une tâche à laquelle vous êtes affecté.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Espace projet
 NewProject=Nouveau projet
 AddProject=Créer projet
@@ -29,7 +30,7 @@ ProjectsList=Liste des projets
 ShowProject=Afficher projet
 SetProject=Définir projet
 NoProject=Aucun projet défini ou responsable
-NbOpenTasks=Nb Tâches Ouvertes
+NbOpenTasks=Nb de tâches ouvertes
 NbOfProjects=Nombre de projets
 TimeSpent=Temps consommé
 TimeSpentByYou=Temps consommé par vous
@@ -41,7 +42,7 @@ TaskTimeSpent=Temps consommé sur les tâches
 TaskTimeUser=Utilisateur
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tâches sur projets ouverts
+TasksOnOpenedProject=Tâches sur les projets ouverts
 WorkloadNotDefined=Charge de travail non définie
 NewTimeSpent=Nouveau consommé
 MyTimeSpent=Mon consommé
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Liste des interventions associées au projet
 ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
 ListDonationsAssociatedProject=Liste des dons associés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
+ListTaskTimeUserProject=Liste du temps consommé sur les tâches d'un projet
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activité sur les projets cette semaine
 ActivityOnProjectThisMonth=Activité sur les projets ce mois
 ActivityOnProjectThisYear=Activité sur les projets cette année
@@ -95,7 +98,7 @@ DeleteATimeSpent=Suppression du temps consommé
 ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ?
 DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées
 ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées
-TaskRessourceLinks=Affectation ressources
+TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
 NoTasks=Aucune tâche pour ce projet
 LinkedToAnotherCompany=Liés à autre société
@@ -139,8 +142,15 @@ ProjectReferers=Objets associés
 SearchAProject=Rechercher un projet
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
 ProjectDraft=Projets brouillons
-FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps
+FirstAddRessourceToAllocateTime=Associer d'abord la ressource pour pouvoir saisir du temps
 InputPerDay=Saisie par jour
 InputPerWeek=Saisie par semaine
 InputPerAction=Saisie par action
 TimeAlreadyRecorded=Temps consommé déjà enregistré pour cette tâche/jour et utilisateur %s
+ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
+TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
+ResourceNotAssignedToProject=Non assigné à un projet
+ResourceNotAssignedToTask=Non assigné à une tâche
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index e8a47528202..35f2a7c7d2f 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Montant par mois (HT)
 NbOfProposals=Nombre de propositions commerciales
 ShowPropal=Afficher proposition
 PropalsDraft=Brouillons
-PropalsOpened=Ouvertes
+PropalsOpened=En cours
 PropalsNotBilled=Non facturées
 PropalStatusDraft=Brouillon (à valider)
 PropalStatusValidated=Validée (proposition ouverte)
@@ -51,8 +51,8 @@ PropalsToClose=Propositions commerciales à fermer
 PropalsToBill=Propositions commerciales signées à facturer
 ListOfProposals=Liste des devis/propositions commerciales
 ActionsOnPropal=Événements sur la proposition
-NoOpenedPropals=Pas de proposition ouverte
-NoOtherOpenedPropals=Pas d'autre proposition brouillon
+NoOpenedPropals=Pas de propositions commerciales ouvertes
+NoOtherOpenedPropals=Pas d'autres propositions commerciales ouvertes
 RefProposal=Réf. proposition commerciale
 SendPropalByMail=Envoyer proposition commerciale par email
 AssociatedDocuments=Documents associés à la proposition :
@@ -98,3 +98,4 @@ DocModelJauneDescription=Modèle de proposition Jaune
 DefaultModelPropalCreate=Modèle par défaut à la création
 DefaultModelPropalToBill=Modèle par défaut lors de la clôture d'une proposition commerciale (à facturer)
 DefaultModelPropalClosed=Modèle par défaut lors de la clôture d'une proposition commerciale (non facturée)
+ProposalCustomerSignature=Cachet, Date, Signature et mention "Bon pour Accord"
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 5db3b16d441..1a92875cc65 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Afficher règlement de salaire
 THM=Tarif horaire moyen
 TJM=Tarif journalier moyen
 CurrentSalary=Salaire courant
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=Cette valeur est actuellement seulement une information et n'est utilisé pour aucun calcul
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 1354fe7ddf6..e884820d042 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Modèle simple
 DocumentModelMerou=Modèle Merou A5
 WarningNoQtyLeftToSend=Alerte, aucun produit en attente de livraison.
 StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions validées uniquement. La date prise en compte est la date de validation (la date de prévision d'expédition n'étant pas toujours renseignée).
-DateDeliveryPlanned=Date de livraison prévue
+DateDeliveryPlanned=Date prévue de livraison
 DateReceived=Date de réception réelle
 SendShippingByEMail=Envoyer bon d'expédition par email
 SendShippingRef=Envoi du bordereau d'expédition %s
@@ -67,7 +67,7 @@ SendingRunning=Produit des commandes clients passées
 SuppliersReceiptRunning=Produit des commandes fournisseurs passées
 ProductQtyInCustomersOrdersRunning=Quantité de produit en commandes client ouvertes
 ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes fournisseur ouvertes
-ProductQtyInShipmentAlreadySent=Quantité de produit déjà reçu en commandes client ouvertes 
+ProductQtyInShipmentAlreadySent=Quantité du produit parmi les commandes clients déjà envoyées
 ProductQtyInSuppliersShipmentAlreadyRecevied=Quantité de produit déjà reçu en commandes fournisseur ouvertes
 
 # Sending methods
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index cae2a14d187..3e96ca304d8 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -48,7 +48,7 @@ PMPValue=Valorisation (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valorisation des stocks
 UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Le stock du produit et le stock des sous-produits sont indépendant
 QtyDispatched=Quantité ventilée
 QtyDispatchedShort=Qté ventilée
 QtyToDispatchShort=Qté à ventiler
@@ -95,11 +95,12 @@ SelectWarehouseForStockDecrease=Sélectionner l'entrepôt à utiliser pour la d
 SelectWarehouseForStockIncrease=Sélectionner l'entrepôt à utiliser pour l'incrémentation du stock
 NoStockAction=Pas d'action sur l'entrepôt
 LastWaitingSupplierOrders=Commandes en attente de réception
-DesiredStock=Stock désiré
+DesiredStock=Stock désiré minimum
+DesiredMaxStock=Stock désiré maximum
 StockToBuy=À commander
 Replenishment=Réapprovisionnement
 ReplenishmentOrders=Commandes de réapprovisionnement
-VirtualDiffersFromPhysical=Selon les options d'incrémentation/décrémentation de stock, le stock physique et le stock théorique (physique + commandes en cours) peut être différent.
+VirtualDiffersFromPhysical=Selon les options d'augmentation/décrémentation de stock, le stock physique et le stock virtuel (stock physique + commandes actuelles) peuvent différer
 UseVirtualStockByDefault=Utilisez le stock théorique par défaut, au lieu du stock réel, pour la fonction de réapprovisionnement
 UseVirtualStock=Utilisation du stock théorique
 UsePhysicalStock=Utilisation du stock réel
@@ -112,8 +113,8 @@ AlertOnly= Alertes seulement
 WarehouseForStockDecrease=L'entrepôt <b>%s</b> sera utilisé pour la décrémentation du stock
 WarehouseForStockIncrease=L'entrepôt <b>%s</b> sera utilisé pour l'incrémentation du stock
 ForThisWarehouse=Pour cet entrepôt
-ReplenishmentStatusDesc=Cet écran permet de voir les produits avec un stock inférieur à la quantité minimale désirée (ou à la quantité du seuil d'alerte si la case "Alertes seulement" est cochée) et propose de créer des commandes fournisseurs pour compléter la différence
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=Ceci est une liste de tous les produits avec un stock inférieur au stock souhaité (ou inférieure à la valeur d'alerte si la case "alerte uniquement" est cochée), et vous suggère de créer les commandes fournisseurs pour compléter la différence.
+ReplenishmentOrdersDesc=Ceci est une liste de toutes les commandes fournisseurs ouvertes comportant des produits prédéfinis. Seules les commandes ouvertes avec des produits prédéfinis, donc les commandes qui peuvent affecter les stocks, sont visibles ici.
 Replenishments=Réapprovisionnement
 NbOfProductBeforePeriod=Quantité du produit <b>%s</b> en stock avant la période sélectionnée (< <b>%s</b>)
 NbOfProductAfterPeriod=Quantité du produit <b>%s</b> en stock après la période sélectionnée (> <b>%s</b>)
@@ -124,16 +125,16 @@ RecordMovement=Enregistrer transfert
 ReceivingForSameOrder=Réceptions pour cette commande
 StockMovementRecorded=Mouvement de stocks enregistré
 RuleForStockAvailability=Règles d'exigence sur les stocks
-StockMustBeEnoughForInvoice=Le niveau de stock doit être suffisant pour ajouter un produit/service dans une facture
-StockMustBeEnoughForOrder=Le niveau de stock doit être suffisant pour ajouter un produit/service dans une commande
-StockMustBeEnoughForShipment= Le niveau de stock doit être suffisant pour ajouter un produit/service dans une expédition
+StockMustBeEnoughForInvoice=Le niveau de stock doit être suffisant pour ajouter ce produit/service à la facture
+StockMustBeEnoughForOrder=Le niveau de stock doit être suffisant pour ajouter ce produit/service à la commande
+StockMustBeEnoughForShipment= Le niveau de stock doit être suffisant pour ajouter ce produit/service à l'expédition
 MovementLabel=Libellé du mouvement
 InventoryCode=Code mouvement ou inventaire
 IsInPackage=Inclus dans un package
 ShowWarehouse=Afficher entrepôt
-MovementCorrectStock=Correction du contenu en stock pour le produit %s
+MovementCorrectStock=Correction du stock pour le produit %s
 MovementTransferStock=Transfert de stock du produit %s dans un autre entrepôt
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Code Inv./Mouv.
-NoPendingReceptionOnSupplierOrder=Pas de réception en attente du fait de commande fournisseur en cours
+NoPendingReceptionOnSupplierOrder=Pas de réception en attente consécutive à des commandes fournisseurs
 ThisSerialAlreadyExistWithDifferentDate=Ce lot/numéro de série (<strong>%s</strong>) existe déjà mais avec des dates de consommation ou péremption différente (trouvé <strong>%s</strong> mais vous avez entré <strong>%s</strong>).
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 233e1828ca6..a7c977aeea8 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Envoyés aux fournisseurs
 ListOfSupplierOrders=Liste des commandes fournisseurs
 MenuOrdersSupplierToBill=Commandes fournisseurs en facture
 NbDaysToDelivery=Délai de livraison en jours
-DescNbDaysToDelivery=Délai le plus élevé parmi la liste de produit dans la commande
+DescNbDaysToDelivery=Le plus gros délai de livraison parmi les produits de cette commande
 UseDoubleApproval=Utiliser la double approbation (la deuxième approbation pourra être faite par tout utilisateur qui bénéficie de la permission dédiée à cela) 
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 131cbe63486..7ae8f1cabcc 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Personne à informer pour la validation.
 TripSociete=Information société
 TripSalarie=Informations utilisateur
 TripNDF=Informations note de frais
-DeleteLine=Effacer une ligne de note de frais
+DeleteLine=Supprimer une ligne d'une note de frais
 ConfirmDeleteLine=Êtes-vous sûr de vouloir supprimer cette ligne ?
 PDFStandardExpenseReports=Modèle de note de frais PDF standard
 ExpenseReportLine=Ligne de la note de frais
@@ -44,7 +44,6 @@ TF_HOTEL=Hôtel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Vous avez déclaré une autre note de frais dans une période similaire.
-ListTripsAndExpenses=Liste des notes de frais
 AucuneNDF=Pas de note de frais trouvées avec ces critères
 AucuneLigne=Aucune note de frais déclarée
 AddLine=Ajout nouvelle ligne
@@ -56,12 +55,12 @@ ModePaiement=Mode de paiement
 Note=Note
 Project=Projet
 
-VALIDATOR=Utilisateur à informer pour approbation
+VALIDATOR=Utilisateur responsable de l'approbation
 VALIDOR=Approuvé par
 AUTHOR=Enregistré par
 AUTHORPAIEMENT=Payé par
 REFUSEUR=Refusé par
-CANCEL_USER=Annulé par
+CANCEL_USER=Supprimé par
 
 MOTIF_REFUS=Motif
 MOTIF_CANCEL=Motif
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Date de paiement
 
 TO_PAID=Payer
 BROUILLONNER=Réouvrir
-SendToValid=Envoyer a l'approbation
+SendToValid=Sent on approval
 ModifyInfoGen=Editer
 ValidateAndSubmit=Valider et envoyer pour approbation
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Vous n'êtes pas autorisé a approuver cette note de frais
 NOT_AUTHOR=Vous n'êtes pas l'auteur de cette note de frais. Opération annulé.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Êtes-vous sûr de vouloir changer le statut de cette note de fr
 CancelTrip=Annuler note de frais
 ConfirmCancelTrip=Êtes-vous sûr de vouloir annuler cette note de frais ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Êtes-vous sûr de vouloir changer le statut de cette note de frais en "Brouillon" ?
 
 SaveTrip=Valider note de frais
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 6215622af74..bd9db5271f9 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Supprimer du groupe
 PasswordChangedAndSentTo=Mot de passe changé et envoyé à <b>%s</b>.
 PasswordChangeRequestSent=Demande de changement de mot de passe pour <b>%s</b> envoyée à <b>%s</b>.
 MenuUsersAndGroups=Utilisateurs & Groupes
+MenuMyUserCard=Ma fiche utilisateur
 LastGroupsCreated=Les %s derniers groupes créés
 LastUsersCreated=Les %s derniers utilisateurs créés
 ShowGroup=Afficher groupe
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index dcdc98fe1ee..8ef2fb06878 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Fichier de prélèvement
 SetToStatusSent=Mettre au statut "Fichier envoyé"
 ThisWillAlsoAddPaymentOnInvoice=Ceci créera également les paiements sur les factures et les classera payées
 StatisticsByLineStatus=Statistiques par statut des lignes
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Crédit prélèvement %s à la banque
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index e718b3e708e..1c96f5273ed 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Configuration du module workflow
-WorkflowDesc=Ce module vous permet de modifier le comportement d'enchaînement automatisé. Par défaut, le workflow est ouvert (vous faites mes choses dans l'ordre que vous voulez). Vous pouvez activer les enchainements automatisées qui vous intéressent.
-ThereIsNoWorkflowToModify=Il n'y a pas de flux workflow modifiable pour les modules que vous avez activé.
+WorkflowDesc=Ce module est conçu pour modifier le comportement des actions automatiques dans l'application. Par défaut, le workflow est ouvert (vous pouvez faire les choses dans l'ordre que vous voulez). Vous pouvez toutefois activer des actions automatiques qui vous intéressent.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Créer une commande client automatiquement à la signature d'une proposition commerciale
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la signature d'une proposition commerciale
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la validation d'un contrat
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la clôture d'une commande client
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer facturée la proposition commerciale source quand la commande client dérivée est classée payée
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients source quand la facture client dérivée est classée payée
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients source lorsque la facture client dérivée est validée
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index e88ecd1a9d6..d842026aa20 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=תפריט עבור משתמשים
 LangFile=הקובץ. Lang
 System=מערכת
 SystemInfo=מערכת מידע
-SystemTools=מערכת כלים
 SystemToolsArea=כלי המערכת באזור
 SystemToolsAreaDesc=אזור זה מספק תכונות ניהול. השתמשו בתפריט כדי לבחור את התכונה שאתה מחפש.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=בטחון
 Passwords=סיסמאות
 DoNotStoreClearPassword=האם כל חנות סיסמאות ברורות במסד הנתונים אלא רק בחנות ערך מוצפן (הופעל מומלץ)
 MainDbPasswordFileConfEncrypted=מאגר המידע הסיסמה מוצפן ב conf.php (הופעל מומלץ)
-InstrucToEncodePass=כדי שהסיסמה מקודד לקובץ <b>conf.php,</b> להחליף את הקו <br> <b>$ Dolibarr_main_db_pass = &quot;...&quot;</b> <br> על ידי <br> <b>$ Dolibarr_main_db_pass = &quot;crypted: %s&quot;</b>
-InstrucToClearPass=כדי שהסיסמה מפוענח (ברור) לקובץ <b>conf.php,</b> להחליף את הקו <br> <b>$ Dolibarr_main_db_pass = &quot;crypted: ...&quot;</b> <br> על ידי <br> <b>$ Dolibarr_main_db_pass = &quot;%s&quot;</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=הגנה על קבצי PDF שנוצרו הופעל (לא מומלץ, שובר את הדור המונית pdf)
 ProtectAndEncryptPdfFilesDesc=הגנה על מסמך PDF שומר אותו לזמין לקרוא ולהדפיס עם כל דפדפן PDF. עם זאת, עריכת והעתקה אינו אפשרי עוד. שים לב כי השימוש בתכונה זו את בניית PDF המצטבר העולמי לא עובד (כמו חשבוניות שלא שולמו).
 Feature=תכונה
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=זהו תהליך ההתקנה:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=שלב %s
 FindPackageFromWebSite=מצא חבילה המספקת התכונה הרצויה (לדוגמה על %s באתר הרשמי של רשת).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=התקן הוא סיים Dolibarr מוכן לשימוש עם מרכיב חדש זה.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr הגרסה הנוכחית
 CallUpdatePage=עבור לעמוד שהעדכונים מבנה מסד הנתונים datas: %s.
 LastStableVersion=הגרסה היציבה האחרונה
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=הצעות
 Module20Desc=ההצעה המסחרית של ההנהלה
 Module22Name=Mass E-דיוור
 Module22Desc=Mass E-הדיוור של ההנהלה
-Module23Name= אנרגיה
-Module23Desc= מעקב אחר צריכת האנרגיה
+Module23Name=אנרגיה
+Module23Desc=מעקב אחר צריכת האנרגיה
 Module25Name=הזמנות של לקוחות
 Module25Desc=כדי לקוחות של ההנהלה
 Module30Name=חשבוניות
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=לוח השנה
 Module410Desc=שילוב לוח השנה
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=הודעות
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=תרומות
 Module700Desc=התרומה של ההנהלה
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=סדר היום
 Module2400Desc=אירועים / משימות וניהול סדר היום
 Module2500Name=תוכן אלקטרוני ניהול
 Module2500Desc=לשמור ולשתף מסמכים
-Module2600Name=WebServices
-Module2600Desc=אפשר האינטרנט Dolibarr שירותי שרת
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=צור / לשנות מוצרים
 Permission34=מחק מוצרים
 Permission36=ראה / ניהול מוצרים מוסתרים
 Permission38=ייצוא מוצרים
-Permission41=קרא פרויקטים (פרויקט משותף פרויקטים אני לפנות לקבלת)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=צור / לשנות פרויקטים (פרויקט משותף פרויקטים אני לפנות לקבלת)
 Permission44=מחק פרויקטים (פרויקט משותף פרויקטים אני לפנות לקבלת)
 Permission61=לקרוא התערבויות
@@ -599,10 +600,10 @@ Permission86=שלח הזמנות הלקוחות
 Permission87=סגור לקוחות הזמנות
 Permission88=ביטול הזמנות הלקוחות
 Permission89=מחק הזמנות הלקוחות
-Permission91=קרא לביטוח הלאומי ומס ערך מוסף
-Permission92=צור / לשנות לביטוח הלאומי ומס ערך מוסף
-Permission93=מחק לביטוח הלאומי ומס ערך מוסף
-Permission94=ייצוא הפרשות סוציאליות
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=לקרוא דוחות
 Permission101=לקרוא sendings
 Permission102=צור / לשנות sendings
@@ -620,9 +621,9 @@ Permission121=לקרוא לצדדים שלישיים הקשורים המשתמש
 Permission122=ליצור / לשנות צדדים שלישיים קשורה המשתמש
 Permission125=מחק צדדים שלישיים הקשורים המשתמש
 Permission126=ייצוא צדדים שלישיים
-Permission141=קרא פרויקטים (גם פרטיות אני לא מתכוון לפנות ל)
-Permission142=ליצור / לשנות פרויקטים (גם פרטיות אני לא מתכוון לפנות לקבלת)
-Permission144=מחיקת פרויקטים (גם פרטיות אני לא מתכוון לפנות ל)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=לקרוא ספקי
 Permission147=קרא את סטטיסטיקת
 Permission151=לקרוא הוראות קבע
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=הגדרת הציל
 BackToModuleList=חזרה לרשימת מודולים
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=רוכסן
 CompanyTown=עיר
 CompanyCountry=מדינה
 CompanyCurrency=ראשי המטבע
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=אל תציג
 DoNotSuggestPaymentMode=לא מציע
 NoActiveBankAccountDefined=אין לך חשבון בנק פעיל מוגדר
 OwnerOfBankAccount=הבעלים של %s חשבון הבנק
 BankModuleNotActive=חשבונות בנק המודול לא מופעל
-ShowBugTrackLink=הצג את &quot;לדווח על בעיה&quot; קישור
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=הצג את &quot;שולחן העבודה&quot; בעמוד הבית
 Alerts=התראות
 Delays=עיכובים
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=מקס שברים עשרוניים עבור מחירי י
 MAIN_MAX_DECIMALS_TOT=מקס שברים עשרוניים במחירים הכל
 MAIN_MAX_DECIMALS_SHOWN=שברים עשרוניים מקס במחירים המוצג על המסך (הוסף <b>...</b> לאחר מספר זה אם אתה רוצה לראות <b>...</b> כאשר מספר מקוצר כאשר מוצג על המסך)
 MAIN_DISABLE_PDF_COMPRESSION=השתמש דחיסה של קבצי PDF PDF שנוצר.
-MAIN_ROUNDING_RULE_TOT= גודל טווח עיגול (עבור מדינות הנדירים שבהם עיגול נעשה על משהו אחר מאשר בסיס 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=יחידת מחיר נטו של המוצר
 TotalPriceAfterRounding=המחיר הכולל (נטו / מע&quot;מ / מס כולל) לאחר עיגול
 ParameterActiveForNextInputOnly=פרמטר יעיל הקלט הבא רק
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=מספר מקסימלי של מוצרים combos ב
 ConfirmDeleteProductLineAbility=אישור לאחר הסרת קווי מוצרים בצורות
 ModifyProductDescAbility=התאמה אישית של תיאורי מוצרים בצורות
 ViewProductDescInFormAbility=ויזואליזציה של תיאורי מוצרים בתחום הטפסים (גם בכינויו tooltip קופץ)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=ויזואליזציה של תיאורי מוצרים בשפה thirdparty
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=תמיכה Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=ברקוד מסוג ברירת מחדל עבור מוצרים
 SetDefaultBarcodeTypeThirdParties=ברקוד מסוג ברירת מחדל עבור צדדים שלישיים
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=ברקוד מסוג UPC
 BarcodeDescISBN=ברקוד מסוג ISBN
 BarcodeDescC39=ברקוד מסוג C39
 BarcodeDescC128=ברקוד מסוג C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=האם אתה בטוח שברצונך למחוק כניסה <b
 DeleteLine=מחק את השורה
 ConfirmDeleteLine=האם אתה בטוח שברצונך למחוק את הקו הזה?
 ##### Tax #####
-TaxSetup=מסים, הפרשות סוציאליות וחלוקת דיבידנד ההתקנה מודול
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=בגלל המע&quot;מ
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices ההתקנה מודול
 WebServicesDesc=על ידי הפעלת מודול זה, Dolibarr להיות שרת שירות אינטרנט לספק שירותי אינטרנט שונים.
 WSDLCanBeDownloadedHere=WSDL קבצים מתאר של השירותים הניתנים ניתן להוריד כאן
 EndPointIs=לקוחות סבון חייב לשלוח את בקשותיהם עד נקודת הסיום Dolibarr זמין בכתובת האתר
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=בנק ההתקנה מודול
 FreeLegalTextOnChequeReceipts=טקסט חופשי על קבלות הסימון
@@ -1581,6 +1599,7 @@ ProjectsSetup=מודול פרויקט ההתקנה
 ProjectsModelModule=מסמך דו&quot;ח פרויקט של מודל
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index ba1542e483f..da104f9daa6 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index ea9145b421e..818edc1039a 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index a5796dd0544..af3dd9c7f8c 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index d61bc5502a3..db7733489d8 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 95e682bcb67..6e5bd6b3c33 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=חברה
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +269,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 69bba17ae4c..4be25a4555b 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index 63223b9e15e..008010d0fec 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
index 7fddd1d7a83..52e981a1780 100644
--- a/htdocs/langs/he_IL/ecm.lang
+++ b/htdocs/langs/he_IL/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index 0b2eb810e67..3ef5bb6a0e8 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/he_IL/incoterm.lang b/htdocs/langs/he_IL/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/he_IL/incoterm.lang
+++ b/htdocs/langs/he_IL/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index c72668ff058..a4f7a64fcb2 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang
index dcf7a8bea0d..d3a567ba903 100644
--- a/htdocs/langs/he_IL/languages.lang
+++ b/htdocs/langs/he_IL/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=ערבית
 Language_ar_SA=ערבית
+Language_bn_BD=Bengali
 Language_bg_BG=בולגרי
 Language_bs_BA=בוסני
 Language_ca_ES=קטלוני
@@ -21,9 +22,10 @@ Language_en_SA=אנגלית (ערב הסעודית)
 Language_en_US=אנגלית (ארצות הברית)
 Language_en_ZA=אנגלית (דרום אפריקה)
 Language_es_ES=ספרדית
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=ספרדית (ארגנטינה)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=ספרדית (הונדורס)
 Language_es_MX=ספרדית (מקסיקו)
 Language_es_PY=ספרדית (פרגוואי)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=איסלנדי
 Language_it_IT=איטלקי
 Language_ja_JP=יפני
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=קוריאני
+Language_lo_LA=Lao
 Language_lt_LT=ליטאי
 Language_lv_LV=לטבי
 Language_mk_MK=מקדונית
@@ -64,6 +69,7 @@ Language_sv_SV=שוודי
 Language_sv_SE=שוודי
 Language_sq_AL=Albanian
 Language_sk_SK=סלובקי
+Language_sw_SW=Kiswahili
 Language_th_TH=תאילנדי
 Language_uk_UA=אוקראיני
 Language_uz_UZ=אוזבקי
diff --git a/htdocs/langs/he_IL/loan.lang b/htdocs/langs/he_IL/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/he_IL/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 42eeab81dd4..cbd4a7ce459 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=הודעות
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index a9fd4612265..997904e9d86 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=לא ידוע
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index ee28fcb125c..ec1b7a9daee 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 5b7a8ec16c2..a5503493cf4 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 47ed25edcec..ee0dc8f5203 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/he_IL/printing.lang b/htdocs/langs/he_IL/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/he_IL/printing.lang
+++ b/htdocs/langs/he_IL/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 179740315d1..d7acb3d35e3 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=מניות
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=ספקים
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 314da1e3650..fcd5d5d63ec 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/he_IL/propal.lang b/htdocs/langs/he_IL/propal.lang
index d17bc952b7d..d10dbb15122 100644
--- a/htdocs/langs/he_IL/propal.lang
+++ b/htdocs/langs/he_IL/propal.lang
@@ -1,102 +1,101 @@
 # Dolibarr language file - Source file is en_US - propal
-# Proposals=Commercial proposals
-# Proposal=Commercial proposal
-# ProposalShort=Proposal
-# ProposalsDraft=Draft commercial proposals
-# ProposalDraft=Draft commercial proposal
-# ProposalsOpened=Opened commercial proposals
-# Prop=Commercial proposals
-# CommercialProposal=Commercial proposal
-# CommercialProposals=Commercial proposals
-# ProposalCard=Proposal card
-# NewProp=New commercial proposal
-# NewProposal=New commercial proposal
-# NewPropal=New proposal
-# Prospect=Prospect
-# ProspectList=Prospect list
-# DeleteProp=Delete commercial proposal
-# ValidateProp=Validate commercial proposal
-# AddProp=Add proposal
-# ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-# ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-# LastPropals=Last %s proposals
-# LastClosedProposals=Last %s closed proposals
-# LastModifiedProposals=Last %s modified proposals
-# AllPropals=All proposals
-# LastProposals=Last proposals
-# SearchAProposal=Search a proposal
-# ProposalsStatistics=Commercial proposal's statistics
-# NumberOfProposalsByMonth=Number by month
-# AmountOfProposalsByMonthHT=Amount by month (net of tax)
-# NbOfProposals=Number of commercial proposals
-# ShowPropal=Show proposal
-# PropalsDraft=Drafts
-# PropalsOpened=Opened
-# PropalsNotBilled=Closed not billed
-# PropalStatusDraft=Draft (needs to be validated)
-# PropalStatusValidated=Validated (proposal is open)
-# PropalStatusOpened=Validated (proposal is open)
-# PropalStatusClosed=Closed
-# PropalStatusSigned=Signed (needs billing)
-# PropalStatusNotSigned=Not signed (closed)
-# PropalStatusBilled=Billed
-# PropalStatusDraftShort=Draft
-# PropalStatusValidatedShort=Validated
-# PropalStatusOpenedShort=Opened
-# PropalStatusClosedShort=Closed
-# PropalStatusSignedShort=Signed
-# PropalStatusNotSignedShort=Not signed
-# PropalStatusBilledShort=Billed
-# PropalsToClose=Commercial proposals to close
-# PropalsToBill=Signed commercial proposals to bill
-# ListOfProposals=List of commercial proposals
-# ActionsOnPropal=Events on proposal
-# NoOpenedPropals=No opened commercial proposals
-# NoOtherOpenedPropals=No other opened commercial proposals
-# RefProposal=Commercial proposal ref
-# SendPropalByMail=Send commercial proposal by mail
-# FileNotUploaded=The file was not uploaded
-# FileUploaded=The file was successfully uploaded
-# AssociatedDocuments=Documents associated with the proposal:
-# ErrorCantOpenDir=Can't open directory
-# DatePropal=Date of proposal
-# DateEndPropal=Validity ending date
-# DateEndPropalShort=Date end
-# ValidityDuration=Validity duration
-# CloseAs=Close with status
-# ClassifyBilled=Classify billed
-# BuildBill=Build invoice
-# ErrorPropalNotFound=Propal %s not found
-# Estimate=Estimate :
-# EstimateShort=Estimate
-# OtherPropals=Other proposals
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
-# CopyPropalFrom=Create commercial proposal by copying existing proposal
-# CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-# DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-# UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-# ClonePropal=Clone commercial proposal
-# ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-# ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-# ProposalsAndProposalsLines=Commercial proposal and lines
-# ProposalLine=Proposal line
-# AvailabilityPeriod=Availability delay
-# SetAvailability=Set availability delay
-# AfterOrder=after order
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalDraft=Draft commercial proposal
+ProposalsOpened=Open commercial proposals
+Prop=Commercial proposals
+CommercialProposal=Commercial proposal
+CommercialProposals=Commercial proposals
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewProposal=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+ProspectList=Prospect list
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
+LastPropals=Last %s proposals
+LastClosedProposals=Last %s closed proposals
+LastModifiedProposals=Last %s modified proposals
+AllPropals=All proposals
+LastProposals=Last proposals
+SearchAProposal=Search a proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (net of tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalsNotBilled=Closed not billed
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusOpened=Validated (proposal is open)
+PropalStatusClosed=Closed
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
+PropalStatusOpenedShort=Open
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+AssociatedDocuments=Documents associated with the proposal:
+ErrorCantOpenDir=Can't open directory
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+DateEndPropalShort=Date end
+ValidityDuration=Validity duration
+CloseAs=Close with status
+ClassifyBilled=Classify billed
+BuildBill=Build invoice
+ErrorPropalNotFound=Propal %s not found
+Estimate=Estimate :
+EstimateShort=Estimate
+OtherPropals=Other proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+ClonePropal=Clone commercial proposal
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
 ##### Availability #####
-# AvailabilityTypeAV_NOW=Immediate
-# AvailabilityTypeAV_1W=1 week
-# AvailabilityTypeAV_2W=2 weeks
-# AvailabilityTypeAV_3W=3 weeks
-# AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
-# TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-# TypeContact_propal_external_BILLING=Customer invoice contact
-# TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 # Document models
-# DocModelAzurDescription=A complete proposal model (logo...)
-# DocModelJauneDescription=Jaune proposal model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=A complete proposal model (logo...)
+DocModelJauneDescription=Jaune proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index c8d5d582b68..91fdb33254a 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 5bc3d4952ae..e4b0fb5f963 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 1056674425a..d26d4a5cb00 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
index 0b3e72d78d4..3ce8065bb03 100644
--- a/htdocs/langs/he_IL/trips.lang
+++ b/htdocs/langs/he_IL/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index b6011056fc8..5f5517b5920 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 44d9dcee2e0..a2a9af94bca 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/he_IL/workflow.lang b/htdocs/langs/he_IL/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/he_IL/workflow.lang
+++ b/htdocs/langs/he_IL/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index ef57225d51c..cfb2eac28b3 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=Sistem
 SystemInfo=System information
-SystemTools=Alati sistema
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index 8e49047bf96..b437288ac71 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Narudžba %s je odbijena
 OrderBackToDraftInDolibarr=Narudžba %s vraćena u status skice
-OrderCanceledInDolibarr=Narudžba %s otkazana
 ProposalSentByEMail=Komercijalni prijedlog %s poslan putem Emaila
 OrderSentByEMail=Narudžba kupca %s poslana putem Emaila
 InvoiceSentByEMail=Račun kupca %s poslan Emailom
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 4fe645a8949..196425be787 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Otvoren
+StatusAccountOpened=Open
 StatusAccountClosed=Zatvoren
 AccountIdShort=Broj
 EditBankRecord=Uredi zapis
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Plaćanje dobavljaču
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bankovni transfer
 BankTransfers=Bankovni transferi
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 640257f7a11..b61ffde1b33 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Broj računa
 NumberOfBillsByMonth=Broj računa po mjesecu
 AmountOfBills=Iznos računa
 AmountOfBillsByMonthHT=Iznos računa po mjesecu (bez PDV-a)
-ShowSocialContribution=Pokazuje društveni doprinos
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Prikaži račun
 ShowInvoice=Prikaži račun
 ShowInvoiceReplace=Prikaži zamjenski računa
@@ -270,7 +270,7 @@ BillAddress=Adresa za naplatu
 HelpEscompte=Ovaj popust zajamčen je jer je kupac izvršio plaćanje prije roka.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Oznaka plaćanja
 InvoiceId=Oznaka računa
 InvoiceRef=Broj računa
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Odmah
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 6e0d4a38875..c10c8628263 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Najnoviji ugovori
 BoxLastContacts=Najnoviji kontakti / Adrese
 BoxLastMembers=Najnoviji članovi
 BoxFicheInter=Najnovije intervencije
-BoxCurrentAccounts=Stanje otvorenih računa
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Promet
 BoxTotalUnpaidCustomerBills=Ukupni neplaćeni računi kupaca
 BoxTotalUnpaidSuppliersBills=Ukupni neplaćeni računi dobavljača
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Prošlogodišnji% s modificirani intervencija
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Stanja otvorila korisničkog računa
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Promet
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 48d8b78f547..2b7392a227c 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Stranka kontakt / adresa
 StatusContactValidated=Status of contact/address
 Company=Kompanija
 CompanyName=Ime kompanije 
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Kompanije
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Ime treće stranke
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Dobavljač
 CompanyList=Lista kompanija
-AddContact=Dodaj kontakt
-AddContactAddress=Dodaj kontakt/adresa
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
 Contact=Kontakt
@@ -268,8 +269,8 @@ ContactsAddresses=Kontakt/adrese
 NoContactDefinedForThirdParty=Nema kontakta za ovo stranku
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Dodaj firmu
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Izbriši firmu
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=IZbriši adresu dostave
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Dodaj adresu
-AddAddress=Dodaj adresu
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Kategorija dobavljača
 JuridicalStatus200=Independant
@@ -410,5 +411,10 @@ OutstandingBillReached=Dosegnut je maksimalni iznos za otvorene stavke
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/hr_HR/ecm.lang
+++ b/htdocs/langs/hr_HR/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/hr_HR/incoterm.lang b/htdocs/langs/hr_HR/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/hr_HR/incoterm.lang
+++ b/htdocs/langs/hr_HR/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index 2fee45a8ffb..74fae07930c 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arapski
 Language_ar_SA=Arapski
+Language_bn_BD=Bengali
 Language_bg_BG=Bugarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonski
@@ -21,9 +22,10 @@ Language_en_SA=Engleski (Saudijska Arabija)
 Language_en_US=Engleski (United States)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španjolski
-Language_es_DO=Španjolski (Dominikanska Republika)
 Language_es_AR=Španjolski (Argentina)
 Language_es_CL=Španjolski (Čile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Španjolski (Dominikanska Republika)
 Language_es_HN=Španjolski (Honduras)
 Language_es_MX=Španjolski (Meksiko)
 Language_es_PY=Španjolski (Paragvaj)
@@ -45,7 +47,10 @@ Language_id_ID=Indonezijski
 Language_is_IS=Islandski
 Language_it_IT=Talijanski
 Language_ja_JP=Japanski
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korejski
+Language_lo_LA=Lao
 Language_lt_LT=Litvanski
 Language_lv_LV=Letonski
 Language_mk_MK=Makedonski
@@ -64,6 +69,7 @@ Language_sv_SV=Švedski
 Language_sv_SE=Švedski
 Language_sq_AL=Albanski
 Language_sk_SK=Slovački
+Language_sw_SW=Kiswahili
 Language_th_TH=Tajlandski
 Language_uk_UA=Ukrajinski
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/hr_HR/loan.lang b/htdocs/langs/hr_HR/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/hr_HR/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 1bbb505b5b2..d32c863260b 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index c482335b687..66c22912504 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Narudžba dobavljaču
 SuppliersOrders=Narudžbe dobavljaču
 SuppliersOrdersRunning=Trenutne narudžbe dobavljaču
 CustomerOrder=Narudžbe kupaca
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Trenutne narudžba kupaca
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Skica
 StatusOrderValidatedShort=Ovjereno
@@ -75,8 +75,9 @@ AddToMyOrders=Dodaj u moje narudžbe
 AddToOtherOrders=Dodaj u ostale narudžbe
 AddToDraftOrders=Add to draft order
 ShowOrder=Prikaži narudžbu
-NoOpenedOrders=Nema otvorenih narudžbi
-NoOtherOpenedOrders=Nema ostalih otvorenih narudžbi
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/hr_HR/printing.lang b/htdocs/langs/hr_HR/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/hr_HR/printing.lang
+++ b/htdocs/langs/hr_HR/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index e94e24244a7..6603ec0ce14 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi ili usluge
 ProductsOrServices=Proizvodi ili usluge
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Statistika proizvoda i usluga
 ProductsStatistics=Statistika proizvoda
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Zadnji zabilježeni proizvodi/usluge na prodaji
@@ -44,7 +44,7 @@ CardProduct1=Kartica usluga
 CardContract=Kartica ugovora
 Warehouse=Skladište
 Warehouses=Skladišta
-WarehouseOpened=Otvoreno skladište
+WarehouseOpened=Warehouse open
 WarehouseClosed=Zatvoreno skladište
 Stock=Zaliha
 Stocks=Zalihe
@@ -71,21 +71,21 @@ SellingPriceTTC=Prodajna cijena (sa PDV-om)
 PublicPrice=Public price
 CurrentPrice=Trenutna cijena
 NewPrice=Nova cijena
-MinPrice=Namanja prodajna cijena
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Prodajna cijena za ovaj proizvod (%s bez PDV-a) ne može biti manja od najmanje dozvoljene. Ova poruka može se pojaviti i kada ste upisali bitan popust.
 ContractStatus=Stanje ugovora
 ContractStatusClosed=Zatvoreno
-ContractStatusRunning=U tijeku
+ContractStatusRunning=Ongoing
 ContractStatusExpired=isteklo
-ContractStatusOnHold=Nije u tijeku
-ContractStatusToRun=To get running
-ContractNotRunning=Ovaj ugovor nije u tijeku
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Proizvod s oznakom %s već postoji
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Dobavljači
 SupplierRef=Supplier's product ref.
 ShowProduct=Prikaži proizvod
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Broj cijena
 MultiPriceLevelsName=Grupe cijena
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Pridruži
 Translation=Prijevod
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Pronađi proizvod za dodavanje
 AddDel=Dodaj/izbriši
 Quantity=Količina
 NoMatchFound=Ništa slično nije pronađeno
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 3af0f7966eb..e0090714ec8 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=Novi projekt
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Lista projekata
 ShowProject=Prikaži projekt
 SetProject=Postavi projekt
 NoProject=Nema definiranih ili vlastih projekata
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Vrijeme utrošeno
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 802f4040feb..c0f6328616b 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -4,7 +4,7 @@ Proposal=Trgovačka ponuda
 ProposalShort=Ponuda
 ProposalsDraft=Skice trgovačkih ponuda
 ProposalDraft=Skica trgovačke ponude
-ProposalsOpened=Otvorene trgovačke ponude
+ProposalsOpened=Open commercial proposals
 Prop=Trgovačke ponude
 CommercialProposal=Trgovačka ponuda
 CommercialProposals=Trgovačke ponude
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Iznos po mjesecu (netto bez PDV-a)
 NbOfProposals=Broj trgovačkih ponuda
 ShowPropal=Prikaži ponudu
 PropalsDraft=Skice
-PropalsOpened=Otvorena
+PropalsOpened=Open
 PropalsNotBilled=Zatvorena, nije naplaćena
 PropalStatusDraft=Skica (potrebno ovjeriti)
 PropalStatusValidated=Ovjerena (otvorena ponuda)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nije potpisana (zatvorena)
 PropalStatusBilled=Naplaćena
 PropalStatusDraftShort=Skica
 PropalStatusValidatedShort=Ovjerena
-PropalStatusOpenedShort=Otvorena
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Zatvorena
 PropalStatusSignedShort=Potpisana
 PropalStatusNotSignedShort=Nije potpisana
@@ -51,8 +51,8 @@ PropalsToClose=Trgovačke ponude za zatvaranje
 PropalsToBill=Potpisane trgovačke ponude za naplatu
 ListOfProposals=Popis trgovačkih ponuda
 ActionsOnPropal=Događaji vezani uz ponudu
-NoOpenedPropals=Nema otvorenih trgovačkih ponuda
-NoOtherOpenedPropals=nema drugih otvorenih trgovačkih ponuda
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Broj trgovačke ponude
 SendPropalByMail=Pošalji trgovačku ponudu e-poštom
 AssociatedDocuments=Dokumenti povezani s ovom ponudom:
@@ -98,3 +98,4 @@ DocModelJauneDescription="Žuti" model ponude
 DefaultModelPropalCreate=Izrada osnovnog modela
 DefaultModelPropalToBill=Osnovni predložak prilikom zatvaranja poslovne ponude (za naplatu)
 DefaultModelPropalClosed=Osnovni predložak prilikom zatvaranja poslovne ponude (nenaplaćeno)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index e20a1b00985..3f368223ab7 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Jednostavan model dokumenta
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Datum primitka pošiljke
 SendShippingByEMail=Pošalji pošiljku Emailom
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index 922a3e316df..b5b907515d7 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Korisnici & Grupe
+MenuMyUserCard=My user card
 LastGroupsCreated=Zadnje %s kreirane grupe
 LastUsersCreated=Zadnji %s kreirani korisnici
 ShowGroup=Prikaži grupu
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/hr_HR/workflow.lang b/htdocs/langs/hr_HR/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/hr_HR/workflow.lang
+++ b/htdocs/langs/hr_HR/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index bb9b358c045..0f0e6dfdce8 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -1,18 +1,25 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
-Accounting=Accounting
-Globalparameters=Global parameters
+Accounting=Könyvelés
+Globalparameters=Globális beállítások
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Pénzügyi év
 Menuaccount=Accounting accounts
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=Eszközök
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
 JournalFinancial=Financial journals
-Exports=Exports
+Exports=Export
 Export=Export
 Modelcsv=Model of export
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
@@ -20,11 +27,11 @@ Selectmodelcsv=Select a model of export
 Modelcsv_normal=Classic export
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Return chart of accounts
-Back=Return
+Back=Megtérülés
 
 Definechartofaccounts=Define a chart of accounts
 Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
+Validate=Érvényesít
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 Ventilation=Breakdown
@@ -34,13 +41,13 @@ Dispatched=Dispatched
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
-Reports=Reports
+Reports=Riportok
 ByCustomerInvoice=By invoices customers
-ByMonth=By Month
+ByMonth=Havonta
 NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
+Update=Frissítés
+List=Lista
+Create=Készít
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
@@ -50,7 +57,7 @@ AccountBalanceByMonth=Account balance by month
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
 AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+Line=Sor
 
 CAHTF=Total purchase supplier HT
 InvoiceLines=Lines of invoice to be ventilated
@@ -63,8 +70,8 @@ VentilationAuto=Automatic breakdown
 Processing=Processing
 EndProcessing=The end of processing
 AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
+SelectedLines=Kválasztott sorok
+Lineofinvoice=Számlasor
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
@@ -95,14 +101,14 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought serv
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
 Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
+Docdate=Dátum
+Docref=Hivatkozás
+Numerocompte=Számla
+Code_tiers=Partner
 Labelcompte=Label account
 Debit=Debit
 Credit=Credit
-Amount=Amount
+Amount=Összeg
 Sens=Sens
 Codejournal=Journal
 
@@ -122,29 +128,29 @@ CashPayment=Cash Payment
 SupplierInvoicePayment=Payment of invoice supplier
 CustomerInvoicePayment=Payment of invoice customer
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Partner számla
 
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=Új mozgás
+NumMvts=Mozgások száma
+ListeMvts=Mozgások Listája
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
+ReportThirdParty=Partnerek számláinak listája
 DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
-Pcgversion=Version of the plan
-Pcgtype=Class of account
+Pcgversion=Terv verziója
+Pcgtype=Számlaosztály
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
-Active=Statement
+Active=Kivonat
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Új pénzügyi év
 
 DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
-TotalMarge=Total sales margin
+TotalMarge=Teljes eladási marzs
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 0c6b123ea84..c9e1fbfc09b 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menü a felhasználók
 LangFile=File. Lang
 System=Rendszer
 SystemInfo=Rendszerinformációk
-SystemTools=Rendszereszközök
 SystemToolsArea=Rendszereszközök területe
 SystemToolsAreaDesc=Ez a terület ad adminisztrációs funkciókat. Használja a menüt a funkciót, amit keresel.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Biztonság
 Passwords=Jelszavak
 DoNotStoreClearPassword=Do No Store egyértelmű jelszavakat adatbázisban tárolja, de csak a titkosított érték (aktivált ajánlott)
 MainDbPasswordFileConfEncrypted=Adatbázis jelszó titkosítva conf.php (aktivált ajánlott)
-InstrucToEncodePass=Ahhoz, hogy a jelszót kódolva a fájlba <b>conf.php,</b> cserélje ki a sort <br> <b>Dolibarr_main_db_pass $ = &quot;...&quot;</b> <br> által <br> <b>Dolibarr_main_db_pass $ = &quot;titkosított: %s&quot;</b>
-InstrucToClearPass=Ahhoz, hogy a jelszó dekódolt (átlátszó) a <b>conf.php</b> fájlt, cserélje ki a sort <br> <b>Dolibarr_main_db_pass $ = &quot;kódolják: ...&quot;</b> <br> által <br> <b>Dolibarr_main_db_pass $ = &quot;%s&quot;</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Védelme generált pdf fájlok (aktivált nem ajánlott, megtöri tömeges pdf generálás)
 ProtectAndEncryptPdfFilesDesc=Védelem a PDF dokumentum tartja elérhetővé olvasni és nyomtatni bármilyen PDF böngészőben. Azonban a szerkesztés és másolás nem lehetséges többé. Megjegyzendő, hogy ezt a szolgáltatást használja, hogy az épület globális összesített pdf nem működik (például kifizetetlen számlák).
 Feature=Feature
@@ -295,18 +294,18 @@ ModuleFamilyFinancial=Pénzügyi modulok (Számviteli / Kincstár)
 ModuleFamilyECM=Elektronikus Content Management (ECM)
 MenuHandlers=Menü rakodók
 MenuAdmin=Menu Editor
-DoNotUseInProduction=Do not use in production
+DoNotUseInProduction=Ne használd a terméket
 ThisIsProcessToFollow=Ez a beállítási folyamat:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Keressen olyan csomag, amely biztosítja a kívánt funkciót (például a hivatalos honlapján %s).
-DownloadPackageFromWebSite=A  %s csomag letöltése
-UnpackPackageInDolibarrRoot=Bontsa ki a csomagfájlt a külső modulok számára fenntartott könyvtárba: <b>%s</b>
+DownloadPackageFromWebSite=Csomag letöltése (pl. a havatalos oldalról %s)
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Telepítése befejeződött, és Dolibarr kész, hogy ehhez az új alkatrész.
 NotExistsDirect=Nincs megadva az alternatív gyökérkönyvtár. <br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Válassza ki a modult:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr jelenlegi verzió
 CallUpdatePage=Lépjen arra az oldalra, amely frissíti az adatbázis szerkezetét és adatok: %s.
 LastStableVersion=Utolsó stabil verzió
@@ -363,20 +362,20 @@ PDFAddressForging=Szabályok kovácsolni címre dobozok
 HideAnyVATInformationOnPDF=Hide kapcsolatos minden információt áfa generált PDF
 HideDescOnPDF=Termékleírás elrejtése a generált PDF fájlban
 HideRefOnPDF=Termékreferencia elrejtése a generált PDF fájlban
-HideDetailsOnPDF=Hide products lines details on generated PDF
+HideDetailsOnPDF=A terméksorok részleteinek elrejtése a PDF-ben
 Library=Könyvtár
 UrlGenerationParameters=URL paraméterek biztosítása
 SecurityTokenIsUnique=Használjunk olyan egyedi securekey paraméter az URL
 EnterRefToBuildUrl=Adja meg az objektum referencia %s
 GetSecuredUrl=Get URL számított
 ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
+OldVATRates=Régi ÁFA-kulcs
+NewVATRates=Új ÁFA-kulcs
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
+MassConvert=Tömeges konvertálás indítása
 String=Húr
-TextLong=Long text
-Int=Integer
+TextLong=Hosszú szöveg
+Int=Egész
 Float=Float
 DateAndTime=Dátum és idő
 Unique=Egyedi
@@ -384,8 +383,8 @@ Boolean=Boolean (Checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Ár
 ExtrafieldMail = E-mail
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
+ExtrafieldSelect = Vlassz listát
+ExtrafieldSelectList = Válassz a táblából
 ExtrafieldSeparator=Elválasztó
 ExtrafieldCheckBox=Jelölőnégyzet
 ExtrafieldRadio=Választógomb
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Hivatkozás frissítése
@@ -430,8 +429,8 @@ Module20Name=Javaslatok
 Module20Desc=Üzleti ajánlat vezetése
 Module22Name=Tömeges e-levelek
 Module22Desc=Tömeges e-mail vezetése
-Module23Name= Energia
-Module23Desc= Ellenőrzése fogyasztása energiák
+Module23Name=Energia
+Module23Desc=Ellenőrzése fogyasztása energiák
 Module25Name=Vevői megrendelések
 Module25Desc=Ügyfél érdekében vezetése
 Module30Name=Számlák
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integráció
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Értesítések
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Adományok
 Module700Desc=Adomány vezetése
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Napirend
 Module2400Desc=Események / feladatok és napirend menedzsment
 Module2500Name=Elektronikus Content Management
 Module2500Desc=Mentés és dokumentumok megosztása
-Module2600Name=WebServices
-Module2600Desc=Engedélyezze a Dolibarr web szerver szolgáltatás
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -557,7 +558,7 @@ Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
 Module59000Desc=Module to manage margins
-Module60000Name=Commissions
+Module60000Name=Jogosultságok
 Module60000Desc=Module to manage commissions
 Permission11=Olvassa vevői számlák
 Permission12=Létrehozza / módosítja vevői számlák
@@ -578,7 +579,7 @@ Permission32=Létrehozza / módosítja termékek
 Permission34=Törlés termékek
 Permission36=Lásd / kezelhetik rejtett termékek
 Permission38=Export termékek
-Permission41=Olvassa projektek (közös projekt és a projektek vagyok contact)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Létrehozza / módosítja projektek (közös projekt és a projektek vagyok contact)
 Permission44=Törlés projektek (közös projekt és a projektek vagyok contact)
 Permission61=Olvassa beavatkozások
@@ -599,10 +600,10 @@ Permission86=Küldje ügyfelek megrendelések
 Permission87=Bezár az ügyfelek megrendelések
 Permission88=Mégsem ügyfelek megrendelések
 Permission89=Törlés ügyfelek megrendelések
-Permission91=Olvassa el a társadalombiztosítási járulékok és áfa
-Permission92=Létrehozza / módosítja a társadalombiztosítási járulékok és áfa
-Permission93=Törlés társadalombiztosítási járulékok és az áfa
-Permission94=Export társadalombiztosítási járulékok
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Olvassa jelentések
 Permission101=Olvassa küldések
 Permission102=Létrehozza / módosítja küldések
@@ -620,9 +621,9 @@ Permission121=Olvassa harmadik fél kapcsolódó felhasználói
 Permission122=Létrehozza / módosítja harmadik fél kapcsolódó felhasználói
 Permission125=Törlés harmadik fél kapcsolódó felhasználói
 Permission126=Export harmadik fél
-Permission141=Olvassa projektek (szintén magán nem vagyok kapcsolatba a)
-Permission142=Létrehozza / módosítja projektek (szintén magán nem vagyok kapcsolatba a)
-Permission144=Törlés projektek (szintén magán nem vagyok kapcsolatba a)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Olvassa szolgáltatók
 Permission147=Olvassa statisztika
 Permission151=Olvassa házszabályok
@@ -800,7 +801,7 @@ DictionaryCountry=Országok
 DictionaryCurrency=Pénznemek
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=E-mail sablonok
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Beállítás mentett
 BackToModuleList=Visszalép a modulok listáját
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Város
 CompanyCountry=Ország
 CompanyCurrency=Fő valuta
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Ne jelenjen meg
 DoNotSuggestPaymentMode=Ne azt
 NoActiveBankAccountDefined=Nincs aktív bankszámla definiált
 OwnerOfBankAccount=Tulajdonosa bankszámla %s
 BankModuleNotActive=Bankszámlák modul nincs engedélyezve
-ShowBugTrackLink=Mutasd link &quot;Hiba jelentése&quot;
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show &quot;munkapad&quot; a honlapon
 Alerts=Figyelmeztetések
 Delays=Késések
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max a tizedes egységár
 MAIN_MAX_DECIMALS_TOT=Max tizedes teljes áron
 MAIN_MAX_DECIMALS_SHOWN=Max tizedes az árak a képernyőn látható (Új <b>...</b> miután ezt a számot, ha meg akarja nézni <b>...</b> amikor számot csonkolni a képernyőn látható)
 MAIN_DISABLE_PDF_COMPRESSION=Használja a PDF tömörítés generált PDF fájlokat.
-MAIN_ROUNDING_RULE_TOT= Mérete kerekítés tartomány (A ritka országok, ahol a kerekítés történik valami más, mint 10-es alapú)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Nettó egységár egy termék
 TotalPriceAfterRounding=Teljes ár (nettó / ÁFA / incl adó) után a kerekítés
 ParameterActiveForNextInputOnly=Paraméter hatékony következő bemeneti csak
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=A %s meghajtóprogram van használatban, ez a jelenleg elérhető legjobb.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max. termékek száma a kombók válassza listák (0
 ConfirmDeleteProductLineAbility=Megerősítés eltávolításakor gyártósorok formában
 ModifyProductDescAbility=Személyre termékleírások formában
 ViewProductDescInFormAbility=Visualization a termékleírásokat a formanyomtatványok (egyébként a felugró eszköztipp)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization termékek leírását a thirdparty nyelven
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Támogatás Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Alapértelmezett típusú vonalkód használatát termékek
 SetDefaultBarcodeTypeThirdParties=Alapértelmezett típusú vonalkód használatát harmadik felek számára
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Vonalkód típusú UPC
 BarcodeDescISBN=Vonalkód típusú ISBN
 BarcodeDescC39=Vonalkód típusú C39
 BarcodeDescC128=Vonalkód típusú C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Biztos benne, hogy törli menübejegyzést <b>%s?</b>
 DeleteLine=Törlés vonal
 ConfirmDeleteLine=Biztosan törölni szeretné ezt a vonalat?
 ##### Tax #####
-TaxSetup=Az adók, társadalombiztosítási járulékok és osztalék modul beállítása
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=ÁFA miatt
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices modul beállítása
 WebServicesDesc=Azáltal, hogy ez a modul, Dolibarr vált a web szerver szolgáltatást nyújtani különböző webes szolgáltatásokat.
 WSDLCanBeDownloadedHere=WSDL leíró fájlok a nyújtott szolgáltatások is letölthető itt
 EndPointIs=SOAP kliens kell küldeni a kérelmeket az Dolibarr végpont elérhető Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank modul beállítása
 FreeLegalTextOnChequeReceipts=Szabad szöveg ellenőrzés bevételek
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekt modul beállítása
 ProjectsModelModule=Projektjének dokumentum modellje
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Megnyitva
+Opened=Open
 Closed=Closed
 AlwaysEditable=Mindig szerkeszthető
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index b3144ba2bd2..87d8b880011 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Rendelés %s jóváhagyott
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Rendelés %s menj vissza vázlat
-OrderCanceledInDolibarr=Rendelés %s törölt
 ProposalSentByEMail=Üzleti ajánlat %s postáztuk
 OrderSentByEMail=Ügyfél érdekében %s postáztuk
 InvoiceSentByEMail=Az ügyfél számlát postáztuk %s
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index 5398c92d8da..6443ac1cb18 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Összeegyeztetni
 Conciliation=Egyeztetés
 ConciliationForAccount=Összeegyeztetni ezt a számlát
 IncludeClosedAccount=Közé zárt fiókok
-OnlyOpenedAccount=Csak számlát nyitott
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Számla a hitelhez
 AccountToDebit=Számla terhére
 DisableConciliation=Letiltása összehangolási funkció erre a számlára
 ConciliationDisabled=Megbékélés funkció tiltva
-StatusAccountOpened=Megnyitotta
+StatusAccountOpened=Open
 StatusAccountClosed=Zárva
 AccountIdShort=Szám
 EditBankRecord=A rekord szerkesztése
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Ügyfél fizetési
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Szállító kifizetése
 WithdrawalPayment=Élelmezés-egészségügyi várakozási fizetés
-SocialContributionPayment=Társadalombiztosítási járulék fizetési
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Pénzügyi mérleg folyóirat
 BankTransfer=Banki átutalás
 BankTransfers=Banki átutalás
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index f33958ab6f6..ce5185ab4df 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb számlák
 NumberOfBillsByMonth=Nb a számlák hónap
 AmountOfBills=Számlák összege
 AmountOfBillsByMonthHT=Összege a számlák havonta (adózott)
-ShowSocialContribution=Mutasd társadalombiztosítási járulék
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Mutasd számla
 ShowInvoice=Mutasd számla
 ShowInvoiceReplace=Megjelenítése helyett számlát
@@ -270,7 +270,7 @@ BillAddress=Bill cím
 HelpEscompte=Ez a kedvezmény egy engedmény a vevő, mert a kifizetés előtt távon.
 HelpAbandonBadCustomer=Ez az összeg már elhagyott (ügyfél azt mondta, hogy egy rossz ügyfél), és van úgy, mint egy kivételes laza.
 HelpAbandonOther=Ez az összeg már elhagyni, mivel ez volt a hiba (hibás számla vagy ügyfél helyébe egy másik, például)
-IdSocialContribution=Társadalombiztosítási járulék id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Fizetés id
 InvoiceId=Számla id
 InvoiceRef=Számla ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Azonnali
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index f91459aba54..b048e792333 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Rss Információk
 BoxLastProducts=Utolsó %s termék / szolgáltatás
-BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Készlet figyelmeztetés
 BoxLastProductsInContract=Utolsó %s leszerződött termék / szolgáltatás
 BoxLastSupplierBills=Utolsó beszállítói számlák
 BoxLastCustomerBills=Utolsó ügyfél számlák
@@ -18,8 +18,8 @@ BoxLastActions=Utolsó cselekvések
 BoxLastContracts=Utolsó szerződések
 BoxLastContacts=Utolsó kapcsolatok / címek
 BoxLastMembers=Utolsó tagok
-BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxFicheInter=Utolsó beavatkozás
+BoxCurrentAccounts=Nyitott számla egyenleg
 BoxSalesTurnover=Értékesítési forgalom
 BoxTotalUnpaidCustomerBills=Összes ki nem fizetett ügyfél számla
 BoxTotalUnpaidSuppliersBills=Összes ki nem fizetett beszállító számla
@@ -27,32 +27,32 @@ BoxTitleLastBooks=Utolsó %s jegyzett könyvek
 BoxTitleNbOfCustomers=Ügyfelek száma
 BoxTitleLastRssInfos=Utolsó %s hír a(z) %s -ról
 BoxTitleLastProducts=Utolsó %s módosított termék / szolgáltatás
-BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleProductsAlertStock=Készlet figyelmeztetés
+BoxTitleLastCustomerOrders=Utolsó %s vevői megrendelés
 BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Utolsó %s jegyzett beszállító
-BoxTitleLastCustomers=Utolsó %s jegyzett ügyfél
+BoxTitleLastCustomers=Utolsó %s jegyzett vevő
 BoxTitleLastModifiedSuppliers=Utolsó %s módosított beszállító
-BoxTitleLastModifiedCustomers=Utolsó %s módosított ügyfél
-BoxTitleLastCustomersOrProspects=Last %s customers or prospects
-BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedCustomers=Utolsó %s módosított vevő
+BoxTitleLastCustomersOrProspects=Utolsó %s vevő vagy jelentkező
+BoxTitleLastPropals=Utolsó %s jelentkező
 BoxTitleLastModifiedPropals=Last %s modified proposals
-BoxTitleLastCustomerBills=Utolsó %s ügyfél számla
+BoxTitleLastCustomerBills=Utolsó %s vevő számla
 BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
-BoxTitleLastSupplierBills=Utolsó %s beszállító számla
+BoxTitleLastSupplierBills=Utolsó %s szállító számla
 BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
-BoxTitleLastModifiedProspects=Utolsó %s módosított kilátás
+BoxTitleLastModifiedProspects=Utolsó %s módosított jelentkező
 BoxTitleLastProductsInContract=Utolsó %s termékek / szolgáltatások szerződésbe foglalva
-BoxTitleLastModifiedMembers=Last %s members
+BoxTitleLastModifiedMembers=Utolsó %s tag
 BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleOldestUnpaidCustomerBills=Legrégebbi %s nyitott vevői számla
+BoxTitleOldestUnpaidSupplierBills=Legrégebbi %s nyitott szállítói számla
+BoxTitleCurrentAccounts=Nyitott számlaegyenleg
 BoxTitleSalesTurnover=Értékesítési forgalom
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
-BoxTitleLastModifiedContacts=Utolsó módosítás %s kapcsolatok / címek
-BoxMyLastBookmarks=%s utolsó könyvjelzőim
+BoxTitleTotalUnpaidCustomerBills=Nyiott vevőszámlák
+BoxTitleTotalUnpaidSuppliersBills=Nyitott szállító számlák
+BoxTitleLastModifiedContacts=Utolsó %s módosított kapcsolat / cím
+BoxMyLastBookmarks=%s utolsó könyvjelzőm
 BoxOldestExpiredServices=Legrégebbi aktív lejárt szolgáltatások
 BoxLastExpiredServices=Utolsó %s legidősebb aktív kapcsolatot lejárt szolgáltatások
 BoxTitleLastActionsToDo=Utolsó %s végrehatjtásra váró cselekvés
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 340e05776ac..4e3931ff2a9 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> sikeresen hozzá lett adva.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Nincs
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ez a kategória ezzel a ref# -el már létezik
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Tartalom nem látható mindenki számára
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Vásárló/Kilátás kategóriák
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 0e5a758e750..6627613b7a5 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -1,65 +1,66 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Cégnév %s már létezik. Válasszon egy másikat.
 ErrorPrefixAlreadyExists=Prefix %s már létezik. Válasszon egy másikat.
-ErrorSetACountryFirst=1. Állítsa be az országot
-SelectThirdParty=Válasszon egy harmadik fél
-DeleteThirdParty=Törlése egy harmadik fél
-ConfirmDeleteCompany=Biztos benne, hogy törli a vállalat és az összes öröklött információt?
+ErrorSetACountryFirst=Először állítsa be az országot
+SelectThirdParty=Válasszon egy partnert
+DeleteThirdParty=Partner törlése
+ConfirmDeleteCompany=Biztos benne, hogy törli a céget és az összes örökölt információt?
 DeleteContact=Kapcsolat törlése
-ConfirmDeleteContact=Biztosan törölni akarja ezt a kapcsolatot és az összes öröklött információt?
-MenuNewThirdParty=Új harmadik fél
+ConfirmDeleteContact=Biztosan törölni akarja ezt a kapcsolatot és az összes örökölt információt?
+MenuNewThirdParty=Új partner
 MenuNewCompany=Új cég
-MenuNewCustomer=Új ügyfél
-MenuNewProspect=Új kilátások
+MenuNewCustomer=Új vevő
+MenuNewProspect=Új jelentkező
 MenuNewSupplier=Új beszállító
 MenuNewPrivateIndividual=Új magánszemély
 MenuSocGroup=Csoportok
-NewCompany=Új cég (kilátás, vevő, szállító)
-NewThirdParty=Új harmadik fél (kilátás, vevő, szállító)
+NewCompany=Új cég (jelentkező, vevő, szállító)
+NewThirdParty=Új partner (jelentkező, vevő, szállító)
 NewSocGroup=Új cégcsoport
-NewPrivateIndividual=Új magánszemély (kilátás, vevő, szállító)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
-ProspectionArea=Bányászati ​​terület
+NewPrivateIndividual=Új magánszemély (jelentkező, vevő, szállító)
+CreateDolibarrThirdPartySupplier=Parnter (szállító) létrehozása
+ProspectionArea=Potenciális ​​terület
 SocGroup=Cégcsoport
-IdThirdParty=Id harmadik fél
-IdCompany=ISZ
+IdThirdParty=Partner ID
+IdCompany=Cég ID
 IdContact=Contact ID
 Contacts=Kapcsolatok
-ThirdPartyContacts=Harmadik fél kapcsolatok
-ThirdPartyContact=Harmadik fél Kapcsolat
-StatusContactValidated=Állapot kapcsolattartó
-Company=Vállalat
+ThirdPartyContacts=Partner kapcsolatok
+ThirdPartyContact=Paertner Kapcsolat/Cím
+StatusContactValidated=Kapcsolat/Cím állapota
+Company=Cég
 CompanyName=Cégnév
+AliasNames=Alias név (kereskedelmi, márkanév, ...)
 Companies=Cégek
-CountryIsInEEC=Ország belül van az Európai Gazdasági Közösség
-ThirdPartyName=Harmadik fél neve
-ThirdParty=Harmadik fél
-ThirdParties=Harmadik fél
-ThirdPartyAll=Harmadik felek (összes)
-ThirdPartyProspects=Kilátások
-ThirdPartyProspectsStats=Kilátások
-ThirdPartyCustomers=Az ügyfelek
-ThirdPartyCustomersStats=Ügyfelek
-ThirdPartyCustomersWithIdProf12=Ügyfelek vagy %s %s
-ThirdPartySuppliers=Beszállítók
-ThirdPartyType=Harmadik fél típusa
-Company/Fundation=Company / Alapítvány
+CountryIsInEEC=EU tagország
+ThirdPartyName=Partner neve
+ThirdParty=Partner
+ThirdParties=Partner
+ThirdPartyAll=Partnerek (összes)
+ThirdPartyProspects=Jelentkezők
+ThirdPartyProspectsStats=Jelentkezők
+ThirdPartyCustomers=Vevők
+ThirdPartyCustomersStats=Vevők
+ThirdPartyCustomersWithIdProf12=Vevők %s vagy %s
+ThirdPartySuppliers=Szállítók
+ThirdPartyType=Partner típusa
+Company/Fundation=Cég / Alapítvány
 Individual=Magánszemély
-ToCreateContactWithSameName=Automatikusan létrehoz egy fizikai érintkezés ugyanolyan információk
+ToCreateContactWithSameName=Automatikus fizikai kapcsolatot hoz létre ugyanazokkal az információkkal
 ParentCompany=Anyavállalat
 Subsidiary=Leányvállalat
 Subsidiaries=Leányvállalatok
 NoSubsidiary=Nincs leányvállalata
-ReportByCustomers=Jelentés az ügyfeleknek
-ReportByQuarter=Jelentése ráta
-CivilityCode=Udvariasság kód
+ReportByCustomers=Jelentés vevőnként
+ReportByQuarter=Jelentés %-onként
+CivilityCode=Udvariassági kód
 RegisteredOffice=Bejegyzett iroda
 Name=Név
 Lastname=Vezetéknév
 Firstname=Keresztnév
-PostOrFunction=Hozzászólás / Function
-UserTitle=Cím
-Surname=Vezetéknév / Pszeudo
+PostOrFunction=Beosztás / Szerepkör
+UserTitle=Titulus
+Surname=Vezetéknév / Becenév
 Address=Cím
 State=Állam / Tartomány
 Region=Régió
@@ -68,53 +69,53 @@ CountryCode=Az ország hívószáma
 CountryId=Ország id
 Phone=Telefon
 Skype=Skype
-Call=Call
+Call=Hívás
 Chat=Chat
-PhonePro=Prof. telefon
+PhonePro=Hivatali telefon
 PhonePerso=Szem. telefon
-PhoneMobile=Mozgó
-No_Email=Don't send mass e-mailings
+PhoneMobile=Mobil
+No_Email=Tömeges e-mail nem küldhető
 Fax=Fax
 Zip=Irányítószám
-Town=City
+Town=Város
 Web=Web
 Poste= Pozíció
 DefaultLang=Nyelv alapértelmezés szerint
-VATIsUsed=ÁFÁ-t használnak
-VATIsNotUsed=ÁFÁ-t nem használják
-CopyAddressFromSoc=Fill address with thirdparty address
-NoEmailDefined=There is no email defined
+VATIsUsed=ÁFÁ-t használandó
+VATIsNotUsed=ÁFÁ-t nem használandó
+CopyAddressFromSoc=Cím kitöltése a partner címével
+NoEmailDefined=Nincs e-mail megadva
 ##### Local Taxes #####
-LocalTax1IsUsedES= RE használják
-LocalTax1IsNotUsedES= RE nem használják
-LocalTax2IsUsedES= IRPF használják
-LocalTax2IsNotUsedES= IRPF nem használják
+LocalTax1IsUsedES= RE használandó
+LocalTax1IsNotUsedES= RE nem használandó
+LocalTax2IsUsedES= IRPF használandó
+LocalTax2IsNotUsedES= IRPF nem használandó
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=RE típus
+TypeLocaltax2ES=IRPF típus
+TypeES=Típus
 ThirdPartyEMail=%s
-WrongCustomerCode=Ügyfél kód érvénytelen
+WrongCustomerCode=Vevőkód érvénytelen
 WrongSupplierCode=Szállító kód érvénytelen
-CustomerCodeModel=Ügyfél kód modell
+CustomerCodeModel=Vevőkód modell
 SupplierCodeModel=Szállító kód modell
 Gencod=Vonalkód
 ##### Professional ID #####
-ProfId1Short=Prof. ID 1
-ProfId2Short=Prof. ID 2
-ProfId3Short=Prof. ID 3
-ProfId4Short=Prof. ID 4
-ProfId5Short=Prof. id 5
-ProfId6Short=Prof. id 5
-ProfId1=Szakmai ID 1
-ProfId2=Szakmai ID 2
-ProfId3=Szakmai ID 3
-ProfId4=Szakmai ID 4
-ProfId5=Szakmai ID 5
-ProfId6=Professional ID 6
-ProfId1AR=Prof ID 1 (CUIL)
-ProfId2AR=Prof ID 2 (revenu barmok)
+ProfId1Short=Szakma ID 1
+ProfId2Short=Szakma ID 2
+ProfId3Short=Szakma ID 3
+ProfId4Short=Szakma ID 4
+ProfId5Short=Szakma id 5
+ProfId6Short=Szakma id 5
+ProfId1=Szakma ID 1
+ProfId2=Szakma ID 2
+ProfId3=Szakma ID 3
+ProfId4=Szakma ID 4
+ProfId5=Szakma ID 5
+ProfId6=Szakma ID 6
+ProfId1AR=Szakma ID 1 (CUIL)
+ProfId2AR=Szakma ID 2 (bruttó jövedelem)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
@@ -125,53 +126,53 @@ ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof ID 1 (Professional szám)
+ProfId1BE=Szakma ID 1 (Szakma szám)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
 ProfId5BE=-
 ProfId6BE=-
 ProfId1BR=-
-ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
+ProfId2BR=RÁ (Regisztrált Állam)
+ProfId3BR=RV (Regisztrált város)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=Prof ID 1 (Federal szám)
-ProfId4CH=Prof ID 2 (Record Kereskedelmi szám)
+ProfId3CH=Szakma ID 1 (szövetségi szám)
+ProfId4CH=Szakma ID 2 (Kereskedelmi azonosító)
 ProfId5CH=-
 ProfId6CH=-
-ProfId1CL=Prof ID 1 (RUT)
+ProfId1CL=Szakma ID 1 (RUT)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=Prof ID 1 (RUT)
+ProfId1CO=Szakma ID 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof ID 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId1DE=Szakma ID 1 (USt.-IdNr)
+ProfId2DE=Szakma Id 2 (USt.-Nr)
+ProfId3DE=Szakma Id 3 (Kereskedelm kamarai szám)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
-ProfId1ES=Prof ID 1 (CIF / NIF)
-ProfId2ES=Prof ID 2 (Társadalombiztosítási szám)
-ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate szám)
+ProfId1ES=Szakma ID 1 (CIF / NIF)
+ProfId2ES=Szakma ID 2 (Társadalombiztosítási szám)
+ProfId3ES=Szakma Id 3 (CNAE)
+ProfId4ES=Szakma Id 4 (Collegiate szám)
 ProfId5ES=-
 ProfId6ES=-
-ProfId1FR=Prof ID 1 (kürt)
-ProfId2FR=Prof ID 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, régi APE)
-ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5
+ProfId1FR=Szakma ID 1 (SIREN)
+ProfId2FR=Szakma ID 2 (SIRET)
+ProfId3FR=Szakma Id 3 (NAF, régi APE)
+ProfId4FR=Szakma Id 4 (RCS / RM)
+ProfId5FR=Szakma Id 5
 ProfId6FR=-
 ProfId1GB=Regisztrációs szám
 ProfId2GB=-
@@ -179,40 +180,40 @@ ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
+ProfId1HN=Szakma di. 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Prof ID 1 (TIN)
-ProfId2IN=Prof ID 2
-ProfId3IN=Prof ID 3
-ProfId4IN=Prof Id 4
-ProfId5IN=Prof Id 5
+ProfId1IN=Szakma ID 1 (TIN)
+ProfId2IN=Szakma ID 2 (PAN)
+ProfId3IN=Szakma ID 3 (SRVC TAX)
+ProfId4IN=Szakma Id 4
+ProfId5IN=Szakma Id 5
 ProfId6IN=-
-ProfId1MA=Id prof. 1 (RC)
-ProfId2MA=Id prof. 2 (Patente)
-ProfId3MA=Id prof. 3 (IF)
-ProfId4MA=Id prof. 4 (CNSS)
+ProfId1MA=Szakma id 1 (RC)
+ProfId2MA=Szakma id 2 (Patente)
+ProfId3MA=Szakma id 3 (IF)
+ProfId4MA=Szakma id 4 (CNSS)
 ProfId5MA=-
 ProfId6MA=-
-ProfId1MX=Prof ID 1 (RFC).
-ProfId2MX=Prof ID 2 (R.. P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charta)
+ProfId1MX=Szakma ID 1 (RFC).
+ProfId2MX=Szakma ID 2 (R.. P. IMSS)
+ProfId3MX=Szakma Id 3 (Profesional Charta)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK Nummer
+ProfId1NL=KVK Szám
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=-
+ProfId4NL=Burgerservicenummer (BSN)
 ProfId5NL=-
 ProfId6NL=-
-ProfId1PT=Prof ID 1 (NIPC)
-ProfId2PT=Prof ID 2 (Társadalombiztosítási szám)
-ProfId3PT=Prof Id 3 (Kereskedelmi Rekord szám)
-ProfId4PT=Prof Id 4 (Konzervatórium)
+ProfId1PT=Szakma ID 1 (NIPC)
+ProfId2PT=Szakma ID 2 (Társadalombiztosítási szám)
+ProfId3PT=Szakma Id 3 (Kereskedelmi azonosító szám)
+ProfId4PT=Szakma Id 4 (Konzervatórium)
 ProfId5PT=-
 ProfId6PT=-
 ProfId1SN=RC
@@ -221,16 +222,16 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=Prof ID 1 (RC)
-ProfId2TN=Prof ID 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane kód)
-ProfId4TN=Prof Id 4 (BAN)
+ProfId1TN=Szakma ID 1 (RC)
+ProfId2TN=Szakma ID 2 (Fiscal matricule)
+ProfId3TN=Szakma Id 3 (Douane kód)
+ProfId4TN=Szakma Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1RU=Prof ID 1 (OGRN)
-ProfId2RU=Prof ID 2 (INN)
-ProfId3RU=Prof Id 3 (KKP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=Szakma ID 1 (OGRN)
+ProfId2RU=Szakma ID 2 (INN)
+ProfId3RU=Szakma Id 3 (KKP)
+ProfId4RU=Szakma Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 VATIntra=Adószám
@@ -238,139 +239,139 @@ VATIntraShort=Adószám
 VATIntraVeryShort=Áfa
 VATIntraSyntaxIsValid=Szintaxis érvényes
 VATIntraValueIsValid=Az érték érvényes
-ProspectCustomer=Prospect / Ügyfél
-Prospect=Kilátás
-CustomerCard=Ügyfél-kártya
+ProspectCustomer=Jelentkező / Vevő
+Prospect=Jelentkező
+CustomerCard=Vevő-kártya
 Customer=Vevő
 CustomerDiscount=Vásárlói kedvezmény
 CustomerRelativeDiscount=Relatív vásárlói kedvezmény
 CustomerAbsoluteDiscount=Abszolút vásárlói kedvezmény
 CustomerRelativeDiscountShort=Relatív kedvezmény
 CustomerAbsoluteDiscountShort=Abszolút kedvezmény
-CompanyHasRelativeDiscount=Ez az ügyfél egy alapértelmezett kedvezményt <b>%s%%</b>
-CompanyHasNoRelativeDiscount=Ez az ügyfél nem rendelkezik a relatív kedvezményes alapértelmezésben
-CompanyHasAbsoluteDiscount=Ez az ügyfél továbbra is kedvezményes hitel vagy betét <b>%s %s</b>
-CompanyHasCreditNote=Ez az ügyfél még a jóváírási <b>%s %s</b>
-CompanyHasNoAbsoluteDiscount=Ez az ügyfélnek nincs kedvezmény hitel áll rendelkezésre
+CompanyHasRelativeDiscount=A vevő alapértelmezett kedvezménye <b>%s%%</b>
+CompanyHasNoRelativeDiscount=A vevő nem rendelkezik relatív kedvezménnyel alapértelmezésben
+CompanyHasAbsoluteDiscount=A vevő továbbra is kedvezményt kap hitel vagy betét <b>%s %s</b>-ig
+CompanyHasCreditNote=Ez a vevő még hitellel rendelkezik <b>%s %s</b>-ig
+CompanyHasNoAbsoluteDiscount=A vevőnek nincs kedvezménye vagy hitele
 CustomerAbsoluteDiscountAllUsers=Abszolút kedvezmények (minden felhasználó által megadott)
 CustomerAbsoluteDiscountMy=Abszolút kedvezmények (által nyújtott magad)
 DefaultDiscount=Alapértelmezett kedvezmény
 AvailableGlobalDiscounts=Abszolút kedvezmények
-DiscountNone=Egyik sem
+DiscountNone=Nincs
 Supplier=Szállító
-CompanyList=Vállalat lista
-AddContact=Új név / cím
-AddContactAddress=Add contact/address
-EditContact=Szerk / cím
-EditContactAddress=Edit contact/address
+CompanyList=Cégek listája
+AddContact=Kapcsolat létrehozása
+AddContactAddress=Kapcsolat/cím létrehozása
+EditContact=Kapcsoalt szerkesztése
+EditContactAddress=Kapcsolat/cím szerkesztése
 Contact=Kapcsolat
-ContactsAddresses=Kapcsolat / címek
-NoContactDefinedForThirdParty=No contact defined for this third party
-NoContactDefined=Nincs kapcsolat az erre a harmadik fél
+ContactsAddresses=Kapcsolatok / címek
+NoContactDefinedForThirdParty=Nincs szerződés ehhez a partnerhez
+NoContactDefined=Nincs kapcsolat megadva
 DefaultContact=Alapértelmezett kapcsolat
-AddCompany=Add cég
-AddThirdParty=Add harmadik fél
-DeleteACompany=Törlése cég
+AddCompany=Cég létrehozása
+AddThirdParty=Parnter létrehozása (harmadik fél)
+DeleteACompany=Cég törlése
 PersonalInformations=Személyes adatok
 AccountancyCode=Számviteli kód
-CustomerCode=Ügyfél kód
+CustomerCode=Vevőkód
 SupplierCode=Szállító kódja
-CustomerAccount=Ügyfélszámla
-SupplierAccount=Szállító számla
-CustomerCodeDesc=Ügyfél kód, egyedi minden ügyfele számára
+CustomerAccount=Vevő számlája
+SupplierAccount=Szállító számlája
+CustomerCodeDesc=Vevőkód, egyedi minden vevő számára
 SupplierCodeDesc=Szállító kódja, egyedi minden szolgáltató
-RequiredIfCustomer=Kötelező, ha harmadik fél, vagy egy ügyfél kilátásba
+RequiredIfCustomer=Kötelező, ha a partner vevő vagy jelentkező
 RequiredIfSupplier=Kötelező, ha harmadik fél a szállító
-ValidityControledByModule=Érvényességi vezérli a modul
-ThisIsModuleRules=Ez a modul szabályok
+ValidityControledByModule=Érvényességi a modulban beállítva
+ThisIsModuleRules=A modul szabályai
 LastProspect=Utolsó
-ProspectToContact=Prospect kapcsolatba
-CompanyDeleted=Társaság &quot;%s&quot; törölve az adatbázisból.
+ProspectToContact=Jelentkező a kapcsolat felvételre
+CompanyDeleted="%s" cég törölve az adatbázisból.
 ListOfContacts=Névjegyek / címek
-ListOfContactsAddresses=List of contacts/adresses
-ListOfProspectsContacts=Kilátás kapcsolatok listája
+ListOfContactsAddresses=Kapcsolatok listája
+ListOfProspectsContacts=Jelentkezők kapcsolatainak listája
 ListOfCustomersContacts=Ügyfél kapcsolatok listája
-ListOfSuppliersContacts=Beszállítói kapcsolatok listája
-ListOfCompanies=Társaságok listája
-ListOfThirdParties=Harmadik személyek listája
-ShowCompany=Mutasd cég
-ShowContact=Mutasd a kontaktus
+ListOfSuppliersContacts=Szállítói kapcsolatok listája
+ListOfCompanies=Cégek listája
+ListOfThirdParties=Partnerek listája
+ShowCompany=Cég mutatása
+ShowContact=Kapcsolat mutatása
 ContactsAllShort=Minden (nincs szűrő)
 ContactType=Kapcsolat típusa
-ContactForOrders=Rend Kapcsolat
-ContactForProposals=Javaslat kapcsolattartó
-ContactForContracts=A szerződés a kapcsolattartó
+ContactForOrders=Megrendelés kapcsolattartó
+ContactForProposals=Jelentkező kapcsolattartó
+ContactForContracts=Szerződéses kapcsolattartó
 ContactForInvoices=Számla kapcsolattartó
-NoContactForAnyOrder=Ez a kapcsolat nem kapcsolat bármilyen sorrendben
-NoContactForAnyProposal=Ez a kapcsolat nem kapcsolat bármilyen kereskedelmi javaslat
-NoContactForAnyContract=Ez a kapcsolat nem kapcsolat bármely szerződéses
-NoContactForAnyInvoice=Ez a kapcsolat nem kapcsolat bármilyen számla
-NewContact=Új kapcsolat / cím
-NewContactAddress=New contact/address
+NoContactForAnyOrder=Egyetlen megrdelésben sem kapcsolattartó
+NoContactForAnyProposal=Nem kapcsolattartó egyik kereskedelmi javaslatnál sem
+NoContactForAnyContract=Nem kapcsolattartó egyetlen szerződésnél sem
+NoContactForAnyInvoice=Nem kapcsolattartó egyik számlánál sem
+NewContact=Új kapcsolat
+NewContactAddress=Új kapcsolat/cím
 LastContacts=Utolsó kapcsolatok
-MyContacts=Saját kapcsolatok
+MyContacts=Kapcsolataim
 Phones=Telefonok
 Capital=Tőke
-CapitalOf=Fővárosa %s
-EditCompany=Cégadatok
+CapitalOf=%s tőkéje
+EditCompany=Cég szerkesztése
 EditDeliveryAddress=Szállítási cím szerkesztése
-ThisUserIsNot=Ez a felhasználó nem egy jelölt, sem a vevő szállító
-VATIntraCheck=Check
-VATIntraCheckDesc=A link <b>%s</b> lehetővé teszi, hogy kérje az európai HÉA-ellenőrző szolgáltatás. Egy külső internetezhetnek Server szükséges ez a szolgáltatás működjön.
+ThisUserIsNot=A felhasználó nem jelentkező, vevő vagy szállító
+VATIntraCheck=Csekk
+VATIntraCheckDesc=A link <b>%s</b> lehetővé teszi, hogy kérje az európai adószám ellenőrzését. Internet kapcsolat szükséges.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Ellenőrizze Intracomunnautary ÁFA jutalék európai helyszínen
-VATIntraManualCheck=Ön is ellenőrizheti manuálisan európai honlapján <a href="%s" target="_blank">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Ellenőrizze nem lehetséges. Ellenőrizze a szolgáltatást nem az érintett tagállam (%s).
-NorProspectNorCustomer=Sem kilátás, sem a vevő
+VATIntraCheckableOnEUSite=Ellenőrizze a közösségen belüli ÁFA-t az európai bizottság oldalán.
+VATIntraManualCheck=Ön is ellenőrizheti manuálisan az EU honlapján <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Ellenőrzés nem lehetséges. A szolgáltatást a tagállam nem teszi lehetővé (%s).
+NorProspectNorCustomer=Nem jelentkező vagy vevő
 JuridicalStatus=Jogi státusz
 Staff=Személyzet
 ProspectLevelShort=Potenciális
-ProspectLevel=Prospect potenciális
+ProspectLevel=Jelentkezői potenciál
 ContactPrivate=Magán
 ContactPublic=Megosztott
 ContactVisibility=Láthatóság
-OthersNotLinkedToThirdParty=Mások, nem kapcsolódik egy harmadik fél
-ProspectStatus=Prospect állapot
+OthersNotLinkedToThirdParty=Más, nem  partnerhez kapcsolt
+ProspectStatus=Jelentkező állapota
 PL_NONE=Egyik sem
 PL_UNKNOWN=Ismeretlen
 PL_LOW=Alacsony
 PL_MEDIUM=Közepes
-PL_HIGH=Nagy
+PL_HIGH=Magas
 TE_UNKNOWN=-
-TE_STARTUP=Indítás
+TE_STARTUP=Induló vállalkozás
 TE_GROUP=Nagyvállalat
-TE_MEDIUM=Közepes cég
+TE_MEDIUM=Közepes vállalat
 TE_ADMIN=Kormányzati
-TE_SMALL=Kis cég
-TE_RETAIL=Kiskereskedő
-TE_WHOLE=Wholetailer
+TE_SMALL=Kisvállalat
+TE_RETAIL=Viszonteladó
+TE_WHOLE=Nagykereskedő
 TE_PRIVATE=Magánszemély
 TE_OTHER=Más
-StatusProspect-1=Ne forduljon
-StatusProspect0=Soha kapcsolatot
+StatusProspect-1=Nincs kapcsolatfelvétel
+StatusProspect0=Kapcsolatfelvétel nem volt
 StatusProspect1=A kapcsolatfelvételhez
 StatusProspect2=Kapcsolat folyamatban
-StatusProspect3=Kapcsolat történt
-ChangeDoNotContact=Megváltoztatják státuszukat &quot;Ne keresse&quot;
-ChangeNeverContacted=Megváltoztatják státuszukat &quot;Soha kapcsolatot&quot;
-ChangeToContact=Megváltoztatják státuszukat &quot;Kapcsolat&quot;
-ChangeContactInProcess=Állapot módosítása a &quot;Kapcsolat folyamatban&quot;
-ChangeContactDone=Állapot módosítása a &quot;Kapcsolat tenni&quot;
-ProspectsByStatus=Kilátások állapot szerint
+StatusProspect3=Kapcsolatfelévétel történt
+ChangeDoNotContact=Megváltoztás erre: &quot;Ne keresse&quot;
+ChangeNeverContacted=Megváltoztatás erre: &quot;Soha kapcsolatot&quot;
+ChangeToContact=Megváltoztás erre: &quot;Kapcsolat&quot;
+ChangeContactInProcess=Megváltoztatás erre: &quot;Kapcsolat folyamatban&quot;
+ChangeContactDone=Megváltoztatás erre: &quot;Kapcsolat tenni&quot;
+ProspectsByStatus=Jelentkezők állapot szerint
 BillingContact=Számlázási kapcsolat
 NbOfAttachedFiles=A csatolt fájlok száma
 AttachANewFile=Új fájl csatolása
-NoRIB=Nem tiltják meg
+NoRIB=Nincs BAN megadva
 NoParentCompany=Egyik sem
 ExportImport=Import-Export
-ExportCardToFormat=Export kártya formátumú
-ContactNotLinkedToCompany=Kapcsolat nem kapcsolódik semmilyen harmadik fél
+ExportCardToFormat=Kártya exportálása formázással
+ContactNotLinkedToCompany=Kapcsolat nincs partnerhez csatolva
 DolibarrLogin=Dolibarr bejelentkezés
 NoDolibarrAccess=Nem Dolibarr hozzáférés
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Partner (Cég/alapítvány/magánszemély) és tulajdonságok
 ExportDataset_company_2=Kapcsolatok és tulajdonságai
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
+ImportDataset_company_1=Partner (Cég/alapítvány/magánszemély) és tulajdonságok
+ImportDataset_company_2=Kapcsolatok/címek (partner vagy nem) és attribútumok
 ImportDataset_company_3=Banki adatok
 PriceLevel=Árszint
 DeliveriesAddress=Szállítási címek
@@ -379,36 +380,41 @@ DeliveryAddressLabel=Szállítási cím címke
 DeleteDeliveryAddress=Szállítási cím törlése
 ConfirmDeleteDeliveryAddress=Biztosan törölni akarja ezt a szállítási címet?
 NewDeliveryAddress=Új szállítási cím
-AddDeliveryAddress=Cím hozzáadása
-AddAddress=Cím hozzáadása
-NoOtherDeliveryAddress=Nincs olyan alternatív szállítási cím határozza meg
-SupplierCategory=Beszállítói kategória
+AddDeliveryAddress=Cím létrehozása
+AddAddress=Cím létrehozása
+NoOtherDeliveryAddress=Nincs alternatív szállítási cím megadva
+SupplierCategory=Szállítói kategória
 JuridicalStatus200=Független
 DeleteFile=Fájl törlése
 ConfirmDeleteFile=Biztosan törölni akarja ezt a fájlt?
-AllocateCommercial=Lefoglalni egy kereskedelmi
+AllocateCommercial=Kereskedelmi képviselőhöz rendelve
 SelectCountry=Válasszon országot
-SelectCompany=Válasszon egy harmadik fél
+SelectCompany=Válasszon partnert
 Organization=Szervezet
 AutomaticallyGenerated=Automatikusan generált
-FiscalYearInformation=Tájékoztatás a költségvetési évben
-FiscalMonthStart=Kezdő hónapban az üzleti év
-YouMustCreateContactFirst=Létre kell hoznia e-mail kapcsolatokat a harmadik párt első, hogy képes legyen felvenni e-mail értesítéseket.
-ListSuppliersShort=Beszállítók listája
-ListProspectsShort=Listája kilátások
-ListCustomersShort=Ügyfelek listája
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Utolsó módosítás %s harmadik fél
-UniqueThirdParties=Összesen egyedi harmadik fél
-InActivity=Nyitva
-ActivityCeased=Zárva
-ActivityStateFilter=Gazdasági aktivitás
-ProductsIntoElements=List of products into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Reached max. for outstanding bill
-MonkeyNumRefModelDesc=Vissza a numero formátumban %syymm-nnnn kódot, és az ügyfelek %syymm-nnnn kódot, ahol a szállító yy év, hónap és mm nnnn sorozata szünet nélkül, és nincs visszaút 0-ra.
-LeopardNumRefModelDesc=Vevő / szállító kód ingyenes. Ez a kód lehet bármikor módosítható.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+FiscalYearInformation=Információ a pénzügyi évről
+FiscalMonthStart=Pénzügyi év kezdő hónapja
+YouMustCreateContactFirst=E-mail értesítő hozzáadásához létre kell hozni egy e-mail kapcsolatot a partnerhez.
+ListSuppliersShort=Szállítók listája
+ListProspectsShort=Jelenkezők listája
+ListCustomersShort=Vevők listája
+ThirdPartiesArea=Partner és a szerződés helye
+LastModifiedThirdParties=Utolsó %s módosított partner
+UniqueThirdParties=Összes egyedi parnter
+InActivity=Nyitott
+ActivityCeased=Lezárt
+ActivityStateFilter=Aktivitás állapota
+ProductsIntoElements=Termékek listája ide: %s
+CurrentOutstandingBill=Jelenlegi kintlévőség
+OutstandingBill=Maximális kintlévőség
+OutstandingBillReached=Elérte a kintlévőség felső határát
+MonkeyNumRefModelDesc=Szám formátumban %syymm-nnnn vevőkód, és %syymm-nnnn szállítóküd, ahol yy év, mm a hónap és nnnn sorfolytonosan növekvő számsor, ami nem lehet nulla.
+LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
+ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
+SearchThirdparty=Partner keresése
+SearchContact=Szerződés keresése
+MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
+MergeThirdparties=Partnerek egyesítése
+ConfirmMergeThirdparties=Biztos hogy egyesíteni szeretnéd ezt a partnert az aktuális partnerrel? Minden kapcsolt objektum (számlák, megrendelések, ...) átkerülnek a jelenlegi partnerhez, így a másik törölhetővé válik.
+ThirdpartiesMergeSuccess=Partnerek egyesítése megtörtént
+ErrorThirdpartiesMerge=Hiba történt a partner törlésekor. Ellenőrizd a log-ban. A változtatás visszavonva.
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 13b4925f02c..882c69ef05d 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Beszedett HÉA
 ToPay=Fizetni
 ToGet=Ahhoz, hogy vissza
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Adó, társadalombiztosítási járulékok és osztalék terület
-SocialContribution=Társadalombiztosítási járulék
-SocialContributions=Társadalombiztosítási hozzájárulások
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Adók és osztalék
 MenuSalaries=Salaries
-MenuSocialContributions=Társadalombiztosítási hozzájárulások
-MenuNewSocialContribution=Új hozzájárulás
-NewSocialContribution=Új társadalombiztosítási járulék
-ContributionsToPay=Hozzájárulás fizetni
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Számviteli / Treasury területén
 AccountancySetup=Számviteli setup
 NewPayment=Új fizetési
 Payments=Kifizetések
 PaymentCustomerInvoice=Ügyfél számla fizetési
 PaymentSupplierInvoice=Szállító számla fizetési
-PaymentSocialContribution=Társadalombiztosítási járulék fizetési
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=ÁFA-fizetés
 PaymentSalary=Salary payment
 ListPayment=A fizetési lista
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=ÁFA fizetés
 VATPayments=ÁFA kifizetések
-SocialContributionsPayments=Társadalombiztosítási hozzájárulások kifizetések
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Mutasd ÁFA fizetési
 TotalToPay=Összes fizetni
 TotalVATReceived=Teljes ÁFA kapott
@@ -116,11 +116,11 @@ NewCheckDepositOn=Készítsen nyugtát letét számla: %s
 NoWaitingChecks=Nem ellenőrzi vár betét.
 DateChequeReceived=Ellenőrizze a fogadás dátumát
 NbOfCheques=Nb ellenőrzések
-PaySocialContribution=Fizetnek társadalombiztosítási járulék
-ConfirmPaySocialContribution=Biztosan meg akarja minősíteni ezt a társadalmi hozzájárulást fizetni?
-DeleteSocialContribution=Törlése társadalombiztosítási járulék
-ConfirmDeleteSocialContribution=Biztosan törölni kívánja ezt a társadalmi hozzájárulás?
-ExportDataset_tax_1=Társadalombiztosítási hozzájárulások és a kifizetések
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index 426c7a37859..3f46617780e 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Szerzősdések terólet
 ListOfContracts=Szerződések listája
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Utolsó %s módosított szerződés
 AllContracts=Minden szerződés
 ContractCard=Szerződés kártya
 ContractStatus=Szerződés állpaot
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Lejárt
 ServiceStatusClosed=Lezárva
 ServicesLegend=Szolgáltatások magyarázat
 Contracts=Szerződések
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Szerződések és a szerződések sorai
 Contract=Szerződés
 NoContracts=Nincs szerződés
 MenuServices=Szolgáltatás
@@ -28,7 +28,7 @@ MenuRunningServices=Futó szolgáltatások
 MenuExpiredServices=Lejárt szolgáltatások
 MenuClosedServices=Lezárt szolgáltatások
 NewContract=Új szerződés
-AddContract=Create contract
+AddContract=Szerződés hozzáadása
 SearchAContract=Szerződés keresése
 DeleteAContract=Szerződés törlése
 CloseAContract=Szerződés lezárása
@@ -39,14 +39,14 @@ ConfirmCloseService=Biztos le akarja zárni a <b>%s</b> dátummal ellátott szol
 ValidateAContract=Szerződés hitelesítése
 ActivateService=Aktív szolgáltatás
 ConfirmActivateService=Biztos aktiválni akarja a <b>%s</b> dátummal ellátott szolgáltatást?
-RefContract=Contract reference
+RefContract=Szerződés azonosító
 DateContract=Szerződés dátuma
 DateServiceActivate=Szolgáltatás aktiválásának dátuma
 DateServiceUnactivate=Szolgáltatás deaktiválásának dátuma
 DateServiceStart=Szolgáltatás kezdetének a dátuma
 DateServiceEnd=Szolgáltatás végének a dátuma
 ShowContract=Szerződés mutatása
-ListOfServices=List of services
+ListOfServices=Szolgáltatások listája
 ListOfInactiveServices=Nem aktív szolágltatások listája
 ListOfExpiredServices=Lejárt, de még aktív szolgáltatások listája
 ListOfClosedServices=Lezárt szolgáltatások listája
@@ -54,7 +54,7 @@ ListOfRunningContractsLines=Futó szerződések listája
 ListOfRunningServices=Futó szolgáltatások listája
 NotActivatedServices=Inaktív szolgáltatások (a hitelesített szerződések között)
 BoardNotActivatedServices=Hitelesített szerződésekhez tartozó aktiválandó szolgáltatások
-LastContracts=Last %s contracts
+LastContracts=Utolsó %s szerződés
 LastActivatedServices=Utolós %s aktivált szolgáltatás
 LastModifiedServices=Utolsó %s módosított szolgáltatás
 EditServiceLine=Szolgáltatás sor szerkesztése
@@ -70,7 +70,7 @@ DateEndReal=Tényleges befejezési dátum
 DateEndRealShort=Tényleges befejezési dátum
 NbOfServices=Szolgáltatások száma
 CloseService=Szolgáltatás lezárása
-ServicesNomberShort=%s szolgáltatás(ok)
+ServicesNomberShort=%s szolgáltatás
 RunningServices=Futó szolgáltatások
 BoardRunningServices=Lejárt futó szolgáltatások
 ServiceStatus=Szolgáltatások állapota
@@ -86,18 +86,18 @@ PaymentRenewContractId=Szerződés sor megújítása (%s)
 ExpiredSince=Lejárati dátum
 RelatedContracts=Csatlakozó szerződések
 NoExpiredServices=Nincs lejárt aktív szolgáltatások
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ListOfServicesToExpireWithDuration=%s napon belül lejáró szolgáltatások
+ListOfServicesToExpireWithDurationNeg=%s napon túl lejáró szolgáltatások
+ListOfServicesToExpire=Lejáró szolgáltatások
+NoteListOfYourExpiredServices=Ez a lista csak azoknak a szerződéseknek a szolgáltatásait tartalmazza, amik harmadik félhez mint kereskedelmi képviselőhöz lettek linkelve.
+StandardContractsTemplate=Általános szerződés minta
+ContactNameAndSignature=A %s-hez név és aláírás
+OnlyLinesWithTypeServiceAreUsed=Csak a "Service" szolgáltatás sorok lesznek klónozva.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Értékesítési képviselő a szerződés aláírásakor
 TypeContact_contrat_internal_SALESREPFOLL=Értékesítési képviselő a szerződés követésekor
 TypeContact_contrat_external_BILLING=Számlázandó ügyfél
 TypeContact_contrat_external_CUSTOMER=Ügyfél kapcsolat tartó
-TypeContact_contrat_external_SALESREPSIGN=A szerződést aláíró ügyfél
+TypeContact_contrat_external_SALESREPSIGN=A szerződést aláíró személy
 Error_CONTRACT_ADDON_NotDefined=Állandó CONTRACT_ADDON nincs definiálva
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index 078f1829621..79fb9737d52 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -4,10 +4,10 @@ About = Róla
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Kezdési dátum
 CronDtEnd=Befejezési dátum
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Módszer
 CronModule=Modul
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Paraméterek
 CronSaveSucess=Save succesfully
 CronNote=Megjegyzés
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/hu_HU/dict.lang b/htdocs/langs/hu_HU/dict.lang
index 538de858333..5cfd1f7c31e 100644
--- a/htdocs/langs/hu_HU/dict.lang
+++ b/htdocs/langs/hu_HU/dict.lang
@@ -6,7 +6,7 @@ CountryES=Spanyolország
 CountryDE=Németország
 CountryCH=Svájc
 CountryGB=Nagy-Britannia
-# CountryUK=United Kingdom
+CountryUK=Egyesült Királyság
 CountryIE=Írország
 CountryCN=Kína
 CountryTN=Tunézia
@@ -252,8 +252,7 @@ CivilityMME=Asszony
 CivilityMR=Úr
 CivilityMLE=Kisasszony
 CivilityMTRE=Mester
-# CivilityDR=Doctor
-
+CivilityDR=Doktor
 ##### Currencies #####
 Currencyeuros=Euró
 CurrencyAUD=AU dollár
@@ -290,10 +289,10 @@ CurrencyXOF=CFA frank BCEAO
 CurrencySingXOF=CFA frank BCEAO
 CurrencyXPF=CFP frank
 CurrencySingXPF=CFP frank
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=ezer
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Levelezési kampányban
@@ -302,28 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Telefon kampány
 DemandReasonTypeSRC_CAMP_FAX=Fax kampány
 DemandReasonTypeSRC_COMM=Kereskedelmi kapcsolat
 DemandReasonTypeSRC_SHOP=Shop kapcsolatban
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Parner
+DemandReasonTypeSRC_EMPLOYEE=Foglalkoztató
+DemandReasonTypeSRC_SPONSORING=Szponoráció
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index 19ae18f33b9..9468e1f5990 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Objektum alapjáni keresés
 ECMSectionOfDocuments=Dokumentumok könyvtárai
 ECMTypeManual=Kézi
 ECMTypeAuto=Automatikus
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Harmadik féllel kapcsolatban álló dokumentumok
 ECMDocsByProposals=Ajánlatokkat kapcsolatban álló dokumentumok
 ECMDocsByOrders=Megrendelésekkel kapcsolatban álló dokumentumok
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index f40cf8a3615..c889d4b1814 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index 6b94d93f203..d631d4ec8a7 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Ok
 UserCP=Felhasználó
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Érték
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/hu_HU/incoterm.lang b/htdocs/langs/hu_HU/incoterm.lang
index 2396d2acb0e..7fa55d7079b 100644
--- a/htdocs/langs/hu_HU/incoterm.lang
+++ b/htdocs/langs/hu_HU/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
-IncotermSetupTitle2=Status
+IncotermSetupTitle1=Tulajdonság
+IncotermSetupTitle2=Státusz
 IncotermSetup=Setup of module Incoterm
 IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index 78d675524cd..050873201b6 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -25,14 +25,14 @@ ErrorGoBackAndCorrectParameters=Menjen vissza és javítsa ki a rossz paraméter
 ErrorWrongValueForParameter=Lehet, hogy rossz értéket adott meg a(z) '%s' paraméter számára.
 ErrorFailedToCreateDatabase=Nem sikerült létrehozni a(z) '%s' adatbázist.
 ErrorFailedToConnectToDatabase=Nem sikerült csatlakozni a(z) '%s' adatbázishoz.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorDatabaseVersionTooLow=Az adatbázis (%s) verziója túl alacsony. %s verzió vagy magasabb szükséges
 ErrorPHPVersionTooLow=Túl régi a PHP verzió. Legalább %s kell.
 WarningPHPVersionTooLow=PHP verzió túl régi. %s vagy több verzió várható. Ez a változat lehetővé teszi telepíteni, de nem támogatott.
 ErrorConnectedButDatabaseNotFound=Sikeres kapcsolódás az adatbázis szerverhez, de a(z) '%s' adatbázis nincs meg.
 ErrorDatabaseAlreadyExists='%s' adatbázis már létezik.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Ha az adatbázis nem létezik akkor menjen vissza és jelölje ki az "Adatbázis létrehozása" opciót.
 IfDatabaseExistsGoBackAndCheckCreate=Ha az adatbázis már létezik, menjen vissza és ne válassza az "Adatbázis létrehozása" opciót.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=A böngésző verziója túl alacsony. A legfrissebb verziójú Firefox, Chrome vagy Opera használata erősen ajánlott. 
 PHPVersion=PHP Verzió
 YouCanContinue=Folytathatja...
 PleaseBePatient=Kerjük legyen türelemmel...
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Adatbázis szerver - Superuser hozzáférés
 CheckToCreateDatabase=Pipálja ki a dobozt ha szeretné, hogy a rendszer létrehozza az adatbázist.<br>Ebbben az esetben a SuperUser bejelentkezési adatai ki kell tölteni az oldal alján.
 CheckToCreateUser=Pipálja ki a dobozt ha szeretné, hogy a rendszer létrehozza az adatbázis tulajdonos.<br>Ebbben az esetben a SuperUser bejelentkezési adatai ki kell tölteni az oldal alján. A a doboz nincs kipipálva akkor az adatbázisnak és a tulajdonosának léteznie kell.
 Experimental=(kísérleti)
+Deprecated=(elavult)
 DatabaseRootLoginDescription=A felhasználó jogosúlt új adatbázisok vagy új felhasználók létrehozására, felesleges ha a szolgáltatás hostolt formában veszik igénybe.
 KeepEmptyIfNoPassword=Hagyja üresen ha a felhasználónak nincs jelszava (az ilyet jobb elkerülni)
 SaveConfigurationFile=Értékek mentése
@@ -154,9 +155,9 @@ MigrationShippingDelivery2=Szállítási tárló frissítése 2
 MigrationFinished=Migráció befejezte
 LastStepDesc=<strong>Utolsó lépés:</strong> Adjuk meg itt bejelentkezési név és jelszó használatát tervezi, hogy csatlakozik a szoftver. Ne laza ez, mivel a számla beadására az összes többi.
 ActivateModule=Modul aktiválása %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ShowEditTechnicalParameters=Klikkelj ide a haladó beállítasok megtekintéséhez/szerkezstéséhez. (szakértő mód)
+WarningUpgrade=Figyelem!\nKészült biztonsági másolat az adatbázisról?\nErősen ajánlott: például az adatbázis rendszer hibája miatt a folyamat során néhány adat vagy tábla elveszhet, ezért erősen ajánlott egy teljes másolat készítése az adatbázisról, mielött a migráció elindul.\n\nVálaszd az OK gombot a migráció elindításához
+ErrorDatabaseVersionForbiddenForMigration=Az adatbázis verziója %s. Ez a verzió kritikus hibát tartalmaz az az adatbis struktúrájának megváltoztatásakor, ami a migrációs folyamat során szükséges. Ennek elkerülése érdekében a migráció nem engedélyezett, amíg az adatbázis nem kerül frissítésre egy magasabb stabil verzióra. (Az ismert hibás verziókat lásd itt:%s)
 
 #########
 # upgrade
@@ -207,8 +208,8 @@ MigrationProjectUserResp=Adatok migrálása fk_user_resp/llx_projet llx_element_
 MigrationProjectTaskTime=Frissítési idõ másodpercekben
 MigrationActioncommElement=Frissítés adatok akciók
 MigrationPaymentMode=Adatmigráció fizetési mód
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationCategorieAssociation=Kategória migrálása
+MigrationEvents=Az események migrálásához az események tulajdonosát be kell állítani a szükséges táblában
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Nem elérhető opciók mutatása
+HideNotAvailableOptions=Nem elérhető opciók elrejtése
diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
index 9788e58c4ee..62220b026d4 100644
--- a/htdocs/langs/hu_HU/languages.lang
+++ b/htdocs/langs/hu_HU/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arab
 Language_ar_SA=Arab
+Language_bn_BD=Bengali
 Language_bg_BG=Bolgár
 Language_bs_BA=Bosnyák
 Language_ca_ES=Katalán
@@ -21,9 +22,10 @@ Language_en_SA=English (Szaúd-Arábia)
 Language_en_US=Angol (Egyesült Államok)
 Language_en_ZA=English (Dél-Afrika)
 Language_es_ES=Spanyo
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spanyo (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanyol (Honduras)
 Language_es_MX=Spanyol (Mexikó)
 Language_es_PY=Spanyol (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Grönlandi
 Language_it_IT=Olasz
 Language_ja_JP=Japán
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Koreai
+Language_lo_LA=Lao
 Language_lt_LT=Litván
 Language_lv_LV=Lett
 Language_mk_MK=Macedóniai
@@ -64,6 +69,7 @@ Language_sv_SV=Svéd
 Language_sv_SE=Svéd
 Language_sq_AL=Albanian
 Language_sk_SK=Szlovák
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrán
 Language_uz_UZ=Üzbég
diff --git a/htdocs/langs/hu_HU/loan.lang b/htdocs/langs/hu_HU/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/hu_HU/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 8fd814d95e0..226b4b503e2 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Értesítések
 NoNotificationsWillBeSent=Nincs e-mail értesítést terveznek erre az eseményre és vállalati
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index ba2b0277b6c..58046e6a3e8 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Nehány hibát találtunk. Visszafordítju
 ErrorConfigParameterNotDefined=<b>%s</b> paraméter nincs definiálva a Dolibarr configurációs fájlban (<b>conf.php</b>).
 ErrorCantLoadUserFromDolibarrDatabase=<b>%s</b> felhasználó nem található a Dolibarr adatbázisban.
 ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatározva.
-ErrorNoSocialContributionForSellerCountry=Hiba, nincs szociális hozzájárulás meghatározva '%s' számára.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Hiba, nem sikerült a fájl mentése.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Egység ár (nettó)
 UnitPriceTTC=Egység ár
 PriceU=E.Á.
 PriceUHT=E.Á. (nettó)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=E.Á.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Mennyiség
 AmountInvoice=Számla mennyiség
 AmountPayment=Fizetés mennyiség
@@ -339,6 +339,7 @@ IncludedVAT=ÁFÁ-val
 HT=Nettó
 TTC=Bruttó
 VAT=ÁFA
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=ÁFA érték
@@ -413,6 +414,8 @@ Qty=Menny.
 ChangedBy=Módosította
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Siker
 ResultKo=Sikerleteln
@@ -421,7 +424,7 @@ Reportings=Jelentés
 Draft=Piszkozat
 Drafts=Piszkozatok
 Validated=Hitelesítve
-Opened=Megnyitva
+Opened=Open
 New=Új
 Discount=Kedvezmény
 Unknown=Ismeretlen
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
@@ -732,3 +739,4 @@ ShortThursday=Cs
 ShortFriday=P
 ShortSaturday=Szo
 ShortSunday=V
+SelectMailModel=Select email template
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index bdac075a8b4..9458170a7ec 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -199,7 +199,8 @@ Entreprises=Cégek
 DOLIBARRFOUNDATION_PAYMENT_FORM=Ahhoz, hogy az előfizetés befizetését a banki átutalást, lásd <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Fizetni hitelkártyával vagy PayPal, kattintson gombra a lap alján. <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index 4246bddb08f..402c074b75a 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Szállító érdekében
 SuppliersOrders=Szállítói megrendelések
 SuppliersOrdersRunning=Jelenlegi szállító megrendelések
 CustomerOrder=Az ügyfelek érdekében
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Jelenlegi ügyfél megrendelések
-CustomersOrdersAndOrdersLines=Vevői megrendelések és megrendelés vonalak
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Szállító megrendelések feldolgozása
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Törölve
 StatusOrderDraftShort=Tervezet
 StatusOrderValidatedShort=Hitelesítette
@@ -75,8 +75,9 @@ AddToMyOrders=Hozzáadás a megrendelések
 AddToOtherOrders=Add az egyéb megrendelések
 AddToDraftOrders=Add to draft order
 ShowOrder=Megjelenítése érdekében
-NoOpenedOrders=Nem nyitott megrendelések
-NoOtherOpenedOrders=Nincs más nyitott megrendelések
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Egyéb megrendelések
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index f28a5a2b778..d79d3d03b48 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -9,9 +9,10 @@ DateToBirth=Dátum a születési
 BirthdayAlertOn= Születésnaposok aktív
 BirthdayAlertOff= Születésnaposok inaktív
 Notify_FICHINTER_VALIDATE=Beavatkozás validált
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_SENTBYMAIL=Beavatkozás küldése e-mailben
 Notify_BILL_VALIDATE=Ügyfél számla hitelesített
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Vevőszámla nincs érvényesítve
+Notify_ORDER_SUPPLIER_VALIDATE=Szállítói megrendelés rögzítve
 Notify_ORDER_SUPPLIER_APPROVE=Szállító érdekében elfogadott
 Notify_ORDER_SUPPLIER_REFUSE=Szállító érdekében hajlandó
 Notify_ORDER_VALIDATE=Ügyfél érdekében érvényesített
@@ -28,12 +29,12 @@ Notify_PROPAL_SENTBYMAIL=Kereskedelmi által küldött javaslatban mail
 Notify_BILL_PAYED=Az ügyfél számlát fizetni
 Notify_BILL_CANCEL=Az ügyfél számlát törölt
 Notify_BILL_SENTBYMAIL=Az ügyfél számlát postai úton
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
+Notify_ORDER_SUPPLIER_VALIDATE=Szállítói megrendelés rögzítve
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Szállító érdekében postai úton
 Notify_BILL_SUPPLIER_VALIDATE=Szállító számlát érvényesített
 Notify_BILL_SUPPLIER_PAYED=Szállító számlát fizetni
 Notify_BILL_SUPPLIER_SENTBYMAIL=Szállító számlát postai úton
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Szállítói számla visszavonva
 Notify_CONTRACT_VALIDATE=A szerződés a validált
 Notify_FICHEINTER_VALIDATE=Beavatkozás érvényesített
 Notify_SHIPPING_VALIDATE=Szállítás validált
@@ -47,14 +48,14 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See setup of module %s
+SeeModuleSetup=Lásd a %s modul beállításait
 NbOfAttachedFiles=Száma csatolt fájlok / dokumentumok
 TotalSizeOfAttachedFiles=Teljes méretű csatolt fájlok / dokumentumok
 MaxSize=Maximális méret
 AttachANewFile=Helyezzen fel egy új file / dokumentum
 LinkedObject=Csatolt objektum
 Miscellaneous=Vegyes
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Figyelmeztetések száma (nyugtázott emailek száma)
 PredefinedMailTest=Ez egy teszt mailt. \\ NA két vonal választja el egymástól kocsivissza.
 PredefinedMailTestHtml=Ez egy <b>teszt</b> mail (a szó vizsgálatot kell vastagon). <br> A két vonal választja el egymástól kocsivissza.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
@@ -81,16 +82,16 @@ ModifiedBy=Módosította %s
 ValidatedBy=Érvényesíti %s
 CanceledBy=Megszakította %s
 ClosedBy=Lezárta %s
-CreatedById=User id who created
-ModifiedById=User id who made last change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made last change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CreatedById=Étrehozó ID
+ModifiedById=Utoljára módosító ID-ja
+ValidatedById=Jóváhagyó ID
+CanceledById=Visszavonó ID
+ClosedById=Lezáró ID
+CreatedByLogin=Létrehozó
+ModifiedByLogin=Utolsjára módosította
+ValidatedByLogin=Jóváhagyta
+CanceledByLogin=Visszavonta
+ClosedByLogin=Lezárta
 FileWasRemoved=Fájl %s eltávolították
 DirWasRemoved=Directory %s eltávolították
 FeatureNotYetAvailableShort=Elérhető a következő verziója
@@ -203,24 +204,25 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add bejegyzés a naptárban %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
+NewCompanyToDolibarr=%s cég hozzáadva
+ContractValidatedInDolibarr=%s szerződés jóváhagyva
+ContractCanceledInDolibarr=%s szerződés visszavonva
+ContractClosedInDolibarr=%s szerződés lezárva
+PropalClosedSignedInDolibarr=A %s javaslat alárva
 PropalClosedRefusedInDolibarr=Proposal %s refused
 PropalValidatedInDolibarr=Proposal %s validated
 PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
+InvoiceValidatedInDolibarr=%s számla jóváhagyva
+InvoicePaidInDolibarr=%s számla fizetettre változott
+InvoiceCanceledInDolibarr=%s számla visszavonva
+PaymentDoneInDolibarr=%s fizetés rendben
+CustomerPaymentDoneInDolibarr=Vevői %s fizetés rendben
+SupplierPaymentDoneInDolibarr=Szállítói %s fizetés rendben
+MemberValidatedInDolibarr=%s tag jóváhagyva
 MemberResiliatedInDolibarr=Member %s resiliated
 MemberDeletedInDolibarr=Member %s deleted
 MemberSubscriptionAddedInDolibarr=Subscription for member %s added
diff --git a/htdocs/langs/hu_HU/printing.lang b/htdocs/langs/hu_HU/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/hu_HU/printing.lang
+++ b/htdocs/langs/hu_HU/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 73774ec73c9..d9a655f8b1f 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Termék vagy Szolgáltatás
 ProductsAndServices=Termékek és Szolgáltatások
 ProductsOrServices=Termékek vagy Szolgáltatások
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Termékek és Szolgáltatások statisztika
 ProductsStatistics=Termék statisztika
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Belső referencia
 LastRecorded=Utolsó termékek/szolgáltatások on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Szolgáltatás kártya
 CardContract=Szerződés kártya
 Warehouse=Raktár
 Warehouses=Raktárak
-WarehouseOpened=Raktár nyitva
+WarehouseOpened=Warehouse open
 WarehouseClosed=Raktár zárva
 Stock=Részvény
 Stocks=Részvények
@@ -71,21 +71,21 @@ SellingPriceTTC=Eladási ár (bruttó)
 PublicPrice=Nyilvános ár
 CurrentPrice=Jelenlegi ár
 NewPrice=Új ár
-MinPrice=Minimum eladási ár
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Az eladási ár nem lehet kisebb a minimum árnál (nettó %s)
 ContractStatus=Szerzőséd állapot
 ContractStatusClosed=Lezárva
-ContractStatusRunning=Folyamatban
+ContractStatusRunning=Ongoing
 ContractStatusExpired=lejárt
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=Ez a szerződés nincs folyamatban
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Egy terméke ezzel a referenciával %s már létezik.
 ErrorProductBadRefOrLabel=Rossz érték a referenciának vagy feliratnak.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Beszállítók
 SupplierRef=Beszállítók ref#.
 ShowProduct=Termék megmutatása
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ha a termék vagy szolgáltatás időkorlátos:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Árak száma
 MultiPriceLevelsName=Ár kategóriák
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Kapcsolás
 Translation=Fordítás
 KeywordFilter=Kulcsszó szűrés
@@ -131,7 +131,7 @@ ProductToAddSearch=Termék keresése hozzáadáshoz
 AddDel=Hozzáadás/Törlés
 Quantity=Mennyiség
 NoMatchFound=Nincs találat
-ProductAssociationList=Vonatkozó szolgáltatások/termékek listája: Termék/szolgáltatás neve (mennyiség érintett)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Az egyik kiválaszott termék szülője az aktuális terméknek
 DeleteProduct=Termék/szolgáltatás törlése
@@ -179,16 +179,41 @@ CloneProduct=Termék vagy szolgáltatás klónozása
 ConfirmCloneProduct=Biztos, hogy klónozni akarja ezt a szolgáltatást: <b>%s</b> ?
 CloneContentProduct=A termék/szolgáltatás minden fő információjának a klónozása
 ClonePricesProduct=Fő információk és árak klónozása
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Ez a termék használatban van
 NewRefForClone=Új termék/szolgáltatás ref#.
-CustomerPrices=Fogyasztói árának
-SuppliersPrices=Beszállítók árak
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Vámkódex
 CountryOrigin=Származási ország
 HiddenIntoCombo=Rejtett a select lista
 Nature=Természet
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 52e733b2e47..1098f057f1c 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Ez a nézet minden projektet tartalmaz.
 MyTasksDesc=Ez a nézet azokra a projektekre van korlátozva amivel valamilyen összefüggésben áll.
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 TasksDesc=Ez a nézet minden projektet tartalmaz.
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projektek terület
 NewProject=Új projekt
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Projektek listája
 ShowProject=Projektek mutatása
 SetProject=Projekt beállítása
 NoProject=Nincs létrehozott vagy tulajdonolt projekt
-NbOpenTasks=Nyitott feladatok száma
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Projektek száma
 TimeSpent=Eltöltött idő
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Új eltöltött idő
 MyTimeSpent=Az én eltöltött időm
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=A projekthez tartozó intervenciók listája
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=A projekthez tartozó cselekvések listája
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Heti projekt aktivitás
 ActivityOnProjectThisMonth=Havi projekt aktivitás
 ActivityOnProjectThisYear=Évi projekt aktivitás
@@ -95,7 +98,7 @@ DeleteATimeSpent=Eltöltött idő törlése
 ConfirmDeleteATimeSpent=Biztos törölni akarja az eltöltött időt?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Erőforrások
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Harmadik félhnek dedikált projektek
 NoTasks=Nincs a projekthez tartozó feladat
 LinkedToAnotherCompany=Harmadik félhez kapcsolva
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang
index ca7102e2bda..64ee9347c05 100644
--- a/htdocs/langs/hu_HU/propal.lang
+++ b/htdocs/langs/hu_HU/propal.lang
@@ -4,7 +4,7 @@ Proposal=Üzleti ajánlat
 ProposalShort=Javaslat
 ProposalsDraft=Készítsen üzleti ajánlatot
 ProposalDraft=Tervezet kereskedelmi javaslat
-ProposalsOpened=Megnyitotta a kereskedelmi javaslatok
+ProposalsOpened=Open commercial proposals
 Prop=Üzleti ajánlatok
 CommercialProposal=Üzleti ajánlat
 CommercialProposals=Üzleti ajánlatok
@@ -16,7 +16,7 @@ Prospect=Kilátás
 ProspectList=Prospect lista
 DeleteProp=Üzleti ajánlat törlése
 ValidateProp=Érvényesítése kereskedelmi javaslat
-AddProp=Add javaslat
+AddProp=Create proposal
 ConfirmDeleteProp=Biztosan törölni kívánja ezt a kereskedelmi javaslat?
 ConfirmValidateProp=Biztosan meg akarja érvényesíteni a kereskedelmi javaslat?
 LastPropals=Utolsó %s javaslatok
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Összeg havonta (adózott)
 NbOfProposals=Száma a kereskedelmi javaslatok
 ShowPropal=Mutasd javaslat
 PropalsDraft=Piszkozatok
-PropalsOpened=Megnyitotta
+PropalsOpened=Open
 PropalsNotBilled=Zárt nem számlázzák
 PropalStatusDraft=Tervezet (kell érvényesíteni)
 PropalStatusValidated=Jóváhagyott (javaslat nyitott)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nem írta alá (zárt)
 PropalStatusBilled=Kiszámlázott
 PropalStatusDraftShort=Tervezet
 PropalStatusValidatedShort=Hitelesítette
-PropalStatusOpenedShort=Megnyitotta
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Zárva
 PropalStatusSignedShort=Aláírt
 PropalStatusNotSignedShort=Nem írták alá
@@ -51,12 +51,10 @@ PropalsToClose=Kereskedelmi javaslatokat, hogy lezárja
 PropalsToBill=Aláírták a kereskedelmi javaslatok törvényjavaslatot
 ListOfProposals=Üzleti ajánlatok listája
 ActionsOnPropal=Események javaslatára
-NoOpenedPropals=Nem nyitott a kereskedelmi javaslatok
-NoOtherOpenedPropals=Nincs más nyitott üzleti ajánlatot
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Üzleti ajánlat ref
 SendPropalByMail=Küldés e-mailben kereskedelmi javaslat
-FileNotUploaded=A feltöltött fájl nem
-FileUploaded=A fájl sikeresen feltöltött
 AssociatedDocuments=Dokumentumok kapcsolódó javaslatot:
 ErrorCantOpenDir=Nem lehet megnyitni a könyvtárat
 DatePropal=Születési javaslat
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal %s nem található
 Estimate=Becslés:
 EstimateShort=Becsüljük
 OtherPropals=Egyéb javaslatok
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=Hozzon létre a kereskedelmi javaslat másolásával meglévő javaslat
 CreateEmptyPropal=Hozzon létre üres üzleti ajánlatot vierge vagy listából termékek / szolgáltatások
 DefaultProposalDurationValidity=Alapértelmezett érvényesség időtartamát kereskedelmi javaslat (napokban)
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=Ügyfélkapcsolati nyomon követése javasl
 # Document models
 DocModelAzurDescription=A javaslat teljes modell (logo. ..)
 DocModelJauneDescription=Jaune javaslat modell
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index 65d32d6f400..54be9f7005e 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Egyszerű dokumentum modell
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Figyelem, nincs szállításra váró termék.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Tervezett szállítási dátum
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Átvétel dátuma
 SendShippingByEMail=Küldés e-mailben szállítás
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index e3aefb8cb1c..b0d13bb6b75 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Raktárak
 NewWarehouse=Új raktár
 WarehouseEdit=Raktár módosítása
 MenuNewWarehouse=Új raktár
-WarehouseOpened=Raktár nyitva
+WarehouseOpened=Warehouse open
 WarehouseClosed=Raktár zárva
 WarehouseSource=Forrás raktár
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Válassza ki a raktár használni állomány cs
 SelectWarehouseForStockIncrease=Válassza ki a raktár használni állomány növekedése
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 2d5eebdf4eb..217b047aec6 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Beszállítók
-AddSupplier=Create a supplier
-SupplierRemoved=Beszállító eltávolítva
-SuppliersInvoice=Beszállító számla
-NewSupplier=Új beszállító
+Suppliers=Szállítók
+AddSupplier=Szállító létrehozása\n
+SupplierRemoved=Szállító eltávolítva
+SuppliersInvoice=Szállítói számla
+NewSupplier=Új szállító
 History=Történet
-ListOfSuppliers=Beszállító listája
-ShowSupplier=Beszállító mutatása
+ListOfSuppliers=Szállítók listája
+ShowSupplier=Szállító mutatása
 OrderDate=Megrendelés dátuma
-BuyingPrice=Vásárlási ár
-BuyingPriceMin=Minimális felvásárlási árat
-BuyingPriceMinShort=Min felvásárlási ár
-TotalBuyingPriceMin=Total of subproducts buying prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Beszállítói ár hozzáadása
-ChangeSupplierPrice=Beszállítói ár megváltoztatása
+BuyingPrice=Vételár
+BuyingPriceMin=Minimális vételár
+BuyingPriceMinShort=Min vételár
+TotalBuyingPriceMin=Az altermékek vételára összesen
+SomeSubProductHaveNoPrices=Néhány altermékhez nincs ár megadva
+AddSupplierPrice=Szállítói ár hozzáadása
+ChangeSupplierPrice=Szállítói ár megváltoztatása
 ErrorQtyTooLowForThisSupplier=A mennyiség túl kicsi ehhez a beszállítóhoz vagy nincs ár meghatározva erre a termékre ettől beszállítótól.
 ErrorSupplierCountryIsNotDefined=A beszállító országa nincs meghatárzova. Először ezt javítsa ki.
-ProductHasAlreadyReferenceInThisSupplier=Ennek a terméknek már van referenciája ennél a beszállítónál
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ez a beszállító már assziciálva van ehhez: %s
-NoRecordedSuppliers=Nincs beszállító bejegyezve
-SupplierPayment=Beszállító fizetés
-SuppliersArea=Beszállítói Terület
-RefSupplierShort=Beszállító #
+ProductHasAlreadyReferenceInThisSupplier=Ennek a terméknek már van azonosítója ennél a szállítónál
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ez a beszállító már hozzá van rendelve van ehhez az azonosítóhoz: %s
+NoRecordedSuppliers=Nincs szállító bejegyezve
+SupplierPayment=Szállítói kifizetés
+SuppliersArea=Szállítói Terület
+RefSupplierShort=Szállítói Ref.
 Availability=Elérhetőség
-ExportDataset_fournisseur_1=Beszállítói számla lista és számla sorok
-ExportDataset_fournisseur_2=Beszállítói számlák és fizetések
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Szállítói számla lista és számla sorok
+ExportDataset_fournisseur_2=Szállítói számlák és fizetések
+ExportDataset_fournisseur_3=Szállítói rendelések és sorok
 ApproveThisOrder=Megrendelés jóváhagyása
 ConfirmApproveThisOrder=Biztos jóvá akarja hagyni a megrendelést?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Megrendelés elutasítása
 ConfirmDenyingThisOrder=Biztos el akarja utasítani a megrendelést?
 ConfirmCancelThisOrder=Biztos meg akarja szakítani a megrendelést?
-AddCustomerOrder=Ügyfél megrendelés létrehozása
-AddCustomerInvoice=Ügyfél számla létrehozása
-AddSupplierOrder=Beszállítói megrendelés létrehozása
-AddSupplierInvoice=Beszállítói számla létrehozása
-ListOfSupplierProductForSupplier=<b>%s</b> beszállító termékei és árai
+AddCustomerOrder=Vevői megrendelés létrehozása
+AddCustomerInvoice=Vevői számla létrehozása
+AddSupplierOrder=Szállítói megrendelés létrehozása
+AddSupplierInvoice=Szállítói számla létrehozása
+ListOfSupplierProductForSupplier=<b>%s</b> szállító termékei és árai
 NoneOrBatchFileNeverRan=Nincs vagy a <b>%s</b> batch fájl nem futott az utóbbi időben
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
+SentToSuppliers=Küldés a szállítónak
+ListOfSupplierOrders=Szállítói rendelések listája
+MenuOrdersSupplierToBill=Szállítói rendelések számlázáshoz
+NbDaysToDelivery=Szállítási késedelem napokban
+DescNbDaysToDelivery=A megrendelésben lévő termékek legnagyobb késedelme.
+UseDoubleApproval=Kettős jóváhagyás (a második jóváhagyást bármelyik felhasználó megteheti, akinek jogosultsága van.)
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index 3932da4b2a2..072ec37213f 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Költségek listája
 NewTrip=New expense report
 CompanyVisited=Látogatott Cég/alapítvány
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 0a315b86711..34864bf48dc 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=HRM terület
 UserCard=Felhasználó kártya
 ContactCard=Kapcsolat kártya
 GroupCard=Csoport kártya
@@ -9,10 +9,10 @@ Permissions=Engedélyek
 EditPassword=Jelszó szerkesztése
 SendNewPassword=Jelszó újragenerálása és küldése
 ReinitPassword=Jelszó újragenerálása
-PasswordChangedTo=%s -ra lett megváltoztatva a jelszó
+PasswordChangedTo=A jelszó erre változott: %s
 SubjectNewPassword=Az új jelszava
 AvailableRights=Elérhető engedélyek
-OwnedRights=Tulajdonolt engedélyek
+OwnedRights=Meglévő engedélyek
 GroupRights=Csoport engedélyek
 UserRights=Felhasználói engedélyek
 UserGUISetup=Felhasználó megjelenésének beállításai
@@ -57,6 +57,7 @@ RemoveFromGroup=Eltávolítás a csoportból
 PasswordChangedAndSentTo=A jelszó megváltoztatva és elküldve: <b>%s</b>.
 PasswordChangeRequestSent=<b>%s</b> által kért jelszóváltoztatás el lett küldve ide: <b>%s</b>.
 MenuUsersAndGroups=Felhasználók és csoportok
+MenuMyUserCard=Az én felhasználói kártyám
 LastGroupsCreated=Utolsó %s létrehozott csoport
 LastUsersCreated=Utolsó %s létrehozott felhasználó
 ShowGroup=Csoport mutatása
@@ -86,7 +87,7 @@ MyInformations=Adataim
 ExportDataset_user_1=Dolibarr felhasználók és tulajdonságaik
 DomainUser=Domain felhasználók %s
 Reactivate=Újra aktiválás
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=Ezzel az űrlappal saját felhasználót hozhatsz létre a cégednek/alapítványodnak. Külső flehasználó létrehozásához (vevő, szállító, ...) használd a "Create Dolibarr user" űrlapot a partner kapcsolati kártyájánál.
 InternalExternalDesc=A <b>belső</b> felhasználó része a cégnek/alapítványnak.<br>A <b>külső</b> felhasználó lehet ügyfél, beszállító vagy bármi egyéb.<br><br>Minden esetben az engedélyek adják a jogokat, és a külső felasználók használhatnak más megjelenésü interfészt
 PermissionInheritedFromAGroup=Engedélyek megadva mert örökölte az egyik csoporttól.
 Inherited=Örökölve
@@ -102,7 +103,7 @@ UserDisabled=Felhasználó %s kikapcsolva
 UserEnabled=Felhasználó %s aktiválva
 UserDeleted=Felhasználó %s eltávolítva
 NewGroupCreated=Csoport %s létrehozva
-GroupModified=Group %s modified
+GroupModified=%s csoport módosítva
 GroupDeleted=Csoport %s eltávolítva
 ConfirmCreateContact=Biztos szeretne Dolibarr fiókot létrehozni ehhez a kapcsolathoz?
 ConfirmCreateLogin=Biztos szeretne Dolibarr fiókot létrehozni ennek a tagnak?
@@ -113,10 +114,10 @@ YourRole=Szerepkörei
 YourQuotaOfUsersIsReached=Aktív felhasználói kvóta elérve!
 NbOfUsers=Nb felhasználók
 DontDowngradeSuperAdmin=Csak egy superadmin lehet downgrade 1 superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
+HierarchicalResponsible=Felettes
+HierarchicView=Hierachia nézet
+UseTypeFieldToChange=Hansználd a mezőt a módosításhoz
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
+LoginUsingOpenID=Használd az OpenID-t a belépéshez
+WeeklyHours=Heti munkaóra
+ColorUser=A felhasználó színe
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index ff8da684158..088aeebfbee 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Kifizetése érdekében állt a bank által %s
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index 23c05f85171..93b34222960 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow modul beállítása
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Nincs munkafolyamat akkor lehet módosítani a modul aktiválása.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Létrehozása után automatikusan az ügyfelek érdekében a kereskedelmi javaslat aláírt
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Hozzon létre egy vásárlói számlát után automatikusan egy kereskedelmi javaslat aláírt
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Hozzon létre egy vásárlói számlát után automatikusan érvényesíti a szerződés
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Hozzon létre egy vásárlói számlát követően automatikusan az ügyfelek érdekében van zárva
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 349fd3e2469..f3ad8d5fc79 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Akuntansi
 Globalparameters=Parameter Global
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
-ACCOUNTING_BANK_JOURNAL=Jurnal Bank
-ACCOUNTING_CASH_JOURNAL=Jurnal Kas
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal lain-lain
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Jurnal Sosial
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Akun transfer
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 32d55507066..73a7a22f301 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu Pengguna
 LangFile=berkas .lang
 System=Sistem
 SystemInfo=Sistem Informasi
-SystemTools=Alat-alat Sistem
 SystemToolsArea=Daerah Alat-Alat Sistem
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Perbersihan
@@ -232,8 +231,8 @@ Security=Keamanan
 Passwords=Kata Sandi
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Keistimewaan
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Pilih Modul
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Versi Dolibarr saat ini
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Versi stabil terakhir
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposal
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energi
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energi
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Pesanan Pelanggan
 Module25Desc=Customer order management
 Module30Name=Nota
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifikasi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Sumbangan
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Membuat/Merubah produk
 Permission34=Menghapus Produk
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Mengirim Pesanan Pelanggan
 Permission87=Menutup Pesanan Pelanggan
 Permission88=Membatalkan Pesanan Pelanggan
 Permission89=Menghapus Pesanan Pelanggan
-Permission91=Membaca Kontribusi Sosial dan VAT
-Permission92=Membuat/Merubah Kontribusi Sosial dan VAT
-Permission93=Menghapus Kontribusi Sosial dan VAT
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Membaca Laporan
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Kembali Ke Daftar Modul
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Kode Pos
 CompanyTown=Kota
 CompanyCountry=Negara
 CompanyCurrency=Mata Uang
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Penundaan
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 5f9bc8f8e5e..cc227b5d310 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index dc23045e239..7498ce84483 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 15a3668333c..030c17faacc 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Perusahaan
 CompanyName=Nama Perusahaan
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Perusahaan
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/id_ID/ecm.lang b/htdocs/langs/id_ID/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/id_ID/ecm.lang
+++ b/htdocs/langs/id_ID/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/id_ID/incoterm.lang b/htdocs/langs/id_ID/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/id_ID/incoterm.lang
+++ b/htdocs/langs/id_ID/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index 278965595b2..2b0a30c6bbc 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang
index 87ed5359bfa..e87b2028d84 100644
--- a/htdocs/langs/id_ID/languages.lang
+++ b/htdocs/langs/id_ID/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arab
 Language_ar_SA=Arab
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgaria
 Language_bs_BA=Bosnia
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=Bahasa Inggris (Amerika Serikat)
 Language_en_ZA=Inggris (Afrika Selatan)
 Language_es_ES=Spanyol
-Language_es_DO=Spanyol (Republik Dominika)
 Language_es_AR=Spanyol (Argentina)
 Language_es_CL=Spanyol (Cili)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanyol (Republik Dominika)
 Language_es_HN=Spanyol (Honduras)
 Language_es_MX=Spanyol (Mexico)
 Language_es_PY=Spanyol (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesia
 Language_is_IS=Icelandic
 Language_it_IT=Italia
 Language_ja_JP=Jepang
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korea
+Language_lo_LA=Lao
 Language_lt_LT=Lithuania
 Language_lv_LV=Latvia
 Language_mk_MK=Macedonia
@@ -64,6 +69,7 @@ Language_sv_SV=Swedia
 Language_sv_SE=Swedia
 Language_sq_AL=Albania
 Language_sk_SK=Slovakia
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukraina
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/id_ID/loan.lang b/htdocs/langs/id_ID/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/id_ID/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index c7c79e7f816..68e8ec31f63 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 53d17128e9b..7a38b9f6aba 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/id_ID/printing.lang b/htdocs/langs/id_ID/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/id_ID/printing.lang
+++ b/htdocs/langs/id_ID/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/id_ID/propal.lang b/htdocs/langs/id_ID/propal.lang
index d17bc952b7d..d10dbb15122 100644
--- a/htdocs/langs/id_ID/propal.lang
+++ b/htdocs/langs/id_ID/propal.lang
@@ -1,102 +1,101 @@
 # Dolibarr language file - Source file is en_US - propal
-# Proposals=Commercial proposals
-# Proposal=Commercial proposal
-# ProposalShort=Proposal
-# ProposalsDraft=Draft commercial proposals
-# ProposalDraft=Draft commercial proposal
-# ProposalsOpened=Opened commercial proposals
-# Prop=Commercial proposals
-# CommercialProposal=Commercial proposal
-# CommercialProposals=Commercial proposals
-# ProposalCard=Proposal card
-# NewProp=New commercial proposal
-# NewProposal=New commercial proposal
-# NewPropal=New proposal
-# Prospect=Prospect
-# ProspectList=Prospect list
-# DeleteProp=Delete commercial proposal
-# ValidateProp=Validate commercial proposal
-# AddProp=Add proposal
-# ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-# ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-# LastPropals=Last %s proposals
-# LastClosedProposals=Last %s closed proposals
-# LastModifiedProposals=Last %s modified proposals
-# AllPropals=All proposals
-# LastProposals=Last proposals
-# SearchAProposal=Search a proposal
-# ProposalsStatistics=Commercial proposal's statistics
-# NumberOfProposalsByMonth=Number by month
-# AmountOfProposalsByMonthHT=Amount by month (net of tax)
-# NbOfProposals=Number of commercial proposals
-# ShowPropal=Show proposal
-# PropalsDraft=Drafts
-# PropalsOpened=Opened
-# PropalsNotBilled=Closed not billed
-# PropalStatusDraft=Draft (needs to be validated)
-# PropalStatusValidated=Validated (proposal is open)
-# PropalStatusOpened=Validated (proposal is open)
-# PropalStatusClosed=Closed
-# PropalStatusSigned=Signed (needs billing)
-# PropalStatusNotSigned=Not signed (closed)
-# PropalStatusBilled=Billed
-# PropalStatusDraftShort=Draft
-# PropalStatusValidatedShort=Validated
-# PropalStatusOpenedShort=Opened
-# PropalStatusClosedShort=Closed
-# PropalStatusSignedShort=Signed
-# PropalStatusNotSignedShort=Not signed
-# PropalStatusBilledShort=Billed
-# PropalsToClose=Commercial proposals to close
-# PropalsToBill=Signed commercial proposals to bill
-# ListOfProposals=List of commercial proposals
-# ActionsOnPropal=Events on proposal
-# NoOpenedPropals=No opened commercial proposals
-# NoOtherOpenedPropals=No other opened commercial proposals
-# RefProposal=Commercial proposal ref
-# SendPropalByMail=Send commercial proposal by mail
-# FileNotUploaded=The file was not uploaded
-# FileUploaded=The file was successfully uploaded
-# AssociatedDocuments=Documents associated with the proposal:
-# ErrorCantOpenDir=Can't open directory
-# DatePropal=Date of proposal
-# DateEndPropal=Validity ending date
-# DateEndPropalShort=Date end
-# ValidityDuration=Validity duration
-# CloseAs=Close with status
-# ClassifyBilled=Classify billed
-# BuildBill=Build invoice
-# ErrorPropalNotFound=Propal %s not found
-# Estimate=Estimate :
-# EstimateShort=Estimate
-# OtherPropals=Other proposals
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
-# CopyPropalFrom=Create commercial proposal by copying existing proposal
-# CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-# DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-# UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-# ClonePropal=Clone commercial proposal
-# ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-# ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-# ProposalsAndProposalsLines=Commercial proposal and lines
-# ProposalLine=Proposal line
-# AvailabilityPeriod=Availability delay
-# SetAvailability=Set availability delay
-# AfterOrder=after order
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalDraft=Draft commercial proposal
+ProposalsOpened=Open commercial proposals
+Prop=Commercial proposals
+CommercialProposal=Commercial proposal
+CommercialProposals=Commercial proposals
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewProposal=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+ProspectList=Prospect list
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
+LastPropals=Last %s proposals
+LastClosedProposals=Last %s closed proposals
+LastModifiedProposals=Last %s modified proposals
+AllPropals=All proposals
+LastProposals=Last proposals
+SearchAProposal=Search a proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (net of tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalsNotBilled=Closed not billed
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusOpened=Validated (proposal is open)
+PropalStatusClosed=Closed
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
+PropalStatusOpenedShort=Open
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+AssociatedDocuments=Documents associated with the proposal:
+ErrorCantOpenDir=Can't open directory
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+DateEndPropalShort=Date end
+ValidityDuration=Validity duration
+CloseAs=Close with status
+ClassifyBilled=Classify billed
+BuildBill=Build invoice
+ErrorPropalNotFound=Propal %s not found
+Estimate=Estimate :
+EstimateShort=Estimate
+OtherPropals=Other proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+ClonePropal=Clone commercial proposal
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
 ##### Availability #####
-# AvailabilityTypeAV_NOW=Immediate
-# AvailabilityTypeAV_1W=1 week
-# AvailabilityTypeAV_2W=2 weeks
-# AvailabilityTypeAV_3W=3 weeks
-# AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
-# TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-# TypeContact_propal_external_BILLING=Customer invoice contact
-# TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 # Document models
-# DocModelAzurDescription=A complete proposal model (logo...)
-# DocModelJauneDescription=Jaune proposal model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=A complete proposal model (logo...)
+DocModelJauneDescription=Jaune proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 17b07d2a8b7..2d3f19f267d 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Menampilkan Pembayaran Gaji
 THM=rata - rata per jam
 TJM=rata - rata per hari
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 7fbe40785a5..19c08add7d4 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Terkirim ke suplier
 ListOfSupplierOrders=Daftar pesanan suplier
 MenuOrdersSupplierToBill=Pesanan suplier menjadi invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/id_ID/trips.lang
+++ b/htdocs/langs/id_ID/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/id_ID/workflow.lang b/htdocs/langs/id_ID/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/id_ID/workflow.lang
+++ b/htdocs/langs/id_ID/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 3d326fa5fb0..bf7be81325b 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Matseðill fyrir notendur
 LangFile=Skrá. Lang
 System=Kerfi
 SystemInfo=System Information
-SystemTools=System tækjum
 SystemToolsArea=Kerfi verkfæri area
 SystemToolsAreaDesc=Þetta svæði býður upp á gjöf lögun. Notaðu valmyndina til að velja aðgerðina sem þú ert að leita að.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Öryggi
 Passwords=Lykilorð
 DoNotStoreClearPassword=Gera ekki geyma skýrar lykilorð í gagnagrunninum en geyma aðeins dulkóðuð gildi (Virkja mælt með)
 MainDbPasswordFileConfEncrypted=Gagnasafn lykilorð dulkóðuð í conf.php (Virkja mælt með)
-InstrucToEncodePass=Til að fá lykilorðið kóðuð í <b>conf.php</b> skrá, skipta um línu <br> <b>$ Dolibarr_main_db_pass ="..."</b> <br> eftir <br> <b>$ Dolibarr_main_db_pass = "crypted: %s "</b>
-InstrucToClearPass=Til að fá lykilorð lesa úr leyniletri (ljóst) í <b>conf.php</b> skrá, skipta um línu <br> <b>$ Dolibarr_main_db_pass = "crypted :..."</b> <br> eftir <br> <b>$ Dolibarr_main_db_pass = " %s "</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Verndun mynda pdf skrá (Virkja EKKI mælt, brýtur massi pdf-kynslóð)
 ProtectAndEncryptPdfFilesDesc=Verndun á PDF skjal heldur laus við að lesa og prenta með einhverju PDF vafra. Hins vegar útgáfa og afritun er ekki hægt lengur. Athugaðu að nota þennan eiginleika að byggja upp alþjóðlegt cumulated Pdf ekki að vinna (eins og ógreiddra reikninga).
 Feature=Lögun
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Þetta er skipulag unnið:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Skref %s
 FindPackageFromWebSite=Finna pakki sem veitir lögun þú vilt (td á heimasíðu %s ).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Setja er lokið og Dolibarr er tilbúinn til notkunar með þessu nýja hluti.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr núverandi útgáfa
 CallUpdatePage=Fara á næstu síðu sem að endurnýja gagnagrunn uppbyggingu og gögn: %s .
 LastStableVersion=Síðasta stöðuga útgáfa
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Tillögur
 Module20Desc=Auglýsing tillögunnar stjórnun
 Module22Name=Mass E-pósti
 Module22Desc=Mass E-póstur í stjórnun
-Module23Name= Orka
-Module23Desc= Eftirlit með notkun orku
+Module23Name=Orka
+Module23Desc=Eftirlit með notkun orku
 Module25Name=Viðskiptavinur Pantanir
 Module25Desc=Viðskiptavinur röð er stjórnun
 Module30Name=Kvittanir
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar sameining
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Tilkynningar
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Fjárframlög
 Module700Desc=Framlög í stjórnun
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Dagskrá
 Module2400Desc=Aðgerðir / verkefni og dagskrá stjórnun
 Module2500Name=Rafræn Innihald Stjórnun
 Module2500Desc=Vista og samnýta skjöl
-Module2600Name=WebServices
-Module2600Desc=Virkja Dolibarr vefþjónusta miðlara
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Búa til / breyta vörur
 Permission34=Eyða vöru
 Permission36=Sjá / stjórna falinn vörur
 Permission38=Útflutningur vöru
-Permission41=Lesa verkefni (sameiginleg verkefni og verkefnum sem ég hef samband vegna)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Búa til / breyta verkefnum (sameiginleg verkefni og verkefnum sem ég hef samband vegna)
 Permission44=Eyða verkefni (sameiginleg verkefni og verkefnum sem ég hef samband vegna)
 Permission61=Lesa inngrip
@@ -599,10 +600,10 @@ Permission86=Senda viðskiptavinum pantanir
 Permission87=Loka viðskiptavinum pantanir
 Permission88=Hætta við viðskiptavini pantanir
 Permission89=Eyða viðskiptavinum pantanir
-Permission91=Lesa félagsleg framlög og VSK
-Permission92=Búa til / breyta félagslegum framlögum og VSK
-Permission93=Eyða félagsleg framlög og VSK
-Permission94=Útflutningur tryggingagjöld
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Lesa skýrslur
 Permission101=Lesa sendings
 Permission102=Búa til / breyta sendings
@@ -620,9 +621,9 @@ Permission121=Lesa þriðja aðila sem tengist notandi
 Permission122=Búa til / breyta þriðja aðila sem tengist notandi
 Permission125=Eyða þriðja aðila sem tengist notandi
 Permission126=Útflutningur þriðja aðila
-Permission141=Lesa verkefni
-Permission142=Búa til / breyta verkefni
-Permission144=Eyða verkefni
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lesa þjónustuveitenda
 Permission147=Lesa Stats
 Permission151=Lesa standa pantanir
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Skipulag vistuð
 BackToModuleList=Til baka í mát lista
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Land
 CompanyCurrency=Main gjaldmiðil
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Ekki sýna ekki
 DoNotSuggestPaymentMode=Ekki benda ekki til
 NoActiveBankAccountDefined=Engin virk bankareikning skilgreind
 OwnerOfBankAccount=Eigandi bankareikning %s
 BankModuleNotActive=Bankareikninga mát ekki virkt
-ShowBugTrackLink=Sýna tengilinn "Report galla"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Sýning "vinnubekkur" á heimasíðu
 Alerts=Alerts
 Delays=Tafir
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max brotum um verð eining
 MAIN_MAX_DECIMALS_TOT=Max brotum fyrir heildar verð
 MAIN_MAX_DECIMALS_SHOWN=Max brotum um verð birtist á skjánum (Bæta við <b>...</b> eftir þetta númer ef þú vilt sjá <b>...</b> þegar tala er minnkaður þegar sýnt á skjá)
 MAIN_DISABLE_PDF_COMPRESSION=Nota PDF þjöppun fyrir mynda PDF skrár.
-MAIN_ROUNDING_RULE_TOT= Stærð lokið máli mínu svið (til Sjaldgæf löndum þar sem lokið máli mínu er lokið á eitthvað annað en stöð 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Hrein einingaverð vöru
 TotalPriceAfterRounding=Samtals verð (net / VSK / incl skatt) eftir lokið máli mínu
 ParameterActiveForNextInputOnly=Breytu gildi fyrir næsta inntak aðeins
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max fjöldi vara í combos velja lista (0 = ótakmar
 ConfirmDeleteProductLineAbility=Staðfesting þegar færanlegur vörulínum eyðublöð
 ModifyProductDescAbility=Personalization lýsingum vara í form
 ViewProductDescInFormAbility=Sjónræn framsetning lýsingar vara í formum (annars eins og tól almenningur)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Sjónræn af vörum lýsingar á thirdparty tungumáli
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Stuðningur Eco-Taxe (raf-og rafeindabúnaðarúrgang)
 SetDefaultBarcodeTypeProducts=Default barcode tegund til nota fyrir vörur
 SetDefaultBarcodeTypeThirdParties=Default barcode tegund til notkunar fyrir þriðju aðila
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Strikamerki af gerðinni UPC
 BarcodeDescISBN=Strikamerki af gerðinni ISBN
 BarcodeDescC39=Strikamerki á C39 tegund
 BarcodeDescC128=Strikamerki af gerðinni C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Ertu viss um að þú viljir eyða Valmynd <b>færslu %s ?</b>
 DeleteLine=Eyða línu
 ConfirmDeleteLine=Ertu viss um að þú viljir eyða þessari línu?
 ##### Tax #####
-TaxSetup=Skattar og félagsleg framlög og arður mát skipulag
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VSK vegna
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices mát skipulag
 WebServicesDesc=Með því að gera þessa græju Dolibarr verða þjónustu vefþjóni til að veita ýmiss konar þjónustu á vefnum.
 WSDLCanBeDownloadedHere=WSDL lýsing skrá sem kveðið er serviceses má sækja hér
 EndPointIs=SOAP viðskiptavini verður að senda beiðni sinni til Dolibarr endapunkt til eru um Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank einingu skipulag
 FreeLegalTextOnChequeReceipts=Frjáls texti á kvittunum athuga
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project mát skipulag
 ProjectsModelModule=Project Skýrsla skjal líkan
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index 057e39f0584..21bea4a8dce 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Panta %s samþykkt
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Panta %s fara aftur til drög að stöðu
-OrderCanceledInDolibarr=Panta %s niður
 ProposalSentByEMail=Verslunarhúsnæði %s tillaga send með tölvupósti
 OrderSentByEMail=Viðskiptavinur röð %s send með tölvupósti
 InvoiceSentByEMail=Viðskiptavinur vörureikningi %s send með tölvupósti
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index fdddb8321d9..7799c6e4393 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Samræmdu
 Conciliation=Sættir
 ConciliationForAccount=Samræmdu þennan reikning
 IncludeClosedAccount=Hafa loka reikningum
-OnlyOpenedAccount=Aðeins opnað reikninga
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Reikningur til að lána
 AccountToDebit=Reikning til skuldfærslu
 DisableConciliation=Slökkva á sáttum lögun fyrir þennan reikning
 ConciliationDisabled=Sættir lögun fatlaðra
-StatusAccountOpened=Opnaður
+StatusAccountOpened=Open
 StatusAccountClosed=Loka
 AccountIdShort=Fjöldi
 EditBankRecord=Breyta færslu
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Viðskiptavinur greiðslu
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Birgir greiðslu
 WithdrawalPayment=Afturköllun greiðslu
-SocialContributionPayment=Félagslegt framlag greiðslu
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial reikning Journal
 BankTransfer=Millifærslu
 BankTransfers=Millifærslur
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 1fa4a21c586..460c7317759 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=NB af reikningum
 NumberOfBillsByMonth=Nb reikninga eftir mánuði
 AmountOfBills=Upphæð á reikningi
 AmountOfBillsByMonthHT=Upphæð á reikningi eftir mánuði (eftir skatta)
-ShowSocialContribution=Sýna félagslegum mörkum
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Sýna reikning
 ShowInvoice=Sýna reikning
 ShowInvoiceReplace=Sýna skipta Reikningar
@@ -270,7 +270,7 @@ BillAddress=Bill heimilisfang
 HelpEscompte=Þessi afsláttur er afsláttur veittur til viðskiptavina vegna greiðslu þess var áður litið.
 HelpAbandonBadCustomer=Þessi upphæð hefur verið yfirgefin (viðskiptavinur til vera a slæmur viðskiptavina) og er talið að sérstakar lausir.
 HelpAbandonOther=Þessi upphæð hefur verið yfirgefin síðan það var villa (vitlaust viðskiptavinar eða reikning í stað með öðrum til dæmis)
-IdSocialContribution=Félagslegt framlag persónuskilríki
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Greiðsla persónuskilríki
 InvoiceId=Invoice persónuskilríki
 InvoiceRef=Invoice dómari.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Skjótur
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index b6200d0a78e..73d04f2b36f 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Síðasta samninga
 BoxLastContacts=Síðustu tengiliðir / Vistfang
 BoxLastMembers=Síðustu meðlimir
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Velta Velta
 BoxTotalUnpaidCustomerBills=reikningum Samtals launalaust viðskiptavinar
 BoxTotalUnpaidSuppliersBills=reikningum Samtals launalaust birgis
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Velta Velta
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 6a6769cfc33..7022f0e816c 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b> %s </b> var bætt við.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Þessi flokkur er þegar til með þessu tilv
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Efnisyfirlit ekki sýnileg um alla
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. Flokkur
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index f46c9383cc2..2e7be412a34 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Í þriðja aðila samband
 StatusContactValidated=Staða Hafðu samband
 Company=Fyrirtæki
 CompanyName=Nafn fyrirtækis
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Stofnanir
 CountryIsInEEC=Landið er inni Evrópubandalagið
 ThirdPartyName=Í þriðja aðila Nafn
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Alger afslættir í boði
 DiscountNone=None
 Supplier=Birgir
 CompanyList=Companie's listi
-AddContact=Bæta við tengilið / heimilisfang
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Breyta tengilið / netfang
 EditContactAddress=Edit contact/address
 Contact=Hafðu samband
@@ -268,8 +269,8 @@ ContactsAddresses=Tengiliðir / Vistfang
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=Engar skilgreind fyrir þessa þriðja aðila
 DefaultContact=Default samband
-AddCompany=Bæta við fyrirtæki
-AddThirdParty=Bæta við þriðja aðila
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Eyða fyrirtæki
 PersonalInformations=Persónuupplýsingar
 AccountancyCode=Bókhalds kóða
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Skila inn miðanum
 DeleteDeliveryAddress=Eyða skila inn
 ConfirmDeleteDeliveryAddress=Ertu viss um að þú viljir eyða þessum að skila inn?
 NewDeliveryAddress=Ný sending heimilisfang
-AddDeliveryAddress=Bæta við heimilisfangi
-AddAddress=Bæta við heimilisfangi
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=Engar val á að skila inn skilgreint
 SupplierCategory=Birgir flokkur
 JuridicalStatus200=Independent
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Fara aftur numero með snið %s yymm-NNNN fyrir kóða viðskiptavina og %s yymm-NNNN fyrir númer birgja þar sem YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0.
 LeopardNumRefModelDesc=Viðskiptavinur / birgir númerið er ókeypis. Þessi kóði getur breytt hvenær sem er.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index beea1abbfa1..2e4edbaa52e 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VSK safnað
 ToPay=Til að borga
 ToGet=Til að fá til baka
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Innheimtu-, félags-Framlög og arður area
-SocialContribution=Félagslegt framlag
-SocialContributions=Tryggingagjöld
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Skattar og arður
 MenuSalaries=Salaries
-MenuSocialContributions=Tryggingagjöld
-MenuNewSocialContribution=New framlag
-NewSocialContribution=New félagslegum mörkum
-ContributionsToPay=Framlög til að greiða
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Bókhalds / ríkissjóðs area
 AccountancySetup=Bókhalds skipulag
 NewPayment=Ný greiðsla
 Payments=Greiðslur
 PaymentCustomerInvoice=Viðskiptavinur Reikningar greiðslu
 PaymentSupplierInvoice=Birgir Reikningar greiðslu
-PaymentSocialContribution=Félagslegt framlag greiðslu
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VSK-greiðslu
 PaymentSalary=Salary payment
 ListPayment=Listi yfir greiðslur
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VSK Greiðsla
 VATPayments=VSK Greiðslur
-SocialContributionsPayments=Tryggingagjöld greiðslur
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Sýna VSK greiðslu
 TotalToPay=Samtals borga
 TotalVATReceived=Samtals VSK móttekin
@@ -116,11 +116,11 @@ NewCheckDepositOn=Búa til kvittun fyrir innborgun á reikning: %s
 NoWaitingChecks=Engar athuganir sem bíður fyrir afhendingu.
 DateChequeReceived=Athugaðu móttöku inntak dagsetningu
 NbOfCheques=ATH eftirlit
-PaySocialContribution=Borga félagslegt framlag
-ConfirmPaySocialContribution=Ertu viss um að þú viljir að flokka þessa félags framlag sem greitt?
-DeleteSocialContribution=Eyða félagslegum mörkum
-ConfirmDeleteSocialContribution=Ertu viss um að þú viljir eyða þessum félagslega framlag?
-ExportDataset_tax_1=Félagsleg framlög og greiðslur
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index af03d82d7bb..05174a31df7 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -4,10 +4,10 @@ About = Um
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Upphafsdagur
 CronDtEnd=Lokadagur
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Aðferð
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Breytur
 CronSaveSucess=Save succesfully
 CronNote=Athugasemd
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
index 7172369ece1..ba2f240f51a 100644
--- a/htdocs/langs/is_IS/ecm.lang
+++ b/htdocs/langs/is_IS/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Leita eftir hlut
 ECMSectionOfDocuments=Möppur skjöl
 ECMTypeManual=Handbók
 ECMTypeAuto=Sjálfvirk
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Skjöl sem tengjast þriðju aðila
 ECMDocsByProposals=Skjöl tengd tillögum
 ECMDocsByOrders=Skjöl tengd viðskiptavinum pantanir
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index ca349e46924..3f002cb7c3a 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index a29a400f47d..1404bc447d4 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Ástæða
 UserCP=Notandi
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Gildi
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/is_IS/incoterm.lang b/htdocs/langs/is_IS/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/is_IS/incoterm.lang
+++ b/htdocs/langs/is_IS/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index 7aa233a456a..32c6fc62912 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Gagnasafn framreiðslumaður - Ofurpaur aðgang
 CheckToCreateDatabase=Hakaðu í reitinn ef gagnagrunnur er ekki til og því þarf að skapa. <br> Í þessum tilfellum verður þú að fylla tenging / lykilorð til Ofurpaur reikning neðst á þessari síðu.
 CheckToCreateUser=Hakaðu í reitinn ef gagnasafn eigandi er ekki til og því þarf að skapa. <br> Í þessum tilfellum verður þú að velja notandanafn og lykilorð og einnig fylla tenging / lykilorð til að Ofurpaur reikning neðst á þessari síðu. Ef þessi kassi er valið, eigandi gagnagrunn og lykilorð hans verður að vera til.
 Experimental=(Á tilraunastigi)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Innskráning á notanda leyft að búa til nýja gagnagrunna eða nýr notandi, gagnslaus ef gagnasafninu og gagnasafn innskráningu þegar til (eins og þegar þú ert haldin af vefþjónusta fyrir hendi).
 KeepEmptyIfNoPassword=Leyfi tómur ef notandi hefur ekki aðgangsorð (forðast þetta)
 SaveConfigurationFile=Vista gildi
diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang
index ee9ed586a3d..0f066c6db55 100644
--- a/htdocs/langs/is_IS/languages.lang
+++ b/htdocs/langs/is_IS/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabíska
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosníska
 Language_ca_ES=Katalónska
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=Enska (United States)
 Language_en_ZA=English (Suður Afríka)
 Language_es_ES=Spænska
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spænska (Austria)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spænska (Hondúras)
 Language_es_MX=Spænska (Mexíkó)
 Language_es_PY=Spænska (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Íslenska
 Language_it_IT=Italien
 Language_ja_JP=Japanska
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Lettneska
 Language_mk_MK=Makedónska
@@ -64,6 +69,7 @@ Language_sv_SV=Sænska
 Language_sv_SE=Sænska
 Language_sq_AL=Albanian
 Language_sk_SK=Slóvakísku
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Úsbekska
diff --git a/htdocs/langs/is_IS/loan.lang b/htdocs/langs/is_IS/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/is_IS/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index b99aa9b8fd8..58098106d3f 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Tilkynningar
 NoNotificationsWillBeSent=Engar tilkynningar í tölvupósti er mjög spennandi fyrir þennan atburð og fyrirtæki
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 7260b333a2c..42675df8b2b 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Villur fundust. Við rollback breytingar.
 ErrorConfigParameterNotDefined=<b>Viðfang %s </b> er ekki skilgreind innan Dolibarr config skrá <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Gat ekki fundið <b>notandann %s </b> í Dolibarr gagnagrunninum.
 ErrorNoVATRateDefinedForSellerCountry=Villa, enginn VSK hlutfall er skilgreind fyrir% landsins.
-ErrorNoSocialContributionForSellerCountry=Villa, engin félagsleg framlag tegund er skilgreind fyrir% landsins.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Villa tókst að vista skrána.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit verð (nettó)
 UnitPriceTTC=Eining verðs
 PriceU=UPP
 PriceUHT=UP (nettó)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UPP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Upphæð
 AmountInvoice=Invoice upphæð
 AmountPayment=Upphæð greiðslu
@@ -339,6 +339,7 @@ IncludedVAT=Innifalið VSK
 HT=Frádregnum skatti
 TTC=Inc VSK
 VAT=VSK
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=VSK-hlutfall
@@ -413,6 +414,8 @@ Qty=Magn
 ChangedBy=Breytt af
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Velgengni
 ResultKo=Bilun
@@ -421,7 +424,7 @@ Reportings=Skýrslur
 Draft=Víxill
 Drafts=Drög
 Validated=Staðfestar
-Opened=Opnaður
+Opened=Open
 New=New
 Discount=Afsláttur
 Unknown=Óþekkt
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index a151150fd4c..5eeeaefd87e 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -199,7 +199,8 @@ Entreprises=Stofnanir
 DOLIBARRFOUNDATION_PAYMENT_FORM=Til að gera áskrift greiðslu með millifærslu, sjá síðu <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Til að greiða með kreditkorti eða PayPal, smelltu á hnappinn neðst á síðunni. <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index eefcdf2edba..60533ae8ebd 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Birgir röð
 SuppliersOrders=pantanir birgis
 SuppliersOrdersRunning=pantanir Current birgis
 CustomerOrder=Viðskiptavinur röð
-CustomersOrders=Customers orders
-CustomersOrdersRunning=pantanir Núverandi viðskiptavinur '
-CustomersOrdersAndOrdersLines=Viðskiptavinur pantanir og línur til þess
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Pantanir birgðasala til að ganga
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Hætt við
 StatusOrderDraftShort=Víxill
 StatusOrderValidatedShort=Staðfestar
@@ -75,8 +75,9 @@ AddToMyOrders=Bæta við pöntunum minn
 AddToOtherOrders=Bæta við aðrar skipanir
 AddToDraftOrders=Add to draft order
 ShowOrder=Sýna röð
-NoOpenedOrders=Nei opnaði pantanir
-NoOtherOpenedOrders=Engin önnur opnaði pantanir
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Aðrar skipanir
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index c777197bdfe..485ffc7841f 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention staðfestar
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Viðskiptavinur Reikningar staðfestar
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Birgir röð samþykkt
 Notify_ORDER_SUPPLIER_REFUSE=Birgir þess neitaði
 Notify_ORDER_VALIDATE=Viðskiptavinur til setja í gildi
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Bæta við færslu í dagbók %s
diff --git a/htdocs/langs/is_IS/printing.lang b/htdocs/langs/is_IS/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/is_IS/printing.lang
+++ b/htdocs/langs/is_IS/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 278ac3161f0..7e79b37df40 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Vara eða þjónusta
 ProductsAndServices=Vörur og þjónusta
 ProductsOrServices=Vara eða þjónusta
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Vörur og þjónusta tölfræði
 ProductsStatistics=Vörur tölfræði
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Innri tilvísun
 LastRecorded=Síðasta vörur / þjónustu á selja á skrá
@@ -44,7 +44,7 @@ CardProduct1=Þjónusta kort
 CardContract=Samningur kort
 Warehouse=Lager
 Warehouses=Vöruhús
-WarehouseOpened=Warehouse opna
+WarehouseOpened=Warehouse open
 WarehouseClosed=Lager lokaður
 Stock=Stock
 Stocks=Verðbréf
@@ -71,21 +71,21 @@ SellingPriceTTC=Söluverð (Inc skatt)
 PublicPrice=Almenn verð
 CurrentPrice=Núverandi verð
 NewPrice=Ný verð
-MinPrice=Minim. Söluverð
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Söluverð er ekki vera lægra en lágmarks leyfð fyrir þessa vöru ( %s  án skatta)
 ContractStatus=Samningur stöðu
 ContractStatusClosed=Loka
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=útrunnið
-ContractStatusOnHold=Ekki í keyrslu
-ContractStatusToRun=To get running
-ContractNotRunning=Þessi samningur er ekki í gangi
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Vara með% tilvísun s er þegar til.
 ErrorProductBadRefOrLabel=Wrong gildi fyrir tilvísun eða merki.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Birgjar
 SupplierRef=Birgir dómari.
 ShowProduct=Sýna vörur
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ef varan er þjónusta við takmarkaðan tíma:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Fjöldi verð
 MultiPriceLevelsName=Verð flokkar
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Félagi
 Translation=Þýðing
 KeywordFilter=Leitarorð sía
@@ -131,7 +131,7 @@ ProductToAddSearch=Leita vara til að bæta
 AddDel=Bæta við / Eyða
 Quantity=Magn
 NoMatchFound=Engin samsvörun fannst
-ProductAssociationList=Listi yfir tengdum vörum / þjónustu: nafn á vöru / þjónustu (magn áhrifum)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Einn af völdum vöru er foreldri með núverandi vöru
 DeleteProduct=Eyða vöru / þjónustu
@@ -179,16 +179,41 @@ CloneProduct=Klóna vöru eða þjónustu
 ConfirmCloneProduct=Ertu viss um að þú viljir klón vöru eða <b>þjónustu %s ?</b>
 CloneContentProduct=Klóna allar helstu upplýsingar um vöru / þjónustu
 ClonePricesProduct=Klóna helstu upplýsingar og verð
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Þessi vara er notuð
 NewRefForClone=Tilv. nýrra vara / þjónusta
-CustomerPrices=Viðskiptavinir verð
-SuppliersPrices=Birgjar verð
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Tollareglna
 CountryOrigin=Uppruni land
 HiddenIntoCombo=Falinn í að velja lista
 Nature=Náttúra
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 5a923bd6b68..464d92df7d8 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Þetta sýnir öll verkefni sem þú ert að fá að lesa.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Þetta sýnir öll verkefni (notandi heimildir veita þér leyfi til að skoða allt).
 MyTasksDesc=Þessi skoðun er takmörkuð við verkefni eða verkefni sem þú ert að hafa samband við (hvað sem er gerð).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að lesa.
 TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér leyfi til að skoða allt).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Verkefni area
 NewProject=Ný verkefni
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Listi yfir verkefni
 ShowProject=Sýna verkefni
 SetProject=Setja verkefni
 NoProject=Engin verkefni skilgreind eða í eigu
-NbOpenTasks=ATH að opna verkefni
+NbOpenTasks=Nb of open tasks
 NbOfProjects=ATH verkefna
 TimeSpent=Tíma sem fer
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nýr tími
 MyTimeSpent=Minn tími var
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Listi yfir inngrip í tengslum við verkefnið
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Listi yfir aðgerðir í tengslum við verkefnið
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Afþreying á verkefni í þessari viku
 ActivityOnProjectThisMonth=Afþreying á verkefni í þessum mánuði
 ActivityOnProjectThisYear=Afþreying á verkefni á þessu ári
@@ -95,7 +98,7 @@ DeleteATimeSpent=Eyða tíma
 ConfirmDeleteATimeSpent=Ertu viss um að þú viljir eyða þessum tíma varið?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Verkefni hollur til þessa þriðja aðila
 NoTasks=Engin verkefni fyrir þetta verkefni
 LinkedToAnotherCompany=Tengjast öðrum þriðja aðila
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/is_IS/propal.lang b/htdocs/langs/is_IS/propal.lang
index d6dea93eb07..4a4f1016a81 100644
--- a/htdocs/langs/is_IS/propal.lang
+++ b/htdocs/langs/is_IS/propal.lang
@@ -4,7 +4,7 @@ Proposal=Auglýsing tillögu
 ProposalShort=Tillaga
 ProposalsDraft=Drög að auglýsing tillögur
 ProposalDraft=Drög að auglýsing tillögu
-ProposalsOpened=Opnaður auglýsing tillögur
+ProposalsOpened=Open commercial proposals
 Prop=Auglýsing tillögur
 CommercialProposal=Auglýsing tillögu
 CommercialProposals=Auglýsing tillögur
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Prospect lista
 DeleteProp=Eyða auglýsing tillögu
 ValidateProp=Staðfesta auglýsing tillögu
-AddProp=Bæta við tillögu
+AddProp=Create proposal
 ConfirmDeleteProp=Ertu viss um að þú viljir eyða þessum viðskiptum tillögur?
 ConfirmValidateProp=Ertu viss um að þú viljir að sannprófa þetta auglýsing tillögur?
 LastPropals=Last %s  tillögur
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Upphæð eftir mánuði (að frádregnum skatti)
 NbOfProposals=Fjöldi viðskipta tillögur
 ShowPropal=Sýna tillögu
 PropalsDraft=Drög
-PropalsOpened=Opnaður
+PropalsOpened=Open
 PropalsNotBilled=Lokað billed ekki
 PropalStatusDraft=Víxill (þarf að vera staðfest)
 PropalStatusValidated=Staðfestar (Tillagan er opið)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Ekki skráð (lokað)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Víxill
 PropalStatusValidatedShort=Staðfestar
-PropalStatusOpenedShort=Opnaður
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Loka
 PropalStatusSignedShort=Innsigli
 PropalStatusNotSignedShort=Ekki skráð
@@ -51,12 +51,10 @@ PropalsToClose=Auglýsing um tillögur um að loka
 PropalsToBill=Undirritað auglýsing tillögur að frumvarpi
 ListOfProposals=Listi yfir auglýsing tillögur
 ActionsOnPropal=Aðgerðir á tillögu
-NoOpenedPropals=Nei opnaði auglýsing tillögur
-NoOtherOpenedPropals=Engin önnur opnaði auglýsing tillögur
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Auglýsing tillögu dómari
 SendPropalByMail=Senda auglýsing tillögu með tölvupósti
-FileNotUploaded=Skráin var ekki birt
-FileUploaded=Skráin tókst að hlaða inn
 AssociatedDocuments=Skjöl sem tengd er við tillögu:
 ErrorCantOpenDir=Get ekki opnað skrá
 DatePropal=Dagsetning tillögu
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal %s  fannst ekki
 Estimate=Áætlun:
 EstimateShort=Áætlun
 OtherPropals=Aðrar tillögur
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=Búa auglýsing tillögu með því að afrita það sem tillaga
 CreateEmptyPropal=Búa til tóm auglýsing tillögur vierge eða lista yfir vörur / þjónustu
 DefaultProposalDurationValidity=Default auglýsing tillögu Gildistími Lengd (í dögum)
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=Viðskiptavinur samband eftirfarandi upp ti
 # Document models
 DocModelAzurDescription=A heill tillögu líkan (logo. ..)
 DocModelJauneDescription=Jaune tillögu líkan
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/is_IS/salaries.lang
+++ b/htdocs/langs/is_IS/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index 40d0f918aa2..b37f32cab64 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Einföld skjal líkan
 DocumentModelMerou=Merou A5 líkan
 WarningNoQtyLeftToSend=Aðvörun, að engar vörur sem bíður sendar.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Flugvél fæðingardag
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date sending berast
 SendShippingByEMail=Senda sendingu með tölvupósti
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index d47c1328207..385190f10bc 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Vöruhús
 NewWarehouse=Nýr lager / lager area
 WarehouseEdit=Breyta vörugeymsla
 MenuNewWarehouse=Nýr lager
-WarehouseOpened=Warehouse opna
+WarehouseOpened=Warehouse open
 WarehouseClosed=Lager lokaður
 WarehouseSource=Heimild vörugeymsla
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Veldu vöruhús að nota til lækkunar hlutabré
 SelectWarehouseForStockIncrease=Veldu vöruhús að nota fyrir hækkun hlutabréfa
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 6abb9995b6e..df46af9b482 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang
index 9561390dfb5..da674e0aeea 100644
--- a/htdocs/langs/is_IS/trips.lang
+++ b/htdocs/langs/is_IS/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Listi yfir gjöld
 NewTrip=New expense report
 CompanyVisited=Fyrirtæki / stofnun heimsótt
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index a21dab91a6c..97d0a755520 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Fjarlægja úr hópi
 PasswordChangedAndSentTo=Lykilorð breyst og sendur <b>til %s .</b>
 PasswordChangeRequestSent=Beiðni um að breyta lykilorðinu <b>fyrir %s </b> sent <b>til %s .</b>
 MenuUsersAndGroups=Notendur & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s  búinn til hópa
 LastUsersCreated=Last %s  notendur skapa
 ShowGroup=Sýna hópur
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 5f10f1a6d0e..cefa106700c 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Greiðsla standa röð %s af bankanum
diff --git a/htdocs/langs/is_IS/workflow.lang b/htdocs/langs/is_IS/workflow.lang
index 918043c65aa..edb4afc7f07 100644
--- a/htdocs/langs/is_IS/workflow.lang
+++ b/htdocs/langs/is_IS/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Vinnuflæði mát skipulag
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Það er ekki workflow hægt að breyta fyrir einingu sem þú hefur valið.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Búa til viðskiptavina röð sjálfkrafa eftir verslunar Tillagan er undirrituð
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Búa til viðskiptavina reikning sjálfkrafa eftir verslunar Tillagan er undirrituð
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Búa til viðskiptavina reikning sjálfkrafa eftir að samningur er staðfest
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Búa til viðskiptavina reikning sjálfkrafa eftir að viðskiptavinur þess er lokað
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index a62039e19da..6529bc8cc78 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -11,7 +11,7 @@ VersionRecommanded=Raccomandata
 FileCheck=Integrità dei file
 FilesMissing=File mancanti
 FilesUpdated=File aggiornati
-FileCheckDolibarr=Check Dolibarr Files Integrity
+FileCheckDolibarr=Controlla l'integrità dei file di Dolibarr
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=ID di sessione
 SessionSaveHandler=Handler per il salvataggio dell sessioni
@@ -149,7 +149,6 @@ MenuForUsers=Menu per gli utenti
 LangFile=file .lang
 System=Sistema
 SystemInfo=Informazioni di sistema
-SystemTools=Strumenti di gestione
 SystemToolsArea=Sezione strumenti di gestione del sistema
 SystemToolsAreaDesc=Questa sezione offre funzioni di gestione. Utilizzare il menu per scegliere la funzione che stai cercando.
 Purge=Pulizia
@@ -232,8 +231,8 @@ Security=Sicurezza
 Passwords=Password
 DoNotStoreClearPassword=Non memorizzare le password in chiaro nel database (raccomandato)
 MainDbPasswordFileConfEncrypted=Password del database crittata in conf.php (raccomandato)
-InstrucToEncodePass=Per conservare le password codificate (criptate) nel file <b>conf.php</b>, sostituire la riga<br/><b>dolibarr_main_db_pass $ ="..."</b><br/>con<br/>><b>$dolibarr_main_db_pass="crypted:..."</b>
-InstrucToClearPass=Per conservare le password decodificate (in chiaro) nel file <b>conf.php</b>, sostituire la riga<br/><b>$dolibarr_main_db_pass="crypted:..."</b><br/>con<br/><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protezione e crittografia dei PDF generati
 ProtectAndEncryptPdfFilesDesc=La protezione di un documento PDF rende possibile solo la lettura e la stampa con qualsiasi browser. La modifica e la copia non sono più possibili.
 Feature=Caratteristica
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Il procedimento da seguire è:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Passo %s
 FindPackageFromWebSite=Trova un pacchetto che fornisca la funzionalità desiderata (per esempio su %s).
-DownloadPackageFromWebSite=Scaricare il pacchetto %s.
-UnpackPackageInDolibarrRoot=Scompatta il pacchetto nella directory dei moduli esterni: <b>%s</b>
+DownloadPackageFromWebSite=Scarica il pacchetto (per esempio dal sito ufficiale %s).
+UnpackPackageInDolibarrRoot=Scompatta il pacchetto sul server nella directory dedicata ai moduli esterni: <b>%s</b>
 SetupIsReadyForUse=Installazione completata. Dolibarr è pronto ad utilizzare questo nuovo componente.
 NotExistsDirect=La directory root alternativa non è stata definita.<br>
 InfDirAlt=A partire dalla versione 3 è possibile definire una directory root alternativa. Ciò permette di archiviare plugin e template personalizzati nello stesso posto.<br>Basta creare una directory nella root di Dolibarr ( per esempio custom).<br>
 InfDirExample=<br>Poi dichiaralo nel file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Queste righe sono commentate con il "#", per levare il commento basta rimuovere il cancelletto.
-YouCanSubmitFile=Seleziona modulo:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Versione attuale di Dolibarr
 CallUpdatePage=Vai alla pagina che aggiorna la struttura del database e dati su %s.
 LastStableVersion=Ultima versione stabile
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=La lista dei parametri viene da una tabella<br />Sint
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Libreria utilizzata per generare PDF
 WarningUsingFPDF=Avviso: Il tuo <b>conf.php</b> contiene la direttiva <b>dolibarr_pdf_force_fpdf = 1.</b> Questo significa che si utilizza la libreria FPDF per generare file PDF. Questa libreria è obsoleta e non supporta un molte funzioni (Unicode, trasparenza dell'immagine, lingue cirillico, arabo e asiatico, ...), quindi potrebbero verificarsi errori durante la generazione di file PDF. <br> Per risolvere questo problema ed avere un supporto completo di generazione di file PDF, scarica <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , quindi commentare o rimuovere la riga <b>$ dolibarr_pdf_force_fpdf = 1,</b> e aggiungere invece <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Per testare l'indirizzo ClickToDial dell'utente <strong>%s</strong>, inserisci un numero di telefono
 RefreshPhoneLink=Link Aggiorna
@@ -430,8 +429,8 @@ Module20Name=Proposte
 Module20Desc=Gestione proposte commerciali
 Module22Name=Posta massiva
 Module22Desc=Gestione posta massiva
-Module23Name= Energia
-Module23Desc= Monitoraggio del consumo energetico
+Module23Name=Energia
+Module23Desc=Monitoraggio del consumo energetico
 Module25Name=Ordini clienti
 Module25Desc=Gestione ordini clienti
 Module30Name=Fatture
@@ -492,17 +491,17 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
-Module500Name=Spese speciali (tasse, contributi sociali, dividendi)
-Module500Desc=Amministrazione delle spese speciali quali tasse, contributi sociali, dividendi e salari.
+Module500Name=Spese speciali
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Stipendi
 Module510Desc=Management of employees salaries and payments
 Module520Name=Prestito
-Module520Desc=Management of loans
+Module520Desc=Gestione dei prestiti
 Module600Name=Notifiche
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donazioni
 Module700Desc=Gestione donazioni
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -510,22 +509,24 @@ Module1200Name=Mantis
 Module1200Desc=Integrazione Mantis
 Module1400Name=Contabilità avanzata
 Module1400Desc=Gestione contabilità per esperti (partita doppia)
-Module1520Name=Document Generation
+Module1520Name=Generazione dei documenti
 Module1520Desc=Mass mail document generation
 Module1780Name=Tag/categorie
 Module1780Desc=Crea tag / categorie (prodotti, clienti, fornitori, contatti o membri)
 Module2000Name=FCKeditor
 Module2000Desc=Permette di usare un editor avanzato per alcune aree di testo
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2200Name=Prezzi dinamici
+Module2200Desc=Abilita l'utilizzo di espressioni matematiche per i prezzi
 Module2300Name=Cron
 Module2300Desc=Gestione delle operazioni pianificate
 Module2400Name=Ordine del giorno
 Module2400Desc=Gestione eventi/compiti e ordine del giorno
 Module2500Name=Gestione dei contenuti digitali
 Module2500Desc=Salvare e condividere documenti
-Module2600Name=WebServices
-Module2600Desc=Attivare i webservices di Dolibarr
+Module2600Name=API (Web services SOAP)
+Module2600Desc=Attiva il server SOAP che fornisce i servizi di API
+Module2610Name=API (Web services REST)
+Module2610Desc=Attiva il server REST che fornisce i servizi di API
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -541,7 +542,7 @@ Module6000Name=Flusso di lavoro
 Module6000Desc=Gestione flussi di lavoro
 Module20000Name=Gestione delle richieste di permesso
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
+Module39000Name=Lotto di produzione
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Modulo per offrire il pagamento online con PayBox
@@ -578,7 +579,7 @@ Permission32=Creare/modificare  prodotti
 Permission34=Eliminare prodotti
 Permission36=Vedere/gestire prodotti nascosti
 Permission38=Esportare prodotti
-Permission41=Vedere progetti (i progetti condivisi e quelli di cui sono un contatto)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Creare/modificare progetti
 Permission44=Eliminare progetti
 Permission61=Vedere gli interventi
@@ -599,10 +600,10 @@ Permission86=Inviare ordini clienti
 Permission87=Chiudere gli ordini clienti
 Permission88=Annullare ordini clienti
 Permission89=Eliminare ordini clienti
-Permission91=Vedere contributi e iva
-Permission92=Creare/modificare contributi e iva
-Permission93=Eliminare contributi e iva
-Permission94=Esportare contributi
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Vedere report
 Permission101=Vedere invii
 Permission102=Creare/modificare spedizioni
@@ -620,9 +621,9 @@ Permission121=Vedere soggetti terzi collegati all'utente
 Permission122=Creare/modificare terzi legati all'utente
 Permission125=Eliminare terzi legati all'utente
 Permission126=Esportare terzi
-Permission141=Vedere progetti (anche privati)
-Permission142=Creare/modificare progetti (anche privati)
-Permission144=Eliminare progetti (anche privati)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Vedere provider
 Permission147=Vedere statistiche
 Permission151=Vedere ordini permanenti
@@ -713,14 +714,14 @@ Permission402=Creare/modificare sconti
 Permission403=Convalidare sconti
 Permission404=Eliminare sconti
 Permission510=Read Salaries
-Permission512=Create/modify salaries
+Permission512=Crea/modifica stipendi
 Permission514=Delete salaries
-Permission517=Export salaries
+Permission517=Esporta stipendi
 Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
+Permission522=Crea/modifica prestiti
+Permission524=Elimina prestiti
 Permission525=Access loan calculator
-Permission527=Export loans
+Permission527=Esporta prestiti
 Permission531=Vedere servizi
 Permission532=Creare/modificare servizi
 Permission534=Eliminare servizi
@@ -800,7 +801,7 @@ DictionaryCountry=Paesi
 DictionaryCurrency=Valute
 DictionaryCivility=Titoli civili
 DictionaryActions=Tipi di azioni/eventi
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Aliquote IVA o Tasse di vendita
 DictionaryRevenueStamp=Ammontare dei valori bollati
 DictionaryPaymentConditions=Termini di pagamento
@@ -811,12 +812,15 @@ DictionaryPaperFormat=Formati di carta
 DictionaryFees=Tipi di tasse
 DictionarySendingMethods=Metodi di spedizione
 DictionaryStaff=Personale
-DictionaryAvailability=Ritardo di consegna
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
+DictionaryAvailability=Tempi di consegna
+DictionaryOrderMethods=Metodi di ordinazione
+DictionarySource=Origine delle proposte/ordini
 DictionaryAccountancyplan=Piano dei conti
 DictionaryAccountancysystem=Modelli per piano dei conti
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Unità
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Impostazioni salvate
 BackToModuleList=Torna alla lista moduli
 BackToDictionaryList=Torna alla lista dei dizionari
@@ -936,13 +940,14 @@ CompanyZip=CAP
 CompanyTown=Città
 CompanyCountry=Paese
 CompanyCurrency=Principali valute
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Non mostrare
 DoNotSuggestPaymentMode=Non suggerire
 NoActiveBankAccountDefined=Nessun conto bancario attivo definito
 OwnerOfBankAccount=Titolare del conto bancario %s
 BankModuleNotActive=Modulo conti bancari non attivato
-ShowBugTrackLink=Visualizza link "Segnala un bug"
+ShowBugTrackLink=Mostra link "<strong>%s</strong>"
 ShowWorkBoard=Mostra "tavolo da lavoro" sulla home page
 Alerts=Avvisi e segnalazioni
 Delays=Ritardi
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Limite massimo di decimali per i prezzi unitari.
 MAIN_MAX_DECIMALS_TOT=Limite massimo di decimali per il totale dei prezzi.
 MAIN_MAX_DECIMALS_SHOWN=Limite massimo dei decimali per i prezzi visualizzati a schermo (Aggiungi <b>...</b> dopo tale numero se vuoi visualizzare tre puntini per indicare il troncamento del numero).
 MAIN_DISABLE_PDF_COMPRESSION=Usa la compressione per i file PDF generati.
-MAIN_ROUNDING_RULE_TOT= Regola per l'arrotondamento (per i pochi paesi in cui l'arrotondamento non è calcolato in base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Prezzo unitario netto di un prodotto
 TotalPriceAfterRounding=Prezzo totale (al netto dell'IVA/IVA inclusa) dopo l'arrotondamento
 ParameterActiveForNextInputOnly=Parametro valido esclusivamente per il prossimo inserimento
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Numero totale di moduli attivati: <b>%s</b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=La classe %s non è stata trovata al percorso PHP indicato
 YesInSummer=Si in estate
-OnlyFollowingModulesAreOpenedToExternalUsers=Nota, solo i seguenti moduli sono aperti agli utenti esterni (qualunque siano i permessi per questi utenti)
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin
 ConditionIsCurrently=La condizione corrente è %s
 YouUseBestDriver=Usi già il miglior driver attualmente disponibile: %s
@@ -1094,7 +1099,7 @@ FieldEdition=Edition of field %s
 FixTZ=Correzione del fuso orario
 FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario)
 GetBarCode=Ottieni codice a barre
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+EmptyNumRefModelDesc=Il codice è libero. Questo codice può essere modificato in qualsiasi momento.
 ##### Module password generation
 PasswordGenerationStandard=Genera una password in base all'algoritmo interno di  Dolibarr: 8 caratteri comprensivi di numeri e lettere minuscole.
 PasswordGenerationNone=Non suggerire eventuali password generate. La password deve essere di tipo manuale.
@@ -1364,7 +1369,7 @@ NotInstalled=Non installato, il tuo server non è rallentato per questo.
 ApplicativeCache=Cache applicativa
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+MemcachedAvailableAndSetup=Il modulo memcached, dedicato all'utilizzo del server memcached, è stato attivato.
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
 HTTPCacheStaticResources=Cache HTTP per le risorse statiche (css, img, javascript)
@@ -1375,7 +1380,7 @@ FilesOfTypeNotCompressed=I file di tipo %s non vengono compressi dal server HTTP
 CacheByServer=Cache per server
 CacheByClient=Cache per browser
 CompressionOfResources=Compressione delle risposte HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Con i browser attuali l'individuazione automatica non è possibile
 ##### Products #####
 ProductSetup=Impostazioni modulo prodotti
 ServiceSetup=Impostazioni modulo servizi
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Numero massimo di prodotti per le liste nelle combo
 ConfirmDeleteProductLineAbility=Attiva la richiesta di conferma nel form in caso di rimozione di una linea di prodotto
 ModifyProductDescAbility=Personalizzazione delle descrizioni dei prodotti nei form
 ViewProductDescInFormAbility=Visualizzare la descrizione dei prodotti nei form (altrimenti appariranno come tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualizzazione delle descrizioni dei prodotti nella lingua di terzi
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Utilizza il form di ricerca per scegliere un prodotto (invece della lista a tendina)
 UseEcoTaxeAbility=Usare l'eco-Tax (RAEE)
 SetDefaultBarcodeTypeProducts=Tipo di codici a barre predefinito da utilizzare per i prodotti
 SetDefaultBarcodeTypeThirdParties=Tipo di codici a barre predefinito da utilizzare per terze parti
+UseUnits=Support units
 ProductCodeChecker= Modulo per la generazione e verifica dei codici prodotto (prodotto o servizio)
 ProductOtherConf= Configurazione Prodotto/servizio
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Codice a barre di tipo UPC
 BarcodeDescISBN=Codice a barre di tipo ISBN
 BarcodeDescC39=Codice a barre di tipo C39
 BarcodeDescC128=Codice a barre di tipo C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation è uno strumento di linea di comando (utilizzato dal motore interno per alcuni tipi di codici a barre). Deve essere compatibile con "genbarcode". <br> Per esempio: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motore interno
 BarCodeNumberManager=Manager per auto-definizione dei numeri barcode
@@ -1438,7 +1447,7 @@ MailingDelay=Seconds to wait after sending next message
 ##### Notification #####
 NotificationSetup=EMail notification module setup
 NotificationEMailFrom=Mittente email (Da) per le email di notifica inviate
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+ListOfAvailableNotifications=Elenco degli eventi per cui è possibile impostare la notifica, per ogni soggetto terzo (si può impostare dalla scheda del soggetto terzo) o a un indirizzo email fisso (La lista dipende dai moduli attivati)
 FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Impostazione del modulo di consegna
@@ -1446,7 +1455,7 @@ SendingsReceiptModel=Modello di ricevuta consegna (D.D.T.)
 SendingsNumberingModules=Moduli per la numerazione delle spedizioni
 SendingsAbility=Support shipment sheets for customer deliveries
 NoNeedForDeliveryReceipts=Nella maggior parte dei casi, i moduli possono essere utilizzati sia come documenti di trasporto (elenco dei prodotti per l'invio) che come ricevute. Le ricevute di consegna risultano quindi una funzione duplicata che raramente viene attivata.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Testo libero per le spedizioni
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Numerazione dei moduli di consegna prodotti
 DeliveryOrderModel=Modello ricevuta di consegna prodotti
@@ -1502,10 +1511,10 @@ ConfirmDeleteMenu=Eliminare definitivamente la voce di menu <b>%s</b>?
 DeleteLine=Elimina riga
 ConfirmDeleteLine=Vuoi davvero eliminare definitivamente questa riga?
 ##### Tax #####
-TaxSetup=Modulo impostazioni Tasse, contributi e dividendi
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Esigibilità dell'IVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Contabilità per cassa
+OptionVATDebitOption=Contabilità per competenza
 OptionVatDefaultDesc=L'IVA è dovuta:<br/> - sulla consegna/pagamento per i beni<br/>- sui pagamenti per i servizi
 OptionVatDebitOptionDesc=L'IVA è dovuta:<br/> - alla consegna/pagamento per i beni<br/>- alla fatturazione (a debito) per i servizi
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
@@ -1552,6 +1561,15 @@ WebServicesSetup=Impostazioni modulo webservices
 WebServicesDesc=Attivando questo modulo, Dolibarr attiva un web server in grado di fornire vari servizi web.
 WSDLCanBeDownloadedHere=È possibile scaricare i file di definizione dei servizi (WSDL) da questo URL
 EndPointIs=I client possono indirizzare le loro richieste SOAP all'endpoint disponibile a questo URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=È possibile accedere alle API all'indirizzo
+ApiExporerIs=È possibile esplorare le API all'indirizzo
+OnlyActiveElementsAreExposed=Vengono esposti solo elementi correlati ai moduli abilitati
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Impostazioni modulo banca/cassa
 FreeLegalTextOnChequeReceipts=Testo libero sulle ricevute assegni
@@ -1581,9 +1599,10 @@ ProjectsSetup=Impostazioni modulo progetti
 ProjectsModelModule=Modelli dei rapporti dei progetti
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Impostazioni GED
-ECMAutoTree = Automatic tree folder and document
+ECMAutoTree = Albero automatico delle cartelle e dei documenti
 ##### Fiscal Year #####
 FiscalYears=Anni fiscali
 FiscalYear=Anno fiscale
@@ -1594,16 +1613,16 @@ OpenFiscalYear=Apri anno fiscale
 CloseFiscalYear=Chiudi anno fiscale
 DeleteFiscalYear=Elimina anno fiscale
 ConfirmDeleteFiscalYear=Vuoi davvero cancellare questo anno fiscale?
-Opened=Aperto
+Opened=Open
 Closed=Chiuso
-AlwaysEditable=Can always be edited
+AlwaysEditable=Può essere modificato in qualsiasi momento
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
+NbMajMin=Numero minimo di caratteri maiuscoli
+NbNumMin=Numero minimo di caratteri numerici
+NbSpeMin=Numero minimo di caratteri speciali
+NbIteConsecutive=Numero massimo di caratteri identici ripetuti
+NoAmbiCaracAutoGeneration=Non utilizzare caratteri ambigui ("1", "l", "i", "|", "0", "O") per la generazione automatica
+SalariesSetup=Impostazioni del modulo stipendi
 SortOrder=Ordina
 Format=Formato
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
@@ -1616,9 +1635,18 @@ YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for E
 ListOfNotificationsPerContact=List of notifications per contact*
 ListOfFixedNotifications=List of fixed notifications
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build database backup dump file
+Threshold=Soglia
+BackupDumpWizard=Procedura guidata per creare file di backup del database (dump)
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 7629981d59b..2ab6962524a 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Ordine %s classificato fatturato
 OrderApprovedInDolibarr=Ordine %s approvato
 OrderRefusedInDolibarr=Ordine %s rifiutato
 OrderBackToDraftInDolibarr=Ordine %s riportato allo stato di bozza
-OrderCanceledInDolibarr=ordine %s annullato
 ProposalSentByEMail=Proposta commerciale %s inviata per email
 OrderSentByEMail=Ordine cliente %s inviato per email
 InvoiceSentByEMail=Fattura attiva %s inviata per email
@@ -96,3 +95,5 @@ AddEvent=Crea evento
 MyAvailability=Mie disponibilità
 ActionType=Tipo di evento
 DateActionBegin=Data di inizio evento
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 9940d5106e0..89953f2b5bd 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -99,7 +99,7 @@ AccountToCredit=Conto di accredito
 AccountToDebit=Conto di addebito
 DisableConciliation=Disattiva funzione di conciliazione per questo conto
 ConciliationDisabled=Funzione di conciliazione disabilitata
-StatusAccountOpened=Aperto
+StatusAccountOpened=Open
 StatusAccountClosed=Chiuso
 AccountIdShort=Numero di conto
 EditBankRecord=Modifica record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Pagamento fattura attiva
 CustomerInvoicePaymentBack=Rimborso cliente
 SupplierInvoicePayment=Pagamento fattura fornitore
 WithdrawalPayment=Ritiro pagamento
-SocialContributionPayment=Versamento contributi
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Diario del conto finanziario
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici e giroconti
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 89528bc4d23..97406941957 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -135,7 +135,7 @@ ErrorInvoiceAvoirMustBeNegative=Errore, la fattura a correzione deve avere un im
 ErrorInvoiceOfThisTypeMustBePositive=Errore, questo tipo di fattura deve avere importo positivo
 ErrorCantCancelIfReplacementInvoiceNotValidated=Errore, non si può annullare una fattura che è stato sostituita da un'altra fattura non ancora convalidata
 BillFrom=Da
-BillTo=Fattura a
+BillTo=A
 ActionsOnBill=Azioni su fattura
 NewBill=Nuova fattura
 LastBills=Ultime %s fatture
@@ -178,7 +178,7 @@ NumberOfBills=Numero di fatture
 NumberOfBillsByMonth=Numero di fatture per mese
 AmountOfBills=Importo delle fatture
 AmountOfBillsByMonthHT=Importo delle fatture per mese (al netto delle imposte)
-ShowSocialContribution=Visualizza contributi
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Visualizza fattura
 ShowInvoice=Visualizza fattura
 ShowInvoiceReplace=Visualizza la fattura sostitutiva
@@ -270,7 +270,7 @@ BillAddress=Indirizzo di fatturazione
 HelpEscompte=Questo sconto è concesso al cliente perché il suo pagamento è stato effettuato prima del termine.
 HelpAbandonBadCustomer=Tale importo è stato abbandonato (cattivo cliente) ed è considerato come un abbandono imprevisto.
 HelpAbandonOther=Tale importo è stato abbandonato dal momento che è stato un errore (cliente errato o fattura sostituita da altra, per esempio)
-IdSocialContribution=Id contributo
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Id Pagamento
 InvoiceId=Id fattura
 InvoiceRef=Rif. Fattura
@@ -430,5 +430,5 @@ NotLastInCycle=Questa fattura non è l'ultima del ciclo e non deve essere modifi
 DisabledBecauseNotLastInCycle=Il prossimo avanzamento lavori esiste già
 DisabledBecauseFinal=Questo è l'avanzamento lavori finale
 CantBeLessThanMinPercent=Il valore dell'avanzamento non può essere inferiore al valore precedente.
-NoSituations=Nessun avanzamento lavori aperto
+NoSituations=No open situations
 InvoiceSituationLast=Fattura a conclusione lavori
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 953dfc497c2..f01fbf7d05a 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Ultimi contratti
 BoxLastContacts=Ultimi contatti/indirizzi
 BoxLastMembers=Ultimi membri
 BoxFicheInter=Ultimi interventi
-BoxCurrentAccounts=Bilancio conti aperti
+BoxCurrentAccounts=Saldo conti aperti
 BoxSalesTurnover=Fatturato
 BoxTotalUnpaidCustomerBills=Totale fatture attive non pagate
 BoxTotalUnpaidSuppliersBills=Totale fatture passive non pagate
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Ultimi %s membri
 BoxTitleLastFicheInter=Ultimi %s interventi modificati
 BoxTitleOldestUnpaidCustomerBills=Ultime %s fatture clienti non pagate
 BoxTitleOldestUnpaidSupplierBills=Ultime %s fatture fornitori non pagate
-BoxTitleCurrentAccounts=Bilancio dei conti aperti
+BoxTitleCurrentAccounts=Saldi dei conti aperti
 BoxTitleSalesTurnover=Fatturato
 BoxTitleTotalUnpaidCustomerBills=Fatture clienti non pagate
 BoxTitleTotalUnpaidSuppliersBills=Fatture fornitori non pagate
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index aef6f6cc559..4c90e34ab74 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Contatto soggetto terzo
 StatusContactValidated=Stato del contatto/indirizzo
 Company=Società
 CompanyName=Ragione Sociale
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Società
 CountryIsInEEC=Paese appartenente alla Comunità Economica Europea
 ThirdPartyName=Nome soggetto terzo
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Sconti globali disponibili
 DiscountNone=Nessuno
 Supplier=Fornitore
 CompanyList=Elenco Società
-AddContact=Aggiungi contatto
-AddContactAddress=Aggiungi contatto/indirizzo
+AddContact=Crea contatto
+AddContactAddress=Crea contatto/indirizzo
 EditContact=Modifica contatto/indirizzo
 EditContactAddress=Modifica contatto/indirizzo
 Contact=Contatto
@@ -268,8 +269,8 @@ ContactsAddresses=Contatti/Indirizzi
 NoContactDefinedForThirdParty=Nessun contatto per questo soggetto terzo
 NoContactDefined=Nessun contatto definito
 DefaultContact=Contatto predefinito
-AddCompany=Aggiungi società
-AddThirdParty=Aggiungi terza parte
+AddCompany=Crea azienda
+AddThirdParty=Crea soggetto terzo
 DeleteACompany=Elimina una società
 PersonalInformations=Dati personali
 AccountancyCode=Codice contabile
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Etichetta indirizzo di consegna
 DeleteDeliveryAddress=Elimina un indirizzo di consegna
 ConfirmDeleteDeliveryAddress=Vuoi davvero eliminare questo indirizzo di consegna?
 NewDeliveryAddress=Nuovo indirizzo di consegna
-AddDeliveryAddress=Aggiungi indirizzo di consegna
-AddAddress=Aggiungi indirizzo
+AddDeliveryAddress=Crea indirizzo
+AddAddress=Crea indirizzo
 NoOtherDeliveryAddress=Non è stato definito un indirizzo di consegna alternativo
 SupplierCategory=Categoria fornitore
 JuridicalStatus200=Indipendente
@@ -397,7 +398,7 @@ YouMustCreateContactFirst=È necessario inserire un contatto email del soggetto
 ListSuppliersShort=Elenco fornitori
 ListProspectsShort=Elenco clienti potenziali
 ListCustomersShort=Elenco clienti
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Area soggetti terzi e contatti
 LastModifiedThirdParties=Ultime %s terze parti modificate
 UniqueThirdParties=Totale soggetti terzi
 InActivity=In attività
@@ -410,5 +411,10 @@ OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
 MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per codice cliente e %syymm-nnnn per il fornitore, in cui yy è  l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0.
 LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Search third party
+SearchContact=Cerca contatto
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 5f848643fd7..59fe6eac328 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -56,23 +56,23 @@ VATCollected=IVA incassata
 ToPay=Da pagare
 ToGet=Da riscuotere
 SpecialExpensesArea=Area per pagamenti straordinari
-TaxAndDividendsArea=Area imposte, contributi e dividendi
-SocialContribution=Contributo
-SocialContributions=Contributi
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Spese straordinarie
 MenuTaxAndDividends=Imposte e dividendi
 MenuSalaries=Stipendi
-MenuSocialContributions=Contributi
-MenuNewSocialContribution=Nuovo contributo
-NewSocialContribution=Nuovo contributo
-ContributionsToPay=Contributi da pagare
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Area contabilità/tesoreria
 AccountancySetup=Configurazione contabilità
 NewPayment=Nuovo pagamento
 Payments=Pagamenti
 PaymentCustomerInvoice=Pagamento fattura attiva
 PaymentSupplierInvoice=Pagamento fattura fornitori
-PaymentSocialContribution=Pagamento contributi
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Pagamento IVA
 PaymentSalary=Pagamento stipendio
 ListPayment=Elenco dei pagamenti
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Pagamento IVA
 VATPayments=Pagamenti IVA
-SocialContributionsPayments=Pagamenti contributi
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Visualizza pagamento IVA
 TotalToPay=Totale da pagare
 TotalVATReceived=Totale IVA incassata
@@ -116,11 +116,11 @@ NewCheckDepositOn=Nuovo deposito sul conto: %s
 NoWaitingChecks=Nessun assegno in attesa di deposito.
 DateChequeReceived=Data di ricezione assegno
 NbOfCheques=Numero di assegni
-PaySocialContribution=Versare un contributo sociale
-ConfirmPaySocialContribution=Vuoi davvero classificare questo contributo come pagato?
-DeleteSocialContribution=Eliminazione di un contributo sociale
-ConfirmDeleteSocialContribution=Vuoi davvero eliminare questo contributo?
-ExportDataset_tax_1=Contributi e pagamenti
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Calcola <b>%sIVA su entrate-uscite%s</b>
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo app
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Metodo di calcolo
 AccountancyJournal=Codice del giornale di contabilità
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clona contributo sociale
-ConfirmCloneTax=Conferma la clonazione del contributo sociale
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clona nel mese successivo
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 49e9aba0dae..c158d62ff93 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -4,10 +4,10 @@ About = Info
 CronAbout = Info su Cron
 CronAboutPage = Pagina informativa su Cron
 # Right
-Permission23101 = Leggi compito programmato
-Permission23102 = Crea/aggiorna compito programmato
-Permission23103 = Cancella compito programmato
-Permission23104 = Esegui compito programmato
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Impostazione delle azioni pianificate
 URLToLaunchCronJobs=URL che lancia i job di cron
@@ -26,11 +26,11 @@ CronLastOutput=Output dell'ultimo avvio
 CronLastResult=Codice del risultato dell'ultima esecuzione
 CronListOfCronJobs=Lista dei job programmati
 CronCommand=Comando
-CronList=Job programmati
+CronList=Scheduled jobs
 CronDelete=Cancella i job programmati
-CronConfirmDelete=Vuoi davvero cancellare i job?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Lanca i job programmati
-CronConfirmExecute=Sei sicuro di voler eseguire ora questi job programmati?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Il modulo per i job programmati permette di eseguire operazioni definite in anticipoi 
 CronWaitingJobs=Job in attesa
 CronTask=Azione
@@ -39,8 +39,8 @@ CronDtStart=Data di inizio
 CronDtEnd=Data di fine
 CronDtNextLaunch=Prossima esecuzione
 CronDtLastLaunch=Ultima esecuzione
-CronFrequency=Frequenza
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metodo
 CronModule=Modulo
 CronAction=Azione
@@ -55,9 +55,9 @@ CronEach=Ogni
 JobFinished=Azione eseguita e completata
 #Page card
 CronAdd= Aggiungi job
-CronHourStart= Ora e data di inizio del compito
-CronEvery= Ed esegui il compito ogni
-CronObject= Istanza/Oggetto da creare
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Istanza/Oggetto da creare
 CronArgs=Parametri
 CronSaveSucess=Salvato con successo
 CronNote=Commento
@@ -76,13 +76,14 @@ CronMethodHelp=Nome del metodo dell'oggetto da eseguire. <BR>Per esempio per ott
 CronArgsHelp=Argomenti del metodo.<br/> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/<u>product.class.php</u>, il valore dei parametri può essere <i>0, ProductRef</i>
 CronCommandHelp=Il comando da eseguire sul sistema
 CronCreateJob=Crea nuovo job programmato
+CronFrom=From
 # Info
 CronInfoPage=Informazioni
 # Common
-CronType=Tipo di compito
+CronType=Job type
 CronType_method=Metodo di chiamata di una classe Dolibarr
 CronType_command=Comando da shell
 CronMenu=Cron
 CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s
 UseMenuModuleToolsToAddCronJobs=Andare nel menu "Home - Modules tools - Job list" per vedere e modificare le azioni pianificate.
-TaskDisabled=Job disattivato
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index 9db118a44c2..167334eca82 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Ricerca per oggetto
 ECMSectionOfDocuments=Directory dei documenti
 ECMTypeManual=Manuale
 ECMTypeAuto=Automatico
-ECMDocsBySocialContributions=Documenti collegati ai contributi
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documenti collegati a soggetti terzi
 ECMDocsByProposals=Documenti collegati alle proposte
 ECMDocsByOrders=Documenti collegati agli ordini clienti
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 06f9f8c0faa..4c64f6e8e3f 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Il campo <b>%s</b> deve essere un valore numerico
 ErrorFieldMustBeAnInteger=Il campo <b>%s</b> deve essere un numero intero
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti
@@ -190,3 +191,4 @@ WarningNotRelevant=Operazione irrilevante per questo dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funzione disabilitata quando le impostazioni di visualizzazione sono ottimizzate per persone non vedenti o browser testuali.
 WarningPaymentDateLowerThanInvoiceDate=La scadenza del pagamento (%s) risulta antecedente alla data di fatturazione (%s) per la fattura %s
 WarningTooManyDataPleaseUseMoreFilters=Troppi risultati. Per favore applica filtri più restrittivi
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index b1ffbd72fb4..be602691ee2 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -3,7 +3,7 @@ HRM=Risorse umane
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Estratto conto mensile
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Motivo
 UserCP=Utente
 ErrorAddEventToUserCP=Si è verificato un errore nell'assegnazione del permesso straordinario.
 AddEventToUserOkCP=Permesso straordinario assegnato correttamente.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Eseguito da
 UserUpdateCP=Per l'utente
@@ -93,6 +93,7 @@ ValueOptionCP=Valore
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Convalida la configurazione
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Aggiornato con successo
 ErrorUpdateConfCP=Si è verificato un errore nell'aggiornamento, riprovare.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Si è verificato un errore nell'invio dell'email:
 NoCPforMonth=Nessun permesso questo mese.
 nbJours=Numero di giorni
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Salve
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/it_IT/incoterm.lang b/htdocs/langs/it_IT/incoterm.lang
index 2396d2acb0e..2362fff0fc5 100644
--- a/htdocs/langs/it_IT/incoterm.lang
+++ b/htdocs/langs/it_IT/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
-IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+Module62000Name=Incoterm
+Module62000Desc=Aggiunge funzioni per la gestione Incoterm
+IncotermLabel=Import-Export
+IncotermSetupTitle1=Caratteristica
+IncotermSetupTitle2=Stato
+IncotermSetup=Impostazioni del modulo Import-Export
+IncotermFunctionDesc=Attiva la modalità Incoterm (Soggetto terzo, proposta, ordine cliente, fattura attiva, spedizione, ordine fornitore)
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index dfd16c717fb..ea452993437 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Accesso superutente al database
 CheckToCreateDatabase=Seleziona questa opzione se il database non esiste e deve essere creato.<br>Sarà necessario indicare login e password dell'account di root in fondo a questa pagina.
 CheckToCreateUser=Seleziona questa opzione se l'utente non esiste e deve essere creato.<br/>In questo caso, è necessario indicare login e password dell'account di root in fondo a questa pagina.
 Experimental=(Sperimentale)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login utente con permesso di creare nuovi database o nuovi utenti. Non è necessario se il database esiste già.
 KeepEmptyIfNoPassword=Lasciare vuoto se l'utente non ha alcuna password (da evitare per motivi di sicurezza)
 SaveConfigurationFile=Salva file
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index 66b279df52f..e0ee06035a1 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabo
 Language_ar_SA=Arabo
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgaro
 Language_bs_BA=Bosniaco
 Language_ca_ES=Catalano
@@ -21,9 +22,10 @@ Language_en_SA=Inglese (Arabia Saudita)
 Language_en_US=Inglese (Stati Uniti)
 Language_en_ZA=Inglese (Sud Africa)
 Language_es_ES=Spagnolo
-Language_es_DO=Spagnolo ( Repubblica Dominicana)
 Language_es_AR=Spagnolo (Argentina)
 Language_es_CL=Spagnolo (Cile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spagnolo ( Repubblica Dominicana)
 Language_es_HN=Spagnolo (Honduras)
 Language_es_MX=Spagnolo (Messico)
 Language_es_PY=Spagnolo (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesiano
 Language_is_IS=Islandese
 Language_it_IT=Italiano
 Language_ja_JP=Giapponese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Coreano
+Language_lo_LA=Lao
 Language_lt_LT=Lituano
 Language_lv_LV=Lettone
 Language_mk_MK=Macedone
@@ -64,6 +69,7 @@ Language_sv_SV=Svedese
 Language_sv_SE=Svedese
 Language_sq_AL=Albanese
 Language_sk_SK=Slovacco
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ucraino
 Language_uz_UZ=Uzbeko
diff --git a/htdocs/langs/it_IT/loan.lang b/htdocs/langs/it_IT/loan.lang
new file mode 100644
index 00000000000..4e7c2a856d7
--- /dev/null
+++ b/htdocs/langs/it_IT/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Prestito
+Loans=Prestiti
+NewLoan=Nuovo prestito
+ShowLoan=Mostra prestito
+PaymentLoan=Pagamento prestito
+ShowLoanPayment=Mostra pagamento prestito
+Capital=Capitale
+Insurance=Assicurazione
+Interest=Interesse
+Nbterms=Numero di rate
+LoanAccountancyCapitalCode=Codice contabilità per il capitale
+LoanAccountancyInsuranceCode=Codice contabilità per l'assicurazione
+LoanAccountancyInterestCode=Codice contabilità per gli interessi
+LoanPayment=Pagamento del prestito
+ConfirmDeleteLoan=Conferma l'eliminazione di questo prestito
+LoanDeleted=Prestito eliminato correttamente
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Prestito ripagato
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Durata del mutuo
+AnnualInterestRate=Tasso di interesse annuo
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Informazioni sul pagamento del mutuo ipotecario
+DownPayment=Anticipo
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Ammontare finanziato
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totali annui
+MonthlyPayment=Rata mensile
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configurazione del modulo prestiti
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index c380f52467b..32be6a92307 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Conferma di lettura
 YourMailUnsubcribeOK=La mail <b>%s</b> è stata cancellata correttamente dalla lista di invio
 MailtoEMail=Collegamento ipertestuale alla email
 ActivateCheckRead=Permetti l'utilizzo del link "Cancella sottoscrizione"
-ActivateCheckReadKey=Chiave utilizzata per criptare l'URL usato per le funzioni "Leggere Ricevuta" e "Annulla Iscrizione"
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=Email inviata a %s destinatari
 XTargetsAdded=<b>%s</b> destinatari aggiunti alla lista di invio
 EachInvoiceWillBeAttachedToEmail=Un documento che usa il template di fattura di default sarà creato ed allegato ad ogni email.
@@ -128,6 +128,7 @@ TagCheckMail=Traccia apertura mail
 TagUnsubscribe=Link di cancellazione alla mailing list
 TagSignature=Firma di invio per l'utente
 TagMailtoEmail=Mail destinatario
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifiche
 NoNotificationsWillBeSent=Non sono previste notifiche per questo evento o società
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index e24c70f9c48..2c105ceed16 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Si sono verificati degli errori. Effettuat
 ErrorConfigParameterNotDefined=Il parametro <b>%s</b> non è stato definito nel file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossibile trovare l'utente <b>%s</b> nel database dell'applicazione.
 ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquote IVA per: <b>%s</b>.
-ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: <b>%s</b>.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Errore, file non salvato.
 SetDate=Imposta data
 SelectDate=Seleziona una data
@@ -301,8 +301,8 @@ UnitPriceHT=Prezzo unitario (netto)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
-AskPriceSupplierUHT=P.U. HT Richiesto
-PriceUTTC=P.U.(lordo)
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Importo
 AmountInvoice=Importo della fattura
 AmountPayment=Importo del pagamento
@@ -339,6 +339,7 @@ IncludedVAT=IVA inclusa
 HT=Al netto delle imposte
 TTC=IVA inclusa
 VAT=IVA
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Aliquota IVA
@@ -413,6 +414,8 @@ Qty=Qtà
 ChangedBy=Cambiato da
 ApprovedBy=Approvato da
 ApprovedBy2=Approvato da (seconda approvazione)
+Approved=Approved
+Refused=Refused
 ReCalculate=Ricalcola
 ResultOk=Successo
 ResultKo=Fallimento
@@ -421,7 +424,7 @@ Reportings=Reportistiche
 Draft=Bozza
 Drafts=Bozze
 Validated=Convalidato
-Opened=Aperto
+Opened=Open
 New=Nuovo
 Discount=Sconto
 Unknown=Sconosciuto
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Con collegamento ad un utente specifico
 DeleteAFile=Cancella un file
 ConfirmDeleteAFile=Sei sicuro di voler cancellare questo file
 NoResults=Nessun risultato
+SystemTools=System tools
 ModulesSystemTools=Strumenti moduli
 Test=Test
 Element=Elemento
@@ -703,6 +707,9 @@ ShowTransaction=Mostra la transazione
 GoIntoSetupToChangeLogo=Vai in Home -> Impostazioni -> Società per cambiare il logo o  in Home - Setup -> display per nasconderlo.
 Deny=Rifiuta
 Denied=Rifiutata
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
@@ -732,3 +739,4 @@ ShortThursday=Gio
 ShortFriday=Ven
 ShortSaturday=Sab
 ShortSunday=Dom
+SelectMailModel=Select email template
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 4211f89127c..61e3a8e7b6f 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -199,7 +199,8 @@ Entreprises=Imprese
 DOLIBARRFOUNDATION_PAYMENT_FORM=Per effettuare il pagamento dell'adesione tramite bonifico bancario, vedi <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br/>Per pagare con carta di credito o Paypal, clicca sul pulsante in fondo a questa pagina.<br/>
 ByProperties=Per natura
 MembersStatisticsByProperties=Statistiche dei membri per natura
-MembersByNature=Membri per natura
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
 NoVatOnSubscription=Nessuna IVA per gli abbonamenti
 MEMBER_PAYONLINE_SENDEMAIL=Email di avviso quando Dolibarr riceve la conferma della validazione di un pagamento per adesione
diff --git a/htdocs/langs/it_IT/printing.lang b/htdocs/langs/it_IT/printing.lang
index f0cd2a40292..14911ddb0e5 100644
--- a/htdocs/langs/it_IT/printing.lang
+++ b/htdocs/langs/it_IT/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Impostazioni del sistema di stampa diretta
+PrintingDesc=Questo modulo aggiunge un pulsante per la stampa diretta dei documenti (senza aprire il pdf) usando vari moduli.
 ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
+PrintingDriverDesc=Credenziali per i driver di stampa
+ListDrivers=Lista dei driver
+PrintTestDesc=Lista delle stampanti
+FileWasSentToPrinter=Il file %s è stato inviato alla stampante
+NoActivePrintingModuleFound=Non ci sono moduli per la stampa attivi
+PleaseSelectaDriverfromList=Seleziona un driver
 SetupDriver=Driver setup
 TestDriver=Test
 TargetedPrinter=Targeted printer
-UserConf=Setup per user
+UserConf=Impostazioni per utente
 PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
+PrintGCPDesc=Questo driver permette la stampa diretta del documento usando Google Cloud Print.
+PrintingDriverDescprintgcp=Credenziali per la stampa con Google Cloud Print.
+PrintTestDescprintgcp=Lista delle stampanti Google Cloud Print.
+PRINTGCP_LOGIN=Nome utente Google
+PRINTGCP_PASSWORD=Password Google
 STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
+STATE_UNKNOWN=Sconosciuto
 STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
+STATE_DORMANT=Offline da un po'
 TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
+TYPE_HP=Stampante HP
 TYPE_DOCS=DOCS
 TYPE_DRIVE=Google Drive
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
+GCP_Name=Nome
 GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
+GCP_Id=ID stampante
+GCP_OwnerName=Nome del proprietario
+GCP_State=Stato della stampante
 GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
-PrintTestDescprintipp=List of Printers for driver PrintIPP.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
+GCP_Type=Tipo di stampante
+PRINTIPP=Driver PrintIPP
+PrintIPPSetup=Impostazioni modulo Direct Print
+PrintIPPDesc=Questo modulo aggiunge un pulsante per la stampa diretta dei documenti. Funziona solo su Linux con sistema di stampa CUPS. 
+PrintingDriverDescprintipp=Credenziali per i driver di stampa
+PrintTestDescprintipp=Lista delle stampanti per il driver PrintIPP
+PRINTIPP_ENABLED=Mostra icona "Stampa diretta" nella lista dei documenti
+PRINTIPP_HOST=Server di stampa
+PRINTIPP_PORT=Porta
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
+NoPrinterFound=Nessuna stampante trovata (controlla la tua installazione di CUPS)
+NoDefaultPrinterDefined=Non è presente una stampante predefinita
+DefaultPrinter=Stampante predefinita
+Printer=Stampante
 CupsServer=CUPS Server
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
+IPP_Uri=Indirizzo della stampante
+IPP_Name=Nome della stampante
+IPP_State=Stato della stampante
 IPP_State_reason=State reason
 IPP_State_reason1=State reason1
-IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
-STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
-STATE_IPP_none=None
-MEDIA_IPP_stationery=Stationery
-MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+IPP_BW=BN
+IPP_Color=A colori
+IPP_Device=Periferica
+IPP_Media=Supporto
+IPP_Supported=Tipo di supporto
+STATE_IPP_idle=In attesa
+STATE_IPP_stopped=Bloccata
+STATE_IPP_paused=In pausa
+STATE_IPP_toner-low-report=Toner in esaurimento
+STATE_IPP_none=Nulla
+MEDIA_IPP_stationery=Tipografica
+MEDIA_IPP_thermal=Termica
+IPP_COLOR_print-black=Stampante BN
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 183d0d58803..111479831d0 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Quantità: %d
 AddDispatchBatchLine=Aggiungi una riga per la durata a scaffale
 BatchDefaultNumber=Non definito
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=Questo prodotto non usa lotto/numero di serie
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 29c7e292205..9a79f0768bc 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Prodotto o servizio
 ProductsAndServices=Prodotti e Servizi
 ProductsOrServices=Prodotti o servizi
 ProductsAndServicesOnSell=Prodotti e servizi in vendita
-ProductsAndServicesNotOnSell=Prodotti e Servizi esauriti
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Statistiche Prodotti e Servizi
 ProductsStatistics=Statistiche Prodotti
-ProductsOnSell=Prodotto in vendit
-ProductsNotOnSell=Prodotto esaurito
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Prodotti in vendit
 ServicesOnSell=Servizi in vendit
-ServicesNotOnSell=Servizi esauriti
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Servizi in vendita
 InternalRef=Riferimento interno
 LastRecorded=Ultimi prodotti/servizi in vendita registrati
@@ -44,7 +44,7 @@ CardProduct1=Scheda servizio
 CardContract=Scheda contratto
 Warehouse=Magazzino
 Warehouses=Magazzini
-WarehouseOpened=Magazzino aperto
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magazzino chiuso
 Stock=Scorte
 Stocks=Scorte
@@ -71,21 +71,21 @@ SellingPriceTTC=Prezzo di vendita (inclusa IVA)
 PublicPrice=Prezzo al pubblico
 CurrentPrice=Prezzo attuale
 NewPrice=Nuovo prezzo
-MinPrice=Prezzo minimo di vendita
-MinPriceHT=Prezzo minimo di vendita (al netto delle tasse)
-MinPriceTTC=Prezzo minimo di vendita (tasse incluse)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Il prezzo di vendita non può essere inferiore al minimo consentito per questo prodotto ( %s IVA esclusa)
 ContractStatus=Stato del Contratto
 ContractStatusClosed=Chiuso
-ContractStatusRunning=In corso
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Scaduto
-ContractStatusOnHold=In attesa
-ContractStatusToRun=Da avviare
-ContractNotRunning=Il presente contratto non è attivo
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Un prodotto con riferimento %s esiste già.
 ErrorProductBadRefOrLabel=Il valore di riferimento o l'etichetta è sbagliato.
 ErrorProductClone=Si è verificato un problema cercando di cuplicare il prodotto o servizio
-ErrorPriceCantBeLowerThanMinPrice=Errore. Il prezzo non può essere inferiore del Prezzo minimo
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Fornitori
 SupplierRef=Rif. fornitore
 ShowProduct=Visualizza prodotto
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Se il prodotto è un servizio di durata limitata:
 MultiPricesAbility=Livello diverso di prezzi per prodotto/servizio
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
 MultiPriceLevelsName=Categorie di prezzo
-AssociatedProductsAbility=Attiva i prodotti associati
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Prodotto associato
-AssociatedProductsNumber=Numero di sottoprodotti che compongono questo prodotto associato
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto
-IfZeroItIsNotAVirtualProduct=Se vale 0, questo non è un prodotto associato
-IfZeroItIsNotUsedByVirtualProduct=Se vale 0, questo prodotto non è utilizzato da nessun prodotto associato come sottoprodotto
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Modifica associazione
 Translation=Traduzione
 KeywordFilter=Filtro per parola chiave
@@ -131,7 +131,7 @@ ProductToAddSearch=Cerca prodotto da aggiungere
 AddDel=Aggiungi/Elimina
 Quantity=Quantità
 NoMatchFound=Nessun risultato trovato
-ProductAssociationList=Elenco dei prodotti/servizi associati: nome del prodotto/servizio (quantità interessata)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Elenco dei prodotti/servizi associati che includono questo sottoprodotto
 ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto
 DeleteProduct=Elimina un prodotto/servizio
@@ -179,16 +179,41 @@ CloneProduct=Clona prodotto/servizio
 ConfirmCloneProduct=Vuoi davvero clonare il prodotto/servizio <b>%s</b>?
 CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
 ClonePricesProduct=Clona principali informazioni e prezzi
-CloneCompositionProduct=Clona prodotto/servizio associato
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Questo prodotto è in uso
 NewRefForClone=Rif. del nuovo prodotto/servizio
-CustomerPrices=Prezzi al cliente
-SuppliersPrices=Prezzi fornitori
-SuppliersPricesOfProductsOrServices=Prezzo fornitore (di prodotti e servizi)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Codice dogana
 CountryOrigin=Paese di origine
 HiddenIntoCombo=Nascosti nelle tendine di selezione
 Nature=Natura
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Template di rif. prodotto
 ServiceCodeModel=Template di rif. servizio
 AddThisProductCard=Crea scheda prodotto
@@ -214,7 +239,7 @@ CostPmpHT=Totale netto VWAP
 ProductUsedForBuild=Autoconsumato dalla produzione
 ProductBuilded=Produzione completata
 ProductsMultiPrice=Prodotto con più prezzi
-ProductsOrServiceMultiPrice=Prezzo clienti (di prodotti o servizi, multi-prezzo)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Turnover dei prodotti trimestrale VWAP
 ServiceSellByQuarterHT=Turnover trimestrale dei servizi VWAP
 Quarter1=Primo trimestre
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Definisci il valore del codice a barre per tutti quell
 PriceByCustomer=Prezzi diversi in base al cliente
 PriceCatalogue=Prezzo unico per prodotto/servizio
 PricingRule=Regole dei prezzi al cliente
-AddCustomerPrice=Aggiungi un prezzo per cliente
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari
 PriceByCustomerLog=Prezzo per log cliente
-MinimumPriceLimit=Il prezzo minimo non può essere inferiore di %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Il prezzo minimo raccomandato è: %s
 PriceExpressionEditor=Editor della formula del prezzo
 PriceExpressionSelected=Formula del prezzo selezionata
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=il formato è: {"URL": "http://example.com/urlo
 UpdateInterval=Frequenza di aggiornamento (in minuti)
 LastUpdated=Ultimo aggiornamento
 CorrectlyUpdated=Aggiornato correttamente
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 5491e5950a6..1246098a6c9 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Questa visualizzazione mostra tutti i progetti che sei autori
 ProjectsPublicTaskDesc=Questa prospettiva presenta tutti i progetti e le attività a cui è permesso accedere.
 ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto).
 MyTasksDesc=Questa visualizzazione mostra solo i progetti o i compiti in cui sei indicati come contatto (di qualsiasi tipo).
-OnlyOpenedProject=Sono visibili solamente i progetti aperti, i progetti con stato di bozza o chiusi non sono visibili.
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere.
 TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto).
-AllTaskVisibleButEditIfYouAreAssigned=Tutti i compiti per questo progetto sono visibili ma è possibile inserire del tempo impiegato solo per compiti a cui sei assegnato. 
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Area progetti
 NewProject=Nuovo progetto
 AddProject=Crea progetto
@@ -29,7 +30,7 @@ ProjectsList=Elenco dei progetti
 ShowProject=Visualizza progetto
 SetProject=Imposta progetto
 NoProject=Nessun progetto definito o assegnato
-NbOpenTasks=Num. di compiti aperti
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Num. di progetti
 TimeSpent=Tempo lavorato
 TimeSpentByYou=Tempo impiegato da te
@@ -41,7 +42,7 @@ TaskTimeSpent=Tempo speso sulle attività
 TaskTimeUser=Utente
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Compiti relativi a progetti aperti
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Carico di lavoro non definito
 NewTimeSpent=Aggiungi tempo lavorato
 MyTimeSpent=Il mio tempo lavorato
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Elenco degli interventi associati al progetto
 ListExpenseReportsAssociatedProject=Lista delle note spese associate con il progetto
 ListDonationsAssociatedProject=Lista delle donazioni associate al progetto
 ListActionsAssociatedProject=Elenco delle azioni associate al progetto
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Operatività sul progetto questa settimana
 ActivityOnProjectThisMonth=Operatività sul progetto questo mese
 ActivityOnProjectThisYear=Operatività sul progetto nell'anno in corso
@@ -95,7 +98,7 @@ DeleteATimeSpent=Cancella il tempo lavorato
 ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato?
 DoNotShowMyTasksOnly=Mostra anche le attività non assegnate a me
 ShowMyTasksOnly=Mostra soltanto le attività assegnate a me
-TaskRessourceLinks=Risorse
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo
 NoTasks=Nessun compito per questo progetto
 LinkedToAnotherCompany=Collegato ad un altro soggetto terzo
@@ -139,8 +142,15 @@ ProjectReferers=Elementi correlati
 SearchAProject=Cerca un progetto
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
 ProjectDraft=Progetti bozza
-FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per giorno
 InputPerWeek=Input per settimana
 InputPerAction=Input per azione
 TimeAlreadyRecorded=Tempo impiegato e già registrato per questo compito/giorno e questo utente %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index b4f153a7a36..eccab59827a 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -16,9 +16,9 @@ Prospect=Potenziale cliente
 ProspectList=Lista Potenziali clienti
 DeleteProp=Elimina proposta commerciale
 ValidateProp=Convalida proposta commerciale
-AddProp=Aggiungi proposta
-ConfirmDeleteProp=Sei sicuro di voler cancellare questa proposta commerciale?
-ConfirmValidateProp=Sei sicuro di voler convalidare questa proposta commerciale?
+AddProp=Crea proposta
+ConfirmDeleteProp=Vuoi davvero cancellare questa proposta commerciale?
+ConfirmValidateProp=Vuoi davvero convalidare questa proposta commerciale come <b>%s</b>?
 LastPropals=Ultimo %s proposte
 LastClosedProposals=Ultimo %s proposte chiuse
 LastModifiedProposals=Ultimo %s proposte modificate
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Importo per mese (al netto delle imposte)
 NbOfProposals=Numero di proposte commerciali
 ShowPropal=Visualizza proposta
 PropalsDraft=Bozze
-PropalsOpened=Aperte
+PropalsOpened=Open
 PropalsNotBilled=Chiuse non fatturate
 PropalStatusDraft=Bozza (deve essere convalidata)
 PropalStatusValidated=Convalidato (proposta è aperta)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Non firmata (chiuso)
 PropalStatusBilled=Fatturata
 PropalStatusDraftShort=Bozza
 PropalStatusValidatedShort=Convalidato
-PropalStatusOpenedShort=Aperta
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Chiusa
 PropalStatusSignedShort=Firmata
 PropalStatusNotSignedShort=Non firmata
@@ -52,11 +52,9 @@ PropalsToBill=Proposte commerciali firmate da fatturare
 ListOfProposals=Elenco delle proposte commerciali
 ActionsOnPropal=Azioni su proposta
 NoOpenedPropals=Nessuna proposta commerciale aperta
-NoOtherOpenedPropals=Nessun altro ha aperto proposte commerciali
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Rif. Proposta commerciale
 SendPropalByMail=Invia proposta commerciale via e-mail
-FileNotUploaded=Il file non è stato caricato
-FileUploaded=Il file è stato caricato con successo
 AssociatedDocuments=Documenti associati con la proposta:
 ErrorCantOpenDir=Impossibile aprire la directory
 DatePropal=Data della proposta
@@ -77,13 +75,13 @@ CreateEmptyPropal=Crea proposta commerciale vuota o dalla lista dei prodotti / s
 DefaultProposalDurationValidity=Durata di validità predefinita per proposta commerciale (in giorni)
 UseCustomerContactAsPropalRecipientIfExist=Utilizzare l'indirizzo del contatto cliente se definito al posto dell'indirizzo del destinatario
 ClonePropal=Clona proposta commerciale
-ConfirmClonePropal=Sei sicuro di voler clonare la presente proposta commerciale <b>%s?</b>
-ConfirmReOpenProp=Sei sicuro di voler aprire di nuovo le <b>%s</b> proposta commerciale?
+ConfirmClonePropal=Vuoi davvero clonare la proposta <b>%s</b>?
+ConfirmReOpenProp=Vuoi davvero riaprire la proposta <b>%s</b>?
 ProposalsAndProposalsLines=Proposta commerciale e le linee
 ProposalLine=Linea della proposta
-AvailabilityPeriod=Disponibilità ritardo
-SetAvailability=Imposta la disponibilità di ritardo
-AfterOrder=dopo la fine
+AvailabilityPeriod=Tempi di consegna
+SetAvailability=Imposta i tempi di consegna
+AfterOrder=dopo ordine
 ##### Availability #####
 AvailabilityTypeAV_NOW=Immediato
 AvailabilityTypeAV_1W=1 settimana
@@ -100,3 +98,4 @@ DocModelJauneDescription=Modello di proposta Jaune
 DefaultModelPropalCreate=Creazione del modello predefinito
 DefaultModelPropalToBill=Template predefinito quando si chiude una proposta commerciale (*preventivo) (che deve essere fatturata)
 DefaultModelPropalClosed=Template predefinito quando si chiude una proposta commerciale (*preventivo) (che non deve essere fatturata)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index fcd094e4682..1812b1c19f8 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Mostra i pagamenti stipendio
 THM=Prezzo medio orario
 TJM=Prezzo medio giornaliero
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index 319b526628e..165e80fb0e4 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Modello semplice di documento
 DocumentModelMerou=Merou modello A5
 WarningNoQtyLeftToSend=Attenzione, non sono rimasti prodotti per la spedizione.
 StatsOnShipmentsOnlyValidated=Statistiche calcolate solo sulle spedizioni convalidate. La data è quella di conferma spedizione (la data di consegna prevista non è sempre conosciuta).
-DateDeliveryPlanned=Data di consegna prevista
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Data di consegna ricevuto
 SendShippingByEMail=Invia spedizione via EMail
 SendShippingRef=Invio della spedizione %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 83573b12c60..ba25edaed7c 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Magazzini
 NewWarehouse=Nuovo magazzino/deposito
 WarehouseEdit=Modifica magazzino
 MenuNewWarehouse=Nuovo Magazzino
-WarehouseOpened=Magazzino aperto
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magazzino chiuso
 WarehouseSource=Magazzino di origine
 WarehouseSourceNotDefined=Non è stato definito alcun magazzino.
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Scegli magazzino da utilizzare per la riduzione
 SelectWarehouseForStockIncrease=Scegli magazzino da utilizzare per l'aumento delle scorte
 NoStockAction=Nessuna azione su queste scorte
 LastWaitingSupplierOrders=Ordini in attesa di ricezione
-DesiredStock=Scorte desiderate
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Da ordinare
 Replenishment=Rifornimento
 ReplenishmentOrders=Ordini di rifornimento
-VirtualDiffersFromPhysical=In accordo con le opzioni di giacenza incrementa/decrementa, le scorte fisiche e quelle virtuali (fisiche + ordini in corso) possono variare
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Utilizza scorte virtuali come default, invece delle scorte fisiche, per la funzione di rifornimento
 UseVirtualStock=Usa scorte virtuale
 UsePhysicalStock=Usa giacenza fisica
-CurentSelectionMode=Modalità di selezione corrente
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Giacenza virtuale
 CurentlyUsingPhysicalStock=Giacenza fisica
 RuleForStockReplenishment=Regola per il rifornimento delle scorte
@@ -112,8 +113,8 @@ AlertOnly= Solo avvisi
 WarehouseForStockDecrease=Il magazzino <b>%s</b> sarà usato per la diminuzione delle scorte
 WarehouseForStockIncrease=Il magazzino <b>%s</b> sarà usato per l'aumento delle scorte
 ForThisWarehouse=Per questo magazzino
-ReplenishmentStatusDesc=Questa è una lista di tutti i prodotti con una giacenza inferiore a quella desiderata (o inferiore a quella del valore di allarme se la casella "solo allarmi" è spuntata)
-ReplenishmentOrdersDesc=Questa è una lista di tutti gli ordini fornitore aperti che includono prodotti predefiniti. Qui sono visibili solo gli ordini aperti che contengano prodotti predefiniti.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Rifornimento
 NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s)
 NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s)
@@ -124,16 +125,16 @@ RecordMovement=Registra trasferimento
 ReceivingForSameOrder=Ricevuta per questo ordine
 StockMovementRecorded=Movimentazione di scorte registrata
 RuleForStockAvailability=Regole sulla fornitura delle scorte
-StockMustBeEnoughForInvoice=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla fattura
-StockMustBeEnoughForOrder=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio all'ordine
-StockMustBeEnoughForShipment= Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla spedizione
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Etichetta per lo spostamento di magazzino
 InventoryCode=Codice di inventario o di spostamento
 IsInPackage=Contenuto nel pacchetto
 ShowWarehouse=Mostra magazzino
-MovementCorrectStock=Correzione delle scorte del prodotto %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Trasferisci scorte del prodotto %s in un altro magazzino
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Deve essere definito un "magazzino sorgente" quando il modulo "lotti" è attivo. \nSarà utilizzato per elencare quale lotto o seriale è disponibile per il prodotto che necessita un lotto/numero seriale per lo spostamento. Se si desidera inviare i prodotti da diversi magazzini, basta effettuare la spedizione in più fasi.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Codice di inventario o di spostamento
-NoPendingReceptionOnSupplierOrder=Non ci sono ricezioni incomplete a causa di ordini fornitori non chiusi
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=Questo lotto/numero seriale (<strong>%s</strong>) esiste già con una differente data di scadenza o di validità (trovata <strong>%s</strong>, inserita <strong>%s</strong> ) 
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 263603b3182..490ce83a4d3 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Inviato ai fornitori
 ListOfSupplierOrders=Elenco ordini fornitori
 MenuOrdersSupplierToBill=Ordini fornitori in fatture
 NbDaysToDelivery=Giorni di ritardo per la consegna
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
index d96ee874190..ad511b990ba 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Note spese
 TripsAndExpensesStatistics=Statistiche note spese
 TripCard=Scheda nota spese
 AddTrip=Crea nota spese
-ListOfTrips=Lista delle note spese
+ListOfTrips=List of expense reports
 ListOfFees=Elenco delle tariffe
 NewTrip=Nuova nota spese
 CompanyVisited=Società/Fondazione visitata
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Persona da informare per la convalida
 TripSociete=Informazioni azienda
 TripSalarie=Informazioni utente
 TripNDF=Informazioni nota spese
-DeleteLine=Cancella una riga della nota spese
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Vuoi davvero eliminare questa riga?
 PDFStandardExpenseReports=Template standard per la generazione dei PDF delle not spese
 ExpenseReportLine=Riga di nota spese
@@ -44,7 +44,6 @@ TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Hai già inviata una nota spese per il periodo selezionato
-ListTripsAndExpenses=Lista delle note spese
 AucuneNDF=Nessuna nota spese trovata
 AucuneLigne=Non ci sono ancora note spese
 AddLine=Aggiungi una riga
@@ -56,12 +55,12 @@ ModePaiement=Modalità di pagamento
 Note=Nota
 Project=Progetto
 
-VALIDATOR=Utente responsabile dell'approvazione
+VALIDATOR=User responsible for approval
 VALIDOR=Approvata da
 AUTHOR=Registrata da
-AUTHORPAIEMENT=Liquidata da
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Rifiutata da
-CANCEL_USER=Eliminata da
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Motivo
 MOTIF_CANCEL=Motivo
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Liquidata in data
 
 TO_PAID=Liquida
 BROUILLONNER=Riapri
-SendToValid=Invia per l'approvazione
+SendToValid=Sent on approval
 ModifyInfoGen=Modifica
 ValidateAndSubmit=Convalida e proponi per l'approvazione
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Non sei autorizzato ad approvare questa nota spese
 NOT_AUTHOR=Non sei l'autore di questa nota spese. Operazione annullata.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Vuoi davvero modificare lo stato di questa nota spese in "liquid
 CancelTrip=Elimina una nota spese
 ConfirmCancelTrip=Vuoi davvero eliminare questa nota spese?
 
-BrouillonnerTrip=Riporta la nota spese allo stato "bozza"
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Vuoi davvero riportare questa nota spese allo stato "bozza"?
 
 SaveTrip=Convalida la nota spese
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index 38049071f76..e06a4a4246b 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Rimuovi dal gruppo
 PasswordChangedAndSentTo=Password cambiata ed inviata a <b>%s</b>
 PasswordChangeRequestSent=Richiesta di cambio password per <b>%s</b> da inviare a <b>%s</b>.
 MenuUsersAndGroups=Utenti e gruppi
+MenuMyUserCard=My user card
 LastGroupsCreated=Ultimi %s gruppi creati
 LastUsersCreated=Ultimi %s utenti creati
 ShowGroup=Visualizza gruppo
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 45609ec17bb..398a854928e 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Ricevuta bancaria
 SetToStatusSent=Imposta stato come "file inviato"
 ThisWillAlsoAddPaymentOnInvoice=Verranno anche creati dei pagamenti tra le ricevuti e saranno classificati come pagati
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Il pagamento dell'ordine permanente %s da parte della banca
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index ab36ea1277f..b9ea449d79a 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Impostazioni flusso di lavoro
-WorkflowDesc=Questo modulo è progettatto per modificare il comportamento delle azioni automatizzate del programma. Il flusso di lavoro è aperto per impostazione predefinita (puoi compiere le azioni nell'ordine che preferisci). Puoi scegliere di attivare solo le azioni automatizzate che ti interessano.
-ThereIsNoWorkflowToModify=Non vi è alcun flusso di lavoro modificabile per il modulo.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Creare automaticamente un ordine cliente alla firma di una proposta commerciale
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva alla firma di una proposta commerciale
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva alla convalida del contratto
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva alla chiusura dell'ordine cliente
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica la proposta commerciale collegata come fatturare quando l'ordine cliente è impostato come pagato
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica gli ordini dei clienti da fatturare quando la fattura viene impostata come pagata
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica gli ordini dei clienti da fatturare quando la fattura è validata
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index b0eb764934a..9cff17cb776 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=ユーザーのためのメニュー
 LangFile=ファイルです。LANG
 System=システム
 SystemInfo=システム情報
-SystemTools=システムツール
 SystemToolsArea=システムツールエリア
 SystemToolsAreaDesc=この領域は、管理機能を提供します。あなたが探している機能を選択するメニューを使用します。
 Purge=Purge
@@ -232,8 +231,8 @@ Security=セキュリティー
 Passwords=パスワード
 DoNotStoreClearPassword=行うにはデータベースに格納しない明確なパスワードがストアのみ暗号化された値（活性化推奨）
 MainDbPasswordFileConfEncrypted=conf.phpで暗号化されたデータベース·パスワード（活性化推奨）
-InstrucToEncodePass=<b>conf.php</b>ファイルにエンコードされたパスワードを持っているために、次の行を置き換える<br> <b>$ dolibarr_main_db_pass = &quot;...&quot;</b> <br>によって<br> <b>$ dolibarr_main_db_pass = &quot;暗号化：%s&quot;</b>
-InstrucToClearPass=<b>conf.php</b>ファイルにパスワードデコードされた（クリア）するには、行を置き換えます。 <br> <b>dolibarr_main_db_pass $は= &quot;暗号化され...&quot;</b> <br>によって<br> <b>$ dolibarr_main_db_pass = &quot;%s&quot;</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=生成されたPDFファイル（推奨しない活性化、大量のPDF生成を壊す）の保護
 ProtectAndEncryptPdfFilesDesc=PDF文書の保護は、任意のPDFブラウザで読んで、印刷することが可能な保持されます。しかし、編集、およびコピーすることはもはや可能ではありません。この機能を使用すると、（未払いの請求書のように）動作していないグローバル累積PDFの建物を作ることに注意してください。
 Feature=機能
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=これは、プロセスのセットアップです。
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=ステップ%s
 FindPackageFromWebSite=（公式ウェブサイト%sの例の場合）必要な機能を提供するパッケージを検索します。
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=インストールが終了しDolibarrは、この新しいコンポーネントで使用できる状態になっています。
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr現在のバージョン
 CallUpdatePage=%s：データベース構造と件のデータを更新するページに移動します。
 LastStableVersion=最後の安定版
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=提案
 Module20Desc=商業的な提案の管理
 Module22Name=大量の電子郵便
 Module22Desc=大量の電子メールの管理
-Module23Name= エネルギー
-Module23Desc= エネルギーの消費量を監視する
+Module23Name=エネルギー
+Module23Desc=エネルギーの消費量を監視する
 Module25Name=顧客からの注文
 Module25Desc=顧客の注文の管理
 Module30Name=請求書
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=通知
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=寄付
 Module700Desc=寄付金の管理
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=議題
 Module2400Desc=イベント/タスクと議題の管理
 Module2500Name=電子コンテンツ管理
 Module2500Desc=ドキュメントを保存および共有
-Module2600Name=Webサービス
-Module2600Desc=Dolibarr Webサービスのサーバをイネーブルにします。
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=グラバター
@@ -578,7 +579,7 @@ Permission32=製品を作成/変更
 Permission34=製品を削除します。
 Permission36=隠された製品を参照してください/管理
 Permission38=輸出製品
-Permission41=プロジェクトを読んで（私が連絡している共有プロジェクトとプロジェクト）
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=プロジェクトを（私が連絡している共有プロジェクトとプロジェクト）を作成/変更
 Permission44=（私が連絡している共有プロジェクトとプロジェクト）のプロジェクトを削除します。
 Permission61=介入を読む
@@ -599,10 +600,10 @@ Permission86=お客様の注文を送る
 Permission87=閉じるお客さまの注文
 Permission88=お客様の注文を取り消す
 Permission89=お客様の注文を削除する
-Permission91=社会貢献とバットを読む
-Permission92=社会貢献とバットを作成/変更
-Permission93=社会貢献とバットを削除します。
-Permission94=社会貢献をエクスポートします。
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=レポートを読む
 Permission101=sendingsを読む
 Permission102=sendingsを作成/変更
@@ -620,9 +621,9 @@ Permission121=ユーザーにリンクされている第三者を読む
 Permission122=ユーザーにリンクされている第三者が作成/変更
 Permission125=ユーザーにリンクされている第三者を削除します。
 Permission126=第三者をエクスポートします。
-Permission141=（私は連絡ないですまた、民間）のプロジェクトを読む
-Permission142=変更/作成プロジェクト（プライベート私は連絡はありません）
-Permission144=（また、私は連絡ないですプライベート）プロジェクトを削除します。
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=プロバイダを読む
 Permission147=統計を読む
 Permission151=立って注文を読み取る
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=セットアップは、保存された
 BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=ZIP
 CompanyTown=町
 CompanyCountry=国
 CompanyCurrency=主な通貨
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=表示されません
 DoNotSuggestPaymentMode=示唆していない
 NoActiveBankAccountDefined=定義された有効な銀行口座なし
 OwnerOfBankAccount=銀行口座の%sの所有者
 BankModuleNotActive=銀行が有効になっていないモジュールを占めて
-ShowBugTrackLink=&quot;バグを報告する&quot;リンクを表示
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=ホームページ上の &quot;ワークベンチ&quot;を表示
 Alerts=アラート
 Delays=遅延
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=ユニット価格の最大小数点以下
 MAIN_MAX_DECIMALS_TOT=合計価格の最大小数点以下
 MAIN_MAX_DECIMALS_SHOWN=画面に表示されている価格の最大10進数（追加<b>...</b>この番号の後にあなたが見たい場合は<b>...</b>数値が切り捨てられたときに画面に表示されている場合）
 MAIN_DISABLE_PDF_COMPRESSION=生成されるPDFファイルのPDF圧縮を使用します。
-MAIN_ROUNDING_RULE_TOT= 丸め範囲のサイズ（丸めは10進以外の何かで行われ珍しい国のために）
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=製品の売上単価
 TotalPriceAfterRounding=丸め後の総価格（純/ VAT /税込）
 ParameterActiveForNextInputOnly=次の入力のための効果的なパラメータのみ
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=コンボselectリスト内の製品の最大数（0
 ConfirmDeleteProductLineAbility=フォーム内の​​製品ラインを削除する確認
 ModifyProductDescAbility=フォームでの製品の説明のパーソナライズ
 ViewProductDescInFormAbility=フォーム内の​​製品の説明の可視化（それ以外のポップアップツールチップなど）
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=thirdparty言語の製品の説明の可視化
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=エコTaxe（WEEE）をサポート
 SetDefaultBarcodeTypeProducts=製品に使用するデフォルトのバーコードの種類
 SetDefaultBarcodeTypeThirdParties=第三者のために使用するデフォルトのバーコードの種類
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=タイプUPCのバーコード
 BarcodeDescISBN=型商品のバーコード
 BarcodeDescC39=タイプC39のバーコード
 BarcodeDescC128=タイプC128のバーコード
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=あなたは、メニューエントリ<b>%sを</b>削除し<b
 DeleteLine=行を削除します
 ConfirmDeleteLine=あなたは、この行を削除してもよろしいですか？
 ##### Tax #####
-TaxSetup=税金、社会貢献や配当モジュールのセットアップ
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=により、付加価値税
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=ウェブサービスモジュールのセットアップ
 WebServicesDesc=このモジュールを有効にすることによって、Dolibarrでは、その他のウェブサービスを提供するWebサービスのサーバーになります。
 WSDLCanBeDownloadedHere=提供されるサービスのWSDL記述子ファイルはここからダウンロードできます。
 EndPointIs=SOAPクライアントは、URLで入手できますDolibarrエンドポイントに要求を送信する必要があります
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=銀行のモジュールのセットアップ
 FreeLegalTextOnChequeReceipts=チェック領収書上のフリーテキスト
@@ -1581,6 +1599,7 @@ ProjectsSetup=プロジェクトモジュールのセットアップ
 ProjectsModelModule=プロジェクトの報告書ドキュメントモデル
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 24c589e4fb1..923ec596634 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=注文%sは、承認された
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=注文%sは、ドラフトの状態に戻って
-OrderCanceledInDolibarr=ご注文はキャンセル%s
 ProposalSentByEMail=電子メールで送信商業提案%s
 OrderSentByEMail=電子メールで送信、顧客の注文%s
 InvoiceSentByEMail=電子メールで送信顧客の請求書%s
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index c7ed52bc8c8..8391fc36a0a 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -94,12 +94,12 @@ Conciliate=調整する
 Conciliation=和解
 ConciliationForAccount=このアカウントを調整する
 IncludeClosedAccount=閉じたアカウントを含める
-OnlyOpenedAccount=唯一開かれたアカウント
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=クレジットのアカウント
 AccountToDebit=振替にアカウント
 DisableConciliation=このアカウントのための調整機能を無効にする
 ConciliationDisabled=和解の機能が無効になって
-StatusAccountOpened=オープン
+StatusAccountOpened=Open
 StatusAccountClosed=閉じ
 AccountIdShort=数
 EditBankRecord=レコードを編集する
@@ -113,7 +113,7 @@ CustomerInvoicePayment=顧客の支払い
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=サプライヤーの支払い
 WithdrawalPayment=撤退の支払い
-SocialContributionPayment=社会貢献の支払い
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=金融口座のジャーナル
 BankTransfer=銀行の転送
 BankTransfers=銀行振込
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 7a6c45ea12d..a9bd63245ef 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=請求書のNb
 NumberOfBillsByMonth=月別請求書のNb
 AmountOfBills=請求書の金額
 AmountOfBillsByMonthHT=月別請求書の金額（税引後）
-ShowSocialContribution=社会貢献を示す
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=請求書を表示する
 ShowInvoice=請求書を表示する
 ShowInvoiceReplace=請求書を交換見せる
@@ -270,7 +270,7 @@ BillAddress=ビル·アドレス
 HelpEscompte=この割引は、その支払いが長期前に行われたため、顧客に付与された割引です。
 HelpAbandonBadCustomer=この金額は、放棄されている（顧客が悪い顧客であると）と卓越した緩いとみなされます。
 HelpAbandonOther=それはエラーが発生しましたので、この量は、（例えば、他に置き換え間違った顧客または請求書）放棄されている
-IdSocialContribution=社会貢献のid
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=お支払い番号
 InvoiceId=請求書のID
 InvoiceRef=請求書参照。
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=即時の
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 79aac820e73..01815f53c82 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=最後の契約
 BoxLastContacts=最後の連絡先/アドレス
 BoxLastMembers=最後のメンバー
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=販売額
 BoxTotalUnpaidCustomerBills=合計未払いの顧客の請求書
 BoxTotalUnpaidSuppliersBills=合計未払いの仕入先の請求書
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=販売額
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 6027c5137f4..61485fb8e6a 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%sが</b>正常<b>に</b>追加されました。
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=なし
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=このカテゴリには、このrefで既に存在している
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=すべてでは表示されない内容
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=クスト/ Prosp。カテゴリ
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 3fd8c12c29a..9d2fbdcc353 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=サードパーティの連絡先
 StatusContactValidated=接点の状態
 Company=会社
 CompanyName=会社名
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=企業
 CountryIsInEEC=国が欧州経済共同体の内部にある
 ThirdPartyName=サードパーティの名前
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=利用可能な絶対的な割引
 DiscountNone=なし
 Supplier=サプライヤー
 CompanyList=企業のリスト
-AddContact=コンタクト/アドレスを追加します。
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=コンタクト/アドレスを編集
 EditContactAddress=Edit contact/address
 Contact=連絡
@@ -268,8 +269,8 @@ ContactsAddresses=コンタクト/アドレス
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=この第三者のために定義された接触禁止
 DefaultContact=デフォルトの連絡先
-AddCompany=会社を追加する
-AddThirdParty=サードパーティを追加します。
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=会社を削除します。
 PersonalInformations=個人データ
 AccountancyCode=会計コード
@@ -379,8 +380,8 @@ DeliveryAddressLabel=配送先住所のラベル
 DeleteDeliveryAddress=配信アドレスを削除します。
 ConfirmDeleteDeliveryAddress=この配信アドレスを削除してもよろしいですか？
 NewDeliveryAddress=新しい配信アドレス
-AddDeliveryAddress=アドレスを追加します。
-AddAddress=アドレスを追加します。
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=定義されている代替の配信アドレスがありません
 SupplierCategory=サプライヤーのカテゴリ
 JuridicalStatus200=独立した
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=yyは年である顧客コードと仕入先コードの%syymm-nnnnの形式%syymm-NNNNとニュメロを返し、mmは月とnnnnはありません休憩0〜ノーリターンでシーケンスです。
 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。このコードは、いつでも変更することができます。
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index fd4e88db8a8..2372b3c2bb2 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -56,23 +56,23 @@ VATCollected=付加価値税回収した
 ToPay=支払いに
 ToGet=戻って取得するには
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=税金、社会貢献と配当のエリア
-SocialContribution=社会貢献
-SocialContributions=社会貢献
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=税金と配当金
 MenuSalaries=Salaries
-MenuSocialContributions=社会貢献
-MenuNewSocialContribution=新しい貢献
-NewSocialContribution=新しい社会貢献
-ContributionsToPay=支払うために貢献
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=会計/財務エリア
 AccountancySetup=会計のセットアップ
 NewPayment=新しいお支払い
 Payments=支払い
 PaymentCustomerInvoice=顧客の請求書の支払い
 PaymentSupplierInvoice=サプライヤの請求書の支払い
-PaymentSocialContribution=社会貢献の支払い
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=付加価値税の支払い
 PaymentSalary=Salary payment
 ListPayment=支払いのリスト
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=付加価値税の支払い
 VATPayments=付加価値税の支払い
-SocialContributionsPayments=社会貢献の支払い
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=付加価値税の支払いを表示する
 TotalToPay=支払いに合計
 TotalVATReceived=総付加価値税は、受信
@@ -116,11 +116,11 @@ NewCheckDepositOn=%s：アカウント上で預金の領収書を作成する
 NoWaitingChecks=入金を待ってはチェックしません。
 DateChequeReceived=受付の日付を確認してください
 NbOfCheques=小切手のNb
-PaySocialContribution=社会貢献を支払う
-ConfirmPaySocialContribution=あなたが支払ったとしてこの社会貢献を分類してもよろしいですか？
-DeleteSocialContribution=社会貢献を削除します。
-ConfirmDeleteSocialContribution=あなたはこの社会貢献を削除してもよろしいですか？
-ExportDataset_tax_1=社会貢献と支払い
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 103bd29a409..a1629861fac 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -4,10 +4,10 @@ About = 約
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=開始日
 CronDtEnd=終了日
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=方法
 CronModule=モジュール
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=パラメータ
 CronSaveSucess=Save succesfully
 CronNote=コメント
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index d0c719668db..a89908b2924 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=オブジェクトで検索
 ECMSectionOfDocuments=ドキュメントのディレクトリ
 ECMTypeManual=マニュアル
 ECMTypeAuto=自動
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=第三者にリンクされたドキュメント
 ECMDocsByProposals=提案にリンクされたドキュメント
 ECMDocsByOrders=顧客の注文にリンクされたドキュメント
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 0f69477c23c..ce2a0613a2f 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 53fdbe451e8..ccceec3f089 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=理由
 UserCP=ユーザー
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=値
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/ja_JP/incoterm.lang b/htdocs/langs/ja_JP/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/ja_JP/incoterm.lang
+++ b/htdocs/langs/ja_JP/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 8a75022f2a5..f9fbe7d4075 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=データベースサーバ - スーパーユーザー
 CheckToCreateDatabase=データベースが存在しない場合はチェックボックスをオンにして作成する必要があります。 <br>このケースでは、このページの下部にスーパーユーザアカウントのログイン/パスワードを入力する必要があります。
 CheckToCreateUser=データベースの所有者が存在しない場合はチェックボックスをオンにして作成する必要があります。 <br>このケースでは、そのログイン名とパスワードを選択しても、ログイン/このページの下部にスーパーユーザーアカウント用のパスワードを入力する必要があります。このボックスがチェックされていない場合、所有者のデータベースとそのパスワードが存在する必要があります。
 Experimental=（実験的）
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=あなたのデータベースおよびデータベースのログインが既に存在する場合（あなたがウェブホスティングプロバイダによってホストされているときのように）役に立たない、新しいデータベースまたは新しいユーザを作成することを禁止するユーザのログイン。
 KeepEmptyIfNoPassword=ユーザーがパスワードを持っていない場合（これを避けるため）を空のままに
 SaveConfigurationFile=値を保存
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index 0dca98435c4..3b5fad5e271 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=アラビア語
 Language_ar_SA=アラビア語
+Language_bn_BD=Bengali
 Language_bg_BG=ブルガリア語
 Language_bs_BA=ボスニア
 Language_ca_ES=カタルにゃ語
@@ -21,9 +22,10 @@ Language_en_SA=英語（サウジアラビア）
 Language_en_US=英語 (アメリカ)
 Language_en_ZA=英語（南アフリカ）
 Language_es_ES=スペイン語
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=スペイン語 (アルゼンチン)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=スペイン語（ホンジュラス）
 Language_es_MX=スペイン語（メキシコ）
 Language_es_PY=スペイン語（パラグアイ）
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=アイスランド語
 Language_it_IT=イタリア語
 Language_ja_JP=日本語
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=韓国語
+Language_lo_LA=Lao
 Language_lt_LT=リトアニア語
 Language_lv_LV=ラトビアの
 Language_mk_MK=マケドニア語
@@ -64,6 +69,7 @@ Language_sv_SV=スウエーデん語
 Language_sv_SE=スウェーデン語
 Language_sq_AL=Albanian
 Language_sk_SK=スロバキア
+Language_sw_SW=Kiswahili
 Language_th_TH=タイの
 Language_uk_UA=ウクライナ語
 Language_uz_UZ=ウズベク語
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 42b6f7a5e5f..1ea790190c9 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=通知
 NoNotificationsWillBeSent=いいえ電子メール通知は、このイベントや会社のために計画されていません
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 62a5a2589a4..d2c33dd1e44 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=いくつかのエラーが検出されま
 ErrorConfigParameterNotDefined=パラメータ<b>%sは</b> Dolibarr configファイル<b>conf.php</b>内で定義されていません。
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarrデータベース内のユーザーの<b>%sを</b>見つけることができませんでした。
 ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義されていないのVAT率。
-ErrorNoSocialContributionForSellerCountry=エラー、国%s 'に対して定義されていない社会貢献型。
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=エラーは、ファイルを保存に失敗しました。
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=単価（純額）
 UnitPriceTTC=単価
 PriceU=UP
 PriceUHT=UP（純額）
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=量
 AmountInvoice=請求額
 AmountPayment=支払金額
@@ -339,6 +339,7 @@ IncludedVAT=税込み
 HT=税引き
 TTC=税込
 VAT=売上税
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=税率
@@ -413,6 +414,8 @@ Qty=個数
 ChangedBy=によって変更され
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=成功
 ResultKo=失敗
@@ -421,7 +424,7 @@ Reportings=報告
 Draft=ドラフト
 Drafts=ドラフト
 Validated=検証
-Opened=開かれた
+Opened=Open
 New=新しい
 Discount=割引
 Unknown=未知の
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=月曜日
 Tuesday=火曜日
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 7455ea4d526..77822333b01 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -199,7 +199,8 @@ Entreprises=企業
 DOLIBARRFOUNDATION_PAYMENT_FORM=銀行振込を使用してサブスクリプション費用の支払いを行うには、ページ参照<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribeを</a> 。 <br>クレジットカードまたはPayPalでお支払いには、このページの下部にあるボタンをクリックします。 <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 113c59964a9..da65b1f66a4 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=サプライヤーのため
 SuppliersOrders=サプライヤーの注文
 SuppliersOrdersRunning=現在のサプライヤーの注文
 CustomerOrder=顧客注文
-CustomersOrders=Customers orders
-CustomersOrdersRunning=現在の顧客の注文
-CustomersOrdersAndOrdersLines=顧客の注文や注文の行
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=処理するために、サプライヤの受注
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=キャンセル
 StatusOrderDraftShort=ドラフト
 StatusOrderValidatedShort=検証
@@ -75,8 +75,9 @@ AddToMyOrders=私の注文に追加
 AddToOtherOrders=他の注文に追加
 AddToDraftOrders=Add to draft order
 ShowOrder=順序を示す
-NoOpenedOrders=いいえ開かれたオーダーがない
-NoOtherOpenedOrders=他の注文を開かれていません
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=他の注文
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 6cee92e2d0a..4baf53dc6ad 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=介入は、検証
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=顧客への請求書が検証さ
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=サプライヤーの順序は、承認さ
 Notify_ORDER_SUPPLIER_REFUSE=サプライヤーのオーダーが拒否されました
 Notify_ORDER_VALIDATE=検証済みの顧客の注文
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=カレンダー%sにエントリを追加します。
diff --git a/htdocs/langs/ja_JP/printing.lang b/htdocs/langs/ja_JP/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/ja_JP/printing.lang
+++ b/htdocs/langs/ja_JP/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index bb0d1ca3050..6796d67e83a 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -23,14 +23,14 @@ ProductOrService=製品やサービス
 ProductsAndServices=製品とサービス
 ProductsOrServices=製品またはサービス
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=製品とサービスの統計情報
 ProductsStatistics=製品統計
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=内部基準
 LastRecorded=販売上の最後の製品/サービスは、記録
@@ -44,7 +44,7 @@ CardProduct1=サービスカード
 CardContract=契約カード
 Warehouse=倉庫
 Warehouses=倉庫
-WarehouseOpened=倉庫をオープン
+WarehouseOpened=Warehouse open
 WarehouseClosed=倉庫は閉じた
 Stock=株式
 Stocks=ストック
@@ -71,21 +71,21 @@ SellingPriceTTC=販売価格（税込）
 PublicPrice=公共の価格
 CurrentPrice=現行価格
 NewPrice=新価格
-MinPrice=ミニム。販売価格
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=販売価格は、本製品（税抜き%s）に許可される最小値より小さくなることはありません。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示されますことができます。
 ContractStatus=契約状況
 ContractStatusClosed=閉じた
-ContractStatusRunning=ランニング
+ContractStatusRunning=Ongoing
 ContractStatusExpired=期限切れの
-ContractStatusOnHold=実行していない
-ContractStatusToRun=To get running
-ContractNotRunning=この契約は実行されていません
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=参照%sした製品はすでに存在しています。
 ErrorProductBadRefOrLabel=参照またはラベルの間違った値。
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=サプライヤー
 SupplierRef=サプライヤーの製品REF。
 ShowProduct=製品を表示
@@ -117,12 +117,12 @@ ServiceLimitedDuration=製品は、限られた期間を持つサービスの場
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=価格数
 MultiPriceLevelsName=価格カテゴリ
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=関連付ける
 Translation=翻訳
 KeywordFilter=キーワードフィルタ
@@ -131,7 +131,7 @@ ProductToAddSearch=追加するには、製品検索
 AddDel=追加/削除
 Quantity=量
 NoMatchFound=マッチするものが見つからない
-ProductAssociationList=関連製品/サービスのリスト：製品/サービスの名前（量の影響）
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親です。
 DeleteProduct=製品/サービスを削除します。
@@ -179,16 +179,41 @@ CloneProduct=クローン製品やサービス
 ConfirmCloneProduct=あなたが製品やサービス<b>%sの</b>クローン<b>を作成</b>してもよろしいですか？
 CloneContentProduct=製品/サービスのすべての主要な情報のクローンを作成する
 ClonePricesProduct=主な情報と価格のクローンを作成する
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=本製品が使用されます
 NewRefForClone=REF。新製品/サービスの
-CustomerPrices=お客様の価格
-SuppliersPrices=仕入価格
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=税関コード
 CountryOrigin=原産国
 HiddenIntoCombo=selectリストの中に隠れて
 Nature=自然
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 5526c92b708..6dc68fd0b82 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=このビューには、読み取りを許可されている
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=このビューはすべてのプロジェクトを（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
 MyTasksDesc=このビューは、連絡先の（種類は何でも）がプロジェクトやタスクに制限されています。
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 TasksDesc=このビューは、すべてのプロジェクトとタスク（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=プロジェクトエリア
 NewProject=新しいプロジェクト
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=プロジェクトのリスト
 ShowProject=プロジェクトを表示する
 SetProject=プロジェクトを設定します。
 NoProject=はプロジェクトが定義されていませんまたは所有している
-NbOpenTasks=開かれたタスクのNb
+NbOpenTasks=Nb of open tasks
 NbOfProjects=プロジェクトのNb
 TimeSpent=に費や​​された時間は
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=新たに費やされた時間は
 MyTimeSpent=私の時間を費やし
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=プロジェクトに関連付けられている
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=プロジェクトに関連付けられているイベントのリスト
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=プロジェクト今週のアクティビティ
 ActivityOnProjectThisMonth=プロジェクトの活動今月
 ActivityOnProjectThisYear=プロジェクトの活動は今年
@@ -95,7 +98,7 @@ DeleteATimeSpent=費やした時間を削除します。
 ConfirmDeleteATimeSpent=この時間を過ごし削除してもよろしいですか？
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=この第三者に専用のプロジェクト
 NoTasks=このプロジェクトのための作業をしない
 LinkedToAnotherCompany=他の第三者へのリンク
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index acdd015cb2e..415ad52e103 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -4,7 +4,7 @@ Proposal=商業的提案
 ProposalShort=提案
 ProposalsDraft=ドラフト商業の提案
 ProposalDraft=ドラフト商業提案
-ProposalsOpened=オープンした商業提案
+ProposalsOpened=Open commercial proposals
 Prop=商用の提案
 CommercialProposal=商業的提案
 CommercialProposals=商用の提案
@@ -16,7 +16,7 @@ Prospect=見通し
 ProspectList=見込み客リスト
 DeleteProp=商業的提案を削除します。
 ValidateProp=商業的提案を検証する
-AddProp=提案を追加します。
+AddProp=Create proposal
 ConfirmDeleteProp=このコマーシャル提案を削除してもよろしいですか？
 ConfirmValidateProp=あなたがこのコマーシャル案を検証してもよろしいですか？
 LastPropals=最後%s提案
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=月別額（税引後）
 NbOfProposals=商業的提案の数
 ShowPropal=提案を示す
 PropalsDraft=ドラフト
-PropalsOpened=開かれた
+PropalsOpened=Open
 PropalsNotBilled=閉じて請求しない
 PropalStatusDraft=ドラフト（検証する必要があります）
 PropalStatusValidated=（提案が開いている）を検証
@@ -42,7 +42,7 @@ PropalStatusNotSigned=（クローズ）署名されていません
 PropalStatusBilled=請求
 PropalStatusDraftShort=ドラフト
 PropalStatusValidatedShort=検証
-PropalStatusOpenedShort=開かれた
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=閉じた
 PropalStatusSignedShort=署名された
 PropalStatusNotSignedShort=署名されていない
@@ -51,12 +51,10 @@ PropalsToClose=閉じるには、商用の提案
 PropalsToBill=法案に署名した商業の提案
 ListOfProposals=商業的提案のリスト
 ActionsOnPropal=提案のイベント
-NoOpenedPropals=商業的な提案を開けません
-NoOtherOpenedPropals=他には、市販の提案を開いていない
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=商業的な提案のref
 SendPropalByMail=メールでの商用の提案を送る
-FileNotUploaded=ファイルがアップロードされませんでした
-FileUploaded=ファイルが正常にアップロードされました
 AssociatedDocuments=提案に関連するドキュメント：
 ErrorCantOpenDir=ディレクトリを開くことができません。
 DatePropal=提案書の日付
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propalの%sが見つかりません
 Estimate=概算：
 EstimateShort=見積もる
 OtherPropals=他の提案
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=既存のプロポーザルをコピーして、商用の提案を作成します。
 CreateEmptyPropal=空の商業的提案のビエルヘを作成するか、または製品/サービスのリストから
 DefaultProposalDurationValidity=デフォルトの商業提案の有効期間（日数）
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=顧客の連絡先フォローアップ提
 # Document models
 DocModelAzurDescription=完全な提案モデル（logo. ..）
 DocModelJauneDescription=Jauneの提案モデル
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index d7fc750da77..cfed0dce619 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=簡単な文書モデル
 DocumentModelMerou=メロウA5モデル
 WarningNoQtyLeftToSend=警告は、出荷されるのを待っていない製品。
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=配達のかんな日付
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=日付の配信は、受信した
 SendShippingByEMail=電子メールで貨物を送る
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index c395689231c..3e2b04997ae 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=倉庫
 NewWarehouse=新倉庫/ストックエリア
 WarehouseEdit=倉庫を変更する
 MenuNewWarehouse=新倉庫
-WarehouseOpened=倉庫をオープン
+WarehouseOpened=Warehouse open
 WarehouseClosed=倉庫は閉じた
 WarehouseSource=ソースの倉庫
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=株式の減少のために使用するために
 SelectWarehouseForStockIncrease=在庫の増加に使用する倉庫を選択します。
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 5e99086f0ed..33a8b58ada4 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 6a53035c5c6..620a2f386b6 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=手数料のリスト
 NewTrip=New expense report
 CompanyVisited=会社概要/基礎を訪問
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 879183074fc..646dfde0b1b 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=グループから削除
 PasswordChangedAndSentTo=パスワードが変更され<b>、%s</b>に送信されます。
 PasswordChangeRequestSent=<b>%s %s</b>に送信するためのパスワードを変更するには、要求します。
 MenuUsersAndGroups=ユーザーとグループ
+MenuMyUserCard=My user card
 LastGroupsCreated=最後%sグループを作成
 LastUsersCreated=最後に作成した%sユーザー
 ShowGroup=グループを表示
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index 195977c4031..446a348c29c 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=銀行によって立っている順序%sの支払い
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index d8885af3da4..78ddb584315 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=ワークフローモジュールのセットアップ
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=あなたがアクティブ化したモジュールに変更することができないワークフローはありません。
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=商業的提案が署名された後、自動的に顧客の注文を作成します。
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=商業的提案が署名された後、自動的に顧客の請求書を作成します。
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=契約が検証された後、自動的に顧客に請求書を作成します。
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=顧客注文が閉じられた後、自動的に顧客の請求書を作成します。
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index e823d364258..13f7eb7c6ec 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index 55fde86864b..3e8b2309f8f 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 8abf1fd1c5a..42a9a884c76 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/ka_GE/ecm.lang b/htdocs/langs/ka_GE/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/ka_GE/ecm.lang
+++ b/htdocs/langs/ka_GE/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/ka_GE/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/ka_GE/holiday.lang
+++ b/htdocs/langs/ka_GE/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/ka_GE/incoterm.lang b/htdocs/langs/ka_GE/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/ka_GE/incoterm.lang
+++ b/htdocs/langs/ka_GE/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang
index d20aab00146..aaeeb235544 100644
--- a/htdocs/langs/ka_GE/languages.lang
+++ b/htdocs/langs/ka_GE/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spanish (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
 Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/ka_GE/loan.lang b/htdocs/langs/ka_GE/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/ka_GE/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 9a32ee6f1ea..12d9337641d 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/ka_GE/printing.lang b/htdocs/langs/ka_GE/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/ka_GE/printing.lang
+++ b/htdocs/langs/ka_GE/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/ka_GE/propal.lang b/htdocs/langs/ka_GE/propal.lang
index 2b6d12870a1..d10dbb15122 100644
--- a/htdocs/langs/ka_GE/propal.lang
+++ b/htdocs/langs/ka_GE/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,8 +51,8 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
 AssociatedDocuments=Documents associated with the proposal:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune proposal model
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/ka_GE/salaries.lang
+++ b/htdocs/langs/ka_GE/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/ka_GE/trips.lang
+++ b/htdocs/langs/ka_GE/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/ka_GE/workflow.lang b/htdocs/langs/ka_GE/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/ka_GE/workflow.lang
+++ b/htdocs/langs/ka_GE/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index e823d364258..13f7eb7c6ec 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index 55fde86864b..3e8b2309f8f 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 0195d7566b0..18dd00f389d 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=ತೃತೀಯ ಸಂಪರ್ಕ / ವಿಳಾಸ
 StatusContactValidated=ಸಂಪರ್ಕ / ವಿಳಾಸದ ಸ್ಥಿತಿ
 Company=ಸಂಸ್ಥೆ
 CompanyName=ಸಂಸ್ಥೆಯ ಹೆಸರು
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=ಕಂಪನಿಗಳು
 CountryIsInEEC=ದೇಶವು ಯುರೋಪಿಯನ್ ಎಕನಾಮಿಕ್ ಕಮ್ಯುನಿಟಿಯಲ್ಲಿದೆ
 ThirdPartyName=ಮೂರನೇ ಪಾರ್ಟಿ ಹೆಸರು
@@ -410,5 +411,10 @@ OutstandingBillReached=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿಯಬಹುದ
 MonkeyNumRefModelDesc=ಫಾರ್ಮ್ಯಾಟ್% syymm-NNNN ಗ್ರಾಹಕ ಕೋಡ್ ಮತ್ತು% syymm-NNNN ವವ ವರ್ಷ ಅಲ್ಲಿ ಪೂರೈಕೆದಾರ ಕೋಡ್ ಫಾರ್ ಜೊತೆ ನ್ಯೂಮರೋ ಹಿಂತಿರುಗಿ, ಮಿಮೀ ತಿಂಗಳು ಮತ್ತು NNNN ಯಾವುದೇ ಬ್ರೇಕ್ ಮತ್ತು 0 ಯಾವುದೇ ಲಾಭ ಒಂದು ಅನುಕ್ರಮದ.
 LeopardNumRefModelDesc=ಕೋಡ್ ಉಚಿತ. ಈ ಕೋಡ್ ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಮಾರ್ಪಡಿಸಬಹುದಾಗಿದೆ.
 ManagingDirectors=ಮ್ಯಾನೇಜರ್ (ಗಳು) ಹೆಸರು (ಸಿಇಒ, ನಿರ್ದೇಶಕ, ಅಧ್ಯಕ್ಷ ...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/kn_IN/ecm.lang
+++ b/htdocs/langs/kn_IN/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/kn_IN/holiday.lang
+++ b/htdocs/langs/kn_IN/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/kn_IN/incoterm.lang b/htdocs/langs/kn_IN/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/kn_IN/incoterm.lang
+++ b/htdocs/langs/kn_IN/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang
index d20aab00146..aaeeb235544 100644
--- a/htdocs/langs/kn_IN/languages.lang
+++ b/htdocs/langs/kn_IN/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spanish (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
 Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/kn_IN/loan.lang b/htdocs/langs/kn_IN/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/kn_IN/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 9a32ee6f1ea..12d9337641d 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/kn_IN/printing.lang b/htdocs/langs/kn_IN/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/kn_IN/printing.lang
+++ b/htdocs/langs/kn_IN/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/kn_IN/propal.lang b/htdocs/langs/kn_IN/propal.lang
index 2b6d12870a1..d10dbb15122 100644
--- a/htdocs/langs/kn_IN/propal.lang
+++ b/htdocs/langs/kn_IN/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,8 +51,8 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
 AssociatedDocuments=Documents associated with the proposal:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune proposal model
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/kn_IN/salaries.lang
+++ b/htdocs/langs/kn_IN/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/kn_IN/trips.lang b/htdocs/langs/kn_IN/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/kn_IN/trips.lang
+++ b/htdocs/langs/kn_IN/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/kn_IN/workflow.lang b/htdocs/langs/kn_IN/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/kn_IN/workflow.lang
+++ b/htdocs/langs/kn_IN/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 5cae3e54282..da09266e2e7 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 06b08f18561..5b7760cb529 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 5580d87b517..42a9a884c76 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +269,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/ko_KR/ecm.lang b/htdocs/langs/ko_KR/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/ko_KR/ecm.lang
+++ b/htdocs/langs/ko_KR/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 8faefb13837..5bfd08fa79b 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/ko_KR/incoterm.lang b/htdocs/langs/ko_KR/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/ko_KR/incoterm.lang
+++ b/htdocs/langs/ko_KR/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index fc4daabf0e6..1f100105778 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang
index 1a5490f6007..a1e8d0d67b7 100644
--- a/htdocs/langs/ko_KR/languages.lang
+++ b/htdocs/langs/ko_KR/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=아랍
 Language_ar_SA=아라비아 말
+Language_bn_BD=Bengali
 Language_bg_BG=불가리아 사람
 Language_bs_BA=Bosniešu
 Language_ca_ES=카탈로니아의
@@ -21,9 +22,10 @@ Language_en_SA=영어 (사우디 아라비아)
 Language_en_US=영어 (미국)
 Language_en_ZA=영어 (남아프리카 공화국)
 Language_es_ES=스페인어
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=스페인어 (아르헨티나)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=스페인어 (온두라스)
 Language_es_MX=스페인어 (멕시코)
 Language_es_PY=스페인어 (파라과이)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=아이슬란드의
 Language_it_IT=이탈리아의
 Language_ja_JP=일본의
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=한국의
+Language_lo_LA=Lao
 Language_lt_LT=Lietuviešu
 Language_lv_LV=라트비아의
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=스웨덴어
 Language_sv_SE=스웨덴어
 Language_sq_AL=Albanian
 Language_sk_SK=Slovākijas
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbeku
diff --git a/htdocs/langs/ko_KR/loan.lang b/htdocs/langs/ko_KR/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/ko_KR/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 3b2fcaf0f52..ef5aa82d532 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index b3f54f1d1c4..083779a848d 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=오류가 있습니다. 변경을 하지 
 ErrorConfigParameterNotDefined=<b>%s</b> 매개변수를 Dolibarr 설정 파일 <b>conf.php</b> 내에서 지정할 수 없습니다.
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarr 데이타베이스에서 <b>%s</b>유저를 찾을 수 없습니다.
 ErrorNoVATRateDefinedForSellerCountry=오류, '%s' 국가의 부가세율이 정의되지 않았습니다.
-ErrorNoSocialContributionForSellerCountry=오류, '%s' 국가의 사회 기여 종류가 지정되지 않았습니다.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=오류, 파일을 저장할 수 없습니다.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=할인
 Unknown=알 수 없음
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=월요일
 Tuesday=화요일
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 5a0094277c9..32ab3851e39 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/ko_KR/printing.lang b/htdocs/langs/ko_KR/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/ko_KR/printing.lang
+++ b/htdocs/langs/ko_KR/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/ko_KR/propal.lang b/htdocs/langs/ko_KR/propal.lang
index d17bc952b7d..d10dbb15122 100644
--- a/htdocs/langs/ko_KR/propal.lang
+++ b/htdocs/langs/ko_KR/propal.lang
@@ -1,102 +1,101 @@
 # Dolibarr language file - Source file is en_US - propal
-# Proposals=Commercial proposals
-# Proposal=Commercial proposal
-# ProposalShort=Proposal
-# ProposalsDraft=Draft commercial proposals
-# ProposalDraft=Draft commercial proposal
-# ProposalsOpened=Opened commercial proposals
-# Prop=Commercial proposals
-# CommercialProposal=Commercial proposal
-# CommercialProposals=Commercial proposals
-# ProposalCard=Proposal card
-# NewProp=New commercial proposal
-# NewProposal=New commercial proposal
-# NewPropal=New proposal
-# Prospect=Prospect
-# ProspectList=Prospect list
-# DeleteProp=Delete commercial proposal
-# ValidateProp=Validate commercial proposal
-# AddProp=Add proposal
-# ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-# ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-# LastPropals=Last %s proposals
-# LastClosedProposals=Last %s closed proposals
-# LastModifiedProposals=Last %s modified proposals
-# AllPropals=All proposals
-# LastProposals=Last proposals
-# SearchAProposal=Search a proposal
-# ProposalsStatistics=Commercial proposal's statistics
-# NumberOfProposalsByMonth=Number by month
-# AmountOfProposalsByMonthHT=Amount by month (net of tax)
-# NbOfProposals=Number of commercial proposals
-# ShowPropal=Show proposal
-# PropalsDraft=Drafts
-# PropalsOpened=Opened
-# PropalsNotBilled=Closed not billed
-# PropalStatusDraft=Draft (needs to be validated)
-# PropalStatusValidated=Validated (proposal is open)
-# PropalStatusOpened=Validated (proposal is open)
-# PropalStatusClosed=Closed
-# PropalStatusSigned=Signed (needs billing)
-# PropalStatusNotSigned=Not signed (closed)
-# PropalStatusBilled=Billed
-# PropalStatusDraftShort=Draft
-# PropalStatusValidatedShort=Validated
-# PropalStatusOpenedShort=Opened
-# PropalStatusClosedShort=Closed
-# PropalStatusSignedShort=Signed
-# PropalStatusNotSignedShort=Not signed
-# PropalStatusBilledShort=Billed
-# PropalsToClose=Commercial proposals to close
-# PropalsToBill=Signed commercial proposals to bill
-# ListOfProposals=List of commercial proposals
-# ActionsOnPropal=Events on proposal
-# NoOpenedPropals=No opened commercial proposals
-# NoOtherOpenedPropals=No other opened commercial proposals
-# RefProposal=Commercial proposal ref
-# SendPropalByMail=Send commercial proposal by mail
-# FileNotUploaded=The file was not uploaded
-# FileUploaded=The file was successfully uploaded
-# AssociatedDocuments=Documents associated with the proposal:
-# ErrorCantOpenDir=Can't open directory
-# DatePropal=Date of proposal
-# DateEndPropal=Validity ending date
-# DateEndPropalShort=Date end
-# ValidityDuration=Validity duration
-# CloseAs=Close with status
-# ClassifyBilled=Classify billed
-# BuildBill=Build invoice
-# ErrorPropalNotFound=Propal %s not found
-# Estimate=Estimate :
-# EstimateShort=Estimate
-# OtherPropals=Other proposals
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
-# CopyPropalFrom=Create commercial proposal by copying existing proposal
-# CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-# DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-# UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-# ClonePropal=Clone commercial proposal
-# ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-# ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-# ProposalsAndProposalsLines=Commercial proposal and lines
-# ProposalLine=Proposal line
-# AvailabilityPeriod=Availability delay
-# SetAvailability=Set availability delay
-# AfterOrder=after order
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalDraft=Draft commercial proposal
+ProposalsOpened=Open commercial proposals
+Prop=Commercial proposals
+CommercialProposal=Commercial proposal
+CommercialProposals=Commercial proposals
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewProposal=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+ProspectList=Prospect list
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
+LastPropals=Last %s proposals
+LastClosedProposals=Last %s closed proposals
+LastModifiedProposals=Last %s modified proposals
+AllPropals=All proposals
+LastProposals=Last proposals
+SearchAProposal=Search a proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (net of tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalsNotBilled=Closed not billed
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusOpened=Validated (proposal is open)
+PropalStatusClosed=Closed
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
+PropalStatusOpenedShort=Open
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+AssociatedDocuments=Documents associated with the proposal:
+ErrorCantOpenDir=Can't open directory
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+DateEndPropalShort=Date end
+ValidityDuration=Validity duration
+CloseAs=Close with status
+ClassifyBilled=Classify billed
+BuildBill=Build invoice
+ErrorPropalNotFound=Propal %s not found
+Estimate=Estimate :
+EstimateShort=Estimate
+OtherPropals=Other proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+ClonePropal=Clone commercial proposal
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
 ##### Availability #####
-# AvailabilityTypeAV_NOW=Immediate
-# AvailabilityTypeAV_1W=1 week
-# AvailabilityTypeAV_2W=2 weeks
-# AvailabilityTypeAV_3W=3 weeks
-# AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
-# TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-# TypeContact_propal_external_BILLING=Customer invoice contact
-# TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 # Document models
-# DocModelAzurDescription=A complete proposal model (logo...)
-# DocModelJauneDescription=Jaune proposal model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=A complete proposal model (logo...)
+DocModelJauneDescription=Jaune proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/ko_KR/salaries.lang
+++ b/htdocs/langs/ko_KR/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 6a54af62d5c..535b18e83f0 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/ko_KR/trips.lang
+++ b/htdocs/langs/ko_KR/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/ko_KR/workflow.lang b/htdocs/langs/ko_KR/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/ko_KR/workflow.lang
+++ b/htdocs/langs/ko_KR/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 879f9fc27c8..7ae27cc7751 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=ບັນ​ຊີ
 Globalparameters=​ໂຕ​ຕັ້ງ​ຄ່າ​ທັງ​ໝົດ
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index e823d364258..13f7eb7c6ec 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index 55fde86864b..3e8b2309f8f 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index fb5ec74abfd..1d9f48ac794 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 8abf1fd1c5a..42a9a884c76 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/lo_LA/ecm.lang
+++ b/htdocs/langs/lo_LA/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/lo_LA/holiday.lang
+++ b/htdocs/langs/lo_LA/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/lo_LA/incoterm.lang b/htdocs/langs/lo_LA/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/lo_LA/incoterm.lang
+++ b/htdocs/langs/lo_LA/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang
index d20aab00146..aaeeb235544 100644
--- a/htdocs/langs/lo_LA/languages.lang
+++ b/htdocs/langs/lo_LA/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spanish (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
 Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/lo_LA/loan.lang b/htdocs/langs/lo_LA/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/lo_LA/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 9a32ee6f1ea..12d9337641d 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/lo_LA/printing.lang b/htdocs/langs/lo_LA/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/lo_LA/printing.lang
+++ b/htdocs/langs/lo_LA/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang
index 2b6d12870a1..d10dbb15122 100644
--- a/htdocs/langs/lo_LA/propal.lang
+++ b/htdocs/langs/lo_LA/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,8 +51,8 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
 AssociatedDocuments=Documents associated with the proposal:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune proposal model
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/lo_LA/salaries.lang
+++ b/htdocs/langs/lo_LA/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/lo_LA/trips.lang b/htdocs/langs/lo_LA/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/lo_LA/trips.lang
+++ b/htdocs/langs/lo_LA/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index 52c2f25d8b0..a34461f0460 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=ລຶບຈາກກຸ່ມ
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=ສະແດງກຸ່ມ
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/lo_LA/workflow.lang
+++ b/htdocs/langs/lo_LA/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index b13d1aba600..4d686cce900 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Apskaita
 Globalparameters=Bendrieji parametrai
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Trečiųjų šalių sąskaitų ilgis
 
 ACCOUNTING_SELL_JOURNAL=Pardavimų žurnalas
 ACCOUNTING_PURCHASE_JOURNAL=Pirkimų žurnalas
-ACCOUNTING_BANK_JOURNAL=Banko žurnalas
-ACCOUNTING_CASH_JOURNAL=Pinigų žurnalas
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Įvairiarūšis žurnalas
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Socialinis žurnalas
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Operacijų sąskaita
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 2fb9ee1a3bd..6709bf8e3ad 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Vartotojų meniu
 LangFile=.lang failas
 System=Sistema
 SystemInfo=Sistemos informacija
-SystemTools=Sistemos įrankiai
 SystemToolsArea=Sistemos įrankių sritis
 SystemToolsAreaDesc=Ši sritis suteikia administravimo funkcijas. Naudokite meniu pasirinkti funkciją jūs ieškote.
 Purge=Išvalyti
@@ -232,8 +231,8 @@ Security=Saugumas
 Passwords=Slaptažodžiai
 DoNotStoreClearPassword=Nesaugokite aiškių slaptažodžių duomenų bazėje, laikykite tik užšifruotus (Activated recomended)
 MainDbPasswordFileConfEncrypted=Duomenų bazės slaptažodis užšifruotas conf.php (Activated recomended)
-InstrucToEncodePass=Norint užkoduoti slaptažodį į <b>conf.php</b> failą, pakeiskite eilutę <br> <b>$ Dolibarr_main_db_pass = "..."</b> <br> į <br> <b>$ Dolibarr_main_db_pass = "crypted:% s"</b>
-InstrucToClearPass=Norint iššifruoti slaptažodį į <b>conf.php</b> failą, pakeisti eilutę <br> <b>$ Dolibarr_main_db_pass = "crypted: ..."</b> <br> į <br> <b>$ Dolibarr_main_db_pass = "% s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Generuojamų PDF failų apsauga (Activated NOT recomended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=PDF dokumento apsauga sudaro galimybę jį skaityti ir spausdinti bet kurioje PDF skaityklėje. Tačiau redagavimas ir kopijavimas yra nebegalimas. Dėmesio, naudojant šią funkciją, masinis sukauptų pdf failų apjungimas neveikia (kaip neapmokėtų sąskaitų).
 Feature=Savybė
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Tai yra nustatymo eiga:
 ThisIsAlternativeProcessToFollow=Tai nustatymų procesui alternatyva:
 StepNb=Žingsnis %s
 FindPackageFromWebSite=Ieškoti paketo, kuris suteikia norimą funkciją (pavyzdžiui oficialioje interneto svetainėje %s).
-DownloadPackageFromWebSite=Užkrauti paketą %s.
-UnpackPackageInDolibarrRoot=Išpakuoti failą į katalogą, skirtą išoriniams moduliams: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Diegimas baigtas ir Dolibarr yra paruoštas naudoti su šiuo nauju komponentu.
 NotExistsDirect=Alternatyvus pagrindinis katalogas nėra apibrėžtas. <br>
 InfDirAlt=Nuo 3 versijos galimanustatyti alternatyvų pagrindinį katalogą.Tai leis saugoti vienoje vietoje papildinius (plug-ins) ir vartotojo šablonus.<br>Tiesiog sukurkite katalogą Dolibarr pagrindiniame kataloge (pvz.: custom).<br>
 InfDirExample=<br>Tada deklaruoti faile conf.php<br> $dolibarr_main_url_root_alt = 'http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Šios eilutės yra pažymėtos "#", atžymėjimui reikia pašalinti šį simbolį.
-YouCanSubmitFile=Pasirinkite modulį:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr dabartinė versija
 CallUpdatePage=Eiti į puslapį, kuriame atnaujinamos duomenų bazės struktūra ir duomenys:%s.
 LastStableVersion=Paskutinė stabili versija
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parametrų sąrašas ateina iš lentelės<br>Sintaks
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Biblioteka naudojama sukurti PDF
 WarningUsingFPDF=Įspėjimas: Jūsų <b>conf.php</b> yra ribojanti direktyva <b>dolibarr_pdf_force_fpdf=1</b>. Tai reiškia, kad jūs naudojate FPDF biblioteką PDF failų generavimui. Ši biblioteka yra sena ir nepalaiko daug funkcijų (Unicode, vaizdo skaidrumo, kirilicos, arabų ir Azijos kalbų, ...), todėl galite patirti klaidų generuojant PDF.<br>Norėdami išspręsti šią problemą ir turėti visapusišką palaikymą generuojant PDF, atsisiųskite <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a> , tada pažymėkite (comment) arba pašalinkite eilutę <b>$dolibarr_pdf_force_fpdf=1</b> ir įdėkite vietoje jos <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Įveskite telefono numerį, kuriuo skambinsite norėdami parodyti vartotojui nuorodą ClickToDial URL testavimui <strong>%s</strong>
 RefreshPhoneLink=Atnaujinti nuorodą
@@ -430,8 +429,8 @@ Module20Name=Pasiūlymai
 Module20Desc=Komercinių pasiūlymų valdymas
 Module22Name=Masiniai el. laiškai
 Module22Desc=Masinių el. laiškų valdymas
-Module23Name= Energija
-Module23Desc= Stebėti energijos suvartojimą
+Module23Name=Energija
+Module23Desc=Stebėti energijos suvartojimą
 Module25Name=Klientų užsakymai
 Module25Desc=Klientų užsakymų valdymas
 Module30Name=Sąskaitos
@@ -492,8 +491,8 @@ Module400Name=Projektai / Galimybės / Iniciatyvos
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web kalendorius
 Module410Desc=Web kalendoriaus integracija
-Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividendai)
-Module500Desc=Spec. išlaidų valdymas, pavyzdžiui: mokesčių, socialinių įmokų, dividendų ir atlyginimų
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Atlyginimai
 Module510Desc=Darbuotojų darbo užmokesčio ir išmokų valdymas
 Module520Name=Paskola
@@ -502,7 +501,7 @@ Module600Name=Pranešimai
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Parama
 Module700Desc=Paramos valdymas
-Module770Name=Išlaidų ataskaita
+Module770Name=Expense reports
 Module770Desc=Valdymo ir pretenzijų išlaidų ataskaitos (transportas, maistas, ...)
 Module1120Name=Tiekėjo komercinis pasiūlymas
 Module1120Desc=Prašyti tiekėjo komercinio pasiūlymo ir kainų
@@ -524,8 +523,10 @@ Module2400Name=Darbotvarkė
 Module2400Desc=Renginių/užduočių ir darbotvarkės valdymas
 Module2500Name=Elektroninis Turinio Valdymas
 Module2500Desc=Išsaugoti dokumentus ir dalintis jais
-Module2600Name=WebServices
-Module2600Desc=Įjungti Dolibarr interneto paslaugas serveryje
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (kliento)
 Module2650Desc=Nustatyti Dolibarr interneto paslaugų klientą (Gali būti naudojamas perkelti Duomenis / Prašymus į išorės serverius. Tiekėjo užsakymai palaikomi tik šiuo metu)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Sukurti/pakeisti produktus
 Permission34=Ištrinti produktus
 Permission36=Žiūrėti/tvarkyti paslėptus produktus
 Permission38=Eksportuoti produktus
-Permission41=Skaityti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Sukurti/keisti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
 Permission44=Ištrinti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
 Permission61=Skaityti intervencijas
@@ -599,10 +600,10 @@ Permission86=Siųsti klientų užsakymus
 Permission87=Uždaryti klientų užsakymus
 Permission88=Atšaukti klientų užsakymus
 Permission89=Ištrinti klientų užsakymus
-Permission91=Skaityti socialines įmokas ir PVM
-Permission92=Sukurti/keisti socialines įmokas ir PVM
-Permission93=Ištrinti socialines įmokas ir PVM
-Permission94=Eksportuoti socialinės įmokas
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Skaityti ataskaitas
 Permission101=Skaityti siuntinius
 Permission102=Sukurti/keisti siuntinius
@@ -620,9 +621,9 @@ Permission121=Skaityti trečiąsias šalis, susijusias su vartotoju
 Permission122=Sukurti/pakeisti trečiąsias šalis, susijusias su vartotoju
 Permission125=Ištrinti trečiąsias šalis, susijusias su vartotoju
 Permission126=Eksportuoti trečiąsias šalis
-Permission141=Skaityti projektus (taip pat privačius, dėl kurių nesikreipiame)
-Permission142=Sukurti/keisti projektus (taip pat privačius, dėl kurių nesikreipiame)
-Permission144=Ištrinti projektus (taip pat privačius, dėl kurių nesikreipiame)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Skaityti teikėjus
 Permission147=Skaityti statistinius duomenis
 Permission151=Skaityti pastovius užsakymus
@@ -800,7 +801,7 @@ DictionaryCountry=Šalys
 DictionaryCurrency=Valiutos
 DictionaryCivility=Mandagumo antraštė
 DictionaryActions=Darbotvarkės įvykių tipas
-DictionarySocialContributions=Socialinių įmokų tipai
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=PVM tarifai ar Pardavimo mokesčio tarifai
 DictionaryRevenueStamp=Pajamų rūšių kiekis
 DictionaryPaymentConditions=Apmokėjimo terminai
@@ -817,6 +818,9 @@ DictionarySource=Pasiūlymų/užsakymų kilmė
 DictionaryAccountancyplan=Sąskaitų planas
 DictionaryAccountancysystem=Sąskaitų plano modeliai
 DictionaryEMailTemplates=El.pašto pranešimų šablonai
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Nustatymai išsaugoti
 BackToModuleList=Atgal į modulių sąrašą
 BackToDictionaryList=Atgal į žodynų sąrašą
@@ -936,13 +940,14 @@ CompanyZip=Pašto kodas
 CompanyTown=Miestas
 CompanyCountry=Šalis
 CompanyCurrency=Pagrindinė valiuta
+CompanyObject=Object of the company
 Logo=Logotipas
 DoNotShow=Nerodyti
 DoNotSuggestPaymentMode=Nesiūlyti
 NoActiveBankAccountDefined=Nenustatyta aktyvi banko sąskaita
 OwnerOfBankAccount=Banko sąskaitos %s savininkas
 BankModuleNotActive=Banko sąskaitos modulis neįjungtas
-ShowBugTrackLink=Rodyti nuorodą "Pranešti apie klaidą"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Rodyti "darbastalį" pagrindiniame puslapyje
 Alerts=Įspėjimai
 Delays=Vėlavimai
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Vieneto kainos maksimalus ženklų po kablelio skaičius
 MAIN_MAX_DECIMALS_TOT=Visos kainos maksimalus ženklų po kablelio skaičius
 MAIN_MAX_DECIMALS_SHOWN=Ekrane rodomų kainų maksimalus ženklų po kablelioskaičius (Pridėti <b>...</b> po šio numerio, jei norite pamatyti <b>...</b> kada ekrane rodomas skaičius yra sutrumpinamas)
 MAIN_DISABLE_PDF_COMPRESSION=Generuojant PDF failus naudoti suspaudimą.
-MAIN_ROUNDING_RULE_TOT= Apvalinimo intervalo dydis (kai kuriose šalyse apvalinimo bazė yra ne 10, kaip įprastai)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Produkto grynoji vieneto kaina
 TotalPriceAfterRounding=Bendra kaina (grynoji kaina/PVM/su PVM) po apvalinimo
 ParameterActiveForNextInputOnly=Parametras veiksmingas tik kitam duomenų įvedimui
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Iš viso aktyvių funkcijų modulių <b>%s</b>
 YouMustEnableOneModule=Jūs turite įjungti bent 1 modulį
 ClassNotFoundIntoPathWarning=Klasė %s nerasta į PHP kelią
 YesInSummer=Taip vasarą
-OnlyFollowingModulesAreOpenedToExternalUsers=Atkreipkite dėmesį, kad tik šie moduliai yra atviri išorės vartotojams (kokie bebūtų šių vartotojų leidimai):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Sesijų saugykla užšifruota Suhosin
 ConditionIsCurrently=Dabartinė būklė yra %s
 YouUseBestDriver=Jūs naudojate tvarkyklę %s, kuri yra geriausia tvarkyklė prieinama šiuo metu.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Maksimalus produktų skaičius grupiniuose pasirinki
 ConfirmDeleteProductLineAbility=Patvirtinimas, norint ištrinti produkto liniją formose
 ModifyProductDescAbility=Produkto aprašymų formose personalizavimas
 ViewProductDescInFormAbility=Produktų aprašymų vizualizavimas formose (kitu būdu per "iššokantį" langą)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Produktų aprašymų vizualizavimas trečios šalies kalba
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Naudokite paieškos formą norint pasirinkti produktą (o ne iškrentantį sąrašą).
 UseEcoTaxeAbility=Palaikyti Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Brūkšninio kodo tipas produktams pagal nutylėjimą
 SetDefaultBarcodeTypeThirdParties=Brūkšninio kodo tipas trečiosioms šalims pagal nutylėjimą
+UseUnits=Support units
 ProductCodeChecker= Produkto kodo generavimo ir tikrinimo modulis (produktui arba paslaugai)
 ProductOtherConf= Produkto/paslaugos konfigūracija
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Brūkšninio kodo tipas UPC
 BarcodeDescISBN=Brūkšninio kodo tipas ISBN
 BarcodeDescC39=Brūkšninio kodo tipas C39
 BarcodeDescC128=Brūkšninio kodo tipas C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Vidinis variklis
 BarCodeNumberManager=Automatinio brūkšninių kodų numerių nustatymo valdiklis
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Ar tikrai norite ištrinti meniu įrašą <b>%s</b> ?
 DeleteLine=Ištrinti eilutę
 ConfirmDeleteLine=Ar tikrai norite ištrinti šią eilutę?
 ##### Tax #####
-TaxSetup=Mokesčių, socialinio draudimo išmokų ir dividendų modulio nustatymai
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Mokėtinas PVM
 OptionVATDefault=Grynųjų pinigų principas
 OptionVATDebitOption=Kaupimo principas
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices modulio nustatymas
 WebServicesDesc=Įjungus šį modulį, Dolibarr tampa interneto serveriu ir teikia įvairias interneto paslaugas.
 WSDLCanBeDownloadedHere=Teikiamų paslaugų WSDL deskriptoriaus failus galima atsisiųsti iš čia
 EndPointIs=SOAP klientai turi siųsti savo prašymus į Dolibarr galinį įrenginį, prieinamą URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Banko modulio nustatymas
 FreeLegalTextOnChequeReceipts=Laisvas tekstas čekių kvituose
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekto modulio nustatymas
 ProjectsModelModule=Projekto ataskaitų dokumento modelis
 TasksNumberingModules=Užduočių numeracijos modulis
 TaskModelModule=Užduočių ataskaitų dokumento modelis
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED nustatymas
 ECMAutoTree = Automatinis medžio aplankas ir dokumentas
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Atidaryti fiskalinius metus
 CloseFiscalYear=Uždaryti fiskalinius metus
 DeleteFiscalYear=Panaikinti fiskalinius metus
 ConfirmDeleteFiscalYear=Ar tikrai panaikinti šiuos fiskalinius metus ?
-Opened=Atidaryta
+Opened=Open
 Closed=Uždaryta
 AlwaysEditable=Visada gali būti redaguojama
 MAIN_APPLICATION_TITLE=Taikyti matomą aplikacijos vardą (įspėjimas: Jūsų nuosavo vardo nustatymas gali nutraukti automatinio prisijungimo funkciją naudojant DoliDroid mobiliąją aplikaciją)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index 1de038b38be..70aa6447949 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Užsakymas %s klasifikuojamas kaip su išrašyta sąskaita
 OrderApprovedInDolibarr=Užsakymas %s patvirtintas
 OrderRefusedInDolibarr=Užsakymas %s atmestas
 OrderBackToDraftInDolibarr=Užsakymas %s grąžintas į projektinę būklę
-OrderCanceledInDolibarr=Užsakymas %s atšauktas
 ProposalSentByEMail=Komercinis pasiūlymas %s išsiųstas e-paštu
 OrderSentByEMail=Kliento užsakymas %s atsiųstas e-paštu
 InvoiceSentByEMail=Kliento sąskaita-faktūra %s išsiųsta e-paštu
@@ -96,3 +95,5 @@ AddEvent=Sukurti įvykį
 MyAvailability=Mano eksploatacinė parengtis
 ActionType=Įvykio tipas
 DateActionBegin=Pradėti įvykio datą
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index beeeaa90f1d..bd44d59466b 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -94,7 +94,7 @@ Conciliate=Suderinti
 Conciliation=Suderinimas
 ConciliationForAccount=Suderinti šią sąskaitą
 IncludeClosedAccount=Įtraukti uždarytas sąskaitas
-OnlyOpenedAccount=Tik atidarytas sąskaitas
+OnlyOpenedAccount=Tik atidarytos sąskaitos
 AccountToCredit=Kredituoti sąskaitą
 AccountToDebit=Debetuoti sąskaitą
 DisableConciliation=Išjungti suderinimo funkciją šiai sąskaitai
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Kliento mokėjimas
 CustomerInvoicePaymentBack=Kliento mokėjimas atgalinis
 SupplierInvoicePayment=Tiekėjo mokėjimas
 WithdrawalPayment=Išėmimo (withdrawal) mokėjimas
-SocialContributionPayment=Socialinės įmokos mokėjimas
+SocialContributionPayment=Socialinio / fiskalinio mokesčio mokėjimas
 FinancialAccountJournal=Finansinės sąskaitos žurnalas
 BankTransfer=Banko pervedimas
 BankTransfers=Banko pervedimai
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 7f5f7daea2d..c3cc6870257 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Sąskaitų-faktūrų skaičius
 NumberOfBillsByMonth=Sąskaitų-faktūrų skaičius pagal mėnesius
 AmountOfBills=Sąskaitų-faktūrų suma
 AmountOfBillsByMonthHT=Sąskaitų-faktūrų suma pagal mėnesius (atskaičius mokesčius)
-ShowSocialContribution=Rodyti socialines įmokas
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Rodyti sąskaitą-faktūrą
 ShowInvoice=Rodyti sąskaitą-faktūrą
 ShowInvoiceReplace=Rodyti pakeičiančią sąskaitą-faktūrą
@@ -270,7 +270,7 @@ BillAddress=Sąskaitos adresas
 HelpEscompte=Ši nuolaida yra nuolaida suteikiama klientui, nes jo mokėjimas buvo atliktas prieš terminą.
 HelpAbandonBadCustomer=Šios sumos buvo atsisakyta (blogas klientas) ir ji yra laikoma išimtiniu nuostoliu.
 HelpAbandonOther=Šios sumos buvo atsisakyta, nes tai buvo klaida (pvz.: neteisingas klientas arba sąskaita-faktūra buvo pakeista kita)
-IdSocialContribution=Socialinių įmokų ID
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Mokėjimo ID
 InvoiceId=Sąskaitos-faktūros ID
 InvoiceRef=Sąskaitos-faktūros nuoroda
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Nedelsiamas
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index d8e71dae52c..a3193b9a4ae 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Paskutinės sutartys
 BoxLastContacts=Paskutiniai kontaktai/adresai
 BoxLastMembers=Paskutiniai nariai
 BoxFicheInter=Paskutinės intervencijos
-BoxCurrentAccounts=Atidarytų sąskaitų balansas
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Pardavimų apyvarta
 BoxTotalUnpaidCustomerBills=Visos nesumokėtos kliento sąskaitos-faktūros
 BoxTotalUnpaidSuppliersBills=Visos nesumokėtos tiekėjo sąskaitos-faktūros
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Paskutiniai %s nariai
 BoxTitleLastFicheInter=Paskutinės %s pakeistos intervencijos
 BoxTitleOldestUnpaidCustomerBills=Seniausios %s neapmokėtos kliento sąskaitos
 BoxTitleOldestUnpaidSupplierBills=Seniausios %s neapmokėtos tiekėjo sąskaitos
-BoxTitleCurrentAccounts=Atidarytų sąskaitų balansas
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Pardavimų apyvarta
 BoxTitleTotalUnpaidCustomerBills=Neapmokėtos kliento sąskaitos
 BoxTitleTotalUnpaidSuppliersBills=Neapmokėtos tiekėjo sąskaitos
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index e601cd2fe33..7ad4a2744d0 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> buvo sėkmingai įrašytas.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Nė vienas
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ši kategorija jau egzistuoja su šia nuoroda
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Turinys nėra matomos visiems
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Klientų/Planų kategorijos
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 52d13af1833..e1b97bd0d13 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Trečiosios šalies kontaktas/adresas
 StatusContactValidated=Adresato/adreso būklė
 Company=Įmonė
 CompanyName=Įmonės pavadinimas
+AliasNames=Pseudonimai (komerciniai, prekių ženklų, ...)
 Companies=Įmonės
 CountryIsInEEC=Šalis yra Europos Ekonominėje Bendrijoje
 ThirdPartyName=Trečiosios šalies pavadinimas
@@ -410,5 +411,10 @@ OutstandingBillReached=Pasiekė neapmokėtų sąskaitų-faktūrų maksimumą
 MonkeyNumRefModelDesc=Gražinimo numeris formatu %syymm-nnnn kliento kodui ir %syymm-nnnn tiekėjo kodui, kur yy yra metai, mm yra mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0.
 LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas bet kada.
 ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...)
-SearchThirdparty=Ieškoti trečios šalies
+SearchThirdparty=Trečios šalies paieška
 SearchContact=Ieškoti kontakto
+MergeOriginThirdparty=Dubliuoti trečiąją šalį (trečiąją šalį, kurią norite ištrinti)
+MergeThirdparties=Sujungti trečiąsias šalis
+ConfirmMergeThirdparties=Ar tikrai norite sujungti šią trečią šalį su dabartine ? Visi susiję objektai (sąskaitos faktūros, užsakymai, ...) bus perkelti į dabartinę trečiąją šalį, todėl jūs galėsite ištrinti pasikartojančius.
+ThirdpartiesMergeSuccess=Trečiosios šalys buvo sujungtos
+ErrorThirdpartiesMerge=Ištrinanat trečiąją šalį įvyko klaida. Prašome patikrinti žurnalą. Pakeitimai buvo panaikinti.
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index fd5be875da4..af7d6d86684 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Gautas PVM
 ToPay=Mokėti
 ToGet=Gauti atgal
 SpecialExpensesArea=Visų specialių atsiskaitymų sritis
-TaxAndDividendsArea=Mokesčių, socialinių įmokų ir dividendų sritis
-SocialContribution=Socialinė įmoka
-SocialContributions=Socialinės įmokos
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Specialios išlaidos
 MenuTaxAndDividends=Mokesčiai ir dividendai
 MenuSalaries=Atlyginimai
-MenuSocialContributions=Socialinės įmokos
-MenuNewSocialContribution=Nauja įmoka
-NewSocialContribution=Naujas socialinė įmoka
-ContributionsToPay=Įmokos mokėti
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Apskaitos/Iždo sritis
 AccountancySetup=Apskaitos nustatymai
 NewPayment=Naujas mokėjimas
 Payments=Mokėjimai
 PaymentCustomerInvoice=Kliento sąskaitos-faktūros mokėjimas
 PaymentSupplierInvoice=Tiekėjo sąskaitos-faktūros apmokėjimas
-PaymentSocialContribution=Socialinės įmokos mokėjimas
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=PVM mokėjimas
 PaymentSalary=Atlyginimo mokėjimas
 ListPayment=Mokėjimų sąrašas
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=PVM mokėjimas
 VATPayments=PVM mokėjimai
-SocialContributionsPayments=Socialinių įmokų mokėjimai
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rodyti PVM mokėjimą
 TotalToPay=Iš viso mokėti
 TotalVATReceived=Gautas iš viso PVM
@@ -116,11 +116,11 @@ NewCheckDepositOn=Sukurti sąskaitos %s depozito kvitą
 NoWaitingChecks=Nėra čekių laukiančių depozito.
 DateChequeReceived=Čekio gavimo data
 NbOfCheques=Čekių skaičius
-PaySocialContribution=Mokėti socialinę įmoką
-ConfirmPaySocialContribution=Ar tikrai norite priskirti šią socialinę įmoką prie apmokėtų ?
-DeleteSocialContribution=Ištrinti socialinę įmoką
-ConfirmDeleteSocialContribution=Ar tikrai norite ištrinti šią socialinę įmoką ?
-ExportDataset_tax_1=Socialinės įmokos ir išmokos
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režimas <b>%sPVM nuo įsipareigojimų apskaitos%s</b>.
 CalcModeVATEngagement=Režimas <b>%sPVM nuo pajamų-išlaidų%s</b>.
 CalcModeDebt=Režimas <b>%sPretenzijos-Skolos%s</b> nurodytas <b>Įsipareigojimų apskaita</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas <b>Pinigų apskaita</b> būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama <b>Įsipareigojimų apskaita</b> režimas (žr. Apskaitos modulio nustatymus).
 CalculationMode=Skaičiavimo metodas
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 480c3ab3d63..b5c06f3b1e5 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -4,10 +4,10 @@ About = Apie
 CronAbout = Apie Cron
 CronAboutPage = Cron apie puslapį
 # Right
-Permission23101 = Skaityti Numatytas užduotis
-Permission23102 = Sukurti/atnaujinti Numatytas užduotis
-Permission23103 = Ištrinti Numatytas užduotis
-Permission23104 = Vykdyti Numatytas užduotis
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Numatytos užduoties valdymo nustatymas
 URLToLaunchCronJobs=URL patikrinti ir pradėti cron darbą, jei reikės
@@ -26,11 +26,11 @@ CronLastOutput=Paskutinė paleista išvestis
 CronLastResult=Paskutinio rezultato kodas
 CronListOfCronJobs=Numatytų darbų sąrašas
 CronCommand=Komanda
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Darbas
@@ -39,8 +39,8 @@ CronDtStart=Pradžios data
 CronDtEnd=Pabaigos data
 CronDtNextLaunch=Kitas vykdymas
 CronDtLastLaunch=Paskutinis vykdymas
-CronFrequency=Dažnis
-CronClass=Klasė
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metodas
 CronModule=Modulis
 CronAction=Veiksmas
@@ -55,9 +55,9 @@ CronEach=Kiekvienas
 JobFinished=Darbas pradėtas ir baigtas
 #Page card
 CronAdd= Pridėti darbus
-CronHourStart= Užduoties pradžios data ir valanda
-CronEvery= Ir vykdyti kiekvieną užduotį
-CronObject= Sukurti Instanciją.Objektą
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Sukurti Instanciją.Objektą
 CronArgs=Parametrai
 CronSaveSucess=Išsaugota sėkmingai
 CronNote=Komentaras
@@ -76,13 +76,14 @@ CronMethodHelp=Objekto metodas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto
 CronArgsHelp=Metodo argumentai. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti <i>0, ProductRef</i>
 CronCommandHelp=Sistemos komandinė eilutė vykdymui
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informacija
 # Common
-CronType=Užduoties tipas
+CronType=Job type
 CronType_method=Dolibarr klasės kvietimo metodas
 CronType_command=Apvalkalo komanda
 CronMenu=Cron
 CronCannotLoadClass=Nepavyko įkelti klasės %s arba objekto %s
 UseMenuModuleToolsToAddCronJobs=Eikite į meniu "Pagrindinis - Modulių įrankiai - Darbo sąrašas" norėdami peržiūrėti ir redaguoti numatytus darbus.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang
index 5ce2723153c..0533d3e47f4 100644
--- a/htdocs/langs/lt_LT/ecm.lang
+++ b/htdocs/langs/lt_LT/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Ieškoti pagal objektą
 ECMSectionOfDocuments=Dokumentų katalogai
 ECMTypeManual=Rankinis
 ECMTypeAuto=Automatinis
-ECMDocsBySocialContributions=Dokumentai, susiję su socialinėmis įmokomis
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumentai, susiję su trečiosiomis šalimis
 ECMDocsByProposals=Dokumentai, susiję su pasiūlymais
 ECMDocsByOrders=Dokumentai, susiję su klientų užsakymais
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index ed8e2deae47..f32a2d1615a 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti
@@ -190,3 +191,4 @@ WarningNotRelevant=Neaktuali operacija šiam duomenų rinkiniui
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index 597f964781a..3040c0f259b 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -3,7 +3,7 @@ HRM=Žmogiškųjų išteklių valdymas (HRM)
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Mėnesio suvestinė
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Priežastis
 UserCP=Vartotojas
 ErrorAddEventToUserCP=Pridedant išimtines atostogas įvyko klaida.
 AddEventToUserOkCP=Išimtinių atostogų pridėjimas baigtas.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Atlieka
 UserUpdateCP=Vartotojui
@@ -93,6 +93,7 @@ ValueOptionCP=Reikšmė
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Patvirtinti konfigūraciją
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Sėkmingai atnaujinta
 ErrorUpdateConfCP=Atnaujinimo metu įvyko klaida, prašome pabandyti dar kartą.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Siunčiant laišką įvyko klaida:
 NoCPforMonth=Šį mėnesį nėra išimtinių atostogų
 nbJours=Dienų skaičius
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Sveiki !
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/lt_LT/incoterm.lang b/htdocs/langs/lt_LT/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/lt_LT/incoterm.lang
+++ b/htdocs/langs/lt_LT/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index a8551d4f356..851683d2de6 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Duomenų bazės serveris - Superuser prieiga
 CheckToCreateDatabase=Žymėti langelį, jei duomenų bazės nėra ir ji turi būti sukurta. <br>Tokiu atveju, turite užpildyti prisijungimo/slaptažodį superuser sąskaitai šio puslapio apačioje.
 CheckToCreateUser=Žymėti langelį, jei duomenų bazės savininko nėra ir jis turi būti sukurtas. <br>Šiuo atveju, jūs turite pasirinkti jo prisijungimo vardą ir slaptažodį ir užpildyti prisijungimo/slaptažodžio superuser sąskaitai šio puslapio apačioje. Jei šis langelis nepažymėtas, savininko duomenų bazė ir jos slaptažodis jau egzistuoja.
 Experimental=(eksperimentinis)
+Deprecated=(užprotestuotas)
 DatabaseRootLoginDescription=Prisijungimas vartotojui leidžia kurti naujas duomenų bazes arba naujus vartotojus. Tai privaloma, jei Jūsų duomenų bazė ar jos savininkas dar neegzistuoja.
 KeepEmptyIfNoPassword=Palikite tuščią, jei vartotojas neturi slaptažodžio (praleisti)
 SaveConfigurationFile=Išsaugoti reikšmes
@@ -155,7 +156,7 @@ MigrationFinished=Perkėlimas baigtas
 LastStepDesc=<strong>Paskutinis žingsnis</strong>: Nustatykite čia prisijungimo vardą ir slaptažodį, kuriuos planuojate naudoti prisijungimui prie programos. Nepameskite jų, nes tai yra administratoriaus, kuris administruoja visus kitus vartotojus, sąskaitos rekvizitai.
 ActivateModule=Įjungti modulį %s
 ShowEditTechnicalParameters=Spauskite čia, kad galėtumete matyti/redaguoti išplėstinius parametrus (eksperto režime)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Įspėjimas: Ar Jūs pasidarėte duomenų bazės atsarginę kopiją ? Tai labai rekomenduotina: pavyzdžiui, dėl kai kurių klaidų duomenų bazės sistemoje (pvz. mysql versija 5.5.40), kai kurie duomenys ar lentelės gali būti prarasti šio proceso metu, todėl, prieš pradedant perkėlimą primygtinai rekomenduojama pasidaryti pilną savo duomenų bazės kopiją. Spausti Gerai, kad pradėti perkėlimo procesą ...
 ErrorDatabaseVersionForbiddenForMigration=Jūsų duomenų bazės versija yra %s. Gali būti kritinė situacija su duomenų praradimu, jeigu pakeisite duomenų bazės struktūrą, kaip reikalaujama perkėlimo proceso metu. Šiuo tikslu perkėlimas nebus leidžiamas, kol nebus atliktas duomenų bazės programos atnaujinimas į aukštesnę versiją (žinomų klaidingų versijų sąrašas: %s)
 
 #########
diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang
index ebb7d44bc39..b82ec9b3131 100644
--- a/htdocs/langs/lt_LT/languages.lang
+++ b/htdocs/langs/lt_LT/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabų
 Language_ar_SA=Arabų
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarų
 Language_bs_BA=Bosnijos
 Language_ca_ES=Katalonų
@@ -21,9 +22,10 @@ Language_en_SA=Anglų (Saudo Arabija)
 Language_en_US=Anglų (JAV)
 Language_en_ZA=Anglų (Pietų Afrika)
 Language_es_ES=Ispanų
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Ispanų (Argentina)
 Language_es_CL=Ispanų (Čilė)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Ispanų (Hondūras)
 Language_es_MX=Ispanų (Meksika)
 Language_es_PY=Ispanų (Paragvajus)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Islandų
 Language_it_IT=Italijos
 Language_ja_JP=Japonijos
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korėjiečių
+Language_lo_LA=Lao
 Language_lt_LT=Lietuvos
 Language_lv_LV=Latvijos
 Language_mk_MK=Makedonijos
@@ -64,6 +69,7 @@ Language_sv_SV=Švedų
 Language_sv_SE=Švedų
 Language_sq_AL=Albanų
 Language_sk_SK=Slovakijos
+Language_sw_SW=Kiswahili
 Language_th_TH=Tailando
 Language_uk_UA=Ukrainiečių
 Language_uz_UZ=Uzbekų
diff --git a/htdocs/langs/lt_LT/loan.lang b/htdocs/langs/lt_LT/loan.lang
new file mode 100644
index 00000000000..4b8f90ad9f0
--- /dev/null
+++ b/htdocs/langs/lt_LT/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Paskola
+Loans=Paskolos
+NewLoan=Nauja paskola
+ShowLoan=Rodyti paskolą
+PaymentLoan=Paskolos apmokėjimas
+ShowLoanPayment=Rodyti paskolos apmokėjimą
+Capital=Kapitalas
+Insurance=Draudimas
+Interest=Palūkanos
+Nbterms=Sąlygos numeris
+LoanAccountancyCapitalCode=Kapitalo sąskaitos Nr.
+LoanAccountancyInsuranceCode=Draudimo sąskaitos Nr.
+LoanAccountancyInterestCode=Palūkanų sąskaitos Nr.
+LoanPayment=Paskolos apmokėjimas
+ConfirmDeleteLoan=Patvirtinti šios paskolos panaikinimą
+LoanDeleted=Skola sėkmingai panaikinta 
+ConfirmPayLoan=Patvirtinti paskolos priskyrimą prie apmokėtų
+LoanPaid=Paskola grąžinta
+ErrorLoanCapital=Paskolos suma turi būti skaičius didesnis už 0.
+ErrorLoanLength=Paskolos terminas turi būti skaičius didesnis už 0.
+ErrorLoanInterest=Metinės palūkanos turi būti skaičius didesnis už 0.
+# Calc
+LoanCalc=Banko paskolų skaičiuoklė
+PurchaseFinanceInfo=Pirkimo ir finansavimo informacija
+SalePriceOfAsset=Turto pardavimo kaina
+PercentageDown=Procentų sumažėjimas
+LengthOfMortgage=Įkeitimo (hipotekos) trukmė
+AnnualInterestRate=Metinė palūkanų norma
+ExplainCalculations=Paaiškinti skaičiavimus
+ShowMeCalculationsAndAmortization=Parodyti skaičiavimus ir amortizaciją
+MortgagePaymentInformation=Įkeisto turto apmokėjimo informacija
+DownPayment=Pradinis mokėjimas
+DownPaymentDesc=<b>Pradinė įmoka</b> = Būsto kaina x procentų sumažėjimo / 100 ( 5% sumažėjimui yra 5/100 or 0.05)
+InterestRateDesc=<b>Palūkanų rodiklis</b> = Metinė palūkanų norma % / 100
+MonthlyFactorDesc=<b>Mėnesio faktorius</b> = Sekančios formulės rezultatas
+MonthlyInterestRateDesc=<b>Mėnesio palūkanų norma</b> = Metinė palūkanų norma / 12
+MonthTermDesc=<b>Mėnesių skaičius</b> = Paskolos metų skaičius x 12
+MonthlyPaymentDesc=Mėnesinė įmoka nustatoma pagal sekančią formulę
+AmortizationPaymentDesc=<a href="#amortizacija">amortizacija</a> parodo kokia mėnesinės įmokos dalis skiriama banko plaūkanoms ir kokia dalis - paskolos dengimui.
+AmountFinanced=Finansuota suma
+AmortizationMonthlyPaymentOverYears=Mėnesinės įmokos amortizacija: <b>%s</b> per %s metų
+Totalsforyear=Iš viso per metus
+MonthlyPayment=Mėnesinė įmoka
+LoanCalcDesc=Ši <b>įkeisto turto skaičiuoklė</b> gali būti naudojama būsto paskolos mėnesinių įmokų skaičiavimui, atsižvelgiant į namo pardavimo kainą, paskolos trukmę, pirkėjo pradinės įmokos procentą ir paskolos palūkanų normą. <br> Ši skaičiuoklė atsižvelgia į PĮBD (Privataus įkeisto Būsto Draudimas) paskoloms, kur pradinė įmoka yra mažiau kaip 20%. Taip pat atsižvelgiama į nekilnojamo turto mokesčius ir jų įtaką mėnesinėms paskolos grą-inimo įmokoms.<br>
+GoToInterest=%s skiriama PALŪKANOMS
+GoToPrincipal=%s skiriama PASKOLOS GRĄŽINIMUI
+YouWillSpend=Jūs išleisite %s Jūsų namui per metus %s
+# Admin
+ConfigLoan=Paskolos modulio konfigūracija
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Kapitalo sąskaitos Nr. pagal nutylėjimą
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Palūkanų sąskaitos Nr. pagal nutylėjimą
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Draudimo sąskaitos Nr. pagal nutylėjimą
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 609ecce2f42..d8fbfa022d5 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Skaityti kvitą
 YourMailUnsubcribeOK=E-paštas <b>%s</b> yra teisingai pašalintas iš adresatų sąrašo
 MailtoEMail=Hiper sąsaja e-paštui
 ActivateCheckRead=Leisti naudotis "Unsubcribe" sąsaja
-ActivateCheckReadKey=Naudoti raktą URL naudojimo užšifravimui "Skaityti siuntą" ir "Pašalinti" funkcijai
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-laiškas išsiųstas %s gavėjams.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=Dokumentas, naudojantis sąskaitos-faktūros šabloną pagal nutylėjimą, bus sukurtas ir pridedamas prie kiekvieno e-laiško.
@@ -128,6 +128,7 @@ TagCheckMail=Sekti pašto atidarymą
 TagUnsubscribe=Pašalinti sąsają
 TagSignature=Siuntimo vartotojo parašas
 TagMailtoEmail=Gavėjo e-paštas
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Pranešimai
 NoNotificationsWillBeSent=Nėra numatytų e-pašto pranešimų šiam įvykiui ir įmonei
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 75b35baf4f7..2f83757a486 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
 FormatDateShortJQueryInput=mm/dd/yy
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=val:min
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
@@ -57,15 +57,15 @@ ErrorSomeErrorWereFoundRollbackIsDone=Rastos kai kurios klaidos. Pakeitimai atš
 ErrorConfigParameterNotDefined=Parametras <b>%s</b> nėra apibrėžta Dolibarr konfigūracijos faile <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Nepavyko rasti vartotojo <b>%s</b> Dolibarr duomenų bazėje.
 ErrorNoVATRateDefinedForSellerCountry=Klaida, nėra apibrėžtų PVM tarifų šaliai '%s'.
-ErrorNoSocialContributionForSellerCountry=Klaida, nėra apibrėžtų socialinių įmokų šaliai '%s'.
+ErrorNoSocialContributionForSellerCountry=Klaida, socialiniai / fiskaliniai mokesčiai neapibrėžti šaliai '%s'.
 ErrorFailedToSaveFile=Klaida, nepavyko išsaugoti failo.
 SetDate=Nustatyti datą
 SelectDate=Pasirinkti datą
 SeeAlso=Taip pat žiūrėkite %s
-SeeHere=See here
+SeeHere=Žiūrėkite čia
 BackgroundColorByDefault=Fono spalva pagal nutylėjimą
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
+FileNotUploaded=Failas nebuvo įkeltas
+FileUploaded=Failas buvo sėkmingai įkeltas
 FileWasNotUploaded=Failas prikabinimui pasirinktas, bet dar nebuvo įkeltas. Paspauskite tam "Pridėti failą".
 NbOfEntries=Įrašų skaičius
 GoToWikiHelpPage=Skaityti tiesioginės pagalbos žinyne (būtina interneto prieiga)
@@ -141,7 +141,7 @@ Cancel=Atšaukti
 Modify=Pakeisti
 Edit=Redaguoti
 Validate=Patvirtinti
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Patvirtinti ir leisti
 ToValidate=Patvirtinti
 Save=Išsaugoti
 SaveAs=Įšsaugoti kaip
@@ -159,7 +159,7 @@ Search=Ieškoti
 SearchOf=Ieškoti
 Valid=Galiojantis
 Approve=Patvirtinti
-Disapprove=Disapprove
+Disapprove=Nepritarti
 ReOpen=Atidaryti iš naujo
 Upload=Siųsti failą
 ToLink=Nuoroda
@@ -173,7 +173,7 @@ User=Vartotojas
 Users=Vartotojai
 Group=Grupė
 Groups=Grupės
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Nėra apibrėžtos vartotojų grupės
 Password=Slaptažodis
 PasswordRetype=Pakartokite slaptažodį
 NoteSomeFeaturesAreDisabled=Atkreipkite dėmesį, kad daug funkcijų/modulių yra išjungti šioje demonstracijoje.
@@ -211,7 +211,7 @@ Limit=Riba
 Limits=Ribos
 DevelopmentTeam=Vystymo komanda
 Logout=Atsijungti
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+NoLogoutProcessWithAuthMode=Nėra tinkamos atjungimo funkcijos su autentifikavimo režimu <b>%s</b>
 Connection=Sujungimas
 Setup=Nustatymai
 Alert=Įspėjimas
@@ -220,9 +220,9 @@ Next=Sekantis
 Cards=Kortelės
 Card=Kortelė
 Now=Dabar
-HourStart=Start hour
+HourStart=Pradėti valandą
 Date=Data
-DateAndHour=Date and hour
+DateAndHour=Data ir valanda
 DateStart=Pradžios data
 DateEnd=Pabaigos data
 DateCreation=Sukūrimo data
@@ -243,8 +243,8 @@ DatePlanShort=Suplanuota data
 DateRealShort=Reali data
 DateBuild=Ataskaitos sudarymo data
 DatePayment=Mokėjimo data
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
+DateApprove=Patvirtinimo data
+DateApprove2=Patvirtinimo data (antrasis patvirtinimas)
 DurationYear=metai
 DurationMonth=mėnuo
 DurationWeek=savaitė
@@ -267,7 +267,7 @@ days=dienos
 Hours=Valandos
 Minutes=Minutės
 Seconds=Sekundės
-Weeks=Weeks
+Weeks=Savaitės
 Today=Šiandien
 Yesterday=Vakar
 Tomorrow=Rytoj
@@ -276,7 +276,7 @@ Afternoon=Popietė
 Quadri=Ketur-
 MonthOfDay=Dienos mėnuo
 HourShort=H
-MinuteShort=mn
+MinuteShort=MN
 Rate=Norma
 UseLocalTax=Įtraukti mokestį
 Bytes=Baitų
@@ -301,8 +301,8 @@ UnitPriceHT=Vieneto kaina (grynoji)
 UnitPriceTTC=Vieneto kaina
 PriceU=U.P.
 PriceUHT=U.P. (grynasis)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. grynasis Prašomas
+PriceUTTC=U.P. (įsk. mokesčius)
 Amount=Suma
 AmountInvoice=Sąskaitos-faktūros suma
 AmountPayment=Mokėjimo suma
@@ -339,6 +339,7 @@ IncludedVAT=Įtraukta mokesčių
 HT=Atskaityta mokesčių
 TTC=Įtraukta mokesčių
 VAT=Pardavimo mokestis
+VATs=Pardavimų mokesčiai
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Mokesčio tarifas
@@ -352,10 +353,10 @@ FullList=Pilnas sąrašas
 Statistics=Statistika
 OtherStatistics=Kiti statistika
 Status=Būklė
-Favorite=Favorite
+Favorite=Favoritas
 ShortInfo=Informacija
 Ref=Nuoroda
-ExternalRef=Ref. extern
+ExternalRef=Nuoroda išorinė
 RefSupplier=Tiekėjo nuoroda
 RefPayment=Mokėjimo nuoroda
 CommercialProposalsShort=Komerciniai pasiūlymai
@@ -370,7 +371,7 @@ ActionNotApplicable=Netaikomas
 ActionRunningNotStarted=Pradėti
 ActionRunningShort=Pradėtas
 ActionDoneShort=Baigtas
-ActionUncomplete=Uncomplete
+ActionUncomplete=Nepilnas
 CompanyFoundation=Įmonė/Organizacija
 ContactsForCompany=Šios trečiosios šalies adresatas
 ContactsAddressesForCompany=Adresatai/adresai šiai trečiajai šaliai
@@ -379,7 +380,7 @@ ActionsOnCompany=Įvykiai su šia trečiają šalimi
 ActionsOnMember=Įvykiai su šiuo nariu
 NActions=%s įvykiai
 NActionsLate=%s vėluoja
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Prašymas jau įregistruotas
 Filter=Filtras
 RemoveFilter=Pašalinti filtrą
 ChartGenerated=Sukurta diagrama
@@ -398,8 +399,8 @@ Available=Prieinamas
 NotYetAvailable=Dar nėra prieinamas
 NotAvailable=Nėra prieinamas
 Popularity=Populiarumas
-Categories=Tags/categories
-Category=Tag/category
+Categories=Žymės / kategorijos
+Category=Žymė / Kategorija
 By=Pagal
 From=Nuo
 to=į
@@ -411,8 +412,10 @@ OtherInformations=Kita informacija
 Quantity=Kiekis
 Qty=Kiekis
 ChangedBy=Pakeitė
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
+ApprovedBy=Patvirtinta (kieno)
+ApprovedBy2=Patvirtinta (antras patvirtinimas) (kieno)
+Approved=Patvirtinta
+Refused=Atmestas
 ReCalculate=Perskaičiuoti
 ResultOk=Sėkmė
 ResultKo=Nesėkmė
@@ -421,7 +424,7 @@ Reportings=Ataskaitos
 Draft=Projektas
 Drafts=Projektai
 Validated=Pripažinti galiojančiais
-Opened=Atidaryta
+Opened=Atidarytas
 New=Naujas
 Discount=Nuolaida
 Unknown=Nežinomas
@@ -525,13 +528,13 @@ NbOfCustomers=Klientų skaičius
 NbOfLines=Eilučių skaičius
 NbOfObjects=Objektų skaičius
 NbOfReferers=Perdavėjų skaičius
-Referers=Refering objects
+Referers=Susiję objektai
 TotalQuantity=Visas kiekis
 DateFromTo=Nuo %s į %s
 DateFrom=Nuo %s
 DateUntil=Iki %s
 Check=Patikrinti
-Uncheck=Uncheck
+Uncheck=Nuimkite žymę
 Internal=Vidinis
 External=Išorinis
 Internals=Vidinis
@@ -570,7 +573,7 @@ MailSentBy=E-Laišką atsiuntė
 TextUsedInTheMessageBody=E-laiško pagrindinė dalis
 SendAcknowledgementByMail=Siųsti patvirtinimą e-paštu
 NoEMail=E-laiškų nėra
-NoMobilePhone=No mobile phone
+NoMobilePhone=Nėra mobilaus telefono
 Owner=Savininkas
 DetectedVersion=Aptikta versija
 FollowingConstantsWillBeSubstituted=Šios konstantos bus pakeistos atitinkamomis reikšmėmis
@@ -625,8 +628,8 @@ Notes=Pastabos
 AddNewLine=Pridėti naują eilutę
 AddFile=Pridėti failą
 ListOfFiles=Galimų failų sąrašas
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
+FreeZone=Laisvas įvedimas
+FreeLineOfType=Nemokamas tipo įėjimas
 CloneMainAttributes=Klonuoti objektą su savo pagrindiniais atributais
 PDFMerge=PDF sujungimas
 Merge=Sujungti
@@ -663,7 +666,7 @@ OptionalFieldsSetup=Papildomų atributų nustatymas
 URLPhoto=Nuotraukos/logotipo URL
 SetLinkToThirdParty=Saitas į kitą trečiąją šalį
 CreateDraft=Sukurti projektą
-SetToDraft=Back to draft
+SetToDraft=Atgal į projektą
 ClickToEdit=Spausk redaguoti
 ObjectDeleted=Objektas %s ištrintas
 ByCountry=Pagal šalį
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Susieta su tam tikro vartotojo adresatu
 DeleteAFile=Ištrinti failą
 ConfirmDeleteAFile=Ar tikrai norite ištrinti failą ?
 NoResults=Nėra rezultatų
+SystemTools=Sistemos įrankiai
 ModulesSystemTools=Modulių įrankiai
 Test=Bandymas
 Element=Elementas
@@ -691,18 +695,21 @@ HelpCopyToClipboard=Naudokite Ctrl+C kopijuoti į iškarpinę (clipboard)
 SaveUploadedFileWithMask=Išsaugokite failą serveryje su pavadinimu "<strong>%s</strong>" (kitaip "%s")
 OriginFileName=Originalus failo pavadinimas
 SetDemandReason=Nustatykite šaltinį
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Nustatykite banko sąskaitą
+AccountCurrency=Sąskaitos valiuta
 ViewPrivateNote=Peržiūrėti pastabas
 XMoreLines=%s paslėptos eilutės
 PublicUrl=Viešas URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show transaction
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
+AddBox=Pridėti langelį
+SelectElementAndClickRefresh=Pasirinkite elementą ir spustelėkite Atnaujinti
+PrintFile=Spausdinti failą %s
+ShowTransaction=Rodyti sandorį
+GoIntoSetupToChangeLogo=Eiti į Pradžia - Nustatymai - Bendrovė, kad pakeisti logotipą arba eikite į Pradžia - Nustatymai - Ekranas, kad paslėpti.
+Deny=Atmesti
+Denied=Atmestas
+ListOfTemplates=Šablonų sąrašas
+Genderman=Vyras
+Genderwoman=Moteris
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
@@ -732,3 +739,4 @@ ShortThursday=Ke
 ShortFriday=Pe
 ShortSaturday=Še
 ShortSunday=Se
+SelectMailModel=Pasirinkite el.pašto šabloną
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 5169ac2887d..bfbe003a2c0 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -199,7 +199,8 @@ Entreprises=Įmonės
 DOLIBARRFOUNDATION_PAYMENT_FORM=Norint atlikti pasirašymo apmokėjimą naudojant banko pervedimą, žiūrėti psl.: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br> Mokėti naudojant kreditinę kortelę arba PayPal, spauskite mygtuką šio puslapio apačioje.<br>
 ByProperties=Pagal savybes
 MembersStatisticsByProperties=Narių statistiniai duomenys pagal savybes
-MembersByNature=Nariai pagal kilmę
+MembersByNature=Šis ekranas rodo Jums statistinius duomenis apie narius pagal jų tipą.
+MembersByRegion=Šis ekranas rodo Jums statistinius duomenis apie narius pagal regionus.
 VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas
 NoVatOnSubscription=Pasirašymams nėra PVM
 MEMBER_PAYONLINE_SENDEMAIL=Įspėti, kai Dolibarr gauna patvirtinimą apie mokėjimą už pasirašymą, nusiunčiant e-laišką
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index ccbf633869e..37b04c179f6 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Tiekėjo užsakymas
 SuppliersOrders=Tiekėjų užsakymai
 SuppliersOrdersRunning=Dabartiniai tiekėjų užsakymai
 CustomerOrder=Kliento užsakymas
-CustomersOrders=Klientų užsakymai
-CustomersOrdersRunning=Dabartiniai klientų užsakymai
-CustomersOrdersAndOrdersLines=Klientų užsakymai ir užsakymų eilės
-OrdersToValid=Klientų užsakymai patvirtinimui
-OrdersToBill=Klientų užsakymai pristatyti
-OrdersInProcess=Klientų užsakymai vykdomi šiuo metu
-OrdersToProcess=Klientų užsakymai vykdymui
-SuppliersOrdersToProcess=Tiekėjų užsakymai vykdymui
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Atšauktas
 StatusOrderDraftShort=Projektas
 StatusOrderValidatedShort=Patvirtintas
@@ -75,8 +75,9 @@ AddToMyOrders=Įtraukti į mano užsakymus
 AddToOtherOrders=Įtraukti į kitų užsakymus
 AddToDraftOrders=Pridėti į užsakymo projektą
 ShowOrder=Rodyti užsakymą
-NoOpenedOrders=Nėra atidarytų užsakymų
-NoOtherOpenedOrders=Nėra kitų atidarytų užsakymų
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Nėra užsakymų projektų
 OtherOrders=Kiti užsakymai
 LastOrders=Paskutinio %s kliento užsakymai
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 084e67f7575..a2da33ecb0e 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervencija patvirtinta
 Notify_FICHINTER_SENTBYMAIL=Intervencija nusiųsta paštu
 Notify_BILL_VALIDATE=Kliento sąskaita-faktūra patvirtinta
 Notify_BILL_UNVALIDATE=Kliento sąskaita-faktūra nepatvirtinta
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Tiekėjo užsakymas patvirtintas
 Notify_ORDER_SUPPLIER_REFUSE=Tiekėjo užsakymas atmestas
 Notify_ORDER_VALIDATE=Kliento užsakymas patvirtintas
@@ -203,6 +204,7 @@ ClickHereToGoTo=Spauskite čia norėdami pereiti į %s
 YouMustClickToChange=Pirmiausia turite paspausti ant šios nuorodos ir patvirtinti šį slaptažodžio pakeitimą
 ForgetIfNothing=Jei neprašėte šio pakeitimo, tiesiog pamirškite šį pranešimą. Jūsų mandatai yra saugūs.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Pridėti įrašą kalendoriuje %s
diff --git a/htdocs/langs/lt_LT/printing.lang b/htdocs/langs/lt_LT/printing.lang
index f0cd2a40292..6f2cabc2146 100644
--- a/htdocs/langs/lt_LT/printing.lang
+++ b/htdocs/langs/lt_LT/printing.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
 PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
+ListDrivers=Draiverių sąrašas
+PrintTestDesc=Printerių sąrašas
 FileWasSentToPrinter=File %s was sent to printer
 NoActivePrintingModuleFound=No active module to print document
 PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
-TestDriver=Test
+SetupDriver=Draiverio nustatymai
+TestDriver=Testas
 TargetedPrinter=Targeted printer
 UserConf=Setup per user
-PRINTGCP=Google Cloud Print
+PRINTGCP=Google Cloud spausdinimas
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
+PRINTGCP_LOGIN=Google Account Login'as
 PRINTGCP_PASSWORD=Google Account Password
-STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
+STATE_ONLINE=Tiesioginis
+STATE_UNKNOWN=Nežinomas
 STATE_OFFLINE=Offline
 STATE_DORMANT=Offline for quite a while
 TYPE_GOOGLE=Google
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 6148b31c11a..40e3b683071 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produktas ar Paslauga
 ProductsAndServices=Produktai ir Paslaugos
 ProductsOrServices=Produktai ar Paslaugos
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Produktų ir paslaugų statistika
 ProductsStatistics=Produktų statistika
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Vidinė nuoroda
 LastRecorded=Naujausi produktai / paslaugos įregistruoti pardavimuose
@@ -44,7 +44,7 @@ CardProduct1=Paslaugos kortelė
 CardContract=Sutarties kortelė
 Warehouse=Sandėlis
 Warehouses=Sandėliai
-WarehouseOpened=Sandėlis atidarytas
+WarehouseOpened=Warehouse open
 WarehouseClosed=Sandėlis uždarytas
 Stock=Atsarga
 Stocks=Atsargos
@@ -71,21 +71,21 @@ SellingPriceTTC=Pardavimo kaina (įskaitant mokesčius)
 PublicPrice=Vieša kaina
 CurrentPrice=Dabartinė kaina
 NewPrice=Nauja kaina
-MinPrice=Minimali pardavimo kaina
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Pardavimo kaina negali būti mažesnė už minimalią leidžiamą šiam produktui (%s be mokesčių). Šis pranešimas taip pat gali pasirodyti, jei įvedate per labai didelę nuolaidą.
 ContractStatus=Sutarties būklė
 ContractStatusClosed=Uždarytas
-ContractStatusRunning=Veikia
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Pasibaigęs
-ContractStatusOnHold=Neveikia
-ContractStatusToRun=To get running
-ContractNotRunning=Ši sutartis nevykdoma
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Produktas su nuoroda %s jau egzistuoja.
 ErrorProductBadRefOrLabel=Neteisinga nuorodos ar etiketės reikšmė
 ErrorProductClone=Iškilo problema bandant klonuoti produktą ar paslaugą.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Tiekėjai
 SupplierRef=Tiekėjo produkto nuoroda
 ShowProduct=Rodyti produktą
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jei produktas yra paslauga su ribota trukme:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Kainų skaičius
 MultiPriceLevelsName=Kainų kategorijos
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Prisijungti
 Translation=Vertimas
 KeywordFilter=Raktažodižio filtras
@@ -131,7 +131,7 @@ ProductToAddSearch=Ieškoti produkto pridėjimui
 AddDel=Pridėti/Ištrinti
 Quantity=Kiekis
 NoMatchFound=Atitikimų nerasta
-ProductAssociationList=Susijusių produktų/paslaugų sąrašas: produkto/paslaugos pavadinimas (paveiktas kiekis)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Vienas iš pasirinkto produkto yra patronuojantis einamam produktui
 DeleteProduct=Ištrinti produktą/paslaugą
@@ -179,16 +179,41 @@ CloneProduct=Klonuoti produktą ar paslaugą
 ConfirmCloneProduct=Ar tikrai norite klonuoti produktą ar paslaugą <b>%s</b> ?
 CloneContentProduct=Klonuoti visą pagrindinę produkto/paslaugos informaciją
 ClonePricesProduct=Klonuoti pagrindinę informaciją ir kainas
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Šis produktas naudojamas
 NewRefForClone=Naujo produkto/paslaugos nuoroda
-CustomerPrices=Klientų kainos
-SuppliersPrices=Tiekėjų kainos
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Muitinės kodas
 CountryOrigin=Kilmės šalis
 HiddenIntoCombo=Nematoma pasirinktuose sąrašuose
 Nature=Prigimtis
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Produkto šablono nuoroda
 ServiceCodeModel=Paslaugos šablono nuoroda
 AddThisProductCard=Sukurti produkto kortelę
@@ -214,7 +239,7 @@ CostPmpHT=Grynasis visų VWAP
 ProductUsedForBuild=Auto suvartotojimas pagal gamybą
 ProductBuilded=Gamyba baigta
 ProductsMultiPrice=Produkto multi-kaina
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Produktų apyvarta per ketvirtį VWAP
 ServiceSellByQuarterHT=Paslaugų apyvarta per ketvirtį VWAP
 Quarter1=I ketvirtis
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Nustatykite brūkšninio kodo reikšmę visiems įraš
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Pridėti kainą pagal klientus
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Nustatykite tą pačią kainą ir kliento dukterinėms įmonėms
 PriceByCustomerLog=Kaina pagal kliento žurnalą
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 98c53e1f452..718372d8584 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -3,21 +3,22 @@ RefProject=Projekto nuoroda
 ProjectId=Projekto ID
 Project=Projektas
 Projects=Projektai
-ProjectStatus=Project status
+ProjectStatus=Projekto statusas
 SharedProject=Visi
 PrivateProject=Kontaktai projekte
 MyProjectsDesc=Šis vaizdas yra ribotas projektams, kuriems esate kontaktinis asmuo (koks bebūtų tipas).
 ProjectsPublicDesc=Šis vaizdas rodo visus projektus, kuriuos yra Jums leidžiama skaityti.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Čia rodomi visi projektai ir užduotys, kuriuos Jums leidžiama skaityti.
 ProjectsDesc=Šis vaizdas rodo visus projektus (Jūsų vartotojo teisės leidžia matyti viską).
 MyTasksDesc=Šis vaizdas yra ribotas projektams ar užduotims, kuriems Jūs esate kontaktinis asmuo (koks bebūtų tipas).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Matomi tik atidaryti projektai (projektai juodraščiai ar uždaryti projektai nematomi).
 TasksPublicDesc=Šis vaizdas rodo visus projektus ir užduotis, kuriuos Jums leidžiama skaityti.
 TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teisės leidžia matyti viską).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projektų sritis
 NewProject=Naujas projektas
-AddProject=Create project
+AddProject=Sukurti projektą
 DeleteAProject=Ištrinti projektą
 DeleteATask=Ištrinti užduotį
 ConfirmDeleteAProject=Ar tikrai norite ištrinti šį projektą?
@@ -32,8 +33,8 @@ NoProject=Nėra apibrėžto ar turimo projekto
 NbOpenTasks=Atidarytų užduočių skaičius
 NbOfProjects=Projektų skaičius
 TimeSpent=Praleistas laikas
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Jūsų sugaištas laikas
+TimeSpentByUser=Vartotojo sugaištas laikas
 TimesSpent=Praleistas laikas
 RefTask=Užduoties nuoroda
 LabelTask=Etiketės užduotis
@@ -41,8 +42,8 @@ TaskTimeSpent=Laikas, praleistas vykdant užduotis
 TaskTimeUser=Vartotojas
 TaskTimeNote=Pastaba
 TaskTimeDate=Data
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=Užduotys atidarytuose projektuose
+WorkloadNotDefined=Darbo krūvis nėra apibrėžtas
 NewTimeSpent=Naujas praleistas laikas
 MyTimeSpent=Mano praleistas laikas
 MyTasks=Mano užduotys
@@ -52,7 +53,7 @@ TaskDateStart=Užduoties pradžios data
 TaskDateEnd=Užduoties pabaigos data
 TaskDescription=Užduoties aprašymas
 NewTask=Nauja užduotis
-AddTask=Create task
+AddTask=Sukurti užduotį
 AddDuration=Pridėti trukmę
 Activity=Veikla
 Activities=Užduotys/veikla
@@ -72,9 +73,11 @@ ListSupplierOrdersAssociatedProject=Tiekėjo užsakymų, susijusių su projektu,
 ListSupplierInvoicesAssociatedProject=Tiekėjo sąskaitų-faktūrų, susijusių su projektu, sąrašas
 ListContractAssociatedProject=Sudarytų sutarčių, susijusių su projektu, sąrašas
 ListFichinterAssociatedProject=Intervencijų, susijusių su projektu, sąrašas
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
-ListDonationsAssociatedProject=List of donations associated with the project
+ListExpenseReportsAssociatedProject=Išlaidų, susijusių su projektu, ataskaitų sąrašas.
+ListDonationsAssociatedProject=Paaukotų lėšų, susijusių su projektu, sąrašas.
 ListActionsAssociatedProject=Įvykių, susijusių su projektu, sąrašas
+ListTaskTimeUserProject=Projekto užduotims sunaudoto laiko sąrašas.
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Projekto aktyvumas šią savaitę
 ActivityOnProjectThisMonth=Projekto aktyvumas šį mėnesį
 ActivityOnProjectThisYear=Projekto aktyvumas šiais metais
@@ -93,13 +96,13 @@ ActionsOnProject=Projekto įvykiai
 YouAreNotContactOfProject=Jūs nesate šios privataus projekto kontaktinis adresatas
 DeleteATimeSpent=Ištrinti praleistą laiką
 ConfirmDeleteATimeSpent=Ar tikrai norite ištrinti šį praleistą laiką ?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Taip pat žiūrėti užduotis pavestas ne man
+ShowMyTasksOnly=Rodyti tik man pavestas užduotis
 TaskRessourceLinks=Ištekliai
 ProjectsDedicatedToThisThirdParty=Projektai, skirti šiai trečiąjai šaliai
 NoTasks=Nėra uždavinių šiam projektui
 LinkedToAnotherCompany=Susijęs su kita trečiąja šalimi
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Užduotis nėra priskirta jums
 ErrorTimeSpentIsEmpty=Praleistas laikas yra tuščias
 ThisWillAlsoRemoveTasks=Šis veiksmas taip pat ištrins visas projekto užduotis (<b>%s</b> užduotis šiuo metu) ir visus praleisto laiko įvestus duomenis.
 IfNeedToUseOhterObjectKeepEmpty=Jei kai kurie objektai (sąskaitos-faktūros, užsakymai, ...), priklausantys kitai trečiąjai šaliai, turi būti susiję su kuriamu projektu, laikykite šitą tuščią, kad projektas būtų kelių trečiųjų šalių (multi).
@@ -109,7 +112,7 @@ CloneContacts=Klonuoti kontaktus
 CloneNotes=Klonuoti pastabas
 CloneProjectFiles=Klonuoti projekto jungiamus failus
 CloneTaskFiles=Klonuoti užduoties (-ių) jungiamus failus (jei užduotis (-ys) klonuotos)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneMoveDate=Atnaujinti projekto / užduočių datas nuo dabar ?
 ConfirmCloneProject=Ar tikrai norite klonuoti šį projektą ?
 ProjectReportDate=Pakeisti užduoties datą priklausomai nuo projekto pradžios datos
 ErrorShiftTaskDate=Neįmanoma perkelti užduoties datą į naujo projekto pradžios datą
@@ -129,18 +132,25 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Aukotojas
 TypeContact_project_task_external_TASKCONTRIBUTOR=Straipsnio autorius
 SelectElement=Pasirinkti elementą
 AddElement=Susieti su elementu
-UnlinkElement=Unlink element
+UnlinkElement=Atsieti elementą
 # Documents models
 DocumentModelBaleine=Pilnas projekto ataskaitos modelis (logo. ..)
 PlannedWorkload=Planuojamas darbo krūvis
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
+PlannedWorkloadShort=Darbo krūvis
+WorkloadOccupation=Darbo krūvio priskyrimas
 ProjectReferers=Nurodomi objektai
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+SearchAProject=Projekto paieška
+ProjectMustBeValidatedFirst=Projektas turi būti pirmiausia patvirtintas
+ProjectDraft=Projektų juodraščiai
+FirstAddRessourceToAllocateTime=Susieti išteklius laiko paskirstymui
+InputPerDay=Įvesčių per dieną
+InputPerWeek=Įvesčių per savaitę
+InputPerAction=Įvesčių vienam veiksmui
+TimeAlreadyRecorded=sugaištas laikas, jau įrašytas šiai užduočiai / dienai ir vartotojas %s
+ProjectsWithThisUserAsContact=Projektai su šiuo vartotoju kaip kontaktu.
+TasksWithThisUserAsContact=Užduotys, priskirtos šiam vartotojui
+ResourceNotAssignedToProject=Nepriskirtas projektui
+ResourceNotAssignedToTask=Nepriskirtas užduočiai
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/lt_LT/propal.lang b/htdocs/langs/lt_LT/propal.lang
index 606961e68f3..bdf1361ffd4 100644
--- a/htdocs/langs/lt_LT/propal.lang
+++ b/htdocs/langs/lt_LT/propal.lang
@@ -4,7 +4,7 @@ Proposal=Komercinis pasiūlymas
 ProposalShort=Pasiūlymas
 ProposalsDraft=Komercinių pasiūlymų projektai
 ProposalDraft=Komercinio pasiūlymo projektas
-ProposalsOpened=Atidaryti komerciniai pasiūlymai
+ProposalsOpened=Open commercial proposals
 Prop=Komerciniai pasiūlymai
 CommercialProposal=Komercinis pasiūlymas
 CommercialProposals=Komerciniai pasiūlymai
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Suma pagal mėnesį (atskaičius mokesčius)
 NbOfProposals=Komercinių pasiūlymų skaičius
 ShowPropal=Rodyti pasiūlymą
 PropalsDraft=Projektai
-PropalsOpened=Atidaryta
+PropalsOpened=Open
 PropalsNotBilled=Uždaryta be pateiktų sąskaitų-faktūrų
 PropalStatusDraft=Projektas (turi būti patvirtintas)
 PropalStatusValidated=Patvirtintas (pasiūlymas yra atidarytas)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nepasirašyta (uždarytas)
 PropalStatusBilled=Sąskaita-faktūra pateikta
 PropalStatusDraftShort=Projektas
 PropalStatusValidatedShort=Patvirtinta
-PropalStatusOpenedShort=Atidaryta
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Uždarytas
 PropalStatusSignedShort=Pasirašyta
 PropalStatusNotSignedShort=Nepasirašyta
@@ -51,8 +51,8 @@ PropalsToClose=Komerciniai pasiūlymai uždarymui
 PropalsToBill=Pasirašyti komerciniai pasiūlymai sąskaitoms-faktūroms
 ListOfProposals=Komercinių pasiūlymų sąrašas
 ActionsOnPropal=Pasiūlymų įvykiai
-NoOpenedPropals=Neatidaryti komerciniai pasiūlymai
-NoOtherOpenedPropals=Nėra kitų atidarytų komercinių pasiūlymų
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Komercinio pasiūlymo nuoroda
 SendPropalByMail=Siųsti komercinį pasiūlymą paštu
 AssociatedDocuments=Dokumentai, susiję su pasiūlymu:
@@ -98,3 +98,4 @@ DocModelJauneDescription="Žalias" pasiūlymo modelis
 DefaultModelPropalCreate=Modelio sukūrimas pagal nutylėjimą
 DefaultModelPropalToBill=Šablonas pagal nutylėjimą, kai uždaromas verslo pasiūlymas (turi būti išrašyta sąskaita-faktūra)
 DefaultModelPropalClosed=Šablonas pagal nutylėjimą, kai uždaromas verslo pasiūlymas (sąskaita-faktūra neišrašoma)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
index a36e72679b2..e0345836347 100644
--- a/htdocs/langs/lt_LT/salaries.lang
+++ b/htdocs/langs/lt_LT/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Rodyti atlyginimo mokėjimą
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 3003c65d6b7..7d864bdf4a3 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Paprastas dokumento modelis
 DocumentModelMerou=Merou A5 modelis
 WarningNoQtyLeftToSend=Įspėjimas, nėra produktų, laukiančių išsiuntimo
 StatsOnShipmentsOnlyValidated=Tik patvirtintas siuntas parodanti statistika. Naudojama data yra siuntos patvirtinimo data (suplanuota pristatymo data yra ne visada žinoma).
-DateDeliveryPlanned=Suplanuota pristatymo data
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Pristatymo gavimo data
 SendShippingByEMail=Siųsti siuntą e-paštu
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 8f51f32a959..80eea875ee4 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -24,7 +24,7 @@ ErrorWarehouseLabelRequired=Sandėlio etiketė būtina
 CorrectStock=Koreguoti atsargas
 ListOfWarehouses=Sandėlių sąrašas
 ListOfStockMovements=Atsargų judėjimų sąrašas
-StocksArea=Warehouses area
+StocksArea=Sandėlių plotas
 Location=Vieta
 LocationSummary=Trumpas vietos pavadinimas
 NumberOfDifferentProducts=Skirtingų produktų skaičius
@@ -63,11 +63,11 @@ ReStockOnValidateOrder=Padidinti realias atsargas tiekėjų užsakymų patvirtin
 ReStockOnDispatchOrder=Padidinti realias atsargas, rankiniu būdu atliekant išsiuntimą į sandėlius, gavus tiekėjo užsakymą
 ReStockOnDeleteInvoice=Padidinti realias atsargas ištrinant sąskaitą-faktūrą
 OrderStatusNotReadyToDispatch=Užsakymas dar neturi arba jau nebeturi statuso, kuris leidžia išsiųsti produktus į atsargų sandėlius.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Skirtumo tarp fizinių ir teorinių atsargų sandėlyje paaiškinimas
 NoPredefinedProductToDispatch=Nėra iš anksto nustatytų produktų šiam objektui. Atsargų siuntimas nėra reikalingas
 DispatchVerb=Išsiuntimas
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Riba perspėjimui
+StockLimit=Sandėlio riba perspėjimui
 PhysicalStock=Fizinės atsargos
 RealStock=Realios atsargos
 VirtualStock=Virtualios atsargos
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Pasirinkite sandėlį atsargų sumažėjimui
 SelectWarehouseForStockIncrease=Pasirinkite sandėlį atsargų padidėjimui
 NoStockAction=Nėra veiksmų su atsargomis
 LastWaitingSupplierOrders=Užsakymai, laukiantys priėmimo
-DesiredStock=Pageidaujamos atsargos
+DesiredStock=Pageidaujamas atsargų minimalus kiekis
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Užsakyti
 Replenishment=Papildymas
 ReplenishmentOrders=Papildymo užsakymai
-VirtualDiffersFromPhysical=Priklausomai nuo atsargų opcijos padidinti/sumažinti, fizinės atsargos ir virtualios atsargos (fiziniai + einamieji užsakymai) gali skirtis
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Papildymo funkcijas naudokite virtualias atsargas pagal nutylėjimą, o ne fizines turimas atsargas
 UseVirtualStock=Naudokite virtualias atsargas
 UsePhysicalStock=Naudoti fizines atsargas
-CurentSelectionMode=Dabarinis pasirinkimo režimas
+CurentSelectionMode=Dabartinis pasirinkimo režimas
 CurentlyUsingVirtualStock=Virtualios atsargos
 CurentlyUsingPhysicalStock=Fizinės atsargos
 RuleForStockReplenishment=Atsargų papildymo taisyklė
@@ -112,8 +113,8 @@ AlertOnly= Tik įspėjimai
 WarehouseForStockDecrease=Sandėlis <b>%s</b> bus naudojamos atsargų sumažėjimui
 WarehouseForStockIncrease=Sandėlis <b>%s</b> bus naudojamos atsargų padidėjimui
 ForThisWarehouse=Šiam sandėliui
-ReplenishmentStatusDesc=Tai sąrašas visų produktų, kurių atsargos mažesnės už pageidaujamą kiekį (arba mažesnės nei įspėjama kritinė riba, jei langelis "Tik įspėjimai" yra pažymėtas), ir siūlymas sukurti tiekėjo užsakymus skirtumo užpildymui.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Papildymai
 NbOfProductBeforePeriod=Produkto %s kiekis atsargose iki pasirinkto periodo (< %s)
 NbOfProductAfterPeriod=Produkto %s kiekis sandėlyje po pasirinkto periodo (> %s)
@@ -121,19 +122,19 @@ MassMovement=Mass movement
 MassStockMovement=Masinis atsargų judėjimas
 SelectProductInAndOutWareHouse=Pasirinkite produktą, kiekį, sandėlį šaltinį ir galutinį sandėlį, tada spauskite "%s". Kai tai bus padaryta visiems reikiamiems judėjimams, spauskite "%s".
 RecordMovement=Įrašyti perdavimą
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Įplaukos už šį užsakymą
 StockMovementRecorded=Įrašyti atsargų judėjimai
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+RuleForStockAvailability=Atsargų reikalavimų taisyklės
+StockMustBeEnoughForInvoice=Atsargų kiekis turi būti pakankamas, kad įtraukti produktą / paslaugą į sąskaitą
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index 808c1872a49..f6fbc9ad260 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Nusiųsta tiekėjams
 ListOfSupplierOrders=Tiekėjo užsakymų sąrašas
 MenuOrdersSupplierToBill=Tiekėjo užsakymai sąskaitoms
 NbDaysToDelivery=Pristatymo vėlavimas dienomis
-DescNbDaysToDelivery=Didžiausias vėlavimas rodomas
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Naudoti dvigubą patvirtinimą (antras patvirtinimas gali būti atliktas bet kurio vartotojo su priskirtais tam leidimais)
diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
index 9f477edc8be..380ea6b08f8 100644
--- a/htdocs/langs/lt_LT/trips.lang
+++ b/htdocs/langs/lt_LT/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Išlaidų ataskaitos
 TripsAndExpensesStatistics=Išlaidų ataskaitų statistika
 TripCard=Išlaidų ataskaitos kortelė
 AddTrip=Sukurti išlaidų ataskaitą
-ListOfTrips=Išlaidų ataskaitų sąrašas
+ListOfTrips=List of expense reports
 ListOfFees=Įmokų sąrašas
 NewTrip=Nauja išlaidų ataskaita
 CompanyVisited=Aplankyta įmonė/organizacija
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Asmuo informuojamas patvirtinimui.
 TripSociete=Informacijos įmonė
 TripSalarie=Informacijos vartotojas
 TripNDF=Informacijos išlaidų ataskaiata
-DeleteLine=Ištrinti išlaidų taskaitos eilutę
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Ar tikrai norite ištrinti šią eilutę ?
 PDFStandardExpenseReports=Standartinis šablonas PDF dokumento išlaidų ataskaitoje generavimui
 ExpenseReportLine=Išlaidų ataskaitos eilutė
@@ -40,11 +40,10 @@ TF_BUS=Autobusas
 TF_CAR=Automobilis
 TF_PEAGE=Mokamas
 TF_ESSENCE=Kuras
-TF_HOTEL=Hostelis
+TF_HOTEL=Hotel
 TF_TAXI=Taksi
 
 ErrorDoubleDeclaration=Jūs deklaravote kitą išlaidų ataskaitą panašiame laiko periode.
-ListTripsAndExpenses=Išlaidų ataskaitų sąrašas
 AucuneNDF=Pagal šį kriterijų nerasta išlaidų ataskaitos
 AucuneLigne=Dar nėra deklaruotos išlaidų ataskaitos
 AddLine=Pridėti eilutę
@@ -56,12 +55,12 @@ ModePaiement=Mokėjimo būdas
 Note=Pranešimas
 Project=Projektas
 
-VALIDATOR=Vartotojas patvirtinimo informavimui
+VALIDATOR=User responsible for approval
 VALIDOR=Patvirtinta
 AUTHOR=Įrašyta
-AUTHORPAIEMENT=Apmokėta
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Atmesta
-CANCEL_USER=Nutraukta
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Priežastis
 MOTIF_CANCEL=Priežastis
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Mokėjimo data
 
 TO_PAID=Mokėti
 BROUILLONNER=Atidaryti iš naujo
-SendToValid=Siųsti patvirtinimui
+SendToValid=Sent on approval
 ModifyInfoGen=Redaguoti
 ValidateAndSubmit=Įvertinti ir pateikti tvirtinimui
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Jums neleidžiama patvirtinti šią išlaidų ataskaitą
 NOT_AUTHOR=Jūs nesate šios išlaidų ataskaitos autorius. Operacija nutraukta.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Ar tikrai norite pakeisti šios išlaidų ataskaitos būklę į
 CancelTrip=Nutraukti išlaidų ataskaitą
 ConfirmCancelTrip=Ar tikrai norite nutraukti šią išlaidų ataskaitą ?
 
-BrouillonnerTrip=Išlaidų ataskaitos būklę grąžinti į "Projektas"
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Ar tikrai norite grąžinti šios išlaidų ataskaitos būklę į "Projektas" ?
 
 SaveTrip=Patvirtinti išlaidų ataskaitą
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 7dedd9cf1e7..e2e1f2e8fdf 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Pašalinti iš grupės
 PasswordChangedAndSentTo=Slaptažodis pakeistas ir išsiųstas į <b>%s</b>.
 PasswordChangeRequestSent=Prašymas pakeisti slaptažodį <b>%s</b> išsiųstą į <b>%s</b>
 MenuUsersAndGroups=Vartotojai ir grupės
+MenuMyUserCard=Mano vartotojo kortelė
 LastGroupsCreated=Paskutinės %s sukurtos grupės
 LastUsersCreated=Paskutiniai %s sukurti vartotojai
 ShowGroup=Rodyti grupę
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index a2f6ea5a720..66cb34caf57 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Išėmimo failas
 SetToStatusSent=Nustatyti būklę "Failas išsiųstas"
 ThisWillAlsoAddPaymentOnInvoice=Tai taip pat taikoma sąskaitų-faktūrų mokėjimams ir jų priskyrimui "Apmokėtos"
 StatisticsByLineStatus=Eilučių būklės statistika
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Periodinio užsakymo %s banko mokėjimas
diff --git a/htdocs/langs/lt_LT/workflow.lang b/htdocs/langs/lt_LT/workflow.lang
index 4d79b753c4e..1e5600309c9 100644
--- a/htdocs/langs/lt_LT/workflow.lang
+++ b/htdocs/langs/lt_LT/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow modulio nustatymas
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Čia nėra darbo eigos Jūsų įjungtam moduliui, kurią galėtumėte modifikuoti
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Sukurti kliento užsakymą automatiškai po komercinio pasiūlymo pasirašymo
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Sukurti kliento sąskaitą-faktūrą automatiškai po komercinio pasiūlymo pasirašymo
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Sukurti kliento sąskaitą-faktūrą automatiškai po sutarties patvirtinimo
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Sukurti kliento sąskaitą-faktūrą automatiškai po kliento užsakymo uždarymo
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Priskirti susijusį šaltinio pasiūlymą prie apmokestintų, kai kliento užsakymas nustatomas kaip apmokėtas
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Priskirti susijusį šaltinio kliento užsakymą (-us) prie apmokestinamų, kai kliento sąskaita-faktūra yra nustatoma kaip jau apmokėta
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Priskirti susijusį šaltinio kliento užsakymą (-us) prie apmokestinamų, kai kliento sąskaita-faktūra yra patvirtinama
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 3f5828327f7..482f3a7b193 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Globālie iestatījumi
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 14bed951fe2..d7c1d21053d 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Lietotāju izvēlne
 LangFile=. lang fails
 System=Sistēma
 SystemInfo=Sistēmas informācija
-SystemTools=Sistēmas rīki
 SystemToolsArea=Sistēmas rīku iestatīšana
 SystemToolsAreaDesc=Šī joma piedāvā administrēšanas funkcijas. Lietojiet izvēlni, lai izvēlētos funkciju, jūs meklējat.
 Purge=Tīrīt
@@ -232,8 +231,8 @@ Security=Drošība
 Passwords=Paroles
 DoNotStoreClearPassword=Neglabāt nešifrētas paroles datubāzē bet izmantot šifrētas (aktivizācija ieteicama)
 MainDbPasswordFileConfEncrypted=Datubāzes paroli šifrēti conf.php (aktivēt ieteicams)
-InstrucToEncodePass=Lai iegūtu paroli, iekodētas <b>conf.php</b> failu, nomainiet līnija <br> <b>$ Dolibarr_main_db_pass = "..."</b> <br> līdz <br> <b>$ Dolibarr_main_db_pass = "crypted: %s"</b>
-InstrucToClearPass=Lai iegūtu paroli, dekodēt (skaidri) uz <b>conf.php</b> failu, nomainiet līnija <br> <b>$ Dolibarr_main_db_pass = "crypted: ..."</b> <br> līdz <br> <b>$ Dolibarr_main_db_pass = "%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Ģenerēto PDF failu aizsardzība (aktivizēta NAV ieteicama, masveida pdf veidošanai)
 ProtectAndEncryptPdfFilesDesc=Aizsardzība PDF dokumentu saglabā to pieejamu lasīt un izdrukāt ar jebkuru PDF pārlūkprogrammu. Tomēr, rediģēšanu un kopēšanu nav iespējams vairs. Ņemiet vērā, ka, izmantojot šo funkciju veikt ēku no pasaules uzkrātā pdf nedarbojas (piemēram, neapmaksātiem rēķiniem).
 Feature=Iespēja
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Tas ir setup, lai process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Solis %s
 FindPackageFromWebSite=Atrast paketi, kas nodrošina iespēju, jūs vēlaties (piemēram, par oficiālo tīmekļa vietnes %s).
-DownloadPackageFromWebSite=Lejupielādēt paku %s
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Instalēšana ir pabeigta, un Dolibarr ir gatavs lietošanai ar šo jauno komponentu.
 NotExistsDirect=Alternatīva saknes direktorijs nav definēta.<br>
 InfDirAlt=Kopš 3 versijas, ir iespējams noteikt alternatīvu sakne directory.Tas ļauj jums saglabāt, tajā pašā vietā, papildinājumus un pielāgotas veidnes.<br> Jums tikai jāizveido direktoriju Dolibarr saknē (piemēram: custom).<br>
 InfDirExample=<br> Tad paziņo to failu conf.php <br> $ Dolibarr_main_url_root_alt = 'http://myserver/custom' <br> $ Dolibarr_main_document_root_alt = '/ ceļš / uz / dolibarr / htdocs / custom' <br> * Šīs līnijas ir komentēja ar "#", lai uncomment tikai noņemt raksturs.
-YouCanSubmitFile=Izvēlieties moduli:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr pašreizējā versija
 CallUpdatePage=Iet uz lapu, kas aktualizē datu bāzes struktūru un datus: %s.
 LastStableVersion=Pēdējā stabilā versija
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Bibliotēka, lai izveidotu PDF
 WarningUsingFPDF=Uzmanību: Jūsu <b>conf.php</b> satur direktīvu <b>dolibarr_pdf_force_fpdf = 1.</b> Tas nozīmē, ka jūs izmantojat FPDF bibliotēku, lai radītu PDF failus. Šī bibliotēka ir vecs un neatbalsta daudz funkcijām (Unicode, attēlu pārredzamība, kirilicas, arābu un Āzijas valodās, ...), tāpēc var rasties kļūdas laikā PDF paaudzes. <br> Lai atrisinātu šo problēmu, un ir pilnībā atbalsta PDF paaudzes, lūdzu, lejupielādējiet <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotēka</a> , tad komentēt vai noņemt līnijas <b>$ dolibarr_pdf_force_fpdf = 1,</b> un pievienojiet vietā <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Ievadiet tālruņa numuru, uz kuru zvanīt, lai parādītu saiti, lai pārbaudītu Nospied lai zvanītu url lietotājam <strong>%s</strong>
 RefreshPhoneLink=Atsvaidzināt
@@ -430,8 +429,8 @@ Module20Name=Priekšlikumi
 Module20Desc=Komerc priekšlikumu vadība
 Module22Name=Masveida e-pasta sūtījumi
 Module22Desc=Masu e-pasta vadība
-Module23Name= Enerģija
-Module23Desc= Uzraudzība patēriņu enerģijas
+Module23Name=Enerģija
+Module23Desc=Uzraudzība patēriņu enerģijas
 Module25Name=Klientu Pasūtījumi
 Module25Desc=Klientu pasūtījumu pārvaldīšana
 Module30Name=Rēķini
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Vebkalendārs
 Module410Desc=Web kalendāra integrācija
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Atalgojums
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Paziņojumi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Ziedojumi
 Module700Desc=Ziedojumu pārvaldība
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Darba kārtība
 Module2400Desc=Notikumi / uzdevumi un darba kārtības vadība
 Module2500Name=Elektroniskā satura pārvaldība
 Module2500Desc=Saglabāt un nošārēt dokumentus
-Module2600Name=WEB pakalpojumi
-Module2600Desc=Ļautu Dolibarr tīmekļa pakalpojumu serveri
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Izveidot / mainīt produktus
 Permission34=Dzēst produktus
 Permission36=Skatīt/vadīt slēptos produktus
 Permission38=Eksportēt produktus
-Permission41=Lasīt projektus (dalīta projekts un projektu es esmu kontaktpersonai)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Izveidot / mainīt projektus (dalīta projekts un projektu es esmu kontaktpersonai)
 Permission44=Dzēst projektus (dalīta projekts un projektu es esmu kontaktpersonai)
 Permission61=Lasīt intervences
@@ -599,10 +600,10 @@ Permission86=Sūtīt klientu pasūtījumus
 Permission87=Slēgt klientu pasūtījumus
 Permission88=Atcelt klientu pasūtījumus
 Permission89=Dzēst klientu pasūtījumus
-Permission91=Lasīt sociālās iemaksas un PVN
-Permission92=Izveidot/labot sociālās iemaksas un PVN
-Permission93=Dzēst sociālās iemaksas un PVN
-Permission94=Eksportēt sociālās iemaksas
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Lasīt atskaites
 Permission101=Lasīt sūtījumus
 Permission102=Izveidot/mainīt sūtījumus
@@ -620,9 +621,9 @@ Permission121=Skatīt trešās personas, kas saistītas ar lietotāju
 Permission122=Izveidot/labot trešās personas, kas saistītas ar lietotāju
 Permission125=Dzēst trešās personas, kas saistītas ar lietotāju
 Permission126=Eksportēt trešās puses
-Permission141=Lasīt projektus (arī privāto es neesmu sazināties par)
-Permission142=Izveidot / mainīt projekti (arī privāto es neesmu kontaktpersonai)
-Permission144=Dzēst projekti (arī privāto es neesmu kontaktinformācija par)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lasīt sniedzējiem
 Permission147=Lasīt statistiku
 Permission151=Lasīt pastāvīgos pieprasījumus
@@ -800,7 +801,7 @@ DictionaryCountry=Valstis
 DictionaryCurrency=Valūtas
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Apmaksas noteikumi
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Kontu līknes
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=E-pastu paraugi
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Iestatījumi saglabāti
 BackToModuleList=Atpakaļ uz moduļu sarakstu
 BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
@@ -936,13 +940,14 @@ CompanyZip=Pasta indekss
 CompanyTown=Pilsēta
 CompanyCountry=Valsts
 CompanyCurrency=Galvenā valūta
+CompanyObject=Object of the company
 Logo=Logotips
 DoNotShow=Nerādīt
 DoNotSuggestPaymentMode=Neieteikt
 NoActiveBankAccountDefined=Nav definēts aktīvs bankas konts
 OwnerOfBankAccount=Bankas konta īpašnieks %s
 BankModuleNotActive=Bankas kontu modulis nav ieslēgts
-ShowBugTrackLink=Rādīt saiti "Ziņot par kļūdu"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Rādīt "darbagaldu" uz mājas lapā
 Alerts=Brīdinājumi
 Delays=Kavēšanās
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Maksimālais ciparu skaits aiz komata cenām
 MAIN_MAX_DECIMALS_TOT=Maksimālās decimāldaļas kopējai cenai
 MAIN_MAX_DECIMALS_SHOWN=Max aiz komata par cenām parādīta ekrānā (Add <b>...</b> pēc šo numuru, ja jūs vēlaties redzēt <b>...</b> kad numurs tiek apcirsti, kad redzams uz ekrāna)
 MAIN_DISABLE_PDF_COMPRESSION=Izmantot PDF saspiešanu izveidotajiem PDF failiem.
-MAIN_ROUNDING_RULE_TOT= Izmērs noapaļošanas diapazons (par retajām valstīm, kur noapaļošana tiek darīts uz kaut ko citu par 10 bāzes)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Neto vienības produkta cena
 TotalPriceAfterRounding=Kopējā cena (neto/pvn/ar nodokli) pēc noapaļošanas
 ParameterActiveForNextInputOnly=Parametrs stājas spēkā no nākamās ievades
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Aktivēto moduļu kopskaits: <b>%s</b>
 YouMustEnableOneModule=Jums ir jābūt ieslēgtam vismaz 1 modulim
 ClassNotFoundIntoPathWarning=Klase %s nav atrasta PHP norādītajā ceļā
 YesInSummer=Jā vasarā
-OnlyFollowingModulesAreOpenedToExternalUsers=Ņemiet vērā, ka tikai šādi moduļi ir pieejami ārējiem lietotājiem (Lai ar kādas ir atļaujas šiem lietotājiem):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Sesija uzglabāšana šifrēta ar Suhosin
 ConditionIsCurrently=Stāvoklis šobrīd ir %s
 YouUseBestDriver=Jūs varat izmantot vadītāja %s, kas ir labākais draiveris, kas pieejams šobrīd.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Maksimālais skaits produktu kombinācijas izvēlēt
 ConfirmDeleteProductLineAbility=Apstiprinājums noņemot produktu līnijas formu
 ModifyProductDescAbility=Personalizācija produktu aprakstiem formās
 ViewProductDescInFormAbility=Vizualizācija produktu aprakstiem formām (citādi kā popup Tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Vizualizācija produktu aprakstiem thirdparty valodā
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Atbalsts Eco-taxe (EEIA)
 SetDefaultBarcodeTypeProducts=Noklusējuma svītrkoda veids izmantojams produktiem
 SetDefaultBarcodeTypeThirdParties=Svītrkodu veids pēc noklusējuma trešām personām
+UseUnits=Support units
 ProductCodeChecker= Modulis produkta koda paaudzes un pārbaudes (produkts vai pakalpojums)
 ProductOtherConf= Produktu / pakalpojumu konfigurācija
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Svītrkoda veids UPC
 BarcodeDescISBN=Svītrkoda veids ISBN
 BarcodeDescC39=Svītrkoda veids C39
 BarcodeDescC128=Svītrkoda veids C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Iekšējais dzinējs
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Vai tiešām vēlaties dzēst izvēlnes ierakstu <b>%s</b> ?
 DeleteLine=Dzēst līniju
 ConfirmDeleteLine=Vai jūs tiešām vēlaties izdzēst šo līniju?
 ##### Tax #####
-TaxSetup=Nodokļi, sociālās iemaksas un dividendes modulis uzstādīšana
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Maksājamais PVN
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Veikalu modulis uzstādīšana
 WebServicesDesc=Ļaujot šo moduli, Dolibarr kļūt interneta pakalpojumu serveri, lai sniegtu dažādus interneta pakalpojumus.
 WSDLCanBeDownloadedHere=WSDL deskriptors failus pakalpojumiem var lejuplādēt šeit
 EndPointIs=SOAP klientiem jānosūta savus lūgumus Dolibarr beigu pieejama Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bankas moduļa uzstādīšana
 FreeLegalTextOnChequeReceipts=Brīvais teksts uz čeku ieņēmumiem
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekta moduļa iestatījumi
 ProjectsModelModule=Projekta ziņojumi dokumenta paraugs
 TasksNumberingModules=Uzdevumi numerācijas modulis
 TaskModelModule=Uzdevumi ziņojumi dokumenta paraugs
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automātiska koku mapes un dokumentu
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Atvērt fiskālo gadu
 CloseFiscalYear=Aizvērt fiskālo gadu
 DeleteFiscalYear=Dzēst fiskālo gadu
 ConfirmDeleteFiscalYear=Vai tiešām vēlaties dzēst fiskālo gadu?
-Opened=Atvērts
+Opened=Open
 Closed=Slēgts
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 362db73f511..606e6624474 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Pasūtījums %s apstiprināts
 OrderRefusedInDolibarr=Pasūtījums %s atteikts
 OrderBackToDraftInDolibarr=Pasūtījums %s doties atpakaļ uz melnrakstu
-OrderCanceledInDolibarr=Pasūtījums %s atcelts
 ProposalSentByEMail=Komerciālais priedāvājums %s nosūtīts pa e-pastu
 OrderSentByEMail=Klienta pasūtījums %s nosūtīts pa e-pastu
 InvoiceSentByEMail=Klienta rēķins %s nosūtīts pa e-pastu
@@ -96,3 +95,5 @@ AddEvent=Izveidot notikumu
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 01851c44132..7e04e7f64dd 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Samierināt
 Conciliation=Samierināšanās
 ConciliationForAccount=Saskaņot šo kontu
 IncludeClosedAccount=Iekļaut slēgti konti
-OnlyOpenedAccount=Tikai atvērtiem kontiem
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Konts, lai kredītu
 AccountToDebit=Konta norakstīt
 DisableConciliation=Atslēgt izlīguma funkciju šim kontam
 ConciliationDisabled=Izlīgums līdzeklis invalīdiem
-StatusAccountOpened=Atvērts
+StatusAccountOpened=Open
 StatusAccountClosed=Slēgts
 AccountIdShort=Numurs
 EditBankRecord=Labot ierakstu
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Klienta maksājums
 CustomerInvoicePaymentBack=Klienta maksājums atpakaļ
 SupplierInvoicePayment=Piegādātājs maksājums
 WithdrawalPayment=Izstāšanās maksājums
-SocialContributionPayment=Sociālo iemaksu maksājumi
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Finanšu konts žurnāls
 BankTransfer=Bankas pārskaitījums
 BankTransfers=Bankas pārskaitījumi
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 03076a4d377..66e807c0e8f 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Rēķinu skaits
 NumberOfBillsByMonth=Rēķinu skaits pa mēnešiem
 AmountOfBills=Rēķinu summa
 AmountOfBillsByMonthHT=Summa rēķini mēnesī (neto pēc nodokļiem)
-ShowSocialContribution=Rādīt sociālās iemaksas
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Rādīt rēķinu
 ShowInvoice=Rādīt rēķinu
 ShowInvoiceReplace=Rādīt aizstājošo rēķinu
@@ -270,7 +270,7 @@ BillAddress=Rēķina adrese
 HelpEscompte=Šī atlaide ir atlaide piešķirta, lai klientam, jo ​​tās maksājums tika veikts pirms termiņa.
 HelpAbandonBadCustomer=Šī summa ir pamests (klients teica, ka slikts klients), un tiek uzskatīts par ārkārtēju zaudēt.
 HelpAbandonOther=Šī summa ir atteikusies, jo tā bija kļūda (nepareizs klients vai rēķins aizstāt ar citiem, piemēram)
-IdSocialContribution=Sociālās iemaksas id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Maksājuma id
 InvoiceId=Rēķina id
 InvoiceRef=Rēķina ref.
@@ -430,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index b1c8e62adf0..450b1f70ba6 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> tika veiksmīgi pievienots.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Nav
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Šī sadaļa jau pastāv ar šo ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Saturu visi neredz
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo / prosp. sadaļas
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index efb066851ea..384651e615b 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Trešās puses kontakts / adrese
 StatusContactValidated=Kontaktu/ adrešu statuss
 Company=Uzņēmums
 CompanyName=Uzņēmuma nosaukums
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Uzņēmumi
 CountryIsInEEC=Valsts ir Eiropas Ekonomikas kopienas dalībvalsts
 ThirdPartyName=Trešās puses nosaukums
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolūtās pieejamās atlaides
 DiscountNone=Nav
 Supplier=Piegādātājs
 CompanyList=Kompāniju saraksts
-AddContact=Pievienot kontaktu
-AddContactAddress=Pievienot kontakta / adresi
+AddContact=Izveidot kontaktu
+AddContactAddress=Izveidot kontaktu/adresi
 EditContact=Labot kontaktu
 EditContactAddress=Labot kontakta / adresi
 Contact=Kontakts
@@ -268,8 +269,8 @@ ContactsAddresses=Kontaktu / adreses
 NoContactDefinedForThirdParty=Nav  definēta kontakta ar šo trešo personu
 NoContactDefined=Nav definēts kontakts
 DefaultContact=Noklsētais kontakts / adrese
-AddCompany=Pievienot uzņēmumu
-AddThirdParty=Pievienot trešo pusi
+AddCompany=Izveidot kompāniju
+AddThirdParty=Izveidot trešo personu
 DeleteACompany=Dzēst uzņēmumu
 PersonalInformations=Personas dati
 AccountancyCode=Grāmatvedība kods
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Piegādes adreses etiķete
 DeleteDeliveryAddress=Dzēst piegādes adresi
 ConfirmDeleteDeliveryAddress=Vai tiešām vēlaties dzēst šo piegādes adresi?
 NewDeliveryAddress=Jauna piegādes adrese
-AddDeliveryAddress=Pievienot adresi
-AddAddress=Pievienot adresi
+AddDeliveryAddress=Izveidot adresi
+AddAddress=Izveidot adresi
 NoOtherDeliveryAddress=Nav definēta alternatīva piegādes adrese
 SupplierCategory=Piegādātāja sadaļa
 JuridicalStatus200=Neatkarīgs
@@ -397,7 +398,7 @@ YouMustCreateContactFirst=Jums ir izveidot e-pastus kontaktus trešās puses vis
 ListSuppliersShort=Piegādātāju saraksts
 ListProspectsShort=Saraksts perspektīvas
 ListCustomersShort=Klientu saraksts
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Trešās personas u kontaktu sadaļa
 LastModifiedThirdParties=Pēdējās %s labotās trešās personas
 UniqueThirdParties=Kopējās unikālās trešās personas
 InActivity=Atvērts
@@ -410,5 +411,10 @@ OutstandingBillReached=Sasniedza maks. par izcilu rēķinu
 MonkeyNumRefModelDesc=Atgriešanās Numero ar formātu %syymm-NNNN par klientu kodu un %syymm-NNNN forsupplier kodu, kur gg ir gads, MM ir mēnesis, un nnnn ir secība bez pārtraukuma un bez atgriezties 0.
 LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) 
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Search third party
+SearchContact=Meklēt kontaktu
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index d02a0c14997..f6ef7913fd4 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Iekasētais PVN
 ToPay=Jāsamaksā
 ToGet=Lai saņemtu atpakaļ
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Nodokļi, sociālās iemaksas un dividendes zona
-SocialContribution=Sociālās iemaksas
-SocialContributions=Sociālās iemaksas
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Īpašie izdevumi
 MenuTaxAndDividends=Nodokļi un dividendes
 MenuSalaries=Algas
-MenuSocialContributions=Sociālās iemaksas
-MenuNewSocialContribution=Jauns ieguldījums
-NewSocialContribution=Jauns sociālās iemaksas
-ContributionsToPay=Iemaksas, kas jāmaksā
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Grāmatvedība / kase laukums
 AccountancySetup=Grāmatvedība iestatīšana
 NewPayment=Jauns maksājums
 Payments=Maksājumi
 PaymentCustomerInvoice=Klienta rēķina apmaksa
 PaymentSupplierInvoice=Piegādātāja rēķina apmaksa
-PaymentSocialContribution=Sociālo iemaksu maksājumi
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=PVN maksājumi
 PaymentSalary=Algu maksājumi
 ListPayment=Maksājumu saraksts
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=PVN maksājums
 VATPayments=PVN Maksājumi
-SocialContributionsPayments=Sociālās iemaksas maksājumi
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rādīt PVN maksājumu
 TotalToPay=Summa
 TotalVATReceived=Kopējais saņemtais PVN
@@ -116,11 +116,11 @@ NewCheckDepositOn=Izveidot kvīti par depozīta kontā: %s
 NoWaitingChecks=Nekādas pārbaudes gaida depozītu.
 DateChequeReceived=Pārbaudiet uzņemšanas datumu
 NbOfCheques=Nb Pārbaužu
-PaySocialContribution=Maksāt sociālās iemaksas
-ConfirmPaySocialContribution=Vai jūs tiešām vēlaties, lai klasificētu šo sociālo iemaksu, kas maksā?
-DeleteSocialContribution=Dzēst sociālo iemaksu
-ConfirmDeleteSocialContribution=Vai tiešām vēlaties dzēst sociālo iemaksu?
-ExportDataset_tax_1=Sociālās iemaksas un maksājumi
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT par saistību accounting%s.</b>
 CalcModeVATEngagement=Mode <b>%sVAT par ienākumu-expense%sS.</b>
 CalcModeDebt=Mode <b>%sClaims-Debt%sS</b> teica <b>Saistību uzskaite.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=no piegādātāja, izvēlēties piemērotu metodi pi
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot <b>skaidras naudas uzskaites</b> režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto <b>saderināšanās grāmatvedības</b> režīmu (skat. iestatīšanu grāmatvedības moduli).
 CalculationMode=Aprēķinu režīms
 AccountancyJournal=Kontu žurnāls
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index c879b80c2d6..95e4a671665 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -4,10 +4,10 @@ About = Par
 CronAbout = Par Cron
 CronAboutPage = Cron par lapu
 # Right
-Permission23101 = Lasīt plānoto uzdevumu
-Permission23102 = Izveidot/atjaunināt plānoto uzdevumu
-Permission23103 = Dzēst plānoto uzdevumu
-Permission23104 = Izpildīt plānoto uzdevumu
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Plānotais darbu vadības iestatīšana
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Pēdējo reizi palaist izejas
 CronLastResult=Pēdējais rezultātu kods
 CronListOfCronJobs=Saraksts ar plānotajiem darbiem
 CronCommand=Komanda
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Darbs
@@ -39,8 +39,8 @@ CronDtStart=Sākuma datums
 CronDtEnd=Beigu datums
 CronDtNextLaunch=Nākošā izpilde
 CronDtLastLaunch=Pēdējā izpilde
-CronFrequency=Biežums
-CronClass=Klase
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metode
 CronModule=Modulis
 CronAction=Darbība
@@ -55,9 +55,9 @@ CronEach=Katru
 JobFinished=Darbs uzsākts un pabeigts
 #Page card
 CronAdd= Pievienot darbu
-CronHourStart= Starta laiks un uzdevuma datums
-CronEvery= Un izpildīt uzdevumu katrā
-CronObject= Instances / Object, lai radītu
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instances / Object, lai radītu
 CronArgs=Parametri
 CronSaveSucess=Veiksmīgi saglabāts
 CronNote=Komentārs
@@ -76,13 +76,14 @@ CronMethodHelp=Objekts metode, lai palaistu. <BR> Par exemple atnest metodi Doli
 CronArgsHelp=Šī metode argumentus. <BR> Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, no paramters vērtība var būt <i>0, ProductRef</i>
 CronCommandHelp=Sistēma komandrindas izpildīt.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informācija
 # Common
-CronType=Darba veids
+CronType=Job type
 CronType_method=Zvanu metode ir Dolibarr klases
 CronType_command=Shell komandu
 CronMenu=Cron
 CronCannotLoadClass=Nevar ielādēt klases %s vai objektu %s
 UseMenuModuleToolsToAddCronJobs=Iet uz izvēlni &quot;Home - moduļi instrumenti - Darbs sarakstu&quot;, lai redzētu un rediģēt plānoto darbu.
-TaskDisabled=Uzdevums bloķēts
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index 0daca52e9c6..6590d762f7e 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Meklēt pēc objekta
 ECMSectionOfDocuments=Dokumentu sadaļas
 ECMTypeManual=Manuāli
 ECMTypeAuto=Automātiski
-ECMDocsBySocialContributions=Dokumenti, kas saistīti ar sociālajām iemaksām
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumenti, kas saistīti ar trešajām personām
 ECMDocsByProposals=Dokumenti, kas saistīti ar priekšlikumiem
 ECMDocsByOrders=Dokumenti, kas saistīti ar klientu rīkojumiem
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 4d6591c2569..f8c0b87a9f4 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
@@ -190,3 +191,4 @@ WarningNotRelevant=Nozīmes operācija šajā datu
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Iespēja bloķēta kad iestatījumi ir optimizēti aklai persionai vai teksta pārlūkprogrammām
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Par daudz datu, lūdzu izmantojiet vairāk filtru 
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 358ca95141d..c46fcf039f8 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -3,7 +3,7 @@ HRM=CRV
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Ikmēneša paziņojums
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=Jums nav nevienas brīvas dienas
@@ -71,7 +71,7 @@ MotifCP=Iemesls
 UserCP=Lietotājs
 ErrorAddEventToUserCP=Kļūda, pievienojot ārkārtas atvaļinājumu.
 AddEventToUserOkCP=Par ārkārtas atvaļinājumu papildinājums ir pabeigta.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Veic
 UserUpdateCP=Lietotājam
@@ -93,6 +93,7 @@ ValueOptionCP=Vērtība
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Apstiprināt konfigurāciju
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Veiksmīgi atjaunināta.
 ErrorUpdateConfCP=Kļūda atjaunināšanas laikā, lūdzu, mēģiniet vēlreiz.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Kļūda sūtot e-pastu:
 NoCPforMonth=Nē atstāt šo mēnesi.
 nbJours=Dienu skaits
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Sveiki
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Pieprasījums noraidīts
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/lv_LV/incoterm.lang b/htdocs/langs/lv_LV/incoterm.lang
index 2396d2acb0e..46294f6a2dd 100644
--- a/htdocs/langs/lv_LV/incoterm.lang
+++ b/htdocs/langs/lv_LV/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
+IncotermLabel=Inkoterms
+IncotermSetupTitle1=Iespēja
 IncotermSetupTitle2=Status
 IncotermSetup=Setup of module Incoterm
 IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 3936294e463..5d157654316 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Datu bāzes serveris - superlietotājs piekļuve
 CheckToCreateDatabase=Rūtiņu, ja datu bāze neeksistē, un ir izveidots. <br> Tādā gadījumā, jums ir jāaizpilda pieteikšanās / paroli SuperUser kontā pie šīs lapas apakšā.
 CheckToCreateUser=Rūtiņu, ja datu bāzes īpašnieks neeksistē, un ir izveidots. <br> Tādā gadījumā, jums ir jāizvēlas savu lietotājvārdu un paroli, kā arī aizpildīt pieteikšanās / paroli superlietotājs kontā pie šīs lapas apakšā. Ja šī rūtiņa ir nekontrolēti, īpašnieks, datu bāzes un tās paroles ir pastāv.
 Experimental=(Eksperimentāls)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Reģistrācija no lietotāja ļāva izveidot jaunas datu bāzes vai jaunus lietotājus, obligātos ja jūsu datu bāzes vai tās īpašnieks nav jau eksistē.
 KeepEmptyIfNoPassword=Atstājiet tukšu, ja lietotājs nav parole (izvairītos)
 SaveConfigurationFile=Saglabāt vērtības
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index 74d6363e994..20738cefd91 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arābu
 Language_ar_SA=Arābu
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgāru
 Language_bs_BA=Bosniešu
 Language_ca_ES=Katalāņu
@@ -21,9 +22,10 @@ Language_en_SA=Angļu (Saūda Arābija)
 Language_en_US=Angļu (ASV)
 Language_en_ZA=English (Dienvidāfrika)
 Language_es_ES=Spāņu
-Language_es_DO=Spāņu (Dominikānas Republika)
 Language_es_AR=Spāņu (Argentīna)
 Language_es_CL=Spāņu (Ķīle)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spāņu (Dominikānas Republika)
 Language_es_HN=Spāņu (Hondurasa)
 Language_es_MX=Spāņu (Meksika)
 Language_es_PY=Spāņu (Paragvaja)
@@ -45,7 +47,10 @@ Language_id_ID=Indonēziešu
 Language_is_IS=Islandiešu
 Language_it_IT=Itāļu
 Language_ja_JP=Japāņu
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korejiešu
+Language_lo_LA=Lao
 Language_lt_LT=Lietuviešu
 Language_lv_LV=Latviešu
 Language_mk_MK=Maķedoniešu
@@ -64,6 +69,7 @@ Language_sv_SV=Zviedru
 Language_sv_SE=Zviedru
 Language_sq_AL=Albāņu
 Language_sk_SK=Slovāku
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukraiņu
 Language_uz_UZ=Uzbeku
diff --git a/htdocs/langs/lv_LV/loan.lang b/htdocs/langs/lv_LV/loan.lang
new file mode 100644
index 00000000000..615b94be95a
--- /dev/null
+++ b/htdocs/langs/lv_LV/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Apdrošināšana
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 8276f5a23aa..de6d87243ae 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Lasīt kvīti
 YourMailUnsubcribeOK=E-pasts <b>%s</b> ir veiksmīgi izņemts no adresātu saraksta
 MailtoEMail=Saite uz e-pastu
 ActivateCheckRead=Atļaut izmantot "Atrakstīšanās" saiti
-ActivateCheckReadKey=Galvenais izmantot, lai šifrētu URL izmantošanu, lai "izlasītu saņemšanai" un "Unsubcribe" funkciju
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-pastu nosūtīja %s saņēmējiem.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Izsekot pasta atvēršanu
 TagUnsubscribe=Atrakstīšanās saite
 TagSignature=Paraksts sūtītājam
 TagMailtoEmail=Saņēmēja e-pasts
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Paziņojumi
 NoNotificationsWillBeSent=Nav e-pasta paziņojumi ir plānota šī notikuma, un uzņēmums
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 6dd995c2a18..fb0d6329059 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Dažas kļūdas tika atrastas. Mēs atgrie
 ErrorConfigParameterNotDefined=Parametrs <b>%s</b> nav definētas Dolibarr konfigurācijas failā <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Neizdevās atrast lietotāju <b>%s</b> Dolibarr datu bāzē.
 ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij '%s'.
-ErrorNoSocialContributionForSellerCountry=Kļūda, nav definēts sociālās iemaksas veids  valstī &quot;%s&quot;.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Kļūda, neizdevās saglabāt failu.
 SetDate=Iestatīt datumu
 SelectDate=Izvēlēties datumu
@@ -301,8 +301,8 @@ UnitPriceHT=Vienības cena (neto)
 UnitPriceTTC=Vienības cena
 PriceU=UP
 PriceUHT=UP (neto)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Rēķina summa
 AmountPayment=Maksājuma summa
@@ -339,6 +339,7 @@ IncludedVAT=Ar PVN
 HT=Bez PVN
 TTC=Ar PVN
 VAT=PVN
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Nodokļa likme
@@ -413,6 +414,8 @@ Qty=Daudz
 ChangedBy=Labojis
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Pārrēķināt
 ResultOk=Veiksmīgi
 ResultKo=Neveiksme
@@ -421,7 +424,7 @@ Reportings=Pārskati
 Draft=Melnraksts
 Drafts=Melnraksti
 Validated=Apstiprināts
-Opened=Atvērts
+Opened=Open
 New=Jauns
 Discount=Atlaide
 Unknown=Nezināms
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Saistītas ar noteiktu lietotāja kontaktu
 DeleteAFile=Izdzēst failu
 ConfirmDeleteAFile=Vai jūs tiešām vēlaties izdzēst failu
 NoResults=Nav rezultātu
+SystemTools=System tools
 ModulesSystemTools=Moduļi instrumenti
 Test=Pārbaude
 Element=Elements
@@ -703,6 +707,9 @@ ShowTransaction=Rādīt transakcijas
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
@@ -732,3 +739,4 @@ ShortThursday=Ce
 ShortFriday=P
 ShortSaturday=Se
 ShortSunday=Sv
+SelectMailModel=Select email template
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 027c6024f71..cb9f5d4ee54 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -199,7 +199,8 @@ Entreprises=Uzņēmumi
 DOLIBARRFOUNDATION_PAYMENT_FORM=Lai padarītu jūsu abonementa maksājumu, izmantojot bankas pārskaitījumu, skatiet lapu <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Maksāt, izmantojot kredītkarti vai Paypal, noklikšķiniet uz pogas šīs lapas apakšā. <br>
 ByProperties=Līdz raksturlielumu
 MembersStatisticsByProperties=Dalībnieku statistika pēc parametriem
-MembersByNature=Dalībnieki pēc būtības
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=PVN likme izmantot abonementu
 NoVatOnSubscription=Nav TVA par abonēšanu
 MEMBER_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu, kad Dolibarr saņem apstiprinājumu par apstiprinātu maksājuma parakstīšanas
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 5fa4c7b43f5..b58bc0ae88c 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Piegādātājs rīkojums
 SuppliersOrders=Piegādātāji pasūtījumi
 SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi
 CustomerOrder=Klienta rīkojums
-CustomersOrders=Klientu pasūtījumi
-CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi
-CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Piegādātāja rīkojumi apstrādāt
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Atcelts
 StatusOrderDraftShort=Projekts
 StatusOrderValidatedShort=Apstiprināts
@@ -75,8 +75,9 @@ AddToMyOrders=Pievienot maniem pasūtījumiem
 AddToOtherOrders=Pievienot citiem pasūtījumiem
 AddToDraftOrders=Pievienot rīkojuma projektu
 ShowOrder=Rādīt pasūtījumu
-NoOpenedOrders=Nav atvērti pasūtījumi
-NoOtherOpenedOrders=Nav neviens cits atvērts pasūtījumus
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Nav projektu pasūtījumi
 OtherOrders=Citi rīkojumi
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 93c60274205..b6581946e08 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -204,6 +204,7 @@ ClickHereToGoTo=Klikšķiniet šeit, lai dotos uz %s
 YouMustClickToChange=Jums ir Taču vispirms noklikšķiniet uz šīs saites, lai apstiprinātu šo paroles maiņa
 ForgetIfNothing=Ja Jums nav lūgt šīs izmaiņas, vienkārši aizmirst šo e-pastu. Jūsu akreditācijas dati tiek glabāti drošībā.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Pievienot ierakstu kalendārā %s
diff --git a/htdocs/langs/lv_LV/printing.lang b/htdocs/langs/lv_LV/printing.lang
index 7ca777ca34e..474dc8229ea 100644
--- a/htdocs/langs/lv_LV/printing.lang
+++ b/htdocs/langs/lv_LV/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Ports
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Parole
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Noklusējuma printeris
 Printer=Printeris
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 58956983556..6f39754f311 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Daudz.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 0bed0f2a3b4..e2c35f803f2 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produkts vai pakalpojums
 ProductsAndServices=Produkti un pakalpojumi
 ProductsOrServices=Produkti vai pakalpojumi
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Produktu un pakalpojumu statistika
 ProductsStatistics=Produktu statistika
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Iekšējā atsauce
 LastRecorded=Jaunākie produkti / pakalpojumi par pārdot reģistrē
@@ -44,7 +44,7 @@ CardProduct1=Paikalpojuma kartiņa
 CardContract=Līguma kartiņa
 Warehouse=Noliktava
 Warehouses=Noliktavas
-WarehouseOpened=Noliktava atvērta
+WarehouseOpened=Warehouse open
 WarehouseClosed=Noliktava slēgta
 Stock=Krājums
 Stocks=Krājumi
@@ -71,21 +71,21 @@ SellingPriceTTC=Pārdošanas cena (ar PVN)
 PublicPrice=Publiskā cena
 CurrentPrice=Pašreizējā cena
 NewPrice=Jaunā cena
-MinPrice=Min. pārdošanas cena
-MinPriceHT=Minimālā pārdošanas cena (bez PVN)
-MinPriceTTC=Minimālā pārdošanas cena (ar PVN)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi.
 ContractStatus=Līguma statuss
 ContractStatusClosed=Slēgts
-ContractStatusRunning=Ekspluatācijas
+ContractStatusRunning=Ongoing
 ContractStatusExpired=beidzies
-ContractStatusOnHold=Nedarbojas
-ContractStatusToRun=To get running
-ContractNotRunning=Šis līgums nedarbojas
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Prece ar atsauci %s jau pastāv.
 ErrorProductBadRefOrLabel=Nepareiza vērtība atsauces vai etiķeti.
 ErrorProductClone=Radās problēma, mēģinot klons produktu vai pakalpojumu.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Piegādātāji
 SupplierRef=Piegādātāja produkta ref.
 ShowProduct=Rādīt preci
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ja produkts ir pakalpojums ir ierobežots darbības laiks
 MultiPricesAbility=Vairāku pakāpju cenas precēm / pakalpojumiem
 MultiPricesNumPrices=Cenu skaits
 MultiPriceLevelsName=Cenu sadaļa
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Asociēt
 Translation=Tulkojums
 KeywordFilter=Atslēgvārda filtru
@@ -131,7 +131,7 @@ ProductToAddSearch=Meklēt produktu, lai pievienotu
 AddDel=Pievienot / Dzēst
 Quantity=Daudzums
 NoMatchFound=Nekas netika atrasts
-ProductAssociationList=Saraksts saistītu produktu / pakalpojumu: nosaukums, produkta / pakalpojuma (daudzums ietekmē)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Viens no izvēlētā produkta mātes ar pašreizējo produktu
 DeleteProduct=Dzēst produktu / pakalpojumu
@@ -179,16 +179,41 @@ CloneProduct=Klonēt produktu vai pakalpojumu
 ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu <b>%s?</b>
 CloneContentProduct=Klons visus galvenos informations par produktu / pakalpojumu
 ClonePricesProduct=Klons galvenos informations un cenas
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Šis produkts tiek izmantots
 NewRefForClone=Ref. jaunu produktu / pakalpojumu
-CustomerPrices=Klientu cenas
-SuppliersPrices=Piegādātāju cenas
-SuppliersPricesOfProductsOrServices=Piegādātāju cenas (preču vai pakalpojumu)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Muitas kods
 CountryOrigin=Izcelsmes valsts
 HiddenIntoCombo=Slēpta vērā izvēlieties sarakstos
 Nature=Daba
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Produkta art. paraugs
 ServiceCodeModel=Pakalpojuma art. paraugs
 AddThisProductCard=Izveidot produkta karti
@@ -214,7 +239,7 @@ CostPmpHT=Neto kopā VWAP
 ProductUsedForBuild=Auto patērē uzrādot
 ProductBuilded=Ražošanas pabeigta
 ProductsMultiPrice=Produkts multi-cena
-ProductsOrServiceMultiPrice=Klientu cenas (precēm pakalpojumiem, mult enas) 
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Produkti apgrozījums ceturksnī VWAP
 ServiceSellByQuarterHT=Pakalpojumi apgrozījums ceturksnī VWAP
 Quarter1=1. Ceturksnis
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unikāla cena poduktam/pakalpojumam
 PricingRule=Rules for customer prices
-AddCustomerPrice=Pievienot cenu klientiem
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimālā cena nevar būt zemāka par %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimālā rekomendējamā cena : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Atjaunošanās intervāls (minūtes)
 LastUpdated=Pēdējo reizi atjaunots
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index a1b50e232d9..a6bdabb4d9b 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Šo viedokli iepazīstina visus projektus jums ir atļauts la
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Šo viedokli iepazīstina visus projektus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
 MyTasksDesc=Šis skats ir tikai uz projektiem vai uzdevumus, jums ir kontakts (kāds ir tipa).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Šo viedokli iepazīstina visus projektus un uzdevumus, jums ir atļauts lasīt.
 TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projektu sadaļa
 NewProject=Jauns projekts
 AddProject=Izveidot projektu
@@ -29,7 +30,7 @@ ProjectsList=Projektu saraksts
 ShowProject=Rādīt projektu
 SetProject=Izvēlēties projektu
 NoProject=Neviens projekts nosaka, vai īpašumā
-NbOpenTasks=Nb atvērto uzdevumu
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb projektu
 TimeSpent=Laiks, kas pavadīts
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Pavadītais laiks veicot uzdevumus
 TaskTimeUser=Lietotājs
 TaskTimeNote=Piezīme
 TaskTimeDate=Datums
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Jauns pavadītais laiks
 MyTimeSpent=Mans pavadīts laiks
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Saraksts iejaukšanās saistīts ar projektu
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Saraksts ar notikumiem, kas saistīti ar projektu
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Aktivitāte projektu šonedēļ
 ActivityOnProjectThisMonth=Aktivitāte projektu šomēnes
 ActivityOnProjectThisYear=Aktivitāte projektā šogad
@@ -95,7 +98,7 @@ DeleteATimeSpent=Dzēst pavadīts laiks
 ConfirmDeleteATimeSpent=Vai tiešām vēlaties dzēst pavadīto laiku?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resursi
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projekti, kas veltīta šai trešajai personai
 NoTasks=Neviens uzdevumi šajā projektā
 LinkedToAnotherCompany=Saistīts ar citām trešajām personām
@@ -139,8 +142,15 @@ ProjectReferers=Atsaucoties objekti
 SearchAProject=Meklēt projektu
 ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda
 ProjectDraft=Melnraksta projekts
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index 7a7603d4e8f..c19145d065a 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -4,7 +4,7 @@ Proposal=Komerciālais priekšlikums
 ProposalShort=Priekšlikums
 ProposalsDraft=Sagatave komerciālajiem priekšlikumiem
 ProposalDraft=Sagatave komerciālajam priekšlikumam
-ProposalsOpened=Atvērtie komerciālie priekšlikumi
+ProposalsOpened=Open commercial proposals
 Prop=Komerciālie priekšlikumi
 CommercialProposal=Komerciālais priekšlikums
 CommercialProposals=Komerciālie priekšlikumi
@@ -16,7 +16,7 @@ Prospect=Perspektīva
 ProspectList=Prospect sarakstu
 DeleteProp=Dzēst komerciālo priekšlikumu
 ValidateProp=Apstiprināt komerciālo priekšlikumu
-AddProp=Pievienot priekšlikumu
+AddProp=Izveidot piedāvājumu
 ConfirmDeleteProp=Vai tiešām vēlaties dzēst šo komerciālo priekšlikumu?
 ConfirmValidateProp=Vai jūs tiešām vēlaties apstiprinātu šo komerciālo priekšlikumu saskaņā ar nosaukumu <b>%s</b> ?
 LastPropals=Pēdējie %s priekšlikumi
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Summa pa mēnešiem (neto pēc nodokļiem)
 NbOfProposals=Skaits tirdzniecības priekšlikumiem
 ShowPropal=Rādīt priekšlikumu
 PropalsDraft=Sagatave
-PropalsOpened=Atvērts
+PropalsOpened=Open
 PropalsNotBilled=Slēgts nav apmaksāts
 PropalStatusDraft=Projekts (ir jāapstiprina)
 PropalStatusValidated=Apstiprināts (priekšlikums ir atvērts)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nav parakstīts (slēgta)
 PropalStatusBilled=Jāmaksā
 PropalStatusDraftShort=Melnraksts
 PropalStatusValidatedShort=Apstiprināts
-PropalStatusOpenedShort=Atvērts
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Slēgts
 PropalStatusSignedShort=Parakstīts
 PropalStatusNotSignedShort=Nav parakstīts
@@ -51,12 +51,10 @@ PropalsToClose=Komerciālie priekšlikumus, lai aizvērtu
 PropalsToBill=Parakstīts tirdzniecības priekšlikumus likumprojekta
 ListOfProposals=Saraksts tirdzniecības priekšlikumiem
 ActionsOnPropal=Pasākumi attiecībā uz priekšlikumu
-NoOpenedPropals=Nav atvēra tirdzniecības priekšlikumi
-NoOtherOpenedPropals=Neviena cita atvērta komerciāliem priekšlikumus
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial priekšlikums ref
 SendPropalByMail=Nosūtīt komerciālo priekšlikumu pa pastu
-FileNotUploaded=Fails netika augšupielādēts
-FileUploaded=Fails veiksmīgi augšupielādēts
 AssociatedDocuments=Dokumenti, kas saistīti ar priekšlikumu:
 ErrorCantOpenDir=Nevar atvērt direktoriju
 DatePropal=Datums, kad priekšlikumu
@@ -100,3 +98,4 @@ DocModelJauneDescription=Jaune priekšlikums modelis
 DefaultModelPropalCreate=Default modeļa izveide
 DefaultModelPropalToBill=Noklusējuma veidne aizverot uzņēmējdarbības priekšlikumu (tiks izrakstīts rēķins)
 DefaultModelPropalClosed=Noklusējuma veidne aizverot uzņēmējdarbības priekšlikumu (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index a08e7eca9b2..3a3a6ce2993 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Rādīt algu maksājumus
 THM=Vidējā stundas cena
 TJM=Vidējā dienas cena
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 03d28db44fe..3e5f28e7e06 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Vienkāršs dokumenta paraugs
 DocumentModelMerou=Merou A5 modelis
 WarningNoQtyLeftToSend=Uzmanību, nav produktu kuri gaida nosūtīšanu.
 StatsOnShipmentsOnlyValidated=Statistika veikti uz sūtījumiem tikai apstiprinātiem. Lietots datums ir datums apstiprināšanu sūtījuma (ēvelēti piegādes datums ir ne vienmēr ir zināms).
-DateDeliveryPlanned=Plānotais piegādes datums
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Datums piegāde saņemti
 SendShippingByEMail=Nosūtīt sūtījumu pa e-pastu
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index dbd7a6ae240..8a9ce83000a 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Noliktavas
 NewWarehouse=Jauns noliktavu / Noliktavas platība
 WarehouseEdit=Modificēt noliktavas
 MenuNewWarehouse=Jauna noliktava
-WarehouseOpened=Noliktava atvērts
+WarehouseOpened=Warehouse open
 WarehouseClosed=Noliktava slēgts
 WarehouseSource=Sākotnējā noliktava
 WarehouseSourceNotDefined=Nē noliktava noteikts,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Izvēlieties noliktavu krājumu samazināšanai
 SelectWarehouseForStockIncrease=Izvēlieties noliktavu krājumu palielināšanai
 NoStockAction=Nav akciju darbība
 LastWaitingSupplierOrders=Pasūtījumi gaida pieņemšanām
-DesiredStock=Vēlamais akciju
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Lai pasūtītu
 Replenishment=Papildinājums
 ReplenishmentOrders=Papildināšanas pasūtījumus
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Izmantot virtuālu noliktavu
 UsePhysicalStock=Izmantot reālu noliktavu
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtuāla noliktava
 CurentlyUsingPhysicalStock=Reāla noliktava
 RuleForStockReplenishment=Noteikums par krājumu papildināšanu
@@ -112,8 +113,8 @@ AlertOnly= Brīdinājumi tikai
 WarehouseForStockDecrease=Noliktava <b>%s</b> tiks izmantota krājumu samazināšanai
 WarehouseForStockIncrease=Noliktava <b>%s</b> tiks izmantota krājumu palielināšanai
 ForThisWarehouse=Šai noliktavai
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Papildinājumus
 NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s)
 NbOfProductAfterPeriod=Daudzums produktu %s krājumā pēc izvēlētā perioda (&gt; %s)
@@ -124,16 +125,16 @@ RecordMovement=Ierakstīt transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Krājumu pārvietošana saglabāta
 RuleForStockAvailability=Noteikumi krājumu nepieciešamībai
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Krājumiem jābūt pietiekošiem, lai preci/pakalpojum varētu pievienot pasūtījumam
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Rādīt noliktavu
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 4bd84c29eb2..bc8dd12d9c6 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Nosūtīti uz piegādātājiem
 ListOfSupplierOrders=Saraksts ar piegādātāju pasūtījumiem
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Piegādes kavēšanās dienās
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index 9987251d363..f5d82a8935c 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Saraksts maksu
 NewTrip=New expense report
 CompanyVisited=Kompānija / organizācija apmeklēta
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Autobuss
 TF_CAR=Automašīna
 TF_PEAGE=Toll
 TF_ESSENCE=Degviela
-TF_HOTEL=Hostelis
+TF_HOTEL=Hotel
 TF_TAXI=Taksis
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Maksājuma veids
 Note=Piezīme
 Project=Projekts
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Apstiprinājis
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Samaksājis
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Atcelts
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Iemesls
 MOTIF_CANCEL=Iemesls
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Maksājuma datums
 
 TO_PAID=Samaksāt
 BROUILLONNER=Atvērt pa jaunu
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Labot
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index cbd3417f334..18561404540 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Dzēst no grupas
 PasswordChangedAndSentTo=Parole nomainīta un nosūtīta <b>%s.</b>
 PasswordChangeRequestSent=Pieprasīt, lai nomaina paroli, <b>%s</b> nosūtīt <b>%s.</b>
 MenuUsersAndGroups=Lietotāji un grupas
+MenuMyUserCard=My user card
 LastGroupsCreated=Pēdējās %s izveidotās grupas
 LastUsersCreated=Pēdējie %s izveidotie lietotāji
 ShowGroup=Rādīt grupa
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index a665f6ec085..df355c3788b 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Izstāšanās fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
 ThisWillAlsoAddPaymentOnInvoice=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Maksājumu pastāvīgā rīkojuma %s banka
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index 1515d6d972e..bc48cb4f7e3 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Darbplūsmu moduļa iestatīšana
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Nav darbplūsma kuru Jūs varat mainīt sim modulim.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Izveidot klienta pasūtījumu automātiski pēc komerciālā priekšlikuma parakstīšanas
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Izveidot klienta rēķinu automātiski pēc komerciāla priekšlikuma parakstīšanas
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Izveidot klientu rēķinu automātiski pēc tam, kad līgums ir apstiprināts
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Izveidot klientu rēķinu automātiski pēc klienta pasūtījuma slēgšanas
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasificēt saistīta avota priekšlikumu Jāmaksā, ja klientu rīkojumu ir iestatīts uz apmaksātu
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasificēt saistīts avots klienta pasūtījumu (s) Jāmaksā, ja klients rēķins ir iestatīts uz apmaksātu
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasificēt saistīta avota klienta pasūtījumu (s) Jāmaksā, ja klients rēķins ir apstiprināts
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index e823d364258..13f7eb7c6ec 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 55fde86864b..3e8b2309f8f 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 5580d87b517..42a9a884c76 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +269,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/mk_MK/ecm.lang b/htdocs/langs/mk_MK/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/mk_MK/ecm.lang
+++ b/htdocs/langs/mk_MK/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/mk_MK/incoterm.lang b/htdocs/langs/mk_MK/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/mk_MK/incoterm.lang
+++ b/htdocs/langs/mk_MK/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang
index 8242615b359..0f81f42e3c5 100644
--- a/htdocs/langs/mk_MK/languages.lang
+++ b/htdocs/langs/mk_MK/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Арапски
 Language_ar_SA=Арапски
+Language_bn_BD=Bengali
 Language_bg_BG=Бугарската
 Language_bs_BA=Босанската
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=Англиски (Саудиска Арабија)
 Language_en_US=Англиски јазик (САД)
 Language_en_ZA=Англиски (Јужна Африка)
 Language_es_ES=Шпански
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Шпански (Аргентина)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Шпански (Хондурас)
 Language_es_MX=Шпански (Мексико)
 Language_es_PY=Шпански (Парагвај)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Исландски
 Language_it_IT=Италијански
 Language_ja_JP=Јапонски
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Кореја
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Летонски
 Language_mk_MK=Македонски
@@ -64,6 +69,7 @@ Language_sv_SV=Шведската
 Language_sv_SE=Шведската
 Language_sq_AL=Albanian
 Language_sk_SK=Словачки
+Language_sw_SW=Kiswahili
 Language_th_TH=Тајландски
 Language_uk_UA=Украинскиот
 Language_uz_UZ=Узбекистански
diff --git a/htdocs/langs/mk_MK/loan.lang b/htdocs/langs/mk_MK/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/mk_MK/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index c7c79e7f816..68e8ec31f63 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/mk_MK/printing.lang b/htdocs/langs/mk_MK/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/mk_MK/printing.lang
+++ b/htdocs/langs/mk_MK/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/mk_MK/propal.lang b/htdocs/langs/mk_MK/propal.lang
index d17bc952b7d..d10dbb15122 100644
--- a/htdocs/langs/mk_MK/propal.lang
+++ b/htdocs/langs/mk_MK/propal.lang
@@ -1,102 +1,101 @@
 # Dolibarr language file - Source file is en_US - propal
-# Proposals=Commercial proposals
-# Proposal=Commercial proposal
-# ProposalShort=Proposal
-# ProposalsDraft=Draft commercial proposals
-# ProposalDraft=Draft commercial proposal
-# ProposalsOpened=Opened commercial proposals
-# Prop=Commercial proposals
-# CommercialProposal=Commercial proposal
-# CommercialProposals=Commercial proposals
-# ProposalCard=Proposal card
-# NewProp=New commercial proposal
-# NewProposal=New commercial proposal
-# NewPropal=New proposal
-# Prospect=Prospect
-# ProspectList=Prospect list
-# DeleteProp=Delete commercial proposal
-# ValidateProp=Validate commercial proposal
-# AddProp=Add proposal
-# ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-# ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-# LastPropals=Last %s proposals
-# LastClosedProposals=Last %s closed proposals
-# LastModifiedProposals=Last %s modified proposals
-# AllPropals=All proposals
-# LastProposals=Last proposals
-# SearchAProposal=Search a proposal
-# ProposalsStatistics=Commercial proposal's statistics
-# NumberOfProposalsByMonth=Number by month
-# AmountOfProposalsByMonthHT=Amount by month (net of tax)
-# NbOfProposals=Number of commercial proposals
-# ShowPropal=Show proposal
-# PropalsDraft=Drafts
-# PropalsOpened=Opened
-# PropalsNotBilled=Closed not billed
-# PropalStatusDraft=Draft (needs to be validated)
-# PropalStatusValidated=Validated (proposal is open)
-# PropalStatusOpened=Validated (proposal is open)
-# PropalStatusClosed=Closed
-# PropalStatusSigned=Signed (needs billing)
-# PropalStatusNotSigned=Not signed (closed)
-# PropalStatusBilled=Billed
-# PropalStatusDraftShort=Draft
-# PropalStatusValidatedShort=Validated
-# PropalStatusOpenedShort=Opened
-# PropalStatusClosedShort=Closed
-# PropalStatusSignedShort=Signed
-# PropalStatusNotSignedShort=Not signed
-# PropalStatusBilledShort=Billed
-# PropalsToClose=Commercial proposals to close
-# PropalsToBill=Signed commercial proposals to bill
-# ListOfProposals=List of commercial proposals
-# ActionsOnPropal=Events on proposal
-# NoOpenedPropals=No opened commercial proposals
-# NoOtherOpenedPropals=No other opened commercial proposals
-# RefProposal=Commercial proposal ref
-# SendPropalByMail=Send commercial proposal by mail
-# FileNotUploaded=The file was not uploaded
-# FileUploaded=The file was successfully uploaded
-# AssociatedDocuments=Documents associated with the proposal:
-# ErrorCantOpenDir=Can't open directory
-# DatePropal=Date of proposal
-# DateEndPropal=Validity ending date
-# DateEndPropalShort=Date end
-# ValidityDuration=Validity duration
-# CloseAs=Close with status
-# ClassifyBilled=Classify billed
-# BuildBill=Build invoice
-# ErrorPropalNotFound=Propal %s not found
-# Estimate=Estimate :
-# EstimateShort=Estimate
-# OtherPropals=Other proposals
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
-# CopyPropalFrom=Create commercial proposal by copying existing proposal
-# CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-# DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-# UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-# ClonePropal=Clone commercial proposal
-# ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-# ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-# ProposalsAndProposalsLines=Commercial proposal and lines
-# ProposalLine=Proposal line
-# AvailabilityPeriod=Availability delay
-# SetAvailability=Set availability delay
-# AfterOrder=after order
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalDraft=Draft commercial proposal
+ProposalsOpened=Open commercial proposals
+Prop=Commercial proposals
+CommercialProposal=Commercial proposal
+CommercialProposals=Commercial proposals
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewProposal=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+ProspectList=Prospect list
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
+LastPropals=Last %s proposals
+LastClosedProposals=Last %s closed proposals
+LastModifiedProposals=Last %s modified proposals
+AllPropals=All proposals
+LastProposals=Last proposals
+SearchAProposal=Search a proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (net of tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalsNotBilled=Closed not billed
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusOpened=Validated (proposal is open)
+PropalStatusClosed=Closed
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
+PropalStatusOpenedShort=Open
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+AssociatedDocuments=Documents associated with the proposal:
+ErrorCantOpenDir=Can't open directory
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+DateEndPropalShort=Date end
+ValidityDuration=Validity duration
+CloseAs=Close with status
+ClassifyBilled=Classify billed
+BuildBill=Build invoice
+ErrorPropalNotFound=Propal %s not found
+Estimate=Estimate :
+EstimateShort=Estimate
+OtherPropals=Other proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+ClonePropal=Clone commercial proposal
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
 ##### Availability #####
-# AvailabilityTypeAV_NOW=Immediate
-# AvailabilityTypeAV_1W=1 week
-# AvailabilityTypeAV_2W=2 weeks
-# AvailabilityTypeAV_3W=3 weeks
-# AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
-# TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-# TypeContact_propal_external_BILLING=Customer invoice contact
-# TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 # Document models
-# DocModelAzurDescription=A complete proposal model (logo...)
-# DocModelJauneDescription=Jaune proposal model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=A complete proposal model (logo...)
+DocModelJauneDescription=Jaune proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/mk_MK/trips.lang
+++ b/htdocs/langs/mk_MK/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/mk_MK/workflow.lang b/htdocs/langs/mk_MK/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/mk_MK/workflow.lang
+++ b/htdocs/langs/mk_MK/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 0152bd1b728..484fdcb5544 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -1,98 +1,104 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Kolonneseparator for eksportfil
+ACCOUNTING_EXPORT_DATE=Datoformat for eksportfil
+ACCOUNTING_EXPORT_PIECE=Eksporter nummeret?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Eksporter med global konto?
+ACCOUNTING_EXPORT_LABEL=Eksportere etiketten?
+ACCOUNTING_EXPORT_AMOUNT=Eksportere beløp?
+ACCOUNTING_EXPORT_DEVISE=Eksporter enheten?
 
 Accounting=Regnskap
 Globalparameters=Globale parametre
-Chartofaccounts=Chart of accounts
+Chartofaccounts=Diagram over kontoer
 Fiscalyear=Regnskapsår
 Menuaccount=Regnskapskonti
-Menuthirdpartyaccount=Thirdparty accounts
+Menuthirdpartyaccount=Tredjepart-kontoer
 MenuTools=Verktøy
 
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Export=Export
-Modelcsv=Model of export
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
-Back=Return
+ConfigAccountingExpert=Oppsett av regnskapsekspert-modulen
+Journaux=Journaler
+JournalFinancial=Finansjournaler
+Exports=Eksport
+Export=Eksport
+Modelcsv=Eksportmodell
+OptionsDeactivatedForThisExportModel=Ingen opsjoner for denne eksportmodellen
+Selectmodelcsv=Velg eksportmodell
+Modelcsv_normal=Klassisk eksport
+Modelcsv_CEGID=Eksport mot CEGID ekspert
+BackToChartofaccounts=Returner kontodiagrammer
+Back=Retur
 
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+Definechartofaccounts=Definer et kontodiagram
+Selectchartofaccounts=Velg et kontodiagram
+Validate=Valider
+Addanaccount=Legg til regnskapskonto
+AccountAccounting=Regnskapskonto
+Ventilation=Fordeling
+ToDispatch=Skal sendes
+Dispatched=Sendt
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+CustomersVentilation=Kundefordeling
+SuppliersVentilation=Leverandørfordeling
+TradeMargin=Handelsmargin
+Reports=Rapporter
+ByCustomerInvoice=Etter kundefakturaer
+ByMonth=Etter måned
+NewAccount=Ny regnskapskonto
+Update=Oppdater
+List=Liste
+Create=Opprett
+UpdateAccount=Endring av regnskapskonto
+UpdateMvts=Endring av bevegelse
+WriteBookKeeping=Legg til kontoer i hovedbok
+Bookkeeping=Hovedbok
+AccountBalanceByMonth=Kontobalanse etter måned
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+AccountingVentilation=Regnskapsfordeling
+AccountingVentilationSupplier=Regnskapsfordeling leverandører
+AccountingVentilationCustomer=Regnskapsfordeling kunder
+Line=Linje
 
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
+CAHTF=Totalt innkjøp HT
+InvoiceLines=Fakturalinjer som skal ventileres
+InvoiceLinesDone=Ventilerte fakturalinjer
+IntoAccount=I regnskapskontoen
 
-Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+Ventilate=Ventiler
+VentilationAuto=Automatisk fordeling
 
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+Processing=Prosesserer
+EndProcessing=Slutt på prosessering
+AnyLineVentilate=Noen linjer å ventilere?
 SelectedLines=Valgte linjer
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+Lineofinvoice=Fakturalinje
+VentilatedinAccount=Vellykket ventilering i regnskapskonto
+NotVentilatedinAccount=Ikke ventilert i regnskapskontoen
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Kolonneseparator i eksportfil
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Antall elementer å fordele på siden (maks anbefalt er 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Start sortering av fordelingssidene "Må fordeles" etter nyeste elementer
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av fordelingssidene "Fordeling" etter de nyeste elementene
 
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+AccountLength=Lengde på regnskapskontoer vist i Dolibarr
+AccountLengthDesc=Funksjon for å redusere lengden på regnskapskontoene ved å erstatte mellomrom med null. Denne funksjonen berører bare visning, det endrer ikke regnskapskontoene registrert i Dolibarr. For eksport, er denne funksjonen nødvendig for å være kompatibel med enkelte programvarer.
+ACCOUNTING_LENGTH_GACCOUNT=Lengde på generelle kontoer
+ACCOUNTING_LENGTH_AACCOUNT=Lengde på tredjepartskontoer
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Salgsjournal
+ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverse-journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsjournal
+ACCOUNTING_SOCIAL_JOURNAL=Sosial-journal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Overføringskonto
+ACCOUNTING_ACCOUNT_SUSPENSE=Ventekonto
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard regnskapskonto for kjøpte varer (hvis den ikke er definert i vareskjemaet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard regnskapskonto for solgte varer (hvis den ikke er definert i vareskjemaet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard regnskapskonto for kjøpte tjenester (hvis den ikke er definert i vareskjemaet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard regnskapskonto for solgte tjenester (hvis den ikke er definert i vareskjemaet)
 
 Doctype=Dokumenttype
 Docdate=Dato
@@ -113,48 +119,48 @@ PurchasesJournal=Innkjøpsjournal
 DescSellsJournal=Salgsjournal
 DescPurchasesJournal=Innkjøpsjournal
 BankJournal=Bankjournal
-DescBankJournal=Bank journal including all the types of payments other than cash
+DescBankJournal=Bankjournal inkludert alle typer annet enn kontantbetalinger
 CashJournal=Kontantjournal
-DescCashJournal=Cash journal including the type of payment cash
+DescCashJournal=Kontantjournal med kontantbetalinger
 
 CashPayment=Kontant Betaling
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Betaling av leverandørfaktura
+CustomerInvoicePayment=Betaling av kundefaktura
 
 ThirdPartyAccount=Tredjepart konto
 
 NewAccountingMvt=Ny bevegelse
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NumMvts=Bevegelsesnummer
+ListeMvts=Liste over bevegelser
 ErrorDebitCredit=Debet og Kredit kan ikke ha en verdi samtidig
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Liste over tredjepartskontoer
+DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoer
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Liste over regnskapskontoer
 
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgversion=Planversjon
+Pcgtype=Kontoklasse
+Pcgsubtype=Konto underklasse
+Accountparent=Konto-base
+Active=Uttalelse
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Nytt regnskapsår
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Årlig regnskapsfordelingfordeling over kundefakturaer
+TotalVente=Totalomsetning HT
+TotalMarge=Total salgsmargin
+DescVentilDoneCustomer=Liste over linjer på kundefakturaer og deres regnskapskontoer
+DescVentilTodoCustomer=Ventiler kundefaktura-linjer med en regnskapskonto
+ChangeAccount=Endre regnskapskontoen for valgte linjer til:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Årlig regnskapsmessig fordeling av leverandørfakturaer
+DescVentilTodoSupplier=Ventiler leverandørfaktura-linjer med en regnskapskonto
+DescVentilDoneSupplier=Liste over linjer på leverandørfakturaer og deres regnskapskontoer
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Valider automatisk
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Feil! Du kan ikke slette denne regnskapskontoen fordi den er i bruk
 
-FicheVentilation=Breakdown card
+FicheVentilation=Fordelingskort
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 2e0b25f81f6..ab50e7ab89b 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -8,24 +8,24 @@ VersionExperimental=Eksperimentell
 VersionDevelopment=Utviklingsversjon
 VersionUnknown=Ukjent
 VersionRecommanded=Anbefalt
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
-SessionId=Økt ID
-SessionSaveHandler=Handler for å lagre sessions
-SessionSavePath=Lagring økt lokalisering
+FileCheck=Filintegritet
+FilesMissing=Manglende filer
+FilesUpdated=Oppdaterte filer
+FileCheckDolibarr=Integritetssjekk av Dolibarrfiler
+XmlNotFound=Xml-fil for Dolibarr-integritet ikke funnet
+SessionId=Økt-ID
+SessionSaveHandler=Håndterer for å lagre sesjoner
+SessionSavePath=Sted for lagring av økt 
 PurgeSessions=Utrenskning av øktene
 ConfirmPurgeSessions=Ønsker du virkelig å rense alle økter? Dette vil koble fra alle brukere (bortsett fra deg selv).
-NoSessionListWithThisHandler=Lagre session behandleren konfigurert i PHP ikke tillater å vise alle kjører økter.
+NoSessionListWithThisHandler=Øktlagrings-behandleren i PHP tillater ikke å vise alle kjørende økter.
 LockNewSessions=Lås nye tilkoblinger
-ConfirmLockNewSessions=Er du sikker på at du vil begrense eventuelle nye Dolibarr tilkobling til deg selv. Bare brukeren <b>%s</b> vil kunne koble til etter det.
-UnlockNewSessions=Fjern forbindelse lås
-YourSession=Økten
-Sessions=Brukere session
-WebUserGroup=Web server bruker / gruppe
-NoSessionFound=Din PHP synes å ikke tillate å liste aktive økter. Directory brukes til å lagre sessions <b>(%s)</b> kan være beskyttet (for eksempel etter OS tillatelser eller PHP direktivet open_basedir).
+ConfirmLockNewSessions=Er du sikker på at du vil begrense eventuelle nye Dolibarr tilkoblinger til deg selv?. Bare brukeren <b>%s</b> vil kunne koble til etter det.
+UnlockNewSessions=Fjern forbindelseslås
+YourSession=Din økt
+Sessions=Brukerøkter
+WebUserGroup=Webserver bruker/gruppe
+NoSessionFound=Din PHP synes å ikke tillate å liste aktive økter. Mappen brukt til å lagre økter <b>(%s)</b> kan være beskyttet (for eksempel etter OS tillatelser eller PHP direktiv open_basedir).
 HTMLCharset=Tegnsett for genererte HTML sider
 DBStoringCharset=Databasetegnsett for lagring av data
 DBSortingCharset=Databasetegnsett for sortering av data
@@ -41,41 +41,41 @@ GlobalSetup=Globalt oppsett
 GUISetup=Display
 SetupArea=Oppsett
 FormToTestFileUploadForm=Skjema for å teste opplasting (i henhold til oppsett)
-IfModuleEnabled=Merk: er ja effektiv bare hvis modulen <b>%s</b> er aktivert
-RemoveLock=Fjern fil <b>%s</b> hvis den eksisterer for å tillate oppdatere verktøyet.
-RestoreLock=Erstatte en fil <b>%s</b> med leserettigheter bare på filen for å deaktivere bruk av oppdatere verktøyet.
-SecuritySetup=Sikkerhetsinstillinger
+IfModuleEnabled=Merk: Ja er bare effektiv hvis modulen <b>%s</b> er aktivert
+RemoveLock=Fjern filen <b>%s</b> , hvis den finnes, for å tillate bruk av oppdateringsverktøyet.
+RestoreLock=Gjenopprett filen <b>%s</b> med kun leserettigheter, for å deaktivere bruk av oppdateringsverktøyet.
+SecuritySetup=Sikkerhetsinnstillinger
 ErrorModuleRequirePHPVersion=Feil: Denne modulen krever PHP versjon %s eller høyere
 ErrorModuleRequireDolibarrVersion=Feil: Denne modulen krever Dolibarr versjon %s eller høyere
 ErrorDecimalLargerThanAreForbidden=Feil: Presisjon over <b>%s</b> støttes ikke.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-Chartofaccounts=Chart of accounts
+DictionarySetup=Oppsett av ordliste
+Dictionary=Ordlister
+Chartofaccounts=Graf over kontoer
 Fiscalyear=Regnskapsår
-ErrorReservedTypeSystemSystemAuto=Value 'system' og 'systemauto' for type er reservert. Du kan bruke 'user' som verdi å legge til din egen oppføring
+ErrorReservedTypeSystemSystemAuto=Verdiene 'system' og 'systemauto' for type er reservert. Du kan bruke 'user' som verdi for å legge til din egen oppføring
 ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0
-DisableJavascript=Deaktiver JavaScript og Ajax funksjoner (Anbefalt for blinde og tekstbaserte nettlesere)
+DisableJavascript=Deaktiver JavaScript og Ajax funksjoner (Anbefalt for tekstbaserte nettlesere og blinde)
 ConfirmAjax=Bruk bekreftelsesvinduer basert på Ajax
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectCompanyTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 UseSearchToSelectCompany=Bruk autofullfør-felt for å velge tredjepart, i stedet for å bruke listeboks.
-ActivityStateToSelectCompany= Legg til en filter alternativ for å vise / skjule thirdparties som i dag er i aktivitet eller har opphørt det
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+ActivityStateToSelectCompany= Legg til et filteralternativ for å vise/skjule tredjeparter som er aktivite eller ikke
+UseSearchToSelectContactTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 UseSearchToSelectContact=Bruk autofullfør-felt for å velge kontakt (i stedet for å bruke listeboks).
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
-SearchFilter=Søkefiltrene alternativer
-NumberOfKeyToSearch=NBR tegn til å utløse søk: %s
+DelaiedFullListToSelectCompany=Vent med å trykke på noen taster før innholdet i tredjeparts-kombilisten er lastet (Dette kan øke ytelsen hvis du har et stort antall tredjeparter)
+DelaiedFullListToSelectContact=Vent med å trykke på noen taster før innholdet i kontakt-kombilisten er lastet (Dette kan øke ytelsen hvis du har et stort antall tredjeparter)
+SearchFilter=Alternativer for søkefiltre 
+NumberOfKeyToSearch=Antall tegn for å starte søk: %s
 ViewFullDateActions=Vis fulle datoer i tredje ark
 NotAvailableWhenAjaxDisabled=Ikke tilgjengelig når Ajax er slått av
-JavascriptDisabled=JavaScript er slått av
+JavascriptDisabled=JavaScript er deaktivert
 UsePopupCalendar=Bruk sprettoppmeny for datoangivelser
 UsePreviewTabs=Bruk faner for forhåndsvisning
-ShowPreview=Vis forhåndsvisning
+ShowPreview=Forhåndsvisning
 PreviewNotAvailable=Forhåndsvisning ikke tilgjengelig
 ThemeCurrentlyActive=Gjeldende tema
-CurrentTimeZone=Gjeldende tidssone
+CurrentTimeZone=Tidssone for PHP (server)
 MySQLTimeZone=Tidssone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+TZHasNoEffect=Datoer lagres og returneres av databaseserver som innsendt streng. Tidssonen har kun effekt ved bruk av UNIX_TIMESTAMP funksjon (som ikke bør brukes av Dolibarr, slik database TZ ikke skal ha noen effekt, selv om den ble endret etter at data ble lagt inn).
 Space=Mellomrom
 Table=Tabell
 Fields=Felt
@@ -84,29 +84,29 @@ Mask=Maske
 NextValue=Neste verdi
 NextValueForInvoices=Neste verdi (fakturaer)
 NextValueForCreditNotes=Neste verdi (kreditnotaer)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Neste beløp (innskudd)
 NextValueForReplacements=Neste verdi (erstatninger)
-MustBeLowerThanPHPLimit=OBS: PHP begrenser hver filopplastning til <b>%s</b> %s, uansett hva som er angitt her
-NoMaxSizeByPHPLimit=OBS: Det er ikke satt noen øvre grense i PHP på denne serveren
+MustBeLowerThanPHPLimit=Merk: PHP begrenser hver filopplastning til <b>%s</b> %s, uansett hva som er angitt her
+NoMaxSizeByPHPLimit=Merk: Det er ikke satt noen begrensninger i din PHP-konfigurasjon på denne serveren
 MaxSizeForUploadedFiles=Maksimal filstørrelse for opplasting av filer (0 for å ikke tillate opplasting)
 UseCaptchaCode=Bruk Capthca på innloggingsside
 UseAvToScanUploadedFiles=Kjør anti-virus på opplastede filer
 AntiVirusCommand= Full sti til antivirus kommandoen
-AntiVirusCommandExample= Eksempel på ClamWin: c: \\ Program Files (x86) \\ Klappe \\ bin \\ clamscan.exe <br> Eksempel på ClamAV: / usr / bin / clamscan
+AntiVirusCommandExample= Eksempel på ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe <br> Eksempel på ClamAV: /usr/bin/clamscan
 AntiVirusParam= Flere parametre på kommandolinjen
-AntiVirusParamExample= Eksempel på ClamWin: - database = "C: \\ Program Files (x86) \\ Klappe \\ lib"
+AntiVirusParamExample= Eksempel på ClamWin: - database = "C:\\Program Files (x86)\\ClamWin\\ lib"
 ComptaSetup=Oppsett av regnskapsmodul
 UserSetup=Oppsett av brukere
 MenuSetup=Oppsett av menyer
 MenuLimits=Grenser og presisjon
 MenuIdParent=ID foreldremeny
-DetailMenuIdParent=ID foreldremeny (0 for toppmeny)
+DetailMenuIdParent=ID foreldremeny (tom for toppmeny)
 DetailPosition=Sorteringsnummer i meny
 PersonalizedMenusNotSupported=Egendefinerte menyer støttes ikke
 AllMenus=Alle
 NotConfigured=Ikke konfigurert
 Setup=Innstillinger
-Activation=Akivering
+Activation=Aktivering
 Active=Aktiv
 SetupShort=Innstillinger
 OtherOptions=Andre innstillinger
@@ -117,7 +117,7 @@ Destination=Mål
 IdModule=Modul ID
 IdPermissions=Rettigheter ID
 Modules=Moduler
-ModulesCommon=Vanligste moduler
+ModulesCommon=Hovedmoduler
 ModulesOther=Andre moduler
 ModulesInterfaces=Grensenittmoduler
 ModulesSpecial=Spesialmoduler
@@ -129,45 +129,44 @@ ClientTZ=Tidssone (bruker)
 ClientHour=Klienttid (bruker)
 OSTZ=Server OS Tidssone
 PHPTZ=Tidssone PHP
-PHPServerOffsetWithGreenwich=Forskyvning for PHP-server mot Greenwich (sekunder)
-ClientOffsetWithGreenwich=Klient / Browser offset bredde Greenwich (sekunder)
-DaylingSavingTime=Sommertid (bruker)
-CurrentHour=Gjeldende tid
-CompanyTZ=Time Zone selskap (firmaets)
+PHPServerOffsetWithGreenwich=Forskyvning for PHP-server mot GMT (sekunder)
+ClientOffsetWithGreenwich=Klient/Nettleser offset i forhold til GMT (sekunder)
+DaylingSavingTime=Sommertid
+CurrentHour=PHP tid (server)
+CompanyTZ=Tidssone for firmaet (hovedkontoret)
 CompanyHour=Time selskap (firmaets)
 CurrentSessionTimeOut=Gjeldende økt-timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=Hvis du vil angi en annen PHP tidssone (ikke nødvendig), kan du prøve å legge til filen  .htacces meddenne linjen "SetEnv TZ Europe/Oslo"
 OSEnv=OS-miljø
 Box=Boks
 Boxes=Bokser
-MaxNbOfLinesForBoxes=Maks. antall linher for bokser
+MaxNbOfLinesForBoxes=Maks. antall linjer for bokser
 PositionByDefault=Gjeldende rekkefølge
 Position=Posisjon
-MenusDesc=Menybehandleren avgjør innholdet i de to menyene (horisontal og vertikal menybjelke).
-MenusEditorDesc=I menybehandleren kan du stille inn egne menyvalg. Bruk denne med forsiktighet for å unngå at Dolibarr blir ustabil eller at noen menyvalg blit permanent borte.<br>Noen moduler legger til oppføringer i menyene (i meny <b>Alle</b> i de fleste tilfeller). Hvis du har fjernet noen av disse ved en feiltagelse kan du få dem tilbake ved å slå av og slå på modulen igjen.
+MenusDesc=Menybehandleren avgjør innholdet i de to menyene (horisontal og vertikal meny).
+MenusEditorDesc=I menybehandleren kan du stille inn egne menyvalg. Bruk denne med forsiktighet for å unngå at Dolibarr blir ustabil eller at noen menyvalg blir permanent utilgjengelige.<br>Noen moduler legger til oppføringer i menyene (i meny <b>Alle</b> i de fleste tilfeller). Hvis du har fjernet noen av disse ved en feiltagelse kan du få dem tilbake ved å slå av og slå på modulen igjen.
 MenuForUsers=Brukermeny
-LangFile=Fil .lang
+LangFile=.lang-fil
 System=System
 SystemInfo=Systeminformasjon
-SystemTools=Systemverktøy
 SystemToolsArea=Område for systemverktøy
-SystemToolsAreaDesc=Dette området gir tilgang til administrasjonsfunksjonene. Bruk menyen til å velge funksjonen du leter etter.
+SystemToolsAreaDesc=Dette området gir tilgang til administrasjonsfunksjonene. Bruk menyen for å velge funksjonen du ønsker.
 Purge=Utrenskning
 PurgeAreaDesc=Denne siden lar deg slette alle filer opprettet eller lagret av Dolibarr (midlertidige filer eller alle filer i mappen <b>%s</b>). Normalt er det ikke nødvendig å bruke denne funksjonen. Den er laget for brukere som har Dolibarr installert på en delt server, og hvor man ikke har tilgang til å slette filer opprettet av webserveren.
-PurgeDeleteLogFile=Slett loggfil <b>%s</b> definert for Syslog modul (ingen risiko for å miste data)
+PurgeDeleteLogFile=Slett loggfil <b>%s</b> definert for Syslog-modul (ingen risiko for å miste data)
 PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (medfører ingen risiko for å miste data)
-PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i mappen <b>%s</b>. Dette vil slette midlertidige filer, men også filer som er lastet opp som vedlegg til elementer (tredjeparter, fakturaer osv. ). Alle filer lastet opp i ECM-modulen vil bli slettet!!!
-PurgeRunNow=Purge now
-PurgeNothingToDelete=no directory to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Fjern alle handlinger
-ConfirmPurgeAuditEvents=Er du sikker på at du vil fjerne alle sikkrehetshendelser? Alle sikkerhetslogger vil bli slettet, ingen andre data vil bli slettet.
+PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i mappen <b>%s</b>. Dette vil slette midlertidige filer, database sikkerhetskopier og filer som er lastet opp som vedlegg til elementer (tredjeparter, fakturaer osv. ). Alle filer lastet opp i ECM-modulen vil bli slettet.
+PurgeRunNow=Start utrenskning
+PurgeNothingToDelete=Ingen mapper eller filer å slette.
+PurgeNDirectoriesDeleted=<b>%s</b> filer eller mapper slettet.
+PurgeAuditEvents=Fjern alle sikkerhetshendelser
+ConfirmPurgeAuditEvents=Er du sikker på at du vil fjerne alle sikkerhetshendelser? Alle sikkerhetslogger vil bli slettet, ingen andre data vil bli slettet.
 NewBackup=Ny backup
 GenerateBackup=Opprett sikkerhetskopi
 Backup=Ta sikkerhetskopi
 Restore=Gjenopprett fra sikkerhetskopi
-RunCommandSummary=Sikkerhetskopiering vil bli utført gjennom følgende kommando
-RunCommandSummaryToLaunch=Backup kan bli lansert med følgende kommando
+RunCommandSummary=Sikkerhetskopiering er startet med følgende kommando
+RunCommandSummaryToLaunch=Backup startes med følgende kommando
 WebServerMustHavePermissionForCommand=Webserveren må ha rettigheter til å kjøre slike kommandoer
 BackupResult=Resultat av sikkerhetsopiering
 BackupFileSuccessfullyCreated=Sikkerhetskopi opprettet
@@ -175,19 +174,19 @@ YouCanDownloadBackupFile=Sikkerhetskopien kan nå lastes ned
 NoBackupFileAvailable=Ingen sikkerhetskopier er tilgjengelig.
 ExportMethod=Eksporteringsmetode
 ImportMethod=Importeringsmetode
-ToBuildBackupFileClickHere=Klikk <a href="%s">here</a> for å lage en backupfil.
-ImportMySqlDesc=For å legge tilbake sikkerhetskopi må du kjøre følgende mysql-kommando fra kommandolinja:
-ImportPostgreSqlDesc=Slik importerer du en backup-fil, må du bruke pg_restore kommando fra kommandolinjen:
+ToBuildBackupFileClickHere=Klikk <a href="%s">her</a> for å lage en backupfil.
+ImportMySqlDesc=For å gjenopprette fra en sikkerhetskopi må du kjøre følgende MySQL-kommando fra kommandolinjen:
+ImportPostgreSqlDesc=For å importere en backup-fil, må du bruke kommandoen pg_restore fra kommandolinjen:
 ImportMySqlCommand=%s %s < myinbackupfil.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Filnavn å opprette
-Compression=Kompresjon
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+Compression=Komprimering
+CommandsToDisableForeignKeysForImport=Kommando for å deaktivere ukjente nøkler ved import
 CommandsToDisableForeignKeysForImportWarning=Obligatorisk hvis du ønsker å gjenopprette sql dump senere
 ExportCompatibility=Kompatibilitet for eksportert fil
 MySqlExportParameters=MySQL eksportparametere
-PostgreSqlExportParameters= PostgreSQL eksportparametere
-UseTransactionnalMode=Bruk transactional modus
+PostgreSqlExportParameters= PostgreSQL eksportparametre
+UseTransactionnalMode=Bruk transaksjonsmodus
 FullPathToMysqldumpCommand=Full filsti til kommandoen mysqldump
 FullPathToPostgreSQLdumpCommand=Full sti til pg_dump kommandoen
 ExportOptions=Eksportinnstillinger
@@ -196,46 +195,46 @@ AddDropTable=Legg til kommandoen DROP TABLE
 ExportStructure=Struktur
 Datas=Data
 NameColumn=Kolonnenavn
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=Ingen lås kommandoer rundt INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignorer feil av like poster (INS ignorere)
+ExtendedInsert=Utvidet INSERT
+NoLockBeforeInsert=Ingen låsekommandoer rundt INSERT
+DelayedInsert=Forsinket INSERT
+EncodeBinariesInHexa=Binære data kodes hexadecimalt
+IgnoreDuplicateRecords=Ignorer duplikat-feil (INSERT IGNORE)
 Yes=Ja
 No=Nei
 AutoDetectLang=Automatisk (nettleserspråk)
 FeatureDisabledInDemo=Funksjonen er slått av i demo
 Rights=Tillatelser
-BoxesDesc=Bokser er områder på skjermen som viser informasjon på ønskede sider. Du kan velge om boksen skal vises eller ikke ved å velge målside og klikke på 'Aktiver', eller ved å klikke på papirkurven for å slå den av.
+BoxesDesc=Bokser er områder på skjermen som viser informasjon på enkelte sider. Du kan velge om boksen skal vises eller ikke ved å velge målside og klikke på 'Aktiver', eller ved å klikke på papirkurven for å slå den av.
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
 ModulesDesc=Dolibarrmodulene styrer hvilken funksjonalitet som er aktivert i programmet. Noen moduler krever at du tildeler brukerne tilgangsrettigheter etter at du har slått på modulen.
 ModulesInterfaceDesc=Modulgrensesnittet i Dolibarr lar deg legge til funksjoner som bruker eksterne programmer, systemer eller tjenester.
-ModulesSpecialDesc=Spesialmoduler er svært spesifikke moduler, eller moduler som sjelden blir sjelden brukt.
+ModulesSpecialDesc=Spesialmoduler er svært spesifikke moduler, eller moduler som sjelden blir brukt.
 ModulesJobDesc=Forretningsmoduler gir et enkelt forhåndsinnstilt oppsett av Dolibarr for spesielle typer bedrifter.
-ModulesMarketPlaceDesc=Du kan finne flere moduler for å laste ned på eksterne nettsider på Internett ...
+ModulesMarketPlaceDesc=Du kan finne flere moduler for nedlasting på eksterne websider.
 ModulesMarketPlaces=Flere moduler ...
-DoliStoreDesc=DoliStore, den offisielle markedsplassen for Dolibarr ERP / CRM eksterne moduler
-DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
-WebSiteDesc=Webområde leverandører du kan søke å finne flere moduler ...
-URL=Link
+DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
+DoliPartnersDesc=Liste med noen selskaper som kan gi/utvikle moduler eller funksjoner (Merk: Alle Open Source-selskaper som kan PHP, kan lage spesifikke egenskaper)
+WebSiteDesc=Web-leverandører du kan søke hos for å finne flere moduler.
+URL=Lenke
 BoxesAvailable=Tilgjengelige bokser
 BoxesActivated=Aktiverte bokser
-ActivateOn=Aktiver den
+ActivateOn=Aktivert den
 ActiveOn=Aktivert den
 SourceFile=Kildefil
 AutomaticIfJavascriptDisabled=Automatisk hvis Javascript er slått av
-AvailableOnlyIfJavascriptNotDisabled=Tilgjengelig bare når JavaScript ikke er slått av
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Tilgjengelig bare hvis Javascript og Ajax ikke er slått av
+AvailableOnlyIfJavascriptNotDisabled=Tilgjengelig bare hvis JavaScript er aktivert
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Tilgjengelig bare hvis Javascript og Ajax er aktivert
 Required=Påkrevet
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Kun brukt i noen Agenda-opsjoner
 Security=Sikkerhet
 Passwords=Passord
-DoNotStoreClearPassword=Har ingen butikk klar passord i databasen men butikken bare kryptert verdi (Aktiverte anbefales)
-MainDbPasswordFileConfEncrypted=Databasepassord kryptert i conf.php
-InstrucToEncodePass=Å ha passord kodet inn i <b>conf.php</b> filen, erstatte linjen <br> <b>$ Dolibarr_main_db_pass ="..."</b> <br> av <br> <b>$ Dolibarr_main_db_pass = "kryptert: %s"</b>
-InstrucToClearPass=Å ha passord dekodet (klar) inn i <b>conf.php</b> filen, erstatte linjen <br> <b>$ Dolibarr_main_db_pass = "kryptert :..."</b> <br> av <br> <b>$ Dolibarr_main_db_pass = "%s"</b>
-ProtectAndEncryptPdfFiles=Beskytt genererte pdf-filer (anbefales ikke, brekker mulighet for massegenerering av PDF'er)
-ProtectAndEncryptPdfFilesDesc=Beskyttede PDF-filer kan fortsatt leses og skrives ut med alle PDF-lesere. De kan derimot ikke redigeres eller kopieres fra. Når du bruker denne funksjonen vil det ikke være mulig å lage globale akkumulerte PDF-filer ( som for eksempel ubetalte fakturaer ).
+DoNotStoreClearPassword=Lagrer passord i krypert form og ikke i klartekst (Aktivering anbefales)
+MainDbPasswordFileConfEncrypted=Databasepassord kryptert i conf.php (Aktivering anbefales)
+InstrucToEncodePass=For å kryptere passordet i <b>conf.php</b> , bytt ut linjen <br><b>$dolibarr_main_db_pass="...";</b><br>med<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=For passord i klartekst(helst ikke) i <b>conf.php</b> , bytt ut linjen <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>med<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Beskytt genererte pdf-filer (anbefales ikke, fjerner mulighet for massegenerering av PDF'er)
+ProtectAndEncryptPdfFilesDesc=Beskyttede PDF-filer kan fortsatt leses og skrives ut med alle PDF-lesere. De kan derimot ikke redigeres eller kopieres fra. Når du bruker denne funksjonen vil det ikke være mulig å lage globale akkumulerte PDF-filer (som for eksempel ubetalte fakturaer).
 Feature=Funksjon
 DolibarrLicense=Lisens
 DolibarrProjectLeader=Prosjektleder
@@ -245,34 +244,34 @@ OfficialWebSite=Internasjonalt offisielt nettsted
 OfficialWebSiteFr=Fransk offisielt nettsted
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr online demonstrasjon
-OfficialMarketPlace=Offisiell markedsplass for eksterne moduler / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialMarketPlace=Offisiell markedsplass for eksterne moduler/tillegg
+OfficialWebHostingService=Referert webhosting service (Cloud hosting)
 ReferencedPreferredPartners=Foretrukne Partnere
 OtherResources=Andre ressurser
-ForDocumentationSeeWiki=For brukeren eller utviklerens dokumentasjon (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=For andre spørsmål / hjelp, kan du bruke Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
-HelpCenterDesc1=Dette området kan hjelpe deg å få en Help support tjeneste på Dolibarr.
+ForDocumentationSeeWiki=For bruker- eller utviklerdokumentasjon (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
+ForAnswersSeeForum=For andre spørsmål/hjelp, kan du bruke Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
+HelpCenterDesc1=Dette området kan hjelpe deg å få support-tjeneste med Dolibarr.
 HelpCenterDesc2=Enkelte deler av denne tjenesten er <b>kun</b> tilgjengelig på <b>engelsk.</b>
-CurrentTopMenuHandler=Gjeldene menybehandler toppmeny
-CurrentLeftMenuHandler=Gjeldende memenybehandler venstre meny
-CurrentMenuHandler=Gjeldende menyen behandleren
-CurrentSmartphoneMenuHandler=Gjeldende smarttelefon menyen behandleren
+CurrentTopMenuHandler=Gjeldene menybehandler for toppmeny
+CurrentLeftMenuHandler=Gjeldende memenybehandler for venstre meny
+CurrentMenuHandler=Gjeldende menyen behandler
+CurrentSmartphoneMenuHandler=Gjeldende menybehandleren for smarttelefon 
 MeasuringUnit=Måleenhet
 Emails=E-poster
 EMailsSetup=E-postinnstillinger
 EMailsDesc=Denne siden lar deg overstyre PHP-innstillingene for å sende e-post. I de fleste tilfeller på Unix/Linuxservere er PHP-innstillingene korrekte, slik at disse innstillingene er unødvendige.
-MAIN_MAIL_SMTP_PORT=SMTP-port (I php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP-server (I php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT=SMTP-port (Standard i php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP-server (Standard i php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP-port (Settes ikke i PHP på Unix/Linux)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-server (Settes ikke i PHP på Unix/Linux)
-MAIN_MAIL_EMAIL_FROM=Avsenders e-postadresse for automatiske e-poster (I php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Avsender e-post brukes for feil avkastning e-poster sendt
+MAIN_MAIL_EMAIL_FROM=Avsenders e-postadresse for automatiske e-poster (Standard i php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Avsenders e-postadresse brukt for returnerte e-poster
 MAIN_MAIL_AUTOCOPY_TO= Send systematisk en skjult karbon-kopi av alle sendte e-post til
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
-MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
-MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send skjult kopi av utsendte tilbud til
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send skjult kopi av utsendte ordre til
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send skjult kopi av utsendte fakturaer til
 MAIN_DISABLE_ALL_MAILS=Slå av alle e-postutsendelser (for testformål eller demonstrasjoner)
-MAIN_MAIL_SENDMODE=Metoden å bruke for å sende e-post
+MAIN_MAIL_SENDMODE=Metode for å sende e-post
 MAIN_MAIL_SMTPS_ID=SMTP-ID hvis godkjenning kreves
 MAIN_MAIL_SMTPS_PW=SMTP-passord hvis godkjenning kreves
 MAIN_MAIL_EMAIL_TLS= Bruk TLS (SSL) krypterer
@@ -280,15 +279,15 @@ MAIN_DISABLE_ALL_SMS=Deaktiver alle SMS sendings (for testformål eller demoer)
 MAIN_SMS_SENDMODE=Metode for å sende SMS
 MAIN_MAIL_SMS_FROM=Standard avsender telefonnummer for sending av SMS
 FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test sendmail lokalt.
-SubmitTranslation=Dersom oversettelse for dette språket er ikke komplett, eller du finner feil, kan du korrigere dette ved å redigere filer i katalogen <b>Langs / %s</b> og send endret filer på www.dolibarr.org forumet.
-ModuleSetup=Modulinstillinger
+SubmitTranslation=Dersom oversettelse for dette språket ikke er  komplett, eller du finner feil, kan du korrigere dette ved å redigere filer i mappen <b>langs/%s</b> og send endrede filer til www.dolibarr.org forumet.
+ModuleSetup=Modulinnstillinger
 ModulesSetup=Modulinnstillinger
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunderelasjonshåndtering (CRM)
-ModuleFamilyProducts=Produkthåndtering
+ModuleFamilyProducts=Varehåndtering
 ModuleFamilyHr=Personalhåndtering
 ModuleFamilyProjects=Prosjekter/Samarbeid
-ModuleFamilyOther=Andre
+ModuleFamilyOther=Annet
 ModuleFamilyTechnic=Multimodulverktøy
 ModuleFamilyExperimental=Eksperimentelle moduler
 ModuleFamilyFinancial=Finansielle moduler (Regnskap/Likviditet)
@@ -296,27 +295,27 @@ ModuleFamilyECM=ECM
 MenuHandlers=Menyhåndtering
 MenuAdmin=Menyredigering
 DoNotUseInProduction=Ikke bruk i produksjon
-ThisIsProcessToFollow=Dette er instillinger for:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=Dette er innstillinger for:
+ThisIsAlternativeProcessToFollow=Alternativt oppsett for å prosessere:
 StepNb=Trinn %s
 FindPackageFromWebSite=Finn en pakke som inneholder funksjonen du vil bruke (for eksempel på nettsider %s).
-DownloadPackageFromWebSite=Last ned pakke %s
-UnpackPackageInDolibarrRoot=Pakk ut filen i katalogen for eksterne moduler: <b>%s</b>
+DownloadPackageFromWebSite=Last ned pakke (for eksempel fra den offisielle websiden %s).
+UnpackPackageInDolibarrRoot=Pakk ut filen i Dolibarrs servermappe for eksterne moduler:<b>%s</b>
 SetupIsReadyForUse=Installasjonen er ferdig og Dolibarr er klar til bruk med den nye modulen.
 NotExistsDirect=Alternativ rotkatalog er ikke definert. <br>
 InfDirAlt=Etter versjon 3 er det mulig å definere en alternativ rotkatalog. Dette lar deg lagre plug-ins og egendefinerte maler på samme sted.<br>Bare lag en katalog i roten av Dolibarr (f.eks: egendefinert).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Velg modul:
-CurrentVersion=Dolibarr gjeldende versjon
+InfDirExample=<br>Aktiver det i conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*disse linjene er deaktivert med "#", for å aktivere fjernes #
+YouCanSubmitFile=I dette trinnet kan du sende pakken med dette verktøyet: Velg modulfil
+CurrentVersion=Gjeldende versjon av Dolibarr 
 CallUpdatePage=Gå til siden som oppdaterer databasestruktur og data %s.
 LastStableVersion=Siste stabile versjon
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Oppdater serveren offline
 GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:<br><b>{000000}</b> tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde. <br><b>{000000+000}</b> samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s. <br><b>{000000@x}</b> samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også. <br><b>{dd}</b> dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{yy}</b>, <b>{yyyy}</b> eller <b>{y}</b> årstall over 2, 4 eller 1 siffer. <br> <b>{cccc000}</b> klientkoden på n tegn etterfulgt av en klientreferanse uten forskyvning og nullet med den globale telleren.<br><br>Alle andre tegn i malen vil forbli intakte.<br>Mellomrom er ikke tillatt.<br><br><u>Eksempel på den 99de %s av tredjeparten blir 31/01/2007:</u><br><b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b><br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> Klientkoden på n karakterer<br><b>{cccc000}</b> klientkoden på n karakterer etterfulgt av en teller dedikert for kunden. Telleren blir tilbakestilt samtidig med den globale telleren.<br><b>{tttt}</b> Koden for tredjepart på n karakterer (se i ordboken: Typer tredjepart).<br>
 GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er ikke tillatt. <br>
 GenericMaskCodes4a=<u>Eksempel på 99nde %s av tredje part TheCompany gjort 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Eksempel på tredjeparts opprettet på 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Eksempel på produkt opprettet 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Eksempel på vare opprettet 2007-03-01:</u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b>
 GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal.
 ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen <b>%s</b> på port <b>%s</b>
@@ -324,10 +323,10 @@ ServerNotAvailableOnIPOrPort=Serveren er ikke tilgjengelig på adressen  <b>%s</
 DoTestServerAvailability=Test servertilkobling
 DoTestSend=Testsending
 DoTestSendHTML=Testsending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Feil! Kan ikke bruke opsjonen @ for å nullstille telleren hvert år, hvis ikke {åå} eller {åååå} er i masken.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Feil: Kan ikke bruke valget @ hvis ikke sekvensen {yy}{mm} eller {yyyy}{mm} er i malen.
 UMask=UMaskparameter for nye filer på Unix/Linux/BSD filsystemer.
-UMaskExplanation=Denne instillingen lar deg angi filtillatelser som settes på filer opprettet på Dolibarrseveren (for eksempel ved opplastning).<br>Dette må være en oktal verdi (for eksempel 0666 betyr lese og skrive for alle).<br>Denne innstillingen bruke ikke på Windowsbaserte servere.
+UMaskExplanation=Denne instillingen lar deg angi filtillatelser som settes på filer opprettet på Dolibarrseveren (for eksempel ved opplastning).<br>Dette må være en oktal verdi (for eksempel 0666 betyr lese og skrive for alle).<br>Denne innstillingen brukes ikke på Windowsbaserte servere.
 SeeWikiForAllTeam=Ta en titt på wiki siden for fullstendig liste over alle aktører og deres organisering
 UseACacheDelay= Forsinkelse for skjulested eksport respons i sekunder (0 eller tom for ingen buffer)
 DisableLinkToHelpCenter=Skjul linken <b>"Trenger du hjelp eller støtte"</b> på innloggingssiden
@@ -337,21 +336,21 @@ ModuleDisabled=Modul deaktivert
 ModuleDisabledSoNoEvent=Modul deaktivert slik hendelse aldri opprettet
 ConfirmPurge=Er du sikker på at du vil utføre denne purge? <br> Dette vil slette absolutt alle datafilene med ingen måte å gjenopprette dem (ECM filer, vedlagte filer ...).
 MinLength=Minimum lengde
-LanguageFilesCachedIntoShmopSharedMemory=Filer. Lang lastes inn i delt minne
-ExamplesWithCurrentSetup=Eksempler med gjeldende kjøre installasjonsprogrammet
+LanguageFilesCachedIntoShmopSharedMemory=Filer .lang lastet i delt minne
+ExamplesWithCurrentSetup=Eksempler med gjeldende oppsett
 ListOfDirectories=Liste over OpenDocument maler kataloger
 ListOfDirectoriesForModelGenODT=Liste over kataloger som inneholder maler filer med OpenDocument format. <br><br> Sett her i sin helhet sti av kataloger. <br> Legg til et linjeskift mellom eah katalogen. <br> For å legge til en katalog av GED modul, legger til her <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> Filer i disse katalogene må slutte <b>med. Odt.</b>
 NumberOfModelFilesFound=Antall ODT / ODS maler filer som finnes i disse mappene
 ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Å vite hvordan du oppretter din odt dokumentmaler, før lagre dem i disse katalogene, lese wiki dokumentasjon:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Plassering av Fornavn / navn
-DescWeather=Følgende bilder vises på dashbordet når antall sene handlinger nå følgende verdier:
+FirstnameNamePosition=Plassering av fornavn/etternavn
+DescWeather=Følgende bilder vises på dashbordet når antall for sene handlinger når følgende verdier:
 KeyForWebServicesAccess=Nøkkel til bruk Web Services (parameter &quot;dolibarrkey&quot; i webservices)
-TestSubmitForm=Inngang test skjema
+TestSubmitForm=Utfylling testskjema
 ThisForceAlsoTheme=Ved hjelp av denne menyen manager vil også bruke sitt eget tema det er brukervalg. Også denne menyen leder spesialisert for smartphones ikke virker ikke på alle smarttelefon. Bruk en annen meny leder hvis du opplever problemer på deg.
 ThemeDir=Skins katalogen
-ConnectionTimeout=Connexion timeout
+ConnectionTimeout=Tidsavbrudd for tilkobling
 ResponseTimeout=Response timeout
 SmsTestMessage=Test melding fra __ PHONEFROM__ til __ PHONETO__
 ModuleMustBeEnabledFirst=Modul <b>%s</b> må være aktivert før du bruker denne funksjonen.
@@ -361,9 +360,9 @@ PDF=PDF
 PDFDesc=Du kan angi at hvert globale alternativer relatert til PDF generasjon
 PDFAddressForging=Regler for Forge Adresse bokser
 HideAnyVATInformationOnPDF=Skjul alle opplysninger knyttet til moms på genererte PDF
-HideDescOnPDF=Skjul produktbeskrivelse på generert PDF
-HideRefOnPDF=Skjul produkts ref. på generert PDF
-HideDetailsOnPDF=Skjul produktlinjedetaljer i generert PDF
+HideDescOnPDF=Skjul varebeskrivelse på generert PDF
+HideRefOnPDF=Skjul varereferanse på generert PDF
+HideDetailsOnPDF=Skjul varelinjedetaljer i generert PDF
 Library=Bibliotek
 UrlGenerationParameters=Parametre for å sikre nettadresser
 SecurityTokenIsUnique=Bruk en unik securekey parameter for hver webadresse
@@ -389,16 +388,16 @@ ExtrafieldSelectList = Velg fra tabell
 ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Avmerkingsboks
 ExtrafieldRadio=Radio-knapp
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldCheckBoxFromList= Avkrysningsboks fra tabell
+ExtrafieldLink=Lenke til et objekt
+ExtrafieldParamHelpselect=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...<br><br>For å gjøre listen avhengig av en annen liste:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpcheckbox=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...
+ExtrafieldParamHelpradio=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...
+ExtrafieldParamHelpsellist=Parameterlisten kommer fra en tabell<br>Syntaks: table_name:label_field:id_field::filter<br>Eksempel : c_typent:libelle:id::filter<br><br>filteret kan være en enkel test (f.eks aktiv=1) for å kun vise de aktive verdiene <br> Hvis du vil bruke filter på ekstrafelt, bruk syntaksen extra.fieldcode=... (Der fieldcode er koden til ekstrafeltet)<br><br>For at denne listen skal være avhengig av en annen:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameterlisten kommer fra en tabell<br>Syntaks : table_name:label_field:id_field::filter<br>Eksempel : c_typent:libelle:id::filter<br><br>filteret kan være en enkel test (f.eks active=1) for kun å vise aktiv verdi <br> hvis du vil filtrere ekstrafelter, bruk extra.fieldcode=... (der fieldcode er koden for ekstrafeltet)<br><br>For at listen skal avhenge av en annen:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Bibliotek som brukes til å bygge PDF
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+WarningUsingFPDF=Advarsel! <b>conf.php</b> inneholder direktivet <b>dolibarr_pdf_force_fpdf=1</b>. Dette betyr at du bruker FPDF biblioteket for å generere PDF-filer. Dette biblioteket er gammelt og støtter ikke en rekke funksjoner (Unicode, bilde-transparens, kyrillisk, arabiske og asiatiske språk, ...), så du kan oppleve feil under PDF generering. <br> For å løse dette, og ha full støtte ved PDF generering, kan du laste ned <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, deretter kommentere eller fjerne linjen <b>$dolibarr_pdf_force_fpdf=1</b>, og i stedet legge inn <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
+LocalTaxDesc=Noen land gjelde to eller tre skatter på hver fakturalinje. Dersom dette er tilfelle, å velge type for andre og tredje skatt og dens hastighet. Mulig type: <br> 1: lokal skatt søke på varer og tjenester uten mva (localtax er beregnet beløp uten mva) <br> 2: lokal skatt søke på varer og tjenester, inkludert merverdiavgift (localtax beregnes på beløpet + hoved skatt ) <br> 3: lokal skatt søke på varer uten mva (localtax er beregnet beløp uten mva) <br> 4: lokal skatt søke på varer inkludert mva (localtax beregnes på beløpet + hoved moms) <br> 5: local skatt søke om tjenester uten moms (localtax er beregnet beløp uten mva) <br> 6: lokal skatt søke på tjenester inkludert mva (localtax beregnes på beløpet + mva)
 SMS=SMS
 LinkToTestClickToDial=Angi et telefonnummer å ringe for å vise en link for å teste ClickToDial url for <strong>bruker%s</strong>
 RefreshPhoneLink=Oppdater kobling
@@ -407,15 +406,15 @@ KeepEmptyToUseDefault=Hold tomt for å bruke standardverdien
 DefaultLink=Standard kobling
 ValueOverwrittenByUserSetup=Advarsel, denne verdien kan bli overskrevet av brukerspesifikke oppsett (hver bruker kan sette sitt eget clicktodial url)
 ExternalModule=Ekstern modul - Installert i katalog %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+BarcodeInitForThirdparties=Masseinitiering av strekkoder for tredjeparter
+BarcodeInitForProductsOrServices=Masseinitiering eller sletting av strekkoder for varer og tjenester
+CurrentlyNWithoutBarCode=For øyeblikket er det <strong>%s</strong> poster <strong>%s</strong> %s uten strekkode.
+InitEmptyBarCode=Startverdi for neste %s tomme post
+EraseAllCurrentBarCode=Slett alle gjeldende strekkode-verdier
+ConfirmEraseAllCurrentBarCode=Er di sikker på at du vil slette alle gjeldende strekkode-verdier?
+AllBarcodeReset=Alle strekkode-verdier er blitt slettet
+NoBarcodeNumberingTemplateDefined=Ingen mal for strekkodenummerering er aktivert strekkodemodulen
+NoRecordWithoutBarcodeDefined=Ingen poster uten strekkode.
 
 # Modules
 Module0Name=Bruker & grupper
@@ -430,34 +429,34 @@ Module20Name=Tilbud
 Module20Desc=Behandling av tilbud
 Module22Name=E-postutsendelser
 Module22Desc=Behandling av e-postutsendelser
-Module23Name= Energi
-Module23Desc= Overvåking av forbruk av energi
+Module23Name=Energi
+Module23Desc=Overvåking av energiforbruk
 Module25Name=Kundeordre
 Module25Desc=Behandling av kundeordre
 Module30Name=Fakturaer
-Module30Desc=Behandling av fakturaer of kreditnotaer for kunder. Fakturabehandling for leverandører
+Module30Desc=Behandling av fakturaer og kreditnotaer for kunder. Fakturabehandling for leverandører
 Module40Name=Leverandører
 Module40Desc=Behandling av innkjøp og leverandører (ordre og fakturaer)
 Module42Name=Syslog
 Module42Desc=Loggefunksjoner (syslog)
 Module49Name=Editors
 Module49Desc=Editors' management
-Module50Name=Produkter
-Module50Desc=Behandling av produkter
+Module50Name=Varer
+Module50Desc=Behandling av varer
 Module51Name=Masseutsendelser
 Module51Desc=Masse papir post ledelse
 Module52Name=Beholdning
 Module52Desc=Behandling av lagerbeholdning
 Module53Name=Tjenester
 Module53Desc=Behandling av tjenester
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Kontrakter/abonnement
+Module54Desc=Administrasjon av  kontrakter (tjenester og abonnementer)
 Module55Name=Strekkoder
 Module55Desc=Behandling av strekkoder
 Module56Name=Telefoni
 Module56Desc=Telefoniintegrasjon
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Faste ordre og behandling av tilbaketrekking. Inkluderer også generering av SEPA-fil for europeiske land.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module59Name=Bookmark4u
@@ -488,170 +487,172 @@ Module320Name=RSS nyhetsstrøm
 Module320Desc=Legg til RSS nyhetsstrøm på Dolibarrsider
 Module330Name=Bookmerker
 Module330Desc=Behandling av bokmerker
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Prosjekter/Muligheter
+Module400Desc=Behandling av prosjekter og muligheter. Du kan deretter tildele elementer (faktura, ordre, tilbud, intervensjon, ...) til et prosjekt og få en bedre prosjekt-visning.
 Module410Name=Webkalender
 Module410Desc=Intergrasjon med webkalender
-Module500Name=Spesielle utgifter (skatt, sosiale bidrag, utbytte)
-Module500Desc=Forvaltning av spesielle utgifter som skatt, sosiale bidrag, utbytte og lønn
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
+Module500Name=Spesielle utgifter
+Module500Desc=Behandling av spesielle utgifter (skatter og avgifter, utbytte mm)
+Module510Name=Lønn
+Module510Desc=Behandling av ansattes lønn og utbetalinger
+Module520Name=Lån
+Module520Desc=Administrering av lån
 Module600Name=Varselmeldinger
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Send e-post notifikasjoner på Dolibarr-hendelser til tredjeparter (Settes opp hos den enkelte tredjepart)
 Module700Name=Donasjoner
 Module700Desc=Behandling av donasjoner
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Utgiftsrapporter
+Module770Desc=Håndtering av utgiftsrapporter (reise, diett, mm)
+Module1120Name=Leverandørtilbud
+Module1120Desc=Forespør leverandørtilbud og tilbud
 Module1200Name=Mantis
 Module1200Desc=Mantisintegrasjon
-Module1400Name=Regnskapsekspert
+Module1400Name=Regnskap
 Module1400Desc=Behandling av regnskapssopplysninger for eksperter (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=Fckeditor
-Module2000Desc=WYSIWYG Editor
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module1520Name=Dokumentgenerering
+Module1520Desc=Masse-epost dokumentgenerering
+Module1780Name=Merker/kategorier
+Module1780Desc=Opprett merker/categorier (varer, kunder, leverandører, kontakter eller medlemmer)
+Module2000Name=WYSIWYG Editor
+Module2000Desc=Tillater å endre tekstområder med en avansert editor
+Module2200Name=Dynamiske priser
+Module2200Desc=Aktiver mulighet for matematiske utrykk for å beregne priser
 Module2300Name=Cron
-Module2300Desc=Scheduled job management
+Module2300Desc=Behandling av planlagte oppgaver
 Module2400Name=Agenda
 Module2400Desc=Handlinger/oppgaver og agendabehandling
 Module2500Name=Electronic Content Management
 Module2500Desc=Lagre og dele dokumenter
-Module2600Name=SOAP baserte WebServices
-Module2600Desc=Aktiver Dolibarr webtjenester server
-Module2650Name=WebServices (client)
-Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2600Name=API servicer (Web service SOAP)
+Module2600Desc=Aktiver Dolibarrs SOAP-server for å kunne bruke API-tjenester
+Module2610Name=API tjenester (Web tjenester REST)
+Module2610Desc=Aktiver Dolibarrs REST-server for å kunne bruke API-tjenester
+Module2650Name=Webservice (klient)
+Module2650Desc=Aktiver Dolibarr webtjenesteklient (Kan brukes til å sende data/forespørsler til eksterne servere. Bare leverandørordre støttes for øyeblikket)
 Module2700Name=Gravatar
 Module2700Desc=Bruke elektronisk Gravatar tjeneste (www.gravatar.com) for å vise bilde av brukere / medlemmer (funnet med e-post). Trenger du en Internett-tilgang
 Module2800Desc=FTP-klient
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringer evner
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Legg til en Skype-knapp i medlem/tredjepart/kontakt-kortet
 Module5000Name=Multi-selskap
 Module5000Desc=Lar deg administrere flere selskaper
 Module6000Name=Arbeidsflyt
-Module6000Desc=Workflow management
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PAYBOX
+Module6000Desc=Behandling av arbeidsflyt
+Module20000Name=Administrasjon av ferieforespørsler
+Module20000Desc=Oppfølging av ansattes ferieforespørsler
+Module39000Name=Vare LOT
+Module39000Desc=Oppsett av lot eller serienummer, best før og siste forbruksdag på varer
+Module50000Name=PayBox
 Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX
 Module50100Name=Kassaapparat
 Module50100Desc=Kassaapparatmodul
 Module50200Name=Paypal
 Module50200Desc=Modul å tilby en online betaling side med kredittkort med Paypal
 Module50400Name=Regnskap (avansert)
-Module50400Desc=Accounting management (double parties)
+Module50400Desc=Regnskapshåndtering (doble parter)
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module54000Desc=Direkteutskrift (uten å åpne dokumentet)ved hjelp av CUPS IPP inteface (Skriveren må være synlig for serveren, og CUPS må være installert på serveren)
+Module55000Name=Åpne meningsmåling
+Module55000Desc=Modul for å lage online meningsmålinger (som Doodle,Studs, Rdvz, m.m)
 Module59000Name=Marginer
 Module59000Desc=Modul for å administrere marginer
 Module60000Name=Provisjoner
 Module60000Desc=Modul for å administrere provisjoner
-Permission11=Vise fakturaer
-Permission12=Lage/Endre fakturaer
-Permission13=Unvalidate fakturaer
-Permission14=Godkjenne fakturaer
-Permission15=Sende fakturaer pr e-post
-Permission16=Lage betalinger for fakturaer
-Permission19=Slette fakturaer
-Permission21=Vise tilbud
-Permission22=Lage/endre tilbud
-Permission24=Godkjenne tilbud
-Permission25=Sende tilbud
-Permission26=Lukke tilbud
-Permission27=Slette tilbud
-Permission28=Eksporter kommersielle forslag
-Permission31=Vise produkter
-Permission32=Lage/endre produkter
-Permission34=Slette produkter
-Permission36=Se / administrere skjulte produkter
-Permission38=Eksportere produkter
-Permission41=Vise prosjekter
-Permission42=Lage/endre prosjekter
+Permission11=Vis kundefakturaer
+Permission12=Opprett/endre kundefakturaer
+Permission13=Ikke validerte kundefakturaer
+Permission14=Godkjenn kundefakturaer
+Permission15=Send fakturaer pr e-post
+Permission16=Opprett betalinger for fakturaer
+Permission19=Slett fakturaer
+Permission21=Vis tilbud
+Permission22=Opprett/endre tilbud
+Permission24=Godkjenn tilbud
+Permission25=Send tilbud
+Permission26=Lukk tilbud
+Permission27=Slett tilbud
+Permission28=Eksporter tilbud
+Permission31=Les varer
+Permission32=Opprett/endre varer
+Permission34=Slett varer
+Permission36=Se/administrer skjulte varer
+Permission38=Eksporter varer
+Permission41=Les prosjekter og oppgaver (delte prosjekter og de jeg er kontakt for). Her kan du også legge inn tidsbruk på tildelte oppgaver (timelister)
+Permission42=Opprett/endre prosjekter(delte og de jeg er kontakt for)
 Permission44=Slette prosjekter
-Permission61=Vise intervensjoner
-Permission62=Lage/endre intervensjoner
-Permission64=Slette intervensjoner
+Permission61=Vis intervensjoner
+Permission62=Opprett/endre intervensjoner
+Permission64=Slett intervensjoner
 Permission67=Eksporter intervensjoner
-Permission71=Vise medlemmer
-Permission72=Lage/endre medlemmer
-Permission74=Slette medlemmer
-Permission75=Setup types of membership
-Permission76=Eksportere data
+Permission71=Vis medlemmer
+Permission72=Opprett/endre medlemmer
+Permission74=Slett medlemmer
+Permission75=Oppsett av medlemskapstyper
+Permission76=Eksporter data
 Permission78=Vise abonnementer
-Permission79=Lage/endre abonnementer
-Permission81=Vise kundeordre
-Permission82=Lage/endre kundeordre
-Permission84=Godkjenne kundeordre
-Permission86=Sende kundeordre
-Permission87=Lukke kundeordre
-Permission88=Avbryte kundeordre
-Permission89=Slette kundeordre
-Permission91=Vise avgifter og MVA
-Permission92=Lage/endre avgifter og MVA
-Permission93=Slette avgifter og MVA
-Permission94=Eksporter sosiale bidrag
-Permission95=Vise rapporter
-Permission101=Vise forsendelser
-Permission102=Lage/endre forsendelser
-Permission104=Godjenne forsendelser
-Permission106=Eksport forsendelser
+Permission79=Opprett/endre abonnementer
+Permission81=Les kundeordre
+Permission82=Opprett/endre kundeordre
+Permission84=Godkjenn kundeordre
+Permission86=Send kundeordre
+Permission87=Lukk kundeordre
+Permission88=Avbryt kundeordre
+Permission89=Slett kundeordre
+Permission91=Les sosial-/finansavgifter og MVA
+Permission92=Opprett/endre sosial-/finansavgifter og MVA
+Permission93=Slett sosial-/finansavgifter og MVA
+Permission94=Eksporter sosial-/finansavgifter og MVA
+Permission95=Les rapporter
+Permission101=Vis forsendelser
+Permission102=Opprett/endre forsendelser
+Permission104=Godjenn forsendelser
+Permission106=Eksporter forsendelser
 Permission109=Slette forsendelser
 Permission111=Vise kontoutdrag
 Permission112=Lage/endre/slette og sammenligne transaksjoner
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Oppsett av finanskontoer (Opprett, håndter kategorier)
+Permission114=Avstemming av transaksjoner
 Permission115=Eksportere transaksjoner og kontoutdrag
 Permission116=Overføringer mellom konti
 Permission117=Håndtere sjekkutsteding
-Permission121=Vise tredjeparter lenket til brukeren
-Permission122=Vise/endre tredjeparter lenket til brukeren
-Permission125=Slette tredjeparter lenket til brukeren
+Permission121=Les tredjeparter lenket til bruker
+Permission122=Opprett/endre tredjeparter lenket til bruker
+Permission125=Slett tredjeparter lenket til bruker
 Permission126=Eksportere tredjeparter
-Permission141=Les oppgaver
-Permission142=Opprett / endre oppgaver
-Permission144=Slett oppgaver
+Permission141=Les alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
+Permission142=Opprett/endre alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
+Permission144=Slett alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
 Permission146=Les tilbydere
 Permission147=Les statistikk
 Permission151=Vise åpne ordre
 Permission152=Sette opp åpne ordre
 Permission153=Vise kvitteringer for stående ordre
-Permission154=Kreditt / nekte stående ordre kvitteringer
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
+Permission154=Kreditt/avslå kvitteringer fra faste ordre 
+Permission161=Les kontrakter/abonnementer
+Permission162=Opprett/endre kontrakter/abonnementer
+Permission163=Aktiver en tjeneste/abonnement i en kontrakt
+Permission164=Deaktiver en tjeneste/abonnement i en kontrakt
 Permission165=Slett kontrakter/abonnementer
-Permission171=Read trips and expenses (own and his subordinates)
+Permission171=Les reiser og utgifter (egne og underordnede)
 Permission172=Opprett/endre reiser og utgifter
 Permission173=Slett reiser og utgifter
-Permission174=Read all trips and expenses
+Permission174=Les alle reiser og utgifter
 Permission178=Eksporter reiser og utgifter
 Permission180=Vise leverandører
 Permission181=Vise leverandøreorde
 Permission182=Lage/endre leverandørordre
 Permission183=Godkjenne leverandørordre
 Permission184=Bekrefte leverandørerordre
-Permission185=Order or cancel supplier orders
+Permission185=Bestill eller kanseller leverandørordre
 Permission186=Motta leverandørordre
 Permission187=Lukke leverandørordre
-Permission188=Avbryte leverandørordre
+Permission188=Avbryt leverandørordre
 Permission192=Lag linjer
 Permission193=Avbryt linjer
-Permission194=Les båndbredde linjene
-Permission202=Lag ADSL tilkoblinger
+Permission194=Les båndbreddelinjene
+Permission202=Oppret  ADSL-tilkoblinger
 Permission203=Bestill tilkoblinger bestillinger
 Permission204=Bestill tilkoblinger
 Permission205=Administrer tilkoblinger
@@ -661,7 +662,7 @@ Permission212=Bestill linjer
 Permission213=Aktiver linje
 Permission214=Oppsett Telefoni
 Permission215=Oppsett tilbydere
-Permission221=Vise e-postutsendelser
+Permission221=Les e-postutsendelser
 Permission222=Lage/endre e-postutsendelser (emne, mottagere...)
 Permission223=Godkjenne e-postutsendelser (tillate sending)
 Permission229=Slette e-postutsendelser
@@ -679,7 +680,7 @@ Permission253=Endre andre brukeres passord
 PermissionAdvanced253=Lag / endre interne / eksterne brukere og tillatelser
 Permission254=Slette eller deaktivere andre brukere
 Permission255=Lage/endre egen brukerinformasjon
-Permission256=Endre sitt eget passord
+Permission256=Slett eller deaktiver andre brukere
 Permission262=Utvid tilgangen til alle tredjeparter (ikke bare de som er lenket til brukeren). Påvirker ikke eksterne brukere (som alltid er begrenset til seg selv).
 Permission271=Les CA
 Permission272=Les fakturaer
@@ -687,18 +688,18 @@ Permission273=Utstede fakturaer
 Permission281=Vise kontaktpersoner
 Permission282=Lage/endre kontaktpersoner
 Permission283=Slette kontaktpersoner
-Permission286=Eksportere kontaktpersoner
+Permission286=Eksportere kontakter
 Permission291=Les tariffer
 Permission292=Angi tillatelser på tariffer
 Permission293=Endre kunder tariffer
-Permission300=Vise strekkoder
-Permission301=Vise/endre strekkoder
-Permission302=Slette strekkoder
+Permission300=Les strekkoder
+Permission301=Opprett/endre strekkoder
+Permission302=Slett strekkoder
 Permission311=Les tjenester
-Permission312=Assign service/subscription to contract
-Permission331=Vise bokmerker
+Permission312=Knytt tjeneste/abonnement til kontrakt
+Permission331=Les bokmerker
 Permission332=Lage/endre bokmerker
-Permission333=Slette bokmerker
+Permission333=Slett bokmerker
 Permission341=Les egne tillatelser
 Permission342=Lag / endre sin egen brukerinformasjon
 Permission343=Endre hans eget passord
@@ -716,11 +717,11 @@ Permission510=Les Lønn
 Permission512=Opprett/endre lønn
 Permission514=Slett lønn
 Permission517=Eksporter lønn
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission520=Les lån
+Permission522=Opprett/endre lån
+Permission524=Slett lån
+Permission525=Gå til lånekalkulator
+Permission527=Eksporter lån
 Permission531=Les tjenester
 Permission532=Opprett / endre tjenester
 Permission534=Slett tjenester
@@ -729,16 +730,16 @@ Permission538=Eksporter tjenester
 Permission701=Vise donasjoner
 Permission702=Lage/endre donasjoner
 Permission703=Slette donasjoner
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Les utgiftsrapporter (egne og underordnedes)
+Permission772=Oprett/endre utgiftsrapport
+Permission773=Slett utgiftsrapport
+Permission774=Les alle utgiftsrapporter (alle brukere)
+Permission775=Godkjenn utgiftsrapport
+Permission776=Betal utgift
+Permission779=Eksporter utgiftsrapporter
 Permission1001=Vise beholdning
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Opprett/endre varehus
+Permission1003=Slett varehus
 Permission1004=Vise lagerbevegelser
 Permission1005=Lage/endre lagerbevegelser
 Permission1101=Vise pakksedler
@@ -753,7 +754,7 @@ Permission1185=Godkjenne leverandørordre
 Permission1186=Bestille leverandørordre
 Permission1187=Bekrefte mottak av leverandørordre
 Permission1188=Lukke leverandørordre
-Permission1190=Approve (second approval) supplier orders
+Permission1190=Godkjenn (2. godkjenning) leverandørordre
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -766,63 +767,66 @@ Permission1237=Eksporter leverandør-bestillinger og detaljer
 Permission1251=Kjør massen import av eksterne data til database (data last)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1421=Eksport kundeordre og attributter
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
+Permission23001=Les planlagt oppgave
+Permission23002=Opprett/endre planlagt oppgave
+Permission23003=Slett planlagt oppgave
+Permission23004=Utfør planlagt oppgave
 Permission2401=Vise handlinger (hendelser og oppgaver) lenket til egen brukerkonto
-Permission2402=Lage/endre/slette handlinger (hendelser og oppgaver) lenket til egen brukerkonto
-Permission2403=Vise andre personers handlinger (hendelser og oppgaver)
-Permission2411=Les handlinger (hendelser eller oppgaver) for andre
-Permission2412=Opprett / endre handlinger (hendelser eller oppgaver) for andre
+Permission2402=Opprett/endre handlinger (hendelser og oppgaver) lenket til egen brukerkonto
+Permission2403=Slett hendelser (hendelser og oppgaver) relatert til egen brukerkonto
+Permission2411=Les handlinger (hendelser eller oppgaver) av andre
+Permission2412=Opprett/endre handlinger (hendelser eller oppgaver) for andre
 Permission2413=Slett handlinger (hendelser eller oppgaver) for andre
-Permission2501=Vise dokumenter
-Permission2502=Laste opp og slette dokumenter
-Permission2503=Send eller slette dokumenter
-Permission2515=Behandle og endre dokumentmappene
+Permission2501=Vise/last ned dokumenter
+Permission2502=Last ned dokumenter
+Permission2503=Send eller slett dokumenter
+Permission2515=Oppsett av  dokumentmapper
 Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
 Permission50101=Bruk Point of salg
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
 Permission54001=Skriv ut
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
+Permission55001=Les meningsmålinger
+Permission55002=Opprett/endre meningsmålinger
+Permission59001=Les kommersielle marginer
+Permission59002=Definer kommersielle marginer
+Permission59003=Les alle brukermarginer
+DictionaryCompanyType=Tredjepartstyper
+DictionaryCompanyJuridicalType=Juridisk status for tredjeparter
+DictionaryProspectLevel=Prospektpotensiale
+DictionaryCanton=Fylke
+DictionaryRegion=Region
+DictionaryCountry=Land
+DictionaryCurrency=Valutaer
+DictionaryCivility=Sivilstatus
+DictionaryActions=Typer agendahendelser
+DictionarySocialContributions=Skatte- og avgiftstyper
+DictionaryVAT=MVA satser
+DictionaryRevenueStamp=Amount of revenue stamps - ikke i Norge
+DictionaryPaymentConditions=Betalingsbetingelser
+DictionaryPaymentModes=Betalingsmåter
+DictionaryTypeContact=Kontakt/adressetyper
+DictionaryEcotaxe=Miljøgebyr (WEEE)
+DictionaryPaperFormat=Papirformater
+DictionaryFees=Gebyrtyper
+DictionarySendingMethods=Leveringsmetoder
+DictionaryStaff=Stab
+DictionaryAvailability=Leveringsforsinkelse
 DictionaryOrderMethods=Ordremetoder
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+DictionarySource=Tilbud/ordre-opprinnelse
+DictionaryAccountancyplan=Graf over kontoer
+DictionaryAccountancysystem=Diagram-modeller for kontoer
+DictionaryEMailTemplates=E-postmaler
+DictionaryUnits=Enheter
+DictionaryProspectStatus=Prospektstatus
+DictionaryHolidayTypes=Ferietyper
 SetupSaved=Innstillinger lagret
 BackToModuleList=Tilbake til moduloversikt
-BackToDictionaryList=Back to dictionaries list
+BackToDictionaryList=Tilbake til ordliste
 VATReceivedOnly=Special rate not charged
 VATManagement=MVA-håndtering
-VATIsUsedDesc=Den MVA-sats som standard når du oppretter prospekter, fakturaer, ordre etc følger den aktive standard regel: <br> Dersom selgeren ikke utsettes for MVA, MVA  = 0. <br> Hvis ()selger og kjøper i samme land, MVA  = MVA på produktet i salgslandet. <br> Dersom selger og kjøper i EU og varene er transportprodukter (bil, båt, fly), MVA = 0 (MVA skal betales av kjøper ved Tollkontoret av sitt land og ikke på selger).  <br> Dersom selger og kjøper i EU og kjøperen ikke er et selskap, MVA  = moms av produktet som selges. <br> Dersom selger og kjøper i EU og kjøper er et selskap, MVA  = 0. Slutt på regelen. <br> Ellers er den foreslåtte standard MVA = 0.
+VATIsUsedDesc=Den MVA-sats som standard når du oppretter prospekter, fakturaer, ordre etc følger den aktive standard regel: <br> Dersom selgeren ikke utsettes for MVA, MVA  = 0. <br> Hvis ()selger og kjøper i samme land, MVA  = MVA på varen i salgslandet. <br> Dersom selger og kjøper i EU og varene er transportvarer (bil, båt, fly), MVA = 0 (MVA skal betales av kjøper ved Tollkontoret av sitt land og ikke på selger).  <br> Dersom selger og kjøper i EU og kjøperen ikke er et selskap, MVA  = moms av varen som selges. <br> Dersom selger og kjøper i EU og kjøper er et selskap, MVA  = 0. Slutt på regelen. <br> Ellers er den foreslåtte standard MVA = 0.
 VATIsNotUsedDesc=Som standard er den foreslåtte MVA 0 som kan brukes for tilfeller som foreninger, enkeltpersoner og små selskaper.
 VATIsUsedExampleFR=I Frankrike, betyr det bedrifter eller organisasjoner som har en reell finanssystem (Forenklet ekte eller normal real). Et system der MVA er deklarert.
 VATIsNotUsedExampleFR=I Frankrike, betyr det foreninger som ikke MVA erklært eller selskaper, organisasjoner eller liberale yrker som har valgt micro enterprise fiskale systemet (MVA i franchise) og betalte en franchise MVA uten MVA erklæring. Dette valget vil vise referansen "Non gjeldende MVA - kunst-293B av CGI" på fakturaene.
@@ -847,18 +851,18 @@ LocalTax1IsUsedDescES= RE rate som standard når du oppretter utsikter, fakturae
 LocalTax1IsNotUsedDescES= Som standard den foreslåtte RE er 0. Slutt på regelen.
 LocalTax1IsUsedExampleES= I Spania er de profesjonelle underlagt noen spesifikke deler av den spanske IAE.
 LocalTax1IsNotUsedExampleES= I Spania er de profesjonelle og samfunn, og på visse deler av den spanske IAE.
-LocalTax2ManagementES= IRPF Management
+LocalTax2ManagementES= IRPF oppsett
 LocalTax2IsUsedDescES= RE rate som standard når du oppretter utsikter, fakturaer, ordre etc følger den aktive standarden regelen: <br> Dersom selgeren ikke utsettes for IRPF, så IRPF som standard = 0. Slutt på regelen. <br> Hvis selgeren er utsatt for IRPF så IRPF som standard. Slutt på regelen. <br>
 LocalTax2IsNotUsedDescES= Som standard den foreslåtte IRPF er 0. Slutt på regelen.
 LocalTax2IsUsedExampleES= I Spania, frilansere og selvstendige fagfolk som leverer tjenester og bedrifter som har valgt skattesystemet til moduler.
 LocalTax2IsNotUsedExampleES= I Spania er de bussines ikke skattepliktig system av moduler.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax=Rapport over lokale avgifter 
+CalcLocaltax1=Salg - Innkjøp
+CalcLocaltax1Desc=Lokale skatter-rapporter kalkuleres med forskjellen mellom kjøp og salg
+CalcLocaltax2=Innkjøp
+CalcLocaltax2Desc=Lokale skatter-rapportene viser totalt kjøp
+CalcLocaltax3=Salg
+CalcLocaltax3Desc=Lokale skatter-rapportene viser totalt salg
 LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode
 LabelOnDocuments=Etiketten på dokumenter
 NbOfDays=Ant dager
@@ -874,7 +878,7 @@ DocumentRootServer=Webserverens rotkatalog
 DataRootServer=Katalog for datafiler
 IP=IP
 Port=Port
-VirtualServerName=Virtual server name
+VirtualServerName=Virtuelt servernavn
 AllParameters=Alle parametere
 OS=OS
 PhpEnv=Env
@@ -886,20 +890,20 @@ PearPackages=Pear Packages
 Browser=Nettleser
 Server=Server
 Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
+DatabaseServer=Database vert
+DatabaseName=Database navn
 DatabasePort=Database port
 DatabaseUser=Database bruker
 DatabasePassword=Database passord
-DatabaseConfiguration=Database setup
-Tables=Tables
-TableName=Table name
-TableLineFormat=Line format
-NbOfRecord=Nb of records
-Constraints=Constraints
-ConstraintsType=Constraint's type
+DatabaseConfiguration=Database oppsett
+Tables=Tabeller
+TableName=Tabellnavn
+TableLineFormat=Linjeformat
+NbOfRecord=Antall poster
+Constraints=Begrensninger
+ConstraintsType=Begrensningstype
 ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry
-AllMustBeOk=Alle disse må være i orden
+AllMustBeOk=Alle disse må sjekkes
 Host=Server
 DriverType=Driver type
 SummarySystem=Systeminformasjon - oppsummering
@@ -910,12 +914,12 @@ MenuCompanySetup=Firma/organisasjon
 MenuNewUser=Ny bruker
 MenuTopManager=Menybehandler: Toppmeny
 MenuLeftManager=Menybehandler: Venstre meny
-MenuManager=Meny manager
-MenuSmartphoneManager=Smartphone-menyen leder
+MenuManager=Menybehandler
+MenuSmartphoneManager=Menybehandler for smarttelefon
 DefaultMenuTopManager=Menybehandler: Toppmeny
 DefaultMenuLeftManager=Menybehandler: Venstre meny
-DefaultMenuManager= Standard meny leder
-DefaultMenuSmartphoneManager=Smartphone-menyen leder
+DefaultMenuManager= Standard menybehandler
+DefaultMenuSmartphoneManager=Menybehandler for smarttelefon
 Skin=Tema
 DefaultSkin=Standard tema
 MaxSizeList=Makslengde på lister
@@ -925,8 +929,8 @@ MessageLogin=Meldingstekst på innloggingsbildet
 PermanentLeftSearchForm=Permanent søkeskjema i venstre meny
 DefaultLanguage=Ønsket standardspråk (språkkode)
 EnableMultilangInterface=Aktiver flerspråklig grensesnitt
-EnableShowLogo=Vis logo på venstre meny
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableShowLogo=Vis logo i venstre meny
+EnableHtml5=Aktiver html5 (Utvikling - kun tilgjengelig i Eldy-mal)
 SystemSuccessfulyUpdated=Systemet ditt er oppdatert!
 CompanyInfo=Firma/organisasjonsinformasjon
 CompanyIds=Firma/organisasjons IDer
@@ -935,24 +939,25 @@ CompanyAddress=Adresse
 CompanyZip=Postnummer
 CompanyTown=Poststed
 CompanyCountry=Land
-CompanyCurrency=Bovedvaluta
+CompanyCurrency=Hovedvaluta
+CompanyObject=Selskapets formål
 Logo=Logo
 DoNotShow=Ikke vis
 DoNotSuggestPaymentMode=Ikke foreslå
-NoActiveBankAccountDefined=Ingen aktive bankkonti aktivert
+NoActiveBankAccountDefined=Ingen aktive bankkonti definert
 OwnerOfBankAccount=Eier av bankkonto  %s
 BankModuleNotActive=Bankkontomodul ikke slått på
-ShowBugTrackLink=Vis lenken "Rapporter en feil"
+ShowBugTrackLink=Vis lenken "<strong>%s</strong>"
 ShowWorkBoard=Vis "arbeidsbordet" på hjemmesiden
 Alerts=Varsler
 Delays=Forsinkelser
 DelayBeforeWarning=Forsinkelse før varsling
 DelaysBeforeWarning=Forsinkelser før varsling
-DelaysOfToleranceBeforeWarning=Toleranseforsikelse før varsling
+DelaysOfToleranceBeforeWarning=Forsinkelsestoleranse før varsling
 DelaysOfToleranceDesc=Denne siden lar deg angi antall 'toleransedager' du ønsker før en forsinkelse skal varsles på skjermen med ikonet %s for hvert forsinkede element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Forinkelstoleranse (i dager) før varsel om planlage handlinger som ikke er utført
+Delays_MAIN_DELAY_ACTIONS_TODO=Forinkelsestoleranse (i dager) før varsel om planlage handlinger som ikke er utført
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Forsinkelsestoleranse (i dager) før varsel om ordrer ikke levert
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Forsinkelse toleranse (i dager) før varsel på leverandørers ordre ennå ikke behandlet
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Forsinkelsestoleranse (i dager) før varsel på leverandørers ordre ennå ikke behandlet
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Forsinkelsestoleranse (i dager) før varsel om tilbud som ikke er lukket
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Forsinkelsestoleranse (i dager) før varsel om tilbud som ikke er fakturert
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Forsinkelsestoleranse (i dager) før varsel om tjenester som ikke er aktivert
@@ -976,7 +981,7 @@ InfoOS=Info om OS
 InfoWebServer=Infos webserver
 InfoDatabase=Infos database
 InfoPHP=Infos PHP
-InfoPerf=Infos performances
+InfoPerf=Ytelsesinfo
 BrowserName=Navn på nettleser
 BrowserOS=Nettleserens operativsystem
 ListEvents=Hendelsesrevisjon
@@ -987,7 +992,7 @@ AreaForAdminOnly=Disse funksjonene kan bare brukes av <b>administratorer</b>. Ad
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er bare tilgjengelig for administratorer. Ingen av tillatelsene i Dolibarr kan senke denne grensen.
 CompanyFundationDesc=Her oppgir du all tilgjengelig informasjon om bedriften eller organisasjonen som skal bruke Dolibarr
-DisplayDesc=Her kan du velge instillinger som styrer Dolibarrs utseende og virkemåte
+DisplayDesc=Her kan du velge innstillinger som styrer Dolibarrs utseende og virkemåte
 AvailableModules=Tilgjengelige moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
 SessionTimeOut=Tidsgrense for økter
@@ -999,7 +1004,7 @@ TriggerDisabledAsModuleDisabled=Utløserne i denne filen er slått av ettersom m
 TriggerAlwaysActive=Utløserne i denne filen er alltid slått på, uansett hvilke moduler som er slått på.
 TriggerActiveAsModuleActive=Utløserne i denne filen er slått på ettersom modulen <b>%s</b> er slått på.
 GeneratedPasswordDesc=Her angir du hvilken regel som skal generere nye passord dersom du ber om å ha automatisk opprettede passord
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Her defineres alle referansedata. Du kan komplettere alle forhåndsdefinerte verdier med dine egne.
 ConstDesc=Her kan du endre innstillinger som ikke er tilgjengelige på de foregående sidene. Dette er reserverte parametere, for avanserte utviklere eller for feilsøking.
 OnceSetupFinishedCreateUsers=OBS! Du er Dolibarr-administrator. Administratorer er brukere som kan sette opp programmet. For vanlig bruk av Dolibarr bør du lage en bruker uten administratorrettigheter ( i Brukere og grupper ).
 MiscellaneousDesc=Her angir du sikkerhetsinnstillinger for Dolibarr.
@@ -1009,22 +1014,22 @@ MAIN_MAX_DECIMALS_UNIT=Desimaler i enhetspriser
 MAIN_MAX_DECIMALS_TOT=Desimaler i totalpriser
 MAIN_MAX_DECIMALS_SHOWN=Desimaler for priser når de vises på skjerm  (Legg til <b>...</b> etter dette tallet dersom du ønsker å se <b>...</b> når et tall er forkortet i skjermvisning)
 MAIN_DISABLE_PDF_COMPRESSION=Bruk PDF-komprimering for genererte PDF-filer.
-MAIN_ROUNDING_RULE_TOT= Størrelse på avrunding rekkevidde (for sjeldne land der runde gjøres på noe annet enn base 10)
-UnitPriceOfProduct=Netto enhet prisen på et produkt
+MAIN_ROUNDING_RULE_TOT=Avrundingstrinn (for land der avrunding er gjort annerledes enn basis 10. For eksempel sett 0,05 hvis avrunding gjøres i trinn på 0,05)
+UnitPriceOfProduct=Netto enhet prisen på et vare
 TotalPriceAfterRounding=Total pris (netto / moms / inkl. moms) etter avrunding
 ParameterActiveForNextInputOnly=Innstillingene gjelder først fra neste inntasting
 NoEventOrNoAuditSetup=Ingen sikkerhetsinnstillinger er registrert ennå. Dette kan være normalt hvis revisjon ikke er slått på  ("innstillinger - sikkerhet - revisjon").
 NoEventFoundWithCriteria=Ingen søketreff i sikkerhetshendelser.
 SeeLocalSendMailSetup=Se lokalt sendmail-oppsett
-BackupDesc=Å lage en komplett sikkerhetskopi av Dolibarr, må du:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
+BackupDesc=For å lage en komplett sikkerhetskopi av Dolibarr, må du:
+BackupDesc2=Lagre innhold av dokumentmappen (<b>%s</b>) som inneholder alle opplastede og genererte filer (du kan lage en zip for eksempel).
+BackupDesc3=Lagre innholdet i databasen (<b>%s</b>) i en dump-fil. For å gjøre dette, kan du bruke følgende assistent:
 BackupDescX=Arkiverte katalogen skal oppbevares på et trygt sted.
 BackupDescY=Den genererte dumpfil bør oppbevares på et trygt sted.
 BackupPHPWarning=Backup kan ikke garanteres med denne metoden. Foretrekker forrige
-RestoreDesc=Hvis du vil gjenopprette en sikkerhetskopi Dolibarr, må du:
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
+RestoreDesc=Hvis du vil gjenopprette en Dolibarr sikkerhetskopi , må du:
+RestoreDesc2=Gjenopprett arkivfil (zip-fil for eksempel) av dokumentmappe for å hente ut filer til en ny Dolibarr-installasjon eller inn i gjeldende mappe (<b>%s</b>).
+RestoreDesc3=Gjenopprett data fra en backup-fil til databasen i den nye Dolibarr-installasjon eller til databasen av gjeldende installasjon (<b>%s</b>). Advarsel! Når gjenopprettingen er ferdig, må du bruke et brukernavn/passord, som fantes da sikkerhetskopien ble laget, for å koble til igjen. For å gjenopprette en sikkerhetskopiert database til gjeldende installasjon, kan du følge denne assistenten:
 RestoreMySQL=MySQL import
 ForcedToByAModule= Denne regelen er tvunget til å <b>%s</b> av en aktivert modul
 PreviousDumpFiles=Tilgjengelig database backup dump filer
@@ -1037,24 +1042,24 @@ SimpleNumRefModelDesc=Returner referansenummeret med format %syymm-nnnn der åå
 ShowProfIdInAddress=Vis Profesjonell id med adresser på dokumenter
 ShowVATIntaInAddress=Skjul MVA Intra num med adresser på dokumenter
 TranslationUncomplete=Delvis oversettelse
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Noen språk kan være delvis oversatt eller inneholder feil. Hvis du oppdager noen, kan du redigere språkfiler ved å registrere deg her <a href="http://transifex.com/projects/p/dolibarr/" target="_blank"> http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=Gjør vertikale menyen hidable (opsjon Javascript må ikke være deaktivert)
 MAIN_DISABLE_METEO=Deaktiver Meteo visning
-TestLoginToAPI=Test logge API
+TestLoginToAPI=Test-innlogging til API
 ProxyDesc=Enkelte funksjoner i Dolibarr må ha en Internett-tilgang for å fungere. Definer her parametere for dette. Hvis Dolibarr serveren er bak en proxy-server, forteller disse parametrene Dolibarr hvordan du få tilgang til Internett gjennom det.
 ExternalAccess=Ekstern tilgang
 MAIN_PROXY_USE=Bruk en proxy-server (ellers direkte tilgang til internett)
-MAIN_PROXY_HOST=Navn / adresse proxy-server
-MAIN_PROXY_PORT=Port of proxy server
-MAIN_PROXY_USER=Logg inn for å bruke proxy-server
+MAIN_PROXY_HOST=Navn/adresse til proxy-server
+MAIN_PROXY_PORT=Proxy server port
+MAIN_PROXY_USER=Logg-inn for å bruke proxy-server
 MAIN_PROXY_PASS=Passord for å bruke proxy-server
-DefineHereComplementaryAttributes=Definer her alle atributes, ikke allerede er tilgjengelig som standard, og at du ønsker å bli støttet for %s.
+DefineHereComplementaryAttributes=Her defineres alle attributter som ikke allerede er tilgjengelig som standard, og at du ønsker å få støtte for %s.
 ExtraFields=Komplementære attributter
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Komplementære attributter (thirdparty)
-ExtraFieldsContacts=Komplementære attributter (kontakt / adresse)
+ExtraFieldsLines=Utfyllende attributter (linjer)
+ExtraFieldsSupplierOrdersLines=Komplementære attributter (ordrelinjer)
+ExtraFieldsSupplierInvoicesLines=Komplementære attributter (fakturalinjer)
+ExtraFieldsThirdParties=Komplementære attributter (tredjepart)
+ExtraFieldsContacts=Komplementære attributter (kontakt/adresse)
 ExtraFieldsMember=Komplementære attributter (medlem)
 ExtraFieldsMemberType=Komplementære attributter (medlem type)
 ExtraFieldsCustomerOrders=Tilleggsattributter (ordre)
@@ -1063,38 +1068,38 @@ ExtraFieldsSupplierOrders=Komplementære attributter (ordre)
 ExtraFieldsSupplierInvoices=Komplementære attributter (fakturaer)
 ExtraFieldsProject=Komplementære attributter (prosjekter)
 ExtraFieldsProjectTask=Komplementære attributter (oppgaver)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldHasWrongValue=Attributten %s har en feil verdi
 AlphaNumOnlyCharsAndNoSpace=bare alfanumeriske tegn tegn uten mellomrom
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=kun alfanumeriske tegn og små bokstaver uten mellomrom
 SendingMailSetup=Oppsett av sendings e-post
 SendmailOptionNotComplete=Advarsel, på enkelte Linux-systemer, for å sende e-post fra e-posten din, sendmail henrettelsen oppsett må conatins alternativ-BA (parameter mail.force_extra_parameters inn din php.ini fil). Hvis noen mottakere aldri motta e-post, kan du prøve å redigere denne PHP parameteren med mail.force_extra_parameters =-BA).
 PathToDocuments=Sti til dokumenter
 PathDirectory=Mappe
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=Funksjonen for å sende e-post ved hjelp av metoden "PHP mail direct" vil generere en melding som kanskje ikke oversatt riktig av enkelte e-postservere. Resultatet er at enkelte e-poster ikke kan leses av personer som mottar e-post gjennom disse serverene (f.eks Orange i Frankrike). Dette er ikke et Dolibarr-problem i, heller ikke PHP, men på mottakende e-postserver. Du kan imidlertid legge til alternativet MAIN_FIX_FOR_BUGGED_MTA til 1 i oppsettet, heller enn å endre Dolibarr for å unngå dette. Du kan oppleve problemer med andre servere som følger SMTP-standarden nøyaktig. Den andre løsningen (anbefales) er å bruke metoden "SMTP socket library" som ikke har noen ulemper.
 TranslationSetup=Konfigurasjon de la traduction
 TranslationDesc=Valg av språk som er synlig på skjermen kan endres: <br> * Globalt fra menyen <strong>Hjem - Setup - Display</strong> <br> * For brukeren bare fra kategorien <strong>Bruker visning</strong> av brukerkort (klikk på innlogging på toppen av skjermen).
 TotalNumberOfActivatedModules=Totalt antall aktiverte funksjoner <b>moduler:%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
-OnlyFollowingModulesAreOpenedToExternalUsers=Obs, bare følgende moduler er åpnet for eksterne brukere (uansett tillatelse for slike brukere):
+OnlyFollowingModulesAreOpenedToExternalUsers=Merk: Kun følgende moduler er åpne for eksterne brukere (hva enn tillatelse til slike brukere er):
 SuhosinSessionEncrypt=Session lagring kryptert av Suhosin
 ConditionIsCurrently=Tilstand er for øyeblikket %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
+YouUseBestDriver=Du bruker driveren %s, som er den beste tilgjengelige for øyeblikket.
+YouDoNotUseBestDriver=Du bruker driveren %s. Driver %s anbefales.
+NbOfProductIsLowerThanNoPb=Du har bare %s varer/tjenester i database. Ingen optimalisering er påkrevet
 SearchOptim=Forbedre søket
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
+YouHaveXProductUseSearchOptim=Du har %s varer i databasen. Du bør legge til konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Hjem-Oppsett-Annet for å begrense søket til begynnelsen av strenger. Dette gjør det mulig for databasen å bruke indeksen og du bør få en raskere respons.
+BrowserIsOK=Du bruker nettleseren %s. Denne nettleseren er ok for sikkerhet og ytelse.
+BrowserIsKO=Du bruker nettleseren %s. Denne nettleseren er kjent for å være et dårlig valg for sikkerhet, ytelse og pålitelighet. Vi anbefaler deg å bruke Firefox, Chrome, Opera eller Safari.
 XDebugInstalled=XDebug er lastet
 XCacheInstalled=XCache er lastet
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+AddRefInList=Vis kunde/leverandør-ref i liste (velg liste eller kombinasjonsboks), og det meste av hyperkobling. Tredjepart vil vises med navnet "CC12345 - SC45678 - Digert selskap", i stedet for "Digert selskap".
+FieldEdition=Endre felt %s
+FixTZ=Tidssone offset
+FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset)
+GetBarCode=Hent strekkode
+EmptyNumRefModelDesc=Koden er gratis og kan endres når man vil.
 ##### Module password generation
 PasswordGenerationStandard=Gir et automatisk laget passord med 8 tegn (bokstaver og tall) i små bokstaver.
 PasswordGenerationNone=Ikke forslå noe passord. Passord må angis manuelt.
@@ -1115,15 +1120,15 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by %s followed by thi
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Bruk beskjeder
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
+NotificationsDesc=E-postvarsling-funksjonen lar deg sende meldinger automatisk i bakgrunnen, for noen Dolibarrhendelser. Måladresser kan defineres:<br> * For hver tredjeparts-kontakt, en om gangen(kunder eller leverandører).<br> * eller ved å sette globale måladresser i oppsettmodulen
 ModelModules=Dokumenter maler
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Generer dokumenter fra OpenDocument-maler (.ODT eller .ODS fra OpenOffice, KOffice, TextEdit, mm)
 WatermarkOnDraft=Vannmerke på utkast
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Aktiver egenskap for å autoutfylle betalingslinjer i betalingsskjema
 CompanyIdProfChecker=Profesjonell Id unik
 MustBeUnique=Må være unik?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeMandatory=Obligatorisk for å opprette tredjeparter?
+MustBeInvoiceMandatory=Obligatorisk for å validere fakturaer?
 Miscellaneous=Diverse
 ##### Webcal setup #####
 WebCalSetup=Webcalendar kobling
@@ -1137,7 +1142,7 @@ WebCalServer=Server som driver kalendedatabase
 WebCalDatabaseName=Databasenavn
 WebCalUser=Databasebruker
 WebCalSetupSaved=Webcalendar-instillinger er lagret.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Tilkobling til serveren '%s' sin database '%s' med bruker '%s' var vellykket.
 WebCalTestKo1=Tilkobling til serveren '%s' vellykket, men databasen '%s' kunne ikke nåes.
 WebCalTestKo2=Tilkobling til serveren '%s' med brukeren '%s' feilet.
 WebCalErrorConnectOkButWrongDatabase=Tilkobling vellykket, men databasen ser ikke ut til å være en Webcalendar-database.
@@ -1165,38 +1170,38 @@ EnableEditDeleteValidInvoice=Slå på muligheten til å endre/slette en godkjent
 SuggestPaymentByRIBOnAccount=Foreslå betaling mot konto
 SuggestPaymentByChequeToAddress=Foreslå betaling med sjekk til
 FreeLegalTextOnInvoices=Fritekst på fakturaer
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+WatermarkOnDraftInvoices=Vannmerke på fakturakladder (ingen hvis tom)
 ##### Proposals #####
 PropalSetup=Innstillinger for tilbud
 CreateForm=Opprett skjemaer
-NumberOfProductLines=Antall produktlinjer
+NumberOfProductLines=Antall varelinjer
 ProposalsNumberingModules=Nummereringsmodul for tilbud
 ProposalsPDFModules=Tilbudsmaler
 ClassifiedInvoiced=Klassifiser fakturert
 HideTreadedPropal=Skjul behandlede tilbud i listen
 AddShippingDateAbility=Legg til felt for forsendelsesdato
 AddDeliveryAddressAbility=Legg til felt for leveringsdato
-UseOptionLineIfNoQuantity=En produkt/tjeneste med med null i kvantum blir betraktet som en valgmulighet
+UseOptionLineIfNoQuantity=En vare/tjeneste med med null i kvantum blir betraktet som en valgmulighet
 FreeLegalTextOnProposal=Fritekst på tilbud
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+WatermarkOnDraftProposal=Vannmerke på tilbudskladder (ingen hvis tom)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bakkonto for tilbudet
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Oppsett av modulen leverandør-prisforespørsler
+AskPriceSupplierNumberingModules=Leverandør-prisforespørsel nummereringsmodeller
+AskPriceSupplierPDFModules=Leverandør-prisforespørsel dokumentmodeller
+FreeLegalTextOnAskPriceSupplier=Fritekst på leverandør-prisforespørsel
+WatermarkOnDraftAskPriceSupplier=Vannmerke på kladder av leverandør-prisforepørsler (ingen hvis tom)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Be  om bankkonto for prisforespørsel
 ##### Orders #####
 OrdersSetup=Innstillinger for ordre
 OrdersNumberingModules=Nummereringsmodul for ordre
 OrdersModelModule=Ordremaler
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Skjul behandlede eller kansellerte ordre i listen
 ValidOrderAfterPropalClosed=Ordre krever godkjenning etter at tilbudet er lukket
 FreeLegalTextOnOrders=Fritekst på ordre
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+WatermarkOnDraftOrders=Vannmerke på ordrekladder (ingen hvis tom)
+ShippableOrderIconInList=Legg til et ikon i ordrelisten for å vise om ordren kan sendes
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Be om bankkontor for ordre
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
 ClickToDialUrlDesc=Url som hentes når brukeren trykker på telefonikonet.<br>Full url vil være: URL?login=...&password=...&caller=...&called=phonecalled
@@ -1207,13 +1212,13 @@ InterventionsSetup=Instillinger for intervensjoner
 FreeLegalTextOnInterventions=Fri tekst om inngrep dokumenter
 FicheinterNumberingModules=Nummereringsmodul for intervensjoner
 TemplatePDFInterventions=Intervensjonsmaler
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+WatermarkOnDraftInterventionCards=Vannmerke på intervensjonskort-dokumenter (ingen hvis tom)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Oppsett av kontrakter/abonnement-modulen
 ContractsNumberingModules=Kontrakter nummerering moduler
-TemplatePDFContracts=Contracts documents models
+TemplatePDFContracts=Dokumentmaler for kontrakter
 FreeLegalTextOnContracts=Fritekst på kontrakter
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+WatermarkOnDraftContractCards=Vannmerke på kontraktkladder (ingen hvis tom)
 ##### Members #####
 MembersSetup=Innstillnger for medlemsmodul
 MemberMainOptions=Hovedinstillinger
@@ -1282,15 +1287,15 @@ LDAPTestSynchroContact=Test contact's synchronization
 LDAPTestSynchroUser=Test user's synchronization
 LDAPTestSynchroGroup=Test group's synchronization
 LDAPTestSynchroMember=Test member's synchronization
-LDAPTestSearch= Test a LDAP search
+LDAPTestSearch= Test et LDAP søk
 LDAPSynchroOK=Synchronization test successful
 LDAPSynchroKO=Failed synchronization test
 LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Tilkobling/Autentisering til LDAP server var vellykket (Server=%s, Port=%s, Admin=%s, Passord=%s)
 LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Vellykket frakobling
 LDAPUnbindFailed=Disconnect failed
 LDAPConnectToDNSuccessfull=Connection au DN (%s) rï¿œussie
 LDAPConnectToDNFailed=Connection au DN (%s) ï¿œchouï¿œe
@@ -1336,8 +1341,8 @@ LDAPFieldCountry=Country
 LDAPFieldCountryExample=Example : c
 LDAPFieldDescription=Description
 LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
+LDAPFieldNotePublic=Offentlig notat
+LDAPFieldNotePublicExample=Eksempel:offentlig notat
 LDAPFieldGroupMembers= Gruppemedlemmer
 LDAPFieldGroupMembersExample= Eksempel: uniqueMember
 LDAPFieldBirthdate=Birthdate
@@ -1348,8 +1353,8 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
 LDAPFieldTitle=Stilling
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPFieldTitleExample=Eksempel: tittel
+LDAPParametersAreStillHardCoded=LDAP parametrene er fortsatt hardkodet(i klassen contact)
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
 LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
@@ -1358,40 +1363,42 @@ LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree
 LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
 LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
 ForANonAnonymousAccess=For an authenticated acces (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+PerfDolibarr=Ytelse oppsett/optimaliseringsrapport
+YouMayFindPerfAdviceHere=På denne siden vil du finne noen sjekkpunkt og råd relatert til ytelse
+NotInstalled=Ikke installert, så serveren taper ikke ytelse pga. denne.
+ApplicativeCache=Applikasjons-cache
+MemcachedNotAvailable=Ingen applikativ cache funnet. Du kan forbedre ytelsen ved å installere en cache-server Memcached og en modul som kan bruke denne cache-serveren. <br> Mer informasjon her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Merk: Mange webhosting-leverandører har ikke en slik cache-server.
+MemcachedModuleAvailableButNotSetup=Modulen memcache er funnet, men oppsett er ikke komplett
+MemcachedAvailableAndSetup=Modulen memcache er aktivert
 OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+NoOPCodeCacheFound=Ingen OPCode cache funnet. Kan være du bruker en annen OPCode-cache enn XCache eller eAccelerator (bra). Det kan også være at du ikke har OPCode-cache (svært dårlig).
+HTTPCacheStaticResources=HTTP cache for statiske ressurser (css, img, javascript)
+FilesOfTypeCached=Filtypene %s er cachet av HTTP-server
+FilesOfTypeNotCached=Filtypene %s er ikke cachet av HTTP-server
+FilesOfTypeCompressed=Filtypene %s er undertrykket av HTTP-server
+FilesOfTypeNotCompressed=Filtypene %s er ikke undertrykket av HTTP-server
+CacheByServer=Server-cache
+CacheByClient=Nettleser-cache
+CompressionOfResources=Undertrykkelse av HTTP-respons
+TestNotPossibleWithCurrentBrowsers=En slik automatisk deteksjon er ikke mulig med nåværende nettlesere
 ##### Products #####
-ProductSetup=Innstillinger for produktmodul
+ProductSetup=Innstillinger for varemodul
 ServiceSetup=Tjenester modul oppsett
-ProductServiceSetup=Produkter og tjenester moduler oppsett
-NumberOfProductShowInSelect=Maksantall produkter i utvalgslister (0=ingen grenser)
-ConfirmDeleteProductLineAbility=Bekreftelse kreves for fjerning av en produktlinje
+ProductServiceSetup=Varer og tjenester moduler oppsett
+NumberOfProductShowInSelect=Maksantall varer i utvalgslister (0=ingen grenser)
+ConfirmDeleteProductLineAbility=Bekreftelse kreves for fjerning av en varelinje
 ModifyProductDescAbility=Personalization of descriptions produced in the forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
-ViewProductDescInThirdpartyLanguageAbility=Visualisering av produkter beskrivelser i thirdparty språk
-UseSearchToSelectProductTooltip=Hvis du har mange produkter (>100 000), kan du øke hastigeten ved å sette konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Oppsett->Annet. Søket vil da begrenses til starten av søkestrengen
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
+MergePropalProductCard=I "Vedlagte filer"-fanen i "Varer og tjenester" kan du aktivere en opsjon for å flette PDF-varedokument til tilbud PDF-azur hvis varen/tjenesten er i tilbudet
+ViewProductDescInThirdpartyLanguageAbility=Visualisering av varer beskrivelser i thirdparty språk
+UseSearchToSelectProductTooltip=Hvis du har mange varer (>100 000), kan du øke hastigeten ved å sette konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Oppsett->Annet. Søket vil da begrenses til starten av søkestrengen
+UseSearchToSelectProduct=Bruk et søkeskjema for å velge vare (i stedet for en nedtrekksliste)
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
+UseUnits=Støtter enheter
+ProductCodeChecker= Modul for varekode-generering og kontroll (vare eller tjeneste)
+ProductOtherConf= Oppsett av Varer/Tjenester
 ##### Syslog #####
 SyslogSetup=Syslog module setup
 SyslogOutput=Log output
@@ -1402,7 +1409,7 @@ SyslogSimpleFile=File
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=Du kan bruke DOL_DATA_ROOT / dolibarr.log for en loggfil i Dolibarr "dokumenter"-katalogen. Du kan angi en annen vei til å lagre denne filen.
 ErrorUnknownSyslogConstant=Constant %s is not a known syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=Windows støtter bare LOG_USER
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Mal for donasjonen kvittering
@@ -1420,33 +1427,35 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeDescDATAMATRIX=Strekkodetype Datamatrix
+BarcodeDescQRCODE=Strekkodetype QR-kode
+GenbarcodeLocation=Kommandolinje-verktøy for strekkodegenerering (brukt av programmet for noen typer strekkode). Må være kompatibel med "genbarcode".<br>For eksempel: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Intern motor
+BarCodeNumberManager=Verktøy for å auto-definere strekkodenumre
 ##### Prelevements #####
 WithdrawalsSetup=Withdrawal module setup
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=En interessant RSS-feed
 ##### Mailing #####
 MailingSetup=EMailing module setup
 MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
 MailingEMailError=Tilbake e-post (Feil-til) for e-post med feil
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Sekunder å vente før utsendelse av neste melding
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Oppset av e-postvarsling-modulen
 NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
-FixedEmailTarget=Fixed email target
+ListOfAvailableNotifications=Liste over hendelser du kan sette varsling på, for hver tredjepart (gå inn på tredjeparts-kortet for å sette opp), eller ved å sette en fast e-post (Liste avhenger av aktiverte moduler)
+FixedEmailTarget=Fast e-post mål
 ##### Sendings #####
 SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings nummerering moduler
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Støtt forsendelsesskjema for kundeleveranser
 NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Fritekst på leveringer
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
 DeliveryOrderModel=Products deliveries receipt model
@@ -1457,19 +1466,19 @@ AdvancedEditor=Avansert redaktør
 ActivateFCKeditor=Activate FCKeditor for:
 FCKeditorForCompany=WYSIWIG creation/edition of companies' description and note
 FCKeditorForProduct=WYSIWIG creation/edition of products/services' description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG opprettelse/endring av varedetaljer for alle enheter (tilbud, ordre, fakturaer, osv ...). <font class="warning"> Advarsel! Bruk av dette alternativet er i dette tilfellet ikke anbefalt, da det kan skape problemer med spesialkarakterer og sideformatering ved opprettelse av PDF-filer.</font>
 FCKeditorForMailing= WYSIWIG creation/edition of mailings
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=WYSIWIG-opprettelse av signatur
+FCKeditorForMail=Bruk WYSIWIG ved opprettelse/endring av all e-post (med unntak av Outils->eMailing)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
 OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Oppsett av varehus-modulen
+UserWarehouse=Benytt bruker-valgte varehus 
+IfYouUsePointOfSaleCheckModule=Hvis du bruker en Point-of-Sale-modul (standard POS-modul eller en annen ekstern modul), kan dette oppsettet bli ignorert av din Point-Of-Sale modul. De fleste POS-moduler er designet for øyeblikkelig å lage faktura og redusere lager som standard, uansett hva som settes her. Så husk å sjekke hvordan POS-modulen er satt opp.
 ##### Menu #####
 MenuDeleted=Menyen er slettet
 TreeMenu=Tremenyer
@@ -1502,13 +1511,13 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Instillinger for avgifter og dividender
+TaxSetup=Modul for skatter,avgifter og utbytte
 OptionVatMode=Alternativ på grunn av MVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=Mva skal beregnes:<br>- ved levering av produkter<br>- ved levering av tjenester
-OptionVatDebitOptionDesc=MVA skal beregnes: :<br>- ved levering av produkter<br>- ved fakturering av tjenester
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+OptionVATDefault=Kontant-base
+OptionVATDebitOption=Periodisering
+OptionVatDefaultDesc=Mva skal beregnes:<br>- ved levering av varer<br>- ved levering av tjenester
+OptionVatDebitOptionDesc=MVA skal beregnes: :<br>- ved levering av varer<br>- ved fakturering av tjenester
+SummaryOfVatExigibilityUsedByDefault=Tidspunkt for MVA-innbetaling som standard i henhold til valgt alternativ:
 OnDelivery=Ved levering
 OnPayment=På betaling
 OnInvoice=På faktura
@@ -1519,30 +1528,30 @@ Sell=Selg
 InvoiceDateUsed=Fakturadatoen brukes
 YourCompanyDoesNotUseVAT=Firmaet ditt har blitt definert for å ikke bruke moms (Home - Setup - Firma / Foundation), så det er ingen moms alternativer for oppsett.
 AccountancyCode=Regnskap Kode
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Kontokode for salg
+AccountancyCodeBuy=Kontokode for innkjøp
 ##### Agenda #####
 AgendaSetup=Instillinger for modulen hendelser og agenda
 PasswordTogetVCalExport=Nøkkel for å autorisere eksportlenke
 PastDelayVCalExport=Må ikke eksportere hendelse eldre enn
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (håndtert i menyen Oppsett -> Ordliste -> Agenda hendelsestyper)
+AGENDA_DEFAULT_FILTER_TYPE=Sett denne hendelsestypen automatisk i søkefilteret til Agenda-visning
+AGENDA_DEFAULT_FILTER_STATUS=Sett denne statustypen automatisk i søkefilteret til Agenda-visning
+AGENDA_DEFAULT_VIEW=Hvilken fane vil åpne som standard når du velger Agenda-menyen?
 ##### ClickToDial #####
 ClickToDialDesc=Denne modulen gir et telefonikon etter telefonnummeret til kontaktpersoner. Et trykk på dette ikonet vil kalle opp en egen server med en URL som du definerer nedenfor. Du kan da få et system som ringer opp kontaktpersonen automatisk for deg, for eksempel på et SIP-system.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of salg
 CashDeskSetup=Instillinger for modulen kassaapparat
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Standard generisk tredjepart for salg
 CashDeskBankAccountForSell=Kassekonto som skal brukes til kontantsalg
 CashDeskBankAccountForCheque= Konto som skal brukes til å motta utbetalinger via sjekk
 CashDeskBankAccountForCB= Konto som skal brukes til å motta kontant betaling med kredittkort
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Deaktiver lagerreduksjon fra Poin-of-Sale (hvis "nei", vil lagerreduksjon bli utført for hvert salg utført fra POS, uansett hva som er innstilt i Lager-modulen).
+CashDeskIdWareHouse=Tving/begrens varehus til å bruke varereduksjon ved salg
+StockDecreaseForPointOfSaleDisabled=Lagerreduksjon fra Point-of-Sale deaktivert
+StockDecreaseForPointOfSaleDisabledbyBatch=Varereduksjon i POS er ikke kompatibel med lot-håndtering
+CashDeskYouDidNotDisableStockDecease=Lagerreduksjon ble ikke utført ved salg fra Point-of-Sale. Velg et varehus
 ##### Bookmark #####
 BookmarkSetup=Legg modul oppsett
 BookmarkDesc=Denne modulen kan du administrere bokmerker. Du kan også legge til snarveier til noen Dolibarr sider eller externale nettsteder på venstre meny.
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices modul oppsett
 WebServicesDesc=Ved å aktivere denne modulen, Dolibarr bli en webtjeneste serveren kan tilby diverse web-tjenester.
 WSDLCanBeDownloadedHere=WSDL beskrivelse fil forutsatt serviceses kan laste ned her
 EndPointIs=SOAP klienter må sende sine forespørsler til Dolibarr endepunktet tilgjengelig på URL
+##### API ####
+ApiSetup=Oppsett av API-modul
+ApiDesc=Ved å  aktivere denne modulen, blir Dolibarr en REST-server for diverse web-tjenester
+KeyForApiAccess=Nøkkel for å bruke API (parameter "api_key")
+ApiProductionMode=Aktiver produksjonsmodus
+ApiEndPointIs=Url for adgang til API
+ApiExporerIs=Url for å utforske API
+OnlyActiveElementsAreExposed=Bare elementer fra aktiverte moduler er vist
+ApiKey=API-nøkkel
 ##### Bank #####
 BankSetupModule=Bank modul oppsett
 FreeLegalTextOnChequeReceipts=Fritekst på å finne kvitteringer
@@ -1566,11 +1584,11 @@ MultiCompanySetup=Multi-selskap modulen setup
 SuppliersSetup=Leverandør modulen oppsett
 SuppliersCommandModel=Komplett mal av leverandør rekkefølge (logo. ..)
 SuppliersInvoiceModel=Komplett mal av leverandør faktura (logo. ..)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersInvoiceNumberingModel=Nummereringsmodel for leverandørfakturaer
+IfSetToYesDontForgetPermission=Hvis ja, ikke glem å gi tillatelser til grupper eller brukere tillatt for 2. godkjenning
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul-oppsett
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Bane til fil som inneholder Maxmind IP til oversetting av land.<br>Eksempler:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Merk at din IP til land datafilen må være inne i en katalog på PHP kan lese (Sjekk din PHP open_basedir oppsett og filesystem tillatelser).
 YouCanDownloadFreeDatFileTo=Du kan laste ned en <b>gratis demoversjon</b> av Maxmind GeoIP landet arkiv for %s.
 YouCanDownloadAdvancedDatFileTo=Du kan også laste ned en mer <b>komplett utgave, med oppdateringer,</b> av Maxmind GeoIP landet arkiv for %s.
@@ -1580,10 +1598,11 @@ ProjectsNumberingModules=Prosjekter nummerering modulen
 ProjectsSetup=Prosjekt modul oppsett
 ProjectsModelModule=Prosjektets rapport dokument modellen
 TasksNumberingModules=Modul for oppgavenummerering
-TaskModelModule=Tasks reports document model
+TaskModelModule=Dokumentmal for oppgaverapporter
+UseSearchToSelectProject=Bruk autokomplettering for å velge prosjekt (i stedet for listeboks)
 ##### ECM (GED) #####
-ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMSetup = GED oppsett
+ECMAutoTree = Automatisk mappetre og dokument
 ##### Fiscal Year #####
 FiscalYears=Regnskapsår
 FiscalYear=Regnskapsår
@@ -1594,31 +1613,40 @@ OpenFiscalYear=Åpne regnskapsår
 CloseFiscalYear=Lukk regnskapsår
 DeleteFiscalYear=Slett regnskapsår
 ConfirmDeleteFiscalYear=Er du sikker på at du vil slette dette regnskapsåret?
-Opened=Åpnet
+Opened=Åpne
 Closed=Lukket
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+AlwaysEditable=Kan alltid endres
+MAIN_APPLICATION_TITLE=Tving synlig navn på program (advarsel: Å sette ditt eget navn her kan fjerne autofyll logginn-funksjonen når du bruker DoliDroid mobilapplikasjon)
+NbMajMin=Minste antall store bokstaver
+NbNumMin=Minste antall numeriske tegn
+NbSpeMin=Minste antall spesial-tegn
+NbIteConsecutive=Maksimalt antall repeterte tegn
+NoAmbiCaracAutoGeneration=Ikke bruk tvetydige tegn ("1","l","i","|","0","O") for automatisk generering
+SalariesSetup=Oppsett av lønnsmodulen
+SortOrder=Sorteringsrekkefølge
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerContact=List of notifications per contact*
-ListOfFixedNotifications=List of fixed notifications
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build database backup dump file
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+TypePaymentDesc=0:Kundebetaling, 1:Leverandørbetaling, 2:Både kunde- og leverandørbetaling
+IncludePath=Inkluder bane (definert i variael %s)
+ExpenseReportsSetup=Oppsett av utgiftsrapport-modulen
+TemplatePDFExpenseReports=Dokumentmaler for å generere utgiftsrapporter
+NoModueToManageStockDecrease=Ingen modul i stand til å håndtere automatisk lagerreduksjon er blitt aktivert. Lagerreduksjon kan bare gjøres manuelt.
+NoModueToManageStockIncrease=Ingen modul i stand til å håndtere automatisk lagerøkning er blitt aktivert. Lagerøkning kan bare gjøres manuelt.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finne alternativer for e-postmeldinger ved å aktivere og konfigurere modulen "Varslingen".
+ListOfNotificationsPerContact=Liste over varslinger per kontakt *
+ListOfFixedNotifications=Liste over faste varslinger
+GoOntoContactCardToAddMore=Gå på fanen "Meldinger" hos en tredjeparts-kontakt for å legge til eller fjerne varsler for kontakter/adresser
+Threshold=Terskel
+BackupDumpWizard=Veiviser for å bygge database-backup dumpfil
+SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
+SomethingMakeInstallFromWebNotPossible2=På grunn av dette, er prosessen for å oppgradere beskrevet her, bare manuelle trinn en privilegert bruker kan gjøre.
+InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert muligheten for å installere eksterne moduler. Administrator må fjerne filen <strong>%s</strong> for å tillate dette.
+ConfFileMuseContainCustom=For å installere en modul må du lagre filene i mappen <strong>%s</strong>. For at Dolibarr skal behandle dette, må du først <strong>conf/conf.php</strong>for å ha opsjonen<br>- <strong>$dolibarr_main_url_root_alt</strong> aktivert med verdien <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> aktivert med <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
+PressF5AfterChangingThis=Trykk F5 etter å ha endret denne verdien for at endringene skal tre i kraft
+NotSupportedByAllThemes=Vil virke med Eldy-temaet men er ikke støttet av av alle temaer
+BackgroundColor=Bakgrunnsfarge
+TopMenuBackgroundColor=Bakgrunnsfarge for toppmeny
+LeftMenuBackgroundColor=Bakgrunnsfarge for venstre meny
+BackgroundTableTitleColor=Bakgrunnsfarge for tabell-tittellinje
+BackgroundTableLineOddColor=Bakgrunnsfarge for oddetalls-tabellinjer
+BackgroundTableLineEvenColor=Bakgrunnsfarge for partalls-tabellinjer
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 6f6bf295180..fd2b5d7ecc0 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -8,7 +8,7 @@ Calendar=Kalender
 Calendars=Kalendre
 LocalAgenda=Intern kalender
 ActionsOwnedBy=Hendelse tilhører
-AffectedTo=Relatert til
+AffectedTo=Tildelt
 DoneBy=Utført av
 Event=Hendelse
 Events=Hendelser
@@ -25,7 +25,7 @@ MenuToDoMyActions=Mine åpne handlinger
 MenuDoneMyActions=Mine avsluttede handlinger
 ListOfEvents=Hendelsesliste (intern kalender)
 ActionsAskedBy=Handlinger registrert av
-ActionsToDoBy=Handlinger relatert til
+ActionsToDoBy=Handlinger tildelt
 ActionsDoneBy=Handlinger utført av
 ActionsForUser=Hendelser for brukere
 ActionsForUsersGroup=Hendelser for alle brukerene i gruppen
@@ -33,7 +33,7 @@ ActionAssignedTo=Hendelse tilordnet
 AllMyActions= Alle mine handlinger/oppgaver
 AllActions= Alle handlinger/oppgaver
 ViewList=Vis liste
-ViewCal=Vis kalender
+ViewCal=Månedsvisning
 ViewDay=Dagsvisning
 ViewWeek=Ukesvisning
 ViewPerUser=Visning pr. bruker
@@ -44,18 +44,17 @@ AgendaSetupOtherDesc= Her kan du gjøre andre innstillinger i agendamodulen.
 AgendaExtSitesDesc=Denne siden lar deg sette opp eksterne kalendere for å visning i Dolibarr agenda.
 ActionsEvents=Handlinger som Dolibarr automatisk registrerer i agendaen
 PropalValidatedInDolibarr=Tilbud godkjent
-InvoiceValidatedInDolibarr=Faktura godkjent
+InvoiceValidatedInDolibarr=Faktura %s validert
 InvoiceValidatedInDolibarrFromPos=Faktura %s godkjent fra POS
 InvoiceBackToDraftInDolibarr=Sett  faktura %s tilbake til utkaststatus
 InvoiceDeleteDolibarr=Faktura %s slettet
-OrderValidatedInDolibarr=Ordre godkjent
+OrderValidatedInDolibarr=Ordre %s validert
 OrderDeliveredInDolibarr=Ordre %s klassifisert som levert
 OrderCanceledInDolibarr=Ordre %s kansellert
 OrderBilledInDolibarr=Ordre %s klassifisert som fakturert
 OrderApprovedInDolibarr=Ordre %s godkjent
 OrderRefusedInDolibarr=Ordre %s avvist
 OrderBackToDraftInDolibarr=Sett ordre %s tilbake til utkaststatus
-OrderCanceledInDolibarr=Ordre %s kansellert
 ProposalSentByEMail=Kommersielle tilbud %s sendt på epost
 OrderSentByEMail=Kundeordrer %s sendt på epost
 InvoiceSentByEMail=Faktura %s sendt på epost
@@ -87,7 +86,7 @@ ExportCal=Eksporter kalender
 ExtSites=Importer eksterne kalendere
 ExtSitesEnableThisTool=Vis eksterne kalendere (definert i global setup) i agenda. Påvirker ikke eksterne kalendere definert av brukere.
 ExtSitesNbOfAgenda=Antall kalendere
-AgendaExtNb=Kalender nb %s
+AgendaExtNb=Kalender nummer %s
 ExtSiteUrlAgenda=URL til. ical-fil
 ExtSiteNoLabel=Ingen beskrivelse
 WorkingTimeRange=Arbeidstid
@@ -96,3 +95,5 @@ AddEvent=Opprett hendelse
 MyAvailability=Min tilgjengelighet
 ActionType=Hendelsestype
 DateActionBegin=Startdato for hendelse
+CloneAction=Klon hendelse
+ConfirmCloneEvent=Er du sikker på at du vil klone hendelsen <b>%s</b>?
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index ff4fb1bc722..d65f537dc40 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -4,8 +4,8 @@ Banks=Banker
 MenuBankCash=Bank/Kasse
 MenuSetupBank=Bank-/Kasseoppsett
 BankName=Banknavn
-FinancialAccount=Hovedbokskonto
-FinancialAccounts=Hovebokskonti
+FinancialAccount=Konto
+FinancialAccounts=Konti
 BankAccount=Bankkonto
 BankAccounts=Bankkonti
 ShowAccount=Vis konto
@@ -13,9 +13,9 @@ AccountRef=Kontonummer hovedbokskonto
 AccountLabel=Kontonavn hovedbokskonto
 CashAccount=Kassekonto
 CashAccounts=Kassekonti
-MainAccount=Hovedkonto (kassekreditt)
-CurrentAccount=Driftskonto
-CurrentAccounts=Driftskonti
+MainAccount=Hovedkonto
+CurrentAccount=Gjeldende konto
+CurrentAccounts=Gjeldende konti
 SavingAccount=Kapitalkonto
 SavingAccounts=Kapitalkonti
 ErrorBankLabelAlreadyExists=Hovedbokskonto med samme navn eksisterer fra før
@@ -33,11 +33,11 @@ AllTime=Fra start
 Reconciliation=Bankavstemming
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=IBAN er gyldig
+IbanNotValid=IBAN er ikke gyldig
 BIC=BIC/SWIFT-nummer
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC/SWIFT er gyldig
+SwiftNotValid=BIC/SWIFT er ikke gyldig
 StandingOrders=Åpne ordre
 StandingOrder=Åpne ordre
 Withdrawals=Uttak
@@ -49,7 +49,7 @@ LastAccountStatements=Kontoutdrag
 Rapprochement=Avstemming
 IOMonthlyReporting=Månedlig rapportering
 BankAccountDomiciliation=Kontoadresse
-BankAccountCountry=Konto landet
+BankAccountCountry=Konto land
 BankAccountOwner=Kontoeier
 BankAccountOwnerAddress=Kontoeiers adresse
 RIBControlError=Integritetssjekk feilet. Dette betyr at informasjon om denne kontoen er ufullstendig eller feil (sjekk land, nummer og IBAN).
@@ -80,28 +80,28 @@ ByCategories=Etter kategorier
 ByRubriques=Etter kategorier
 BankTransactionByCategories=Transaksjoner etter kategorier
 BankTransactionForCategory=Transaksjoner i kategorien <b>%s</b>
-RemoveFromRubrique=Fjern lenke med kategorier
+RemoveFromRubrique=Fjern lenke med kategori
 RemoveFromRubriqueConfirm=Er du sikker på at du vil fjerne lenken mellom transaksjonen og kategorien?
 ListBankTransactions=Oversikt over transaksjoner
 IdTransaction=Transaksjons-ID
 BankTransactions=Banktransaksjoner
 SearchTransaction=Søk i transaksjoner
-ListTransactions=Liste transaksjoner
-ListTransactionsByCategory=Liste transaksjon / kategori
+ListTransactions=List over transaksjoner
+ListTransactionsByCategory=Liste over transaksjoner/kategorier
 TransactionsToConciliate=Transaksjon du vil stemme av
-Conciliable=Avstemmingsbar
-Conciliate=Avstemm
+Conciliable=Kan avstemmes
+Conciliate=Avstem
 Conciliation=Avstemming
-ConciliationForAccount=Avstemm denne kontoen
+ConciliationForAccount=Avstem denne kontoen
 IncludeClosedAccount=Ta med lukkede konti
-OnlyOpenedAccount=Bare åpne konti
+OnlyOpenedAccount=Kun åpne konti
 AccountToCredit=Konto å kreditere
 AccountToDebit=Konto å debitere
 DisableConciliation=Slå av avstemmingsfunksjon for denne kontoen
 ConciliationDisabled=Avstemmingsfunksjon slått av
-StatusAccountOpened=Åpnet
-StatusAccountClosed=Luket
-AccountIdShort=Numer
+StatusAccountOpened=Åpne
+StatusAccountClosed=Lukket
+AccountIdShort=Nummer
 EditBankRecord=Rediger post
 LineRecord=Transaksjon
 AddBankRecord=Legg til transaksjon
@@ -110,10 +110,10 @@ ConciliatedBy=Avstemt av
 DateConciliating=Avstemt den
 BankLineConciliated=Transaksjonen er avstemt
 CustomerInvoicePayment=Kundeinnbetaling
-CustomerInvoicePaymentBack=Customer payment back
-SupplierInvoicePayment=Leverandøutbetaling
-WithdrawalPayment=Tilbaketrekking betaling
-SocialContributionPayment=Social contribution betaling (ikke i Norge)
+CustomerInvoicePaymentBack=Innbetaling fra kunde
+SupplierInvoicePayment=Leverandøbetaling
+WithdrawalPayment=Uttaksbetaling
+SocialContributionPayment=Betaling av skatter og avgifter
 FinancialAccountJournal=Utskrift hovedbok
 BankTransfer=Bankoverføring
 BankTransfers=Bankoverføringer
@@ -128,8 +128,8 @@ DeleteCheckReceipt=Slett denne sjekkbetalingen?
 ConfirmDeleteCheckReceipt=Er du sikker på at du vil slette denne sjekkbetalingen?
 BankChecks=Banksjekker
 BankChecksToReceipt=Sjekker som venter på å bli satt inn
-ShowCheckReceipt=Vis sjekk innskudd kvittering
-NumberOfCheques=Ant. sjekker
+ShowCheckReceipt=Vis sjekkinnskuddskvittering
+NumberOfCheques=Antall sjekker
 DeleteTransaction=Slett transaksjon
 ConfirmDeleteTransaction=Er du sikker på at du vil slette transaksjonen?
 ThisWillAlsoDeleteBankRecord=Dette vil også slette genererte banktransaksjoner
@@ -138,7 +138,7 @@ CashBudget=Likviditetsbudsjett
 PlannedTransactions=Planlagte transaksjoner
 Graph=Grafikk
 ExportDataset_banque_1=Banktransaksjoner og kontoutdrag
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Kvittering
 TransactionOnTheOtherAccount=Transaksjonen på den andre kontoen
 TransactionWithOtherAccount=Overført beløp
 PaymentNumberUpdateSucceeded=Betalingsnummer er oppdatert
@@ -147,15 +147,15 @@ PaymentDateUpdateSucceeded=Betalingsdato oppdatert
 PaymentDateUpdateFailed=Klarte ikke å oppdatere betalingsdatoen
 Transactions=Transaksjoner
 BankTransactionLine=Bankoverføring
-AllAccounts=Alle bank / cash kontoer
+AllAccounts=Alle bank/kontant-kontoer
 BackToAccount=Tilbake til kontoen
 ShowAllAccounts=Vis for alle kontoer
-FutureTransaction=Transaksjon i Futur. Ingen måte å forsone.
-SelectChequeTransactionAndGenerate=Velg / filter sjekker for å inkludere inn sjekken innskudd kvitteringen og klikk på &quot;Create&quot;.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+FutureTransaction=Fremtidig transaksjon. Ingen måte å avstemme.
+SelectChequeTransactionAndGenerate=Velg/filter sjekker for å inkludere sjekkinnskuddskvitteringen og klikk på &quot;Create&quot;.
+InputReceiptNumber=Velg kontoutskriften som hører til avstemmingen. Bruke en sorterbar numerisk verdi: YYYYMM eller YYYYMMDD
+EventualyAddCategory=Til slutt, velg en kategori for å klassifisere postene
+ToConciliate=Avstem?
+ThenCheckLinesAndConciliate=Sjekk linjene i kontoutskriften og klikk
 BankDashboard=Bankkonti sammendrag
 DefaultRIB=Standard BAN
 AllRIB=Alle BAN
@@ -163,5 +163,5 @@ LabelRIB=BAN Etikett
 NoBANRecord=Ingen BAN kort
 DeleteARib=BAN-kort slettet
 ConfirmDeleteRib=Er du sikker på at du vil slette dette BAN-kortet?
-StartDate=Start date
-EndDate=End date
+StartDate=Startdato
+EndDate=Sluttdato
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 75101db467e..5ecb7e64568 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Fakturaer
-BillsCustomers=Kundens fakturaer
+BillsCustomers=Kundefakturaer
 BillsCustomer=Kundens faktura
 BillsSuppliers=Leverandørens fakturaer
 BillsCustomersUnpaid=Ubetalte kundefakturaer
 BillsCustomersUnpaidForCompany=Ubetalte kundefakturaer for %s
 BillsSuppliersUnpaid=Ubetalte leverandørfakturaer
-BillsSuppliersUnpaidForCompany=Ubetalt leverandørens fakturaer for %s
+BillsSuppliersUnpaidForCompany=Ubetalte leverandørfakturaer for %s
 BillsLate=Sene betalinger
-BillsStatistics=Kundens fakturastatistikk
-BillsStatisticsSuppliers=Leverandørens fakturastatistikk
-DisabledBecauseNotErasable=Deaktivert fordi kan ikke slettes
+BillsStatistics=Kunde fakturastatistikker
+BillsStatisticsSuppliers=Leverandør fakturastatistikker
+DisabledBecauseNotErasable=Deaktivert fordi den ikke kan slettes
 InvoiceStandard=Standardfaktura
 InvoiceStandardAsk=Standardfaktura
 InvoiceStandardDesc=Denne fakturatypen er den vanligste fakturaen.
-InvoiceDeposit=Faktura
-InvoiceDepositAsk=Innskudd faktura
-InvoiceDepositDesc=Denne typen faktura gjøres når et innskudd har blitt mottatt.
+InvoiceDeposit=Innskuddsfaktura
+InvoiceDepositAsk=Innskuddsfaktura
+InvoiceDepositDesc=Denne typen faktura lages når et innskudd har blitt mottatt.
 InvoiceProForma=Proforma faktura
 InvoiceProFormaAsk=Proforma faktura
-InvoiceProFormaDesc=<b>Proforma faktura</b> er et bilde av en ekte faktura, men har ingen regnskapsføring verdi.
+InvoiceProFormaDesc=<b>Proforma faktura</b> er et bilde av en ekte faktura, men har ingen verdi i regnskapsføring.
 InvoiceReplacement=Erstatningsfaktura. Må erstatte faktura med referanse
 InvoiceReplacementAsk=Erstatningsfaktura for faktura
-InvoiceReplacementDesc=<b>Erstatningsfaktura</b> brukes til å avbryte og erstatte en faktura uten at betaling allerede er mottatt. <br><br> Merk: Bare faktura uten innbetaling kan erstattes. Hvis ikke faktura er stengt, vil den bli automatisk satt til 'forlatt'.
+InvoiceReplacementDesc=<b>Erstatningsfaktura</b> brukes til å avbryte og erstatte en faktura uten at betaling allerede er mottatt. <br><br> Merk: Bare faktura uten innbetaling kan erstattes. Hvis ikke faktura er lukket, vil den bli automatisk satt til 'forlatt'.
 InvoiceAvoir=Kreditnota
-InvoiceAvoirAsk=Kreditnota for å korriger fektura
+InvoiceAvoirAsk=Kreditnota for å korrigere faktura
 InvoiceAvoirDesc=En <b>kreditnota</b> er en negativ faktura som brukes for å løse situasjoner hvor en faktura har et annet beløp enn det som virkelig er betalt (fordi kunden har betalt for lite ved en feil, eller for eksempel ikke ønsker å betale alt fordi han har returnert noen varer.).<br><br>Obs!: Originalfakturaen må allerede være lukket ('betalt' eller 'delbetalt') for at du skal kunne opprette en kreditnota mot den.
 invoiceAvoirWithLines=Opprett kreditnota med opprinnelige fakturalinjer
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirWithPaymentRestAmount=Lag kreditnota pålydende restbeløp fra faktura
 invoiceAvoirLineWithPaymentRestAmount=Kreditnota for restbeløp
 ReplaceInvoice=Erstatt faktura %s
 ReplacementInvoice=Erstatningsfaktura
@@ -55,14 +55,14 @@ SuppliersInvoices=Leverandørfakturaer
 SupplierBill=Leverandørfaktura
 SupplierBills=Leverandørfakturaer
 Payment=Betaling
-PaymentBack=Betaling tilbake
+PaymentBack=Tilbakebetaling
 Payments=Betalinger
-PaymentsBack=Betalinger tilbake
+PaymentsBack=Tilbakebetaling
 PaidBack=Tilbakebetalt
 DatePayment=Betalingsdato
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
-ConfirmConvertToReduc=Ønsker du å konvertere denne kreditnotaen til absolutt rabatt?<br>Beløpet på denne kreditnotaen vil da bli lagret bland alle rabatter, og kan brukes som rabatt for en eksisterende eller framtidig faktura til denne kunden.
+ConfirmConvertToReduc=Ønsker du å konvertere denne kreditnotaen til absolutt rabatt?<br>Beløpet på denne kreditnotaen vil da bli lagret blant alle rabatter, og kan brukes som rabatt for en eksisterende eller framtidig faktura til denne kunden.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
 ReceivedCustomersPayments=Betalinger mottatt fra kunder
@@ -80,16 +80,16 @@ PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Beløp til betaling
 ValidatePayment=Godkjenn betaling
 PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp
-HelpPaymentHigherThanReminderToPay=Oppmerksomhet, er betalingen mengden av en eller flere regninger høyere enn resten til å betale. <br> Endre din oppføring, ellers bekrefte og tenke på å lage en kreditnota av det overskytende mottatt for hver overbetalte fakturaer.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPay=NB! Innbetalingen av en eller flere fakturaer er høyere enn restbeløpet. <br> Endre oppføringen eller bekreft for å lage kreditnota av det overskytende for overbetalte fakturaer.
+HelpPaymentHigherThanReminderToPaySupplier=NB! Innbetalingsbeløpet fra en eller flere fakturaer er høyere enn restbeløpet. <br> Korriger innbetaling, eller aksepter den
 ClassifyPaid=Merk 'Betalt'
 ClassifyPaidPartially=Merk 'Delbetalt'
 ClassifyCanceled=Merk 'Tapsført'
 ClassifyClosed=Merk 'Lukket'
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Klassifiser 'ufakturert'
 CreateBill=Lag faktura
 AddBill=Legg til faktura eller kreditnota
-AddToDraftInvoices=Add to draft invoice
+AddToDraftInvoices=Legg til i fakturamal
 DeleteBill=Slett faktura
 SearchACustomerInvoice=Finn kundefaktura
 SearchASupplierInvoice=Finn leverandørfaktura
@@ -125,15 +125,15 @@ BillShortStatusNotPaid=Utbetalt
 BillShortStatusClosedUnpaid=Lukket
 BillShortStatusClosedPaidPartially=Delbetalt
 PaymentStatusToValidShort=Til godkjenning
-ErrorVATIntraNotConfigured=Intracommunautary VAT-nummer er ikke definert
+ErrorVATIntraNotConfigured=Internt MVA-nummer er ikke definert
 ErrorNoPaiementModeConfigured=Det er ingen forhåndsinnstilt betalingsmåte. Gå til Fakturamodul for å rette dette.
-ErrorCreateBankAccount=Opprett en bankkonto, deretter går du til Oppsett i Fakturamodil for å angi betalingsmetoder
+ErrorCreateBankAccount=Opprett en bankkonto, deretter går du til Oppsett i Fakturamodul for å angi betalingsmetoder
 ErrorBillNotFound=Faktura %s eksisterer ikke
-ErrorInvoiceAlreadyReplaced=Feil: Du prøver å godkjenne en faktura som erstatter faktura %s. Men denne er allerde blitt erstattet av faktura %s.
+ErrorInvoiceAlreadyReplaced=Feil: Du prøver å godkjenne en faktura som erstatter faktura %s. Denne er allerede blitt erstattet av faktura %s.
 ErrorDiscountAlreadyUsed=Feil: Rabatten er allerde blitt benyttet
 ErrorInvoiceAvoirMustBeNegative=Feil: Korrigeringsfaktura må ha negativt beløp
 ErrorInvoiceOfThisTypeMustBePositive=Feil: Denne fakturatypen må ha postitivt beløp
-ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en faktura som er erstattet av en annen faktura som fortsatt er i klademodus
+ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en faktura som er erstattet av en annen faktura som fortsatt er i kladdemodus
 BillFrom=Fra
 BillTo=Fakturamottaker
 ActionsOnBill=Handlinger på faktura
@@ -144,8 +144,8 @@ LastSuppliersBills=Siste %s kundefakturaer
 AllBills=Alle fakturaer
 OtherBills=Andre fakturaer
 DraftBills=Fakturakladder
-CustomersDraftInvoices=Kundens fakturakladder
-SuppliersDraftInvoices=Leverandørene fakturakladder
+CustomersDraftInvoices=Kunde fakturakladder
+SuppliersDraftInvoices=Leverandør fakturakladder
 Unpaid=Ubetalt
 ConfirmDeleteBill=Er du sikker på at du vil slette denne fakturaen?
 ConfirmValidateBill=Er du sikker på at du vil godkjenne denne fakturaen med referansen <b>%s</b> ?
@@ -165,40 +165,40 @@ ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Dette valget er kun mulig hv
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=I noen land er dette valget kun mulig hvis fakturaen inneholder en spesiell påskrift.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Bruk dette valget hvis ingen av de andre passer
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=En <b>dårlig kunde</b> er en kunde som nekter å betale.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Dette valger brukes når betalingen ikke er komplett fordi noen produkter er returnert
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Dette valger brukes når betalingen ikke er komplett fordi noen varer er returnert
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Bruk dette valget hvis ingen av de andre passer, for eksempel i følgende situasjon:<br>- betaling ikke komplett fordi noen varer er sendt tilbake<br>- ikke betalt fullt ut fordi rabatt er uteglemt<br>I alle tilfelle må beløpet rettes i regnskapssystemet ved å lage en kreditnota.
 ConfirmClassifyAbandonReasonOther=Annen
 ConfirmClassifyAbandonReasonOtherDesc=Dette valger brukes i alle andre tilfeller. For eksempel fordi du vil lage en erstatningsfaktura.
 ConfirmCustomerPayment=Vil du bekrefte at denne betalingen gjelder <b>%s</b> %s ?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
+ConfirmSupplierPayment=Aksepterer du denne innbetalingen for <b>%s</b> %s ?
 ConfirmValidatePayment=Er du sikker på at du vil godkjenne betalingen? Du kan ikke endre dette senere.
 ValidateBill=Godkjenn fakturaer
-UnvalidateBill=Unvalidate faktura
+UnvalidateBill=Fjern validering på faktura
 NumberOfBills=Ant. fakturaer
-NumberOfBillsByMonth=Nb av fakturaer etter måned
+NumberOfBillsByMonth=Antall fakturaer pr. måned
 AmountOfBills=Totalbeløp fakturaer
-AmountOfBillsByMonthHT=Mengde fakturaer per måned (netto etter skatt)
-ShowSocialContribution=Vis social contribution
+AmountOfBillsByMonthHT=Sum fakturaer pr. mnd (eks. MVA)
+ShowSocialContribution=Vis skatter og avgifter
 ShowBill=Vis faktura
 ShowInvoice=Vis faktura
 ShowInvoiceReplace=Vis erstatningsfaktura
 ShowInvoiceAvoir=Vis kreditnota
-ShowInvoiceDeposit=Vis depositum faktura
+ShowInvoiceDeposit=Vis innskuddsfaktura
 ShowPayment=Vis betaling
 File=Fil
 AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbakebetalt
-AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd)
+AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditnotater og innskudd)
 Abandoned=Tapsført
 RemainderToPay=Restbeløp
 RemainderToTake=Restbeløp
-RemainderToPayBack=Resterende beløp å betale:
-Rest=Ventende
+RemainderToPayBack=Restbeløp
+Rest=Venter
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
 EscompteOffered=Rabatt innrømmet (betalt før forfall)
 SendBillRef=Innsendelse av faktura %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendReminderBillRef=Innsendelse av faktura %s (påminnelse)
 StandingOrders=Utestående ordre
 StandingOrder=Utestående ordre
 NoDraftBills=Ingen fakturakladder
@@ -218,8 +218,8 @@ NoInvoice=Ingen faktura
 ClassifyBill=Klassifiser faktura
 SupplierBillsToPay=Leverandørfakturaer til betaling
 CustomerBillsUnpaid=Ubetalte kundefakturaer
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
-NonPercuRecuperable=Non-recoverable
+DispenseMontantLettres=Maskinleste fakturaer er sortert i alfabetisk rekkefølge
+NonPercuRecuperable=Kan ikke dekkes inn
 SetConditions=Angi betalingsbetingelser
 SetMode=Angi betalingsmodus
 Billed=Fakturert
@@ -234,7 +234,7 @@ CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer
 CustomersInvoicesAndPayments=Kundefakturaer og betalinger
 ExportDataset_invoice_1=Oversikt over kundefakturaer og fakturalinjer
 ExportDataset_invoice_2=Kundefakturaer og betalinger
-ProformaBill=Pro forma faktura
+ProformaBill=Proforma faktura
 Reduction=Reduksjon
 ReductionShort=Red.
 Reductions=Reduksjoner
@@ -246,8 +246,8 @@ AddRelativeDiscount=Lag relativ rabatt
 EditRelativeDiscount=Endre relativ rabatt
 AddGlobalDiscount=Legg til rabatt
 EditGlobalDiscounts=Rediger absolutte rabatter
-AddCreditNote=Lag kreditt notat
-ShowDiscount=Vis rebatt
+AddCreditNote=Lag kreditnota
+ShowDiscount=Vis rabatt
 ShowReduc=Vis fradraget
 RelativeDiscount=Relativ rabatt
 GlobalDiscount=Global rabatt
@@ -256,9 +256,9 @@ CreditNotes=Kreditnotaer
 Deposit=Innskudd
 Deposits=Innskudd
 DiscountFromCreditNote=Rabatt fra kreditnota %s
-DiscountFromDeposit=Betalinger fra forekomst faktura %s
-AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før godkjenningen sin
-CreditNoteDepositUse=Faktura må godkjennes for å bruke denne kongen av studiepoeng
+DiscountFromDeposit=Betalinger fra innskuddsfaktura %s
+AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før den godkjennes
+CreditNoteDepositUse=Faktura må godkjennes for å bruke denne typen kreditt
 NewGlobalDiscount=Ny rabatt
 NewRelativeDiscount=Nye relative rabatt
 NoteReason=Notat/Årsak
@@ -267,12 +267,12 @@ DiscountOfferedBy=Innrømmet av
 DiscountStillRemaining=Gjenstående rabatt
 DiscountAlreadyCounted=Rabatt allerede avregnet
 BillAddress=Fakturaadresse
-HelpEscompte=Denne rabatten er innrømmet fordi kunden har betalt før forfall.
-HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes som eksepsjonelt tap.
+HelpEscompte=Denne rabatten er gitt fordi kunden betalte før forfall.
+HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes som tap.
 HelpAbandonOther=Dette beløpet er tapsført på grunn av feil. (For eksempel feil kunde eller faktura er erstattet av en annen)
-IdSocialContribution=Sosiale bidrag id
-PaymentId=Betaling id
-InvoiceId=FakturaID
+IdSocialContribution=Skatter og avgifter ID
+PaymentId=Betalings-ID
+InvoiceId=Faktura-ID
 InvoiceRef=Fakturareferanse
 InvoiceDateCreation=Fakturadato
 InvoiceStatus=Fakturastatus
@@ -280,25 +280,25 @@ InvoiceNote=Falturanotat
 InvoicePaid=Faktura betalt
 PaymentNumber=Betalingsnummer
 RemoveDiscount=Fjern rabatt
-WatermarkOnDraftBill=Vannmerke på kladdefakturaer (ingenting hvis tomt)
+WatermarkOnDraftBill=Vannmerke på fakturakladder (ingenting hvis tomt)
 InvoiceNotChecked=Ingen faktura er valgt
 CloneInvoice=Klon faktura
 ConfirmCloneInvoice=Er du sikker på at du vil klone denne fakturaen?
 DisabledBecauseReplacedInvoice=Handling slått av fordi fakturaen er blitt erstattet
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
-NbOfPayments=Nb av betalinger
-SplitDiscount=Split rabatt i to
+DescTaxAndDividendsArea=Dette området viser summen av alle betalinger til spesielle utgifter. Kun poster fra dette regnskapsåret er tatt med her.
+NbOfPayments=Antall betalinger
+SplitDiscount=Del rabatt i to
 ConfirmSplitDiscount=Er du sikker på at du vil dele denne rabatten av <b>%s</b> %s i to lavere rabatter?
-TypeAmountOfEachNewDiscount=Inngang beløp for hver av to deler:
-TotalOfTwoDiscountMustEqualsOriginal=Totalt to nye rabatt må være lik originale rabattbeløpet.
+TypeAmountOfEachNewDiscount=Sett inn beløp for hver av de to delene:
+TotalOfTwoDiscountMustEqualsOriginal=Totalen for de to nye rabattene må være lik det originale rabattbeløpet.
 ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabatten?
 RelatedBill=Relaterte faktura
 RelatedBills=Relaterte fakturaer
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
+RelatedCustomerInvoices=Relaterte kundefakturaer
+RelatedSupplierInvoices=Relaterte leverandørfakturaer
 LatestRelatedBill=Siste tilknyttede faktura
-WarningBillExist=Warning, one or more invoice already exist
-MergingPDFTool=Merging PDF tool
+WarningBillExist=Advarsel: en eller flere fakturaer finnes allerede
+MergingPDFTool=Verktøy for fletting av PDF 
 
 # PaymentConditions
 PaymentConditionShortRECEP=Kontant
@@ -334,8 +334,8 @@ PaymentTypeTIP=TIP
 PaymentTypeShortTIP=TIP
 PaymentTypeVAD=Nettbank
 PaymentTypeShortVAD=Nettbank
-PaymentTypeTRA=Utbetaling
-PaymentTypeShortTRA=Utbetalt
+PaymentTypeTRA=Fakturabetaling
+PaymentTypeShortTRA=Fakturer
 BankDetails=Bankopplysninger
 BankCode=Bank code (ikke i Norge)
 DeskCode=Desk code (ikke i Norge)
@@ -352,12 +352,12 @@ ChequeNumber=Sjekk nummer
 ChequeOrTransferNumber=Sjekk/overføringsnummer
 ChequeMaker=Sjekkutsteder
 ChequeBank=Sjekkutsteders bank
-CheckBank=Check
+CheckBank=Sjekk
 NetToBePaid=Netto til betaling
 PhoneNumber=Tlf
 FullPhoneNumber=Telefon
 TeleFax=Fax
-PrettyLittleSentence=Vennligst utsted eventuelle sjekker krysset, i vårt firmanavn.
+PrettyLittleSentence=Aksepter forfalte beløp godkjent av regnskapsfører.
 IntracommunityVATNumber=Intracommunity number of VAT (ikke i Norge)
 PaymentByChequeOrderedTo=Sjekkbetaling til %s send til
 PaymentByChequeOrderedToShort=Sjekkbetaling til
@@ -365,70 +365,70 @@ SendTo=sendt til
 PaymentByTransferOnThisBankAccount=Vennligst betal til følgende bankkonto
 VATIsNotUsedForInvoice=* Avgiftsfritt
 LawApplicationPart1=Alle varer forblir vår eiendom
-LawApplicationPart2=intil de er fullt ut betalt.
-LawApplicationPart3=Fakturautsteder forbeholder seg salgspant
-LawApplicationPart4=i leverte varer inntil de er betalt i sin helhet.
+LawApplicationPart2=til de er fullt ut betalt.
+LawApplicationPart3=Fakturautsteder har salgspant
+LawApplicationPart4=i leverte varer til de er betalt i sin helhet.
 LimitedLiabilityCompanyCapital=AS med organisajonsnummer
 UseLine=Legg til
 UseDiscount=Bruk rabatt
-UseCredit=Bruk kredittkort
-UseCreditNoteInInvoicePayment=Rediset betaling med denne kreditnotaen
+UseCredit=Bruk kreditt
+UseCreditNoteInInvoicePayment=Reduser betaling med denne kreditnotaen
 MenuChequeDeposits=Sjekkinnskudd
 MenuCheques=Sjekker
 MenuChequesReceipts=Sjekkvitteringer
 NewChequeDeposit=Nytt innskudd
 ChequesReceipts=Sjekkvitteringer
-ChequesArea=Sjekkinnskuddsområde
-ChequeDeposits=Sjekkinskudd
+ChequesArea=Område for sjekkinnskudd
+ChequeDeposits=Sjekkinnskudd
 Cheques=Sjekker
 CreditNoteConvertedIntoDiscount=Denne kreditnotaen er konvertert til %s
 UsBillingContactAsIncoiveRecipientIfExist=Bruk kontaktpersonens adresse i stedet for tredjepartens adresse
 ShowUnpaidAll=Vis alle ubetalte fakturaer
-ShowUnpaidLateOnly=Vis sent ubetalte faktura bare
+ShowUnpaidLateOnly=Vis kun forfalte fakturaer
 PaymentInvoiceRef=Betaling faktura %s
 ValidateInvoice=Valider faktura
-Cash=Kontanter
+Cash=Kontant
 Reported=Forsinket
 DisabledBecausePayments=Ikke mulig siden det er noen betalinger
-CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er i alle fall på faktura klassifisert utbetales
-ExpectedToPay=Forventet utbetaling
-PayedByThisPayment=Betales av denne betalingen
+CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er minst en faktura som er klassifisert som betalt
+ExpectedToPay=Forventet innbetaling
+PayedByThisPayment=Betales av denne innbetalingen
 ClosePaidInvoicesAutomatically=Klassifiser alle fakturaer (alle typer) som betalt
-ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status &quot;betales&quot;.
+ClosePaidCreditNotesAutomatically=Klassifiser alle fakturaer som betalt
+AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten restbeløp vil bli automatisk satt til &quot;betalt&quot;.
 ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
-RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+RevenueStamp=Stempelmerke
+YouMustCreateInvoiceFromThird=Kun mulig når du lager faktura fra "kunde" i tredjeparter
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Returnerer nummer med format %syymm-nnnn for standardfaktura og %syymm-nnnn for kreditnota, der yy er året, mm måned og nnnn er et løpenummer som starter på 0+1.
+MarsNumRefModelDesc1=Returnerer nummer med format %syymm-nnnn for standardfaktura og %syymm-nnnn for erstatningsfaktura, %syymm-nnnn for kreditnotaer der yy er år, mm er måned og nnnn er et løpenummer som starter på 0+1 %s .
 TerreNumRefModelError=En faktura som starter med $sååmm finnes allerede og er ikke kompatibel med denne nummereringsmodulen. Du må slette den eller gi den ett nytt navn for å aktivere denne modulen.
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representant oppfølging kunde faktura
-TypeContact_facture_external_BILLING=Kunden faktura kontakt
-TypeContact_facture_external_SHIPPING=Kunden shipping kontakt
-TypeContact_facture_external_SERVICE=Kundeservice Kontakt
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representant oppfølging leverandørfaktura
-TypeContact_invoice_supplier_external_BILLING=Leverandørfaktura kontakt
-TypeContact_invoice_supplier_external_SHIPPING=Leverandør shipping kontakt
-TypeContact_invoice_supplier_external_SERVICE=Leverandør service kontakt
+TypeContact_facture_internal_SALESREPFOLL=Representant for oppfølging av kundefaktura
+TypeContact_facture_external_BILLING=Kundens fakturakontakt
+TypeContact_facture_external_SHIPPING=Kundens leveringskontakt
+TypeContact_facture_external_SERVICE=Kundens servicekontakt
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representant for oppfølging av leverandørfaktura
+TypeContact_invoice_supplier_external_BILLING=Leverandørens fakturakontakt
+TypeContact_invoice_supplier_external_SHIPPING=Leverandøren leveransekontakt
+TypeContact_invoice_supplier_external_SERVICE=Leverandørens servicekontakt
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceFirstSituationAsk=Første delfaktura
+InvoiceFirstSituationDesc=<b>Delfakturaer</b> er bundet til en situasjon og følger dennes progresjon, for eksempel byggingen av en konstruksjo. Hver delfaktura er bundet til en faktura.
+InvoiceSituation=Delfaktura
+InvoiceSituationAsk=Faktura som følger situasjonen
+InvoiceSituationDesc=Oppret ny situasjon som følger en eksisterende
+SituationAmount=Delfaktura-beløp (eks. MVA)
+SituationDeduction=Situasjonsfradrag
+Progress=Progresjon
+ModifyAllLines=Endre alle linjer
+CreateNextSituationInvoice=Opprett neste situasjon
+NotLastInCycle=Denne fakturaen er ikke den siste i rekken og må ikke modifiseres
+DisabledBecauseNotLastInCycle=Neste delfaktura er allerede opprettet
+DisabledBecauseFinal=Dette er siste delfaktura
+CantBeLessThanMinPercent=Progresjonen kan ikke ha lavere verdi enn forrige delfaktura
+NoSituations=Ingen  åpne situasjoner
+InvoiceSituationLast=Siste delfaktura
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 8edbd718c56..7dd81b9ab79 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Rss informasjon
-BoxLastProducts=Siste produkter/tjenester
-BoxProductsAlertStock=Varsel om produkter på lager
-BoxLastProductsInContract=Siste kontraktsinngåtte produkter/tjenester
+BoxLastProducts=Siste varer/tjenester
+BoxProductsAlertStock=Varsel om varer på lager
+BoxLastProductsInContract=Siste kontraktsinngåtte varer/tjenester
 BoxLastSupplierBills=Siste leverandørfakturaer
 BoxLastCustomerBills=Siste kundefakturaer
 BoxOldestUnpaidCustomerBills=Eldste ubetalte kundefakturaer
@@ -16,18 +16,18 @@ BoxLastValidatedCustomerOrders=Siste godkjente kundeordrer
 BoxLastBooks=Siste bøker
 BoxLastActions=Siste handlinger
 BoxLastContracts=Siste kontrakter
-BoxLastContacts=Siste kontakter / adresser
+BoxLastContacts=Siste kontakter/adresser
 BoxLastMembers=Siste medlemmer
 BoxFicheInter=Siste intervensjoner
-BoxCurrentAccounts=Åpnet kontobalanse
+BoxCurrentAccounts=Åpne kontobalanse
 BoxSalesTurnover=Omsetning
 BoxTotalUnpaidCustomerBills=Totalt utestående kundefakturaer
 BoxTotalUnpaidSuppliersBills=Totalt utestående leverandørfakturaer
 BoxTitleLastBooks=Siste %s registrerte bøker
 BoxTitleNbOfCustomers=Antall kunder
 BoxTitleLastRssInfos=Siste %s nyheter fra %s
-BoxTitleLastProducts=Siste %s endrede produkter/tjenester
-BoxTitleProductsAlertStock=Varsel om produkter på lager
+BoxTitleLastProducts=Siste %s endrede varer/tjenester
+BoxTitleProductsAlertStock=Varsel om varer på lager
 BoxTitleLastCustomerOrders=Siste %s kundeordre
 BoxTitleLastModifiedCustomerOrders=Siste %s endrede kundeordrer
 BoxTitleLastSuppliers=Siste %s registrerte leverandører
@@ -42,12 +42,12 @@ BoxTitleLastModifiedCustomerBills=Siste %s endrede kundefakturaer
 BoxTitleLastSupplierBills=Siste %s leverandørfakturaer
 BoxTitleLastModifiedSupplierBills=Siste %s endrede leverandørfakturaer
 BoxTitleLastModifiedProspects=Sist %s endrede prospekter
-BoxTitleLastProductsInContract=Siste %s produkter/tjenerster i kontrakter
+BoxTitleLastProductsInContract=Siste %s varer/tjenerster i kontrakter
 BoxTitleLastModifiedMembers=Siste %s endrede medlemmer
 BoxTitleLastFicheInter=Siste %s endrede intervensjon
 BoxTitleOldestUnpaidCustomerBills=Eldste %s ubetalte kundefakturaer
 BoxTitleOldestUnpaidSupplierBills=Eldste %s ubetalte leverandørfakturaer
-BoxTitleCurrentAccounts=Åpnede kontobalanser
+BoxTitleCurrentAccounts=Åpne kontobalanser
 BoxTitleSalesTurnover=Omsetning
 BoxTitleTotalUnpaidCustomerBills=Ubetalte kundefakturaer
 BoxTitleTotalUnpaidSuppliersBills=Ubetalte leverandørfakturaer
@@ -74,9 +74,9 @@ NoUnpaidCustomerBills=Ingen ubetalte kundefakturaer
 NoRecordedSupplierInvoices=Ingen registrte leverandørfakturaer
 NoUnpaidSupplierBills=Ingen ubetalte leverandørfakturaer
 NoModifiedSupplierBills=Ingen registrerte leverandørfakturaer
-NoRecordedProducts=Ingen registrerte produkter/tjenester
+NoRecordedProducts=Ingen registrerte varer/tjenester
 NoRecordedProspects=Ingen registrerte prospekter
-NoContractedProducts=Ingen innleide produkter/tjenester
+NoContractedProducts=Ingen innleide varer/tjenester
 NoRecordedContracts=Ingen registrerte kontrakter
 NoRecordedInterventions=Ingen registrerte intervensjoner
 BoxLatestSupplierOrders=Siste leverandørordrer
@@ -88,8 +88,8 @@ BoxSuppliersInvoicesPerMonth=Leverandørfakturaer pr. mnd.
 BoxCustomersOrdersPerMonth=Kundeordrer pr. mnd.
 BoxSuppliersOrdersPerMonth=Leverandørordrer pr. mnd.
 BoxProposalsPerMonth=Tilbud pr. mnd.
-NoTooLowStockProducts=Ingen produkter med for lav beholdning
-BoxProductDistribution=Fordeling produkter/tjenester
+NoTooLowStockProducts=Ingen varer med for lav beholdning
+BoxProductDistribution=Fordeling varer/tjenester
 BoxProductDistributionFor=Fordeling av %s for %s
 ForCustomersInvoices=Kundens fakturaer
 ForCustomersOrders=Kundeordrer
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index c01ee45a2c7..01de9fd4b36 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -8,7 +8,7 @@ CashDeskBankCB=Bankkonto (kort)
 CashDeskBankCheque=Bankkonto (sjekk)
 CashDeskWarehouse=Varehus
 CashdeskShowServices=Selgende tjenester
-CashDeskProducts=Produkter
+CashDeskProducts=Varer
 CashDeskStock=Lager
 CashDeskOn=på
 CashDeskThirdParty=Tredjepart
@@ -19,15 +19,15 @@ BackOffice=Administrasjonen
 AddThisArticle=Legg til denne artikkelen
 RestartSelling=Gå tilbake på salg
 SellFinished=Salg avsluttet
-PrintTicket=Skriv billett
+PrintTicket=Skriv kvittering
 NoProductFound=Ingen artikler funnet
-ProductFound=produktet funnet
-ProductsFound=produkter funnet
+ProductFound=vare funnet
+ProductsFound=varer funnet
 NoArticle=Ingen artikkel
 Identification=Identifisering
 Article=Artikkel
 Difference=Forskjell
-TotalTicket=Totalt billett
+TotalTicket=Totalt kvittering
 NoVAT=Ingen mva for dette salget
 Change=For mye mottatt
 CalTip=Klikk for å vise kalenderen
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index 662c28bdc3b..ad44e13c4cb 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -1,110 +1,110 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-NoCategoryYet=No tag/category of this type created
+Rubrique=Merke/Kategori
+Rubriques=Merker/Kategorier
+categories=merker/kategorier
+TheCategorie=merket/kategorien
+NoCategoryYet=Ingen merker/kategorier av denne typen er opprettet
 In=I
 AddIn=Legg til i
 modify=endre
 Classify=Klassifiser
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
+CategoriesArea=Merker/Kategorier-område
+ProductsCategoriesArea=Område for varer/tjenester, merker/kategorier
+SuppliersCategoriesArea=Område for leverandør-merker/kategorier
+CustomersCategoriesArea=Område for kunde-merker/kategorier
+ThirdPartyCategoriesArea=Område for tredjepart-merker/kategorier
+MembersCategoriesArea=Område for medlems-merker/kategorier
+ContactsCategoriesArea=Område for kontakters merker/kategorier
+MainCats=Hoved-merker/kategorier
 SubCats=Underkategorier
 CatStatistics=Statistikk
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-ValidateFields=Godkjenn feltene
+CatList=Liste over merker/kategorier
+AllCats=Alle merker/kategorier
+ViewCat=Vis merke/kategori
+NewCat=Legg til merke/kategori
+NewCategory=Nytt merke/kategori
+ModifCat=Endre merke/kategori
+CatCreated=Merke/kategori opprettet
+CreateCat=Opprett merke/kategori
+CreateThisCat=Opprett merket/kategorien
+ValidateFields=Valider feltene
 NoSubCat=Ingen underkategori.
 SubCatOf=Undekategori
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
+FoundCats=Funnet merker/kategorier
+FoundCatsForName=Merke/kategori funnet med navnet:
+FoundSubCatsIn=Underkategorier finnet i merket/kategorien
+ErrSameCatSelected=Du valgte samme merke/kategori flere ganger
+ErrForgotCat=Du glemte å velge merke/kategori
 ErrForgotField=Du glemte feltene
 ErrCatAlreadyExists=Dette navnet er allerede i bruk
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
+AddProductToCat=Legge denne varen til et merke/kategori?
+ImpossibleAddCat=Kan ikke legge til merke/kategori
+ImpossibleAssociateCategory=Kan ikke knytte merke/kategori til
 WasAddedSuccessfully=<b>%s</b> ble lagt til.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ObjectAlreadyLinkedToCategory=Elementet er allerede lenket til dette merket/kategorien
+CategorySuccessfullyCreated=Merket/kategorien %s ble lagt til
+ProductIsInCategories=Vare/tjeneste er lenket til følgende merker/kategorier
+SupplierIsInCategories=Tredjeparten er lenket til følgende merker/kategorier
+CompanyIsInCustomersCategories=Denne tredjeparten er lenket til følgende kunders/prospekters merker/kategorier
+CompanyIsInSuppliersCategories=Denne tredjeparten er lenket til følgende leverandørers merker/kategorier
+MemberIsInCategories=Dette medlemmet er lenket til følgende medlems-merker/kategorier
+ContactIsInCategories=Denne kontakten er lenket til følgende kunde-merker/kategorier
+ProductHasNoCategory=Denne varen/tjenesten har ikke noen merker/kategorier
+SupplierHasNoCategory=Denne leverandøren har ikke noen merker/kategorier
+CompanyHasNoCategory=Denne tredjepartenhar ikke noen merker/kategorier
+MemberHasNoCategory=Dette medlemmet har ikke noen merker/kategorier
+ContactHasNoCategory=Denne kontakten har ingen merker/kategorier
+ClassifyInCategory=Legg til i merke/kategori
 NoneCategory=Ingen
-NotCategorized=Without tag/category
+NotCategorized=Uten merke/kategori
 CategoryExistsAtSameLevel=Denne kategorien finnes allerede med denne referansen
-ReturnInProduct=Tilbake til produkt-/tjenestekort
+ReturnInProduct=Tilbake til vare-/tjenestekort
 ReturnInSupplier=Tilbake til leverandørkort
 ReturnInCompany=Tilbake til kunde-/prospektkort
-ContentsVisibleByAll=Inneholdet vil være synlig for alle
+ContentsVisibleByAll=Innholdet vil være synlig for alle
 ContentsVisibleByAllShort=Innhold synlig for alle
 ContentsNotVisibleByAllShort=Innhold ikke synlig for alle
-CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
+CategoriesTree=Tre over merker/kategorier
+DeleteCategory=Slett merke/kategori
+ConfirmDeleteCategory=Er du sikke på at du vil slette dette merket/kategorien?
+RemoveFromCategory=Slett lenke med merke/kategori
+RemoveFromCategoryConfirm=Er du sikker på at du vil fjerne lenken mellom transaksjonen og merket/kategorien?
+NoCategoriesDefined=Ingen merke/kategori definert
+SuppliersCategoryShort=Leverandørs merke/kategori
+CustomersCategoryShort=Kundes merke/kategori
+ProductsCategoryShort=Vare merke/kategori
+MembersCategoryShort=Medlems merke/kategori
+SuppliersCategoriesShort=Levrandørers merker/kategorier
+CustomersCategoriesShort=Kunders merker/kategorier
 CustomersProspectsCategoriesShort=Kunde-/prospektkategorier
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-ThisCategoryHasNoProduct=Denne kategorien inneholder ingen produkter.
+ProductsCategoriesShort=Varenes merker/kategorier
+MembersCategoriesShort=Medlemmers merker/kategorier
+ContactCategoriesShort=Kontakters merker/kategorier
+ThisCategoryHasNoProduct=Denne kategorien inneholder ingen varer.
 ThisCategoryHasNoSupplier=Denne kategorien inneholder ingen leverandører.
 ThisCategoryHasNoCustomer=Denne kategorien inneholder ingen kunder.
-ThisCategoryHasNoMember=Denne kategorien inneholder ingen medlem.
+ThisCategoryHasNoMember=Denne kategorien inneholder ingen medlemmer.
 ThisCategoryHasNoContact=Denne kategorien inneholder ikke noen kontakt.
 AssignedToCustomer=Knyttet til en kunde
 AssignedToTheCustomer=Knyttet til kunden
 InternalCategory=Intern kategori
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
-DeletePicture=Slette bilde 
+CategoryContents=Merkers/kategoriers innhold
+CategId=Merke/kategori-ID
+CatSupList=Liste over leverandør-merker/kategorier
+CatCusList=Liste over kunde/prospekt merker/kategorier
+CatProdList=Liste over vare-merker/kategorier
+CatMemberList=Liste over medlems-merker/kategorier
+CatContactList=Liste over kontakt-merker/kategorier
+CatSupLinks=Lenker mellom leverandører og merker/kategorier
+CatCusLinks=Lenker mellom kunder/prospekter og merker/kategorier
+CatProdLinks=Lenker mellom varer/tjenester og merker/kategorier
+CatMemberLinks=Lenker mellom medlemmer og merker/kategorier
+DeleteFromCat=Fjern fra merker/kategorier
+DeletePicture=Slett bilde 
 ConfirmDeletePicture=Bekreft bildesletting?
 ExtraFieldsCategories=Komplementære attributter
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori
-AddProductServiceIntoCategory=Legg til følgende produkt/tjeneste
-ShowCategory=Show tag/category
+CategoriesSetup=Oppsett av merker/kategorier
+CategorieRecursiv=Automatisk lenke til overordnet merke/kategori
+CategorieRecursivHelp=Hvis aktivert, vil varen også knyttes til overordnet kategori når du legger inn en underkategori
+AddProductServiceIntoCategory=Legg til følgende vare/tjeneste
+ShowCategory=Vis merke/kategori
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index a111e8f1b6a..6ddf62c4325 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Tredjepartskontakt
 StatusContactValidated=Status for kontakt
 Company=Bedrift
 CompanyName=Firmanavn
+AliasNames=Aliaser (kommersielle, varemerke, ...)
 Companies=Bedrifter
 CountryIsInEEC=Landet er en del av det europeiske økonomiske fellesskap
 ThirdPartyName=Tredjepart navn
@@ -403,7 +404,7 @@ UniqueThirdParties=Totalt antall unike tredjeparter
 InActivity=Åpen
 ActivityCeased=Stengt
 ActivityStateFilter=Aktivitetstatus
-ProductsIntoElements=Produktliste i %s
+ProductsIntoElements=Vareliste i %s
 CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
 OutstandingBillReached=Nådd maks. for utestående regning
@@ -412,3 +413,8 @@ LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 SearchThirdparty=Søk etter tredjepart
 SearchContact=Søk etter kontakt
+MergeOriginThirdparty=Dupliser tredjepart (tredjepart du vil slette)
+MergeThirdparties=Flett tredjeparter
+ConfirmMergeThirdparties=Er du sikker på at du vil flette denne tredjeparten inn i nåværende? Alle relaterte objekter (fakturaer, ordre, mm) vil bli flyttet til nåværende, slik at du kan slette den dupliserte.
+ThirdpartiesMergeSuccess=Tredjepartene er blitt flettet
+ErrorThirdpartiesMerge=Det oppsto en feil under sletting av tredjeparter. Sjekk i loggen. Endringene ble reversert
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index e93afb8364d..0e4651e511c 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -3,8 +3,8 @@ Accountancy=Revisjon
 AccountancyCard=Revisjon kort
 Treasury=Treasury
 MenuFinancial=Finansiell
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRules=Gå til <a href="%s">Oppsett av Skatter/avgifter-modul</a> for å endre regler for utregning
+TaxModuleSetupToModifyRulesLT=Gå til <a href="%s">Firmaoppsett</a> for  å endre kalkulasjonsreglene
 OptionMode=Opsjon for regnskap
 OptionModeTrue=Alternativ input-output
 OptionModeVirtual=Alternativ Mynter-Debiteringer
@@ -12,15 +12,15 @@ OptionModeTrueDesc=I denne sammenheng er omsetningen beregnet over utbetalinger
 OptionModeVirtualDesc=I denne sammenheng er omsetningen beregnet over fakturaer (dato for validering). Når disse fakturaene er grunn, enten de er betalt eller ikke, er de oppført i omsetning produksjon.
 FeatureIsSupportedInInOutModeOnly=Funksjonen bare tilgjengelig i KREDITT-gjeld regnskapsføring modus (Se Regnskapsorganisasjon modul konfigurasjon)
 VATReportBuildWithOptionDefinedInModule=Beløp som vises her er beregnet ved hjelp av regler definert av Skatt modul oppsett.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Beløpene vist her er kalkulert ved hjelp av reglene som er definert i Firmaoppsett
 Param=Oppsett
 RemainingAmountPayment=Beløp betalingen som gjenstår:
 AmountToBeCharged=Totalt beløp å betale:
 AccountsGeneral=Kontoer
 Account=Konto
 Accounts=Kontoer
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Overordnet konto
+Accountsparent=Overordnede kontoer
 BillsForSuppliers=Veksler for leverandører
 Income=Inntekt
 Outcome=Expense
@@ -29,11 +29,11 @@ ReportTurnover=Omsetning
 PaymentsNotLinkedToInvoice=Betalinger ikke knyttet til noen faktura, så ikke knyttet til noen tredje part
 PaymentsNotLinkedToUser=Betalinger ikke knyttet til noen bruker
 Profit=Profit
-AccountingResult=Accounting result
+AccountingResult=Regnskapsresultat
 Balance=Balanse
 Debit=Debet
 Credit=Kreditt
-Piece=Accounting Doc.
+Piece=Regnskapsdokument
 Withdrawal=Uttak
 Withdrawals=Uttak
 AmountHTVATRealReceived=Netto samlet
@@ -43,55 +43,55 @@ VATReceived=MVA mottatt
 VATToCollect=MVA kjøp
 VATSummary=MVA Balanse
 LT2SummaryES=IRPF Balanse
-LT1SummaryES=RE Balance
+LT1SummaryES=RE Balanse
 VATPaid=VAT paid
-SalaryPaid=Salary paid
+SalaryPaid=Lønn utbetalt
 LT2PaidES=IRPF Betalt
-LT1PaidES=RE Paid
+LT1PaidES=RE Betalt
 LT2CustomerES=IRPF salg
 LT2SupplierES=IRPF kjøp
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE Salg
+LT1SupplierES=RE Kjøp
 VATCollected=MVA samlet
 ToPay=Å betale
 ToGet=Å komme tilbake
-SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Skatt, sosiale bidrag og utbytte området
-SocialContribution=Samfunnsbidrag
-SocialContributions=Sosiale bidrag
-MenuSpecialExpenses=Special expenses
+SpecialExpensesArea=Område for spesielle betalinger
+TaxAndDividendsArea=Område for MVA, skatter/avgifter og utbytte
+SocialContribution=Skatt eller avgift
+SocialContributions=Skatter eller avgifter
+MenuSpecialExpenses=Spesielle utgifter
 MenuTaxAndDividends=Skatter og utbytte
-MenuSalaries=Salaries
-MenuSocialContributions=Sosiale bidrag
-MenuNewSocialContribution=Nye bidrag
-NewSocialContribution=Nye sosiale bidrag
-ContributionsToPay=Bidrag til å betale
+MenuSalaries=Lønn
+MenuSocialContributions=Skatter/avgifter
+MenuNewSocialContribution=Ny skatteinnbetaling
+NewSocialContribution=Ny skatt/avgift
+ContributionsToPay=Skatter og avgifter som skal betales
 AccountancyTreasuryArea=Revisjon / finans-området
 AccountancySetup=Revisjon oppsett
 NewPayment=Ny betaling
 Payments=Betalinger
 PaymentCustomerInvoice=Kunden faktura betaling
 PaymentSupplierInvoice=Leverandørfaktura betaling
-PaymentSocialContribution=Sosiale bidrag betaling
+PaymentSocialContribution=Skatter- og avgiftsbetaling
 PaymentVat=MVA betaling
-PaymentSalary=Salary payment
+PaymentSalary=Lønnsutbetaling
 ListPayment=Liste over betalinger
 ListOfPayments=Liste over betalinger
 ListOfCustomerPayments=Liste over kundebetalinger
 ListOfSupplierPayments=Liste av leverandør betalinger
 DatePayment=Utbetalingsdato
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Startdato
+DateEndPeriod=Sluttdato
 NewVATPayment=Nye MVA betaling
 newLT2PaymentES=Ny IRPF betaling
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Ny RE Betaling
 LT2PaymentES=IRPF Betaling
 LT2PaymentsES=IRPF Betalinger
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE Betaling
+LT1PaymentsES=RE Betalinger
 VATPayment=MVA Betaling
 VATPayments=MVA Betalinger
-SocialContributionsPayments=Sosiale bidrag betalinger
+SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
 TotalToPay=Sum å betale
 TotalVATReceived=Sum MVA mottatt
@@ -101,62 +101,62 @@ AccountNumberShort=Kontonummer
 AccountNumber=Kontonummer
 NewAccount=Ny konto
 SalesTurnover=Salg omsetning
-SalesTurnoverMinimum=Minimum sales turnover
+SalesTurnoverMinimum=Minimums salgsomsetning
 ByThirdParties=Bu tredjeparter
 ByUserAuthorOfInvoice=Av faktura forfatter
 AccountancyExport=Revisjon eksport
 ErrorWrongAccountancyCodeForCompany=Dårlig kunde regnskap koden for %s
-SuppliersProductsSellSalesTurnover=Den genererte omsetningen av salg av leverandørens produkter.
+SuppliersProductsSellSalesTurnover=Den genererte omsetningen av salg av leverandørens varer.
 CheckReceipt=Sjekk innskudd
 CheckReceiptShort=Sjekk innskudd
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=Siste %s sjekkvitteringer
 NewCheckReceipt=Nye rabatt
 NewCheckDeposit=Ny sjekk innskudd
 NewCheckDepositOn=Lag kvittering for innskudd på konto: %s
 NoWaitingChecks=Ingen sjekker venter på innskudd.
 DateChequeReceived=Sjekk mottak inngang dato
 NbOfCheques=Nb av sjekker
-PaySocialContribution=Betale et samfunnsbidrag
-ConfirmPaySocialContribution=Er du sikker på at du vil klassifisere dette sosiale bidrag som betalt?
-DeleteSocialContribution=Slette et samfunnsbidrag
-ConfirmDeleteSocialContribution=Er du sikker på at du vil slette denne samfunnsbidrag?
-ExportDataset_tax_1=Sosiale bidrag og utbetalinger
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+PaySocialContribution=Betal skatt/avgift
+ConfirmPaySocialContribution=Er du sikker på at du vil klassifisere denne skatten/avgiften som betalt?
+DeleteSocialContribution=Slett en skatt eller avgift
+ConfirmDeleteSocialContribution=Er du sikker på at du vil slette denne skatten/avgiften?
+ExportDataset_tax_1=Skatte- og avgiftsbetalinger
+CalcModeVATDebt=Modus <b>%sMVA ved commitment regnskap%s</b>.
+CalcModeVATEngagement=Modus <b>%sMVA på inntekt-utgifter%s</b>.
+CalcModeDebt=Modus <b>%sKredit-Debet%s</b> sagt <b>Commitment regnskap</b>.
+CalcModeEngagement=Modus <b>%sInntekt-Utgifter%s</b> sagt <b>kassaregnskap</b>
+CalcModeLT1= Modus <b>%sRE på kundefakturaer - leverandørfakturaer%s</b>
+CalcModeLT1Debt=Modus <b>%sRE på kundefakturaer%s</b>
+CalcModeLT1Rec= Modus <b>%sRE på leverandørfakturaer%s</b>
+CalcModeLT2= Modus <b>%sIRPF på kundefakturaer - leverandørfakturaer%s</b>
+CalcModeLT2Debt=Modus <b>%sIRPF på kundefakturaer%s</b>
+CalcModeLT2Rec= Modus <b>%sIRPF på leverandørfakturaer%s</b>
+AnnualSummaryDueDebtMode=Inn/ut balanse. Årlig oppsummering
+AnnualSummaryInputOutputMode=Inn/ut balanse. Årlig oppsummering
 AnnualByCompaniesDueDebtMode=Balanse mellom inntekter og utgifter, detalj av tredjeparter, modus <b>%sClaims-Debts%s</b> sa <b>Engasjement regnskap.</b>
 AnnualByCompaniesInputOutputMode=Balanse mellom inntekter og utgifter, detalj av tredjeparter, modus <b>%sRevenues-Expenses%s</b> sa <b>kontant regnskap.</b>
 SeeReportInInputOutputMode=Se rapporten <b>%sIncomes-Expenses%s</b> sier <b>kontanter utgjør</b> en beregning for faktiske utbetalinger
 SeeReportInDueDebtMode=Se rapporten <b>%sClaims-Debts%s</b> sa <b>forpliktelse utgjør</b> en beregning på utstedte fakturaer
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded=- Viste beløp er inkludert alle avgifter
 RulesResultDue=- Beløp som vises er med alle avgifter inkludert <br> - Det inkluderer utestående fakturaer, utgifter og moms om de er betalt eller ikke. <br> - Det er basert på validering dato for fakturaer og moms, og ved forfall for utgifter.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
+RulesResultInOut=- Det inkluderer de virkelige utbetalinger på fakturaer, utgifter og MVA. <br>- Den er basert på betalingstidspunktene av fakturaer, utgifter og MVA.
 RulesCADue=- Det inkluderer kundens forfalte fakturaer enten de er betalt eller ikke. <br> - Det er basert på validering dato for disse fakturaene. <br>
 RulesCAIn=- Det inkluderer alle effektive betaling av fakturaer mottatt fra klienter. <br> - Det er basert på utbetalingsdatoen for disse fakturaene <br>
 DepositsAreNotIncluded=- Deposit fakturaer er eller inngår
 DepositsAreIncluded=- Deposit fakturaer er inkludert
 LT2ReportByCustomersInInputOutputModeES=Rapport fra tredje part IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByCustomersInInputOutputModeES=Rapport etter tredjepart RE
+VATReportByCustomersInInputOutputMode=Rapport over innhentet og betalt MVA etter kunde
+VATReportByCustomersInDueDebtMode=Rapport over innhentet og betalt MVA etter kunde
+VATReportByQuartersInInputOutputMode=Rapport over innhentet og betalt MVA etter sats
+LT1ReportByQuartersInInputOutputMode=Rapport etter RE sats
+LT2ReportByQuartersInInputOutputMode=Rapport etter IRPF sats
+VATReportByQuartersInDueDebtMode=Rapport over innhentet og betalt MVA etter sats
+LT1ReportByQuartersInDueDebtMode=Rapport etter RE sats
+LT2ReportByQuartersInDueDebtMode=Rapport etter IRPF sats
 SeeVATReportInInputOutputMode=Se rapport <b>%sVAT encasement%s</b> for en standard utregning
 SeeVATReportInDueDebtMode=Se rapport <b>%sVAT om flow%s</b> for en beregning med en opsjon på flyten
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- For tjenester, omfatter rapporten MVA regnskap på grunnlag av betalingstidspunktet.
 RulesVATInProducts=- For materielle eiendeler, det inkluderer MVA fakturaer på grunnlag av faktura dato.
 RulesVATDueServices=- For tjenester, omfatter rapporten MVA fakturaer grunn, betalt eller ikke, basert på fakturadato.
 RulesVATDueProducts=- For materielle eiendeler, det inkluderer MVA fakturaene, basert på fakturadato.
@@ -179,29 +179,29 @@ CodeNotDef=Ikke definert
 AddRemind=Forsendelse tilgjengelig beløp
 RemainToDivide= Forbli til levering:
 WarningDepositsNotIncluded=Innskudd fakturaer er ikke inkludert i denne versjonen med dette regnskap modulen.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+DatePaymentTermCantBeLowerThanObjectDate=Betalingsdato kan ikke være før objektdato
+Pcg_version=Kontoplan versjon
+Pcg_type=Kontoplan type
+Pcg_subtype=Kontoplan undertype
+InvoiceLinesToDispatch=Fakturalinjer for utsendelse
+InvoiceDispatched=Utsendte fakturaer
+AccountancyDashboard=Regnskapssammendrag
+ByProductsAndServices=Etter varer og tjenester
+RefExt=Ekstern referanse
+ToCreateAPredefinedInvoice=For å opprette en forhåndsdefinert faktura: Opprett en standardfaktura, og uten å validere den, klikk på knappen "Konverter til forhåndsdefinert faktura".
+LinkedOrder=Lenke til ordre
+ReCalculate=Rekalkuler
+Mode1=Metode 1
+Mode2=Metode 2
+CalculationRuleDesc=For å beregne total MVA, er det to metoder:<br>Metode 1 er avrunding på hver linje, og deretter summere dem.<br>Metode 2 er å summere alle på hver linje, og deretter avrunde resultatet.<br>Endelig resultat kan variere noen få kroner. Standardmodusen er modusen <b>%s</b>.
+CalculationRuleDescSupplier=ifølge leverandøren, velg samme beregningsregel og få resultat som forventes av leverandøren.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Omsetningsrapport pr. produkt, er ikke relevant når du bruker en <b>kontantregnskap</b>-modus. Denne rapporten er bare tilgjengelig når du bruker <b>engasjement regnskap</b> modus (se oppsett av regnskap modul).
+CalculationMode=Kalkuleringsmodus
+AccountancyJournal=Regnskapskode journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Standard regnskapskode for innhenting av MVA
+ACCOUNTING_VAT_BUY_ACCOUNT=Standard regnskapskode for betaling av MVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Standard regnskapskode for kunder
+ACCOUNTING_ACCOUNT_SUPPLIER=Standard regnskapskode for leverandører
+CloneTax=Klon skatt/avgift
+ConfirmCloneTax=Bekreft kloning av skatt/avgiftsbetaling
+CloneTaxForNextMonth=Klon for neste måned
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index e854391d7f1..e20ae6fc578 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -12,12 +12,12 @@ ContractStatusValidated=Godkjent
 ContractStatusClosed=Lukket
 ServiceStatusInitial=Ikke i drift
 ServiceStatusRunning=I drift
-ServiceStatusNotLate=Running, ikke er utløpt
-ServiceStatusNotLateShort=Ikke er utløpt
+ServiceStatusNotLate=I drift, ikke utløpt
+ServiceStatusNotLateShort=Ikke utløpt
 ServiceStatusLate=I drift, utløpt
 ServiceStatusLateShort=Utløpt
 ServiceStatusClosed=Lukket
-ServicesLegend=Tjeneste legend
+ServicesLegend=Tjenestehistorikk
 Contracts=Kontrakter
 ContractsAndLine=Kontrakter og kontraktlinjer
 Contract=Kontrakt
@@ -32,27 +32,27 @@ AddContract=Opprett kontrakt
 SearchAContract=Finn kontrakt
 DeleteAContract=Slett kontrakt
 CloseAContract=Lukk kontrakt
-ConfirmDeleteAContract=Er du sikker på at du vil slette denne kontrakten med alle tilhørende thenester?
+ConfirmDeleteAContract=Er du sikker på at du vil slette denne kontrakten med alle tilhørende tjenester?
 ConfirmValidateContract=Er du sikker på at du vil godkjenne denne kontrakten?
 ConfirmCloseContract=Dette vil lukke alle tjenester (aktive eller ikke). Er du sikker på at du vil lukke kontrakten?
 ConfirmCloseService=Er du sikker på at du vil lukke denne tjenesten med datoen <b>%s</b> ?
-ValidateAContract=Goskjenn en kontrakt
+ValidateAContract=Godkjenn en kontrakt
 ActivateService=Aktiver tjeneste
 ConfirmActivateService=Er du sikker på at du vil aktivere denne tjensten med datoen <b>%s</b> ?
 RefContract=Kontraktsreferanse
 DateContract=Kontraktsdato
 DateServiceActivate=Dato for aktivering av tjenste
 DateServiceUnactivate=Dato for deaktivering av tjeneste
-DateServiceStart=Startdato for tjenstene
+DateServiceStart=Startdato for tjensten
 DateServiceEnd=Sluttdato for tjenesten
 ShowContract=Vis kontrakt
 ListOfServices=Oversikt over tjenester
 ListOfInactiveServices=Liste over ikke aktive tjenester
-ListOfExpiredServices=Liste over utløpt aktive tjenester
+ListOfExpiredServices=Liste over utløpte, aktive tjenester
 ListOfClosedServices=Liste over lukkede tjenester
 ListOfRunningContractsLines=Oversikt over løpende kontraktslinjer
 ListOfRunningServices=Overikt over løpende tjenster
-NotActivatedServices=Ikke aktiverte tjenester (blant godkjente kontrakter)
+NotActivatedServices=Ikke aktive tjenester (blant godkjente kontrakter)
 BoardNotActivatedServices=Tjenester til aktivering blant godkjente kontrakter
 LastContracts=Siste %s kontrakter
 LastActivatedServices=Siste %s aktiverte tjenester
@@ -72,22 +72,22 @@ NbOfServices=Ant. tjenester
 CloseService=Lukk tjeneste
 ServicesNomberShort=%s tjeneste(r)
 RunningServices=Løpende tjenester
-BoardRunningServices=Utløpte løpende tjenester
+BoardRunningServices=Utgåtte, løpende tjenester
 ServiceStatus=Tjenestestatus
 DraftContracts=Kontraktskladder
 CloseRefusedBecauseOneServiceActive=Kontrakten kan ikke lukkes ettersom det er minst en åpen tjenste på den
 CloseAllContracts=Lukk alle kontrakter
-DeleteContractLine=Slette en kontrakt linje
-ConfirmDeleteContractLine=Er du sikker på at du vil slette denne kontrakten linje?
+DeleteContractLine=Slett en kontraktlinje
+ConfirmDeleteContractLine=Er du sikker på at du vil slette denne kontraktlinjen?
 MoveToAnotherContract=Flytt tjeneste til annen kontrakt
 ConfirmMoveToAnotherContract=Jeg bekrefter at jeg hat valgt ny målkontrakt og at jeg ønsker å flytte denne tjenesten inn i den nye kontrakten.
 ConfirmMoveToAnotherContractQuestion=Velg hvilken eksisterende kontrakt (eid av samme tredjepart) du vil flytte tjenesten til
-PaymentRenewContractId=Forny kontrakt linje (antall %s)
+PaymentRenewContractId=Forny kontraktlinje (antall %s)
 ExpiredSince=Utløpsdato
 RelatedContracts=Relaterte kontrakter
-NoExpiredServices=Ingen utgåtte aktive tjenester
+NoExpiredServices=Ingen utgåtte, aktive tjenester
 ListOfServicesToExpireWithDuration=Liste over tjenester som utløper innen %s dager
-ListOfServicesToExpireWithDurationNeg=Liste over tjenester utløpt fra mer enn %s dager
+ListOfServicesToExpireWithDurationNeg=Liste over tjenester utløpt i mer enn %s dager
 ListOfServicesToExpire=Liste over utløpende tjenester
 NoteListOfYourExpiredServices=Denne listen inneholder kun tjenester av kontrakter for tredjeparter du er koblet til som salgsrepresentant.
 StandardContractsTemplate=Standard kontraktskjema
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 4cf688b277e..4e6d5835efa 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -4,18 +4,18 @@ About = Om
 CronAbout = Om Cron
 CronAboutPage = Side om Cron
 # Right
-Permission23101 = Les planlagt oppgave
-Permission23102 = Opprett/endre planlagt oppgave
-Permission23103 = Slett planlagt oppgave
-Permission23104 = Utfør planlagt oppgave
+Permission23101 = Les planlagt jobb
+Permission23102 = Opprett/endre planlagt jobb
+Permission23103 = Slett planlagt jobb
+Permission23104 = Utfør planlagt jobb
 # Admin
 CronSetup= Administrasjon av planlagte oppgaver
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL til å sjekke og kjøre Cron jobber hvis nødvendig
+OrToLaunchASpecificJob=eller for å sjekke og kjøre en spesifikk jobb
 KeyForCronAccess=Sikkerhetsnøkkel for URL for å starte cronjobber
 FileToLaunchCronJobs=Kommandolinje for å starte cronjobber
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunUnix=I Unix-miljøer bør du bruke følgende crontab-oppføring for å kjøre kommandolinje hvert 5. minutt
+CronExplainHowToRunWin=I Microsoft(tm) Windows-miljø kan du bruke planlagte oppgaver-verktøyet for å kjøre kommandolinje hvert 5. minutt
 # Menu
 CronJobs=Planlagte jobber
 CronListActive=Liste over aktive/planlagte jobber
@@ -26,12 +26,12 @@ CronLastOutput=Resultat av forrige kjøring
 CronLastResult=Siste kjøring - kode
 CronListOfCronJobs=Liste over planlagte oppgaver
 CronCommand=Kommando
-CronList=Planlagt jobb
+CronList=Planlagte jobber
 CronDelete=Slett planlagte jobber
-CronConfirmDelete=Er du sikker på at du vil slette denne planlagte jobben
+CronConfirmDelete=Er du sikker på at du vil slette disse planlagte jobbene?
 CronExecute=Start planlagte jobber
-CronConfirmExecute=Er du sikker på at du vil kjøre denne oppgaven nå?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronConfirmExecute=Er du sikker på at du vil kjøre disse planlagte jobbene nå?
+CronInfo=Planlagte jobber-modulen gir deg mulighet til å utføre jobber til ønsket tid
 CronWaitingJobs=Ventende jobber
 CronTask=Jobb
 CronNone=Ingen
@@ -46,43 +46,44 @@ CronModule=Modul
 CronAction=Handling
 CronStatus=Status
 CronStatusActive=Slått på
-CronStatusInactive=Slått av
-CronNoJobs=Ingen registrerte jobb
+CronStatusInactive=Deaktivert
+CronNoJobs=Ingen registrerte jobber
 CronPriority=Prioritet
 CronLabel=Beskrivelse
-CronNbRun=NB! Start
+CronNbRun=Antall starter
 CronEach=Alle
 JobFinished=Jobb startet og fullført
 #Page card
 CronAdd= Legg til jobber
-CronHourStart= Time og dato for oppgavestart
-CronEvery= Og utfør oppgave hver
-CronObject= Objekt å opprette
-CronArgs=Parametere
+CronHourStart= Start time og dato for jobben
+CronEvery=Kjør jobb hver
+CronObject=Objekt å opprette
+CronArgs=Parametre
 CronSaveSucess=Lagret
 CronNote=Kommentar
 CronFieldMandatory=Feltene %s er obligatoriske
 CronErrEndDateStartDt=Sluttdato kan ikke være før startdato
 CronStatusActiveBtn=Aktiver
-CronStatusInactiveBtn=Slå av
+CronStatusInactiveBtn=Deaktiver
 CronTaskInactive=Denne jobben er deaktivert
 CronDtLastResult=Dato for siste resultat
 CronId=ID
 CronClassFile=Klasser (filnavn.klasse.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronModuleHelp=Navn på Dolibarr-modul katalogen (også arbeid med ekstern Dolibarr-modul). <BR> For eksempel hente-metode for Dolibarr Product objekt /htdocs/<u>product</u>/class/product.class.php, er verdien av modulen <i>vare</i>
+CronClassFileHelp=Filnavn å laste. <BR> For eksempel hente metode for Dolibarr Vare object/htdocs/vare/klasse/<u>product.class.php</u>, er verdien av klassen filnavnet <i> product.class.php </i>
+CronObjectHelp=Objektnavn som skal lastes.<BR> For eksempel metode for å hente Dolibarr Product object /htdocs/product/class/product.class.php, er verdien av klasse-filnavn <i>Product</i>
+CronMethodHelp=Objekt-metode for å starte. <BR> For eksempel hente Dolibarr Vare objekt /htdocs/product/class/product.class.php, er verdien av metoden <i> fecth </i>
+CronArgsHelp=Metode argumenter. <BR> For eksempel hent Dolibarr Product object /htdocs/product/class/product.class.php, kan parameterverdien være <i>0, ProductRef</i>
 CronCommandHelp=System kommandolinje som skal kjøres
 CronCreateJob=Opprett ny planlagt jobb
+CronFrom=Fra
 # Info
 CronInfoPage=Informasjon
 # Common
-CronType=Oppgavetype
-CronType_method=Call method of a Dolibarr Class
+CronType=Jobbtype
+CronType_method=Oppkallsmetode av en Dolibarr-klasse
 CronType_command=Shell kommando
 CronMenu=Cron
 CronCannotLoadClass=Kan ikke laste klasse %s eller objekt %s
 UseMenuModuleToolsToAddCronJobs=Gå til meny "Hjem - Modulverktøy - Jobbliste" for å se på og endre planlagte jobber.
-TaskDisabled=Oppgave deaktivert
+TaskDisabled=Jobb deaktivert
diff --git a/htdocs/langs/nb_NO/deliveries.lang b/htdocs/langs/nb_NO/deliveries.lang
index a0963eca837..7fbc4e28424 100644
--- a/htdocs/langs/nb_NO/deliveries.lang
+++ b/htdocs/langs/nb_NO/deliveries.lang
@@ -7,11 +7,11 @@ DeliveryOrders=Leveringsordre
 DeliveryDate=Leveringsdato
 DeliveryDateShort=Lev. dato
 CreateDeliveryOrder=Opprett leveringsordre
-QtyDelivered=Ant levert
+QtyDelivered=Ant. levert
 SetDeliveryDate=Angi leveringsdato
 ValidateDeliveryReceipt=Godkjenn leveringskvittering
-ValidateDeliveryReceiptConfirm=Er du sikker på at du vil godkjenne denne leveringskvitteringen?
-DeleteDeliveryReceipt=Slett levering kvittering
+ValidateDeliveryReceiptConfirm=Er du sikker på at du vil validere denne leveringskvitteringen?
+DeleteDeliveryReceipt=Slett leveringskvittering
 DeleteDeliveryReceiptConfirm=Er du sikker på at du vil slette leveringskvitteringen <b>%s?</b>
 DeliveryMethod=Leveringsmåte
 TrackingNumber=Trackingnummer
diff --git a/htdocs/langs/nb_NO/dict.lang b/htdocs/langs/nb_NO/dict.lang
index 440a84e600e..639922cbb77 100644
--- a/htdocs/langs/nb_NO/dict.lang
+++ b/htdocs/langs/nb_NO/dict.lang
@@ -6,14 +6,14 @@ CountryES=Spania
 CountryDE=Tyskland
 CountryCH=Sveits
 CountryGB=Storbritannia
-# CountryUK=United Kingdom
+CountryUK=Storbritannia
 CountryIE=Irland
 CountryCN=Kina
 CountryTN=Tunisia
 CountryUS=USA
 CountryMA=Marokko
 CountryDZ=Algerie
-CountryCA=Kanada
+CountryCA=Canada
 CountryTG=Togo
 CountryGA=Gabon
 CountryNL=Nederland
@@ -30,18 +30,18 @@ CountryMC=Monaco
 CountryAU=Australia
 CountrySG=Singapore
 CountryAF=Afghanistan
-CountryAX=Ålandøyene
+CountryAX=Åland
 CountryAL=Albania
 CountryAS=Amerikansk Samoa
 CountryAD=Andorra
 CountryAO=Angola
 CountryAI=Anguilla
 CountryAQ=Antarktis
-CountryAG=Antigua and Barbuda
+CountryAG=Antigua og Barbuda
 CountryAM=Armenia
 CountryAW=Aruba
-CountryAT=Austria
-CountryAZ=Azerbaijan
+CountryAT=Østerrike
+CountryAZ=Aserbajdsjan
 CountryBS=Bahamas
 CountryBH=Bahrain
 CountryBD=Bangladesh
@@ -52,57 +52,57 @@ CountryBJ=Benin
 CountryBM=Bermuda
 CountryBT=Bhutan
 CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
+CountryBA=Bosnia og Herzegovina
 CountryBW=Botswana
-CountryBV=Bouvet Island
-CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
+CountryBV=Bouvet-øyene
+CountryBR=Brasil
+CountryIO=Det britiske territoriet i Indiahavet
 CountryBN=Brunei Darussalam
 CountryBG=Bulgaria
 CountryBF=Burkina Faso
 CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
+CountryKH=Kambodsja
+CountryCV=Kapp Verde
+CountryKY=Cayman-øyene
+CountryCF=Sentralafrikanske republikk
 CountryTD=Chad
 CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
+CountryCX=Christmasøyen
+CountryCC=Kokosøyene(Keeling)
 CountryCO=Colombia
-CountryKM=Comoros
-CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
+CountryKM=Komorene
+CountryCG=Kongo
+CountryCD=Kongo
+CountryCK=Cook-øyene
 CountryCR=Costa Rica
-CountryHR=Croatia
+CountryHR=Kroatia
 CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
+CountryCY=Kypros
+CountryCZ=Tsjekkia
 CountryDK=Danmark
 CountryDJ=Djibouti
 CountryDM=Dominica
-CountryDO=Dominican Republic
+CountryDO=Dominikanske Republikk
 CountryEC=Ecuador
 CountryEG=Egypt
 CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
+CountryGQ=Ekvatorial Guinea
 CountryER=Eritrea
-CountryEE=Estonia
-CountryET=Ethiopia
-CountryFK=Falkland Islands
+CountryEE=Estland
+CountryET=Etiopia
+CountryFK=Falklandsøyene
 CountryFO=Færøyene
-CountryFJ=Fiji Islands
+CountryFJ=Fiji-øyene
 CountryFI=Finland
-CountryGF=French Guiana
-CountryPF=French Polynesia
-CountryTF=French Southern Territories
+CountryGF=Fransk Guinea
+CountryPF=Fransk Polynesia
+CountryTF=De franske sørterritorier
 CountryGM=Gambia
 CountryGE=Georgia
 CountryGH=Ghana
 CountryGI=Gibraltar
-CountryGR=Greece
-CountryGL=Greenland
+CountryGR=Hellas
+CountryGL=Grønland
 CountryGD=Grenada
 CountryGP=Guadeloupe
 CountryGU=Guam
@@ -111,155 +111,154 @@ CountryGN=Guinea
 CountryGW=Guinea-Bissau
 CountryGY=Guyana
 CountryHT=Haïti
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
+CountryHM=Heard- og McDonaldøyene
+CountryVA=Holy See (Vatikanet)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Island
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
-CountryIQ=Iraq
+CountryIQ=Irak
 CountryIL=Israel
 CountryJM=Jamaica
 CountryJP=Japan
 CountryJO=Jordan
-CountryKZ=Kazakhstan
+CountryKZ=Kasakstan
 CountryKE=Kenya
 CountryKI=Kiribati
-CountryKP=North Korea
-CountryKR=South Korea
+CountryKP=Nord-Korea
+CountryKR=Sør-Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
-CountryLA=Lao
+CountryKG=Kirgisistan
+CountryLA=Laos
 CountryLV=Latvia
-CountryLB=Lebanon
+CountryLB=Libanon
 CountryLS=Lesotho
 CountryLR=Liberia
-CountryLY=Libyan
+CountryLY=Libya
 CountryLI=Liechtenstein
-CountryLT=Lituania
+CountryLT=Litauen
 CountryLU=Luxembourg
 CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
-CountryMG=Madagascar
+CountryMK=Makedonia
+CountryMG=Madagaskar
 CountryMW=Malawi
 CountryMY=Malaysia
-CountryMV=Maldives
+CountryMV=Maldivene
 CountryML=Mali
 CountryMT=Malta
-CountryMH=Marshall Islands
+CountryMH=Marshall-øyene
 CountryMQ=Martinique
 CountryMR=Mauritania
 CountryMU=Mauritius
 CountryYT=Mayotte
 CountryMX=Mexico
-CountryFM=Micronesia
+CountryFM=Mikronesia
 CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
-CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMZ=Mosambik
+CountryMM=Myanmar
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
-CountryAN=Netherlands Antilles
-CountryNC=New Caledonia
+CountryAN=Nederlandske Antiller
+CountryNC=Ny Caledonia
 CountryNZ=New Zealand
 CountryNI=Nicaragua
 CountryNE=Niger
 CountryNG=Nigeria
 CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
+CountryNF=Norfolkøya
+CountryMP=Nord-Marianene
 CountryNO=Norge
 CountryOM=Oman
 CountryPK=Pakistan
 CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
+CountryPS=Palestina
 CountryPA=Panama
 CountryPG=Papua New Guinea
 CountryPY=Paraguay
 CountryPE=Peru
-CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poland
+CountryPH=Filippinene
+CountryPN=Pitcairn-øyene
+CountryPL=Polen
 CountryPR=Puerto Rico
 CountryQA=Qatar
 CountryRE=Reunion
 CountryRO=Romania
 CountryRW=Rwanda
-CountrySH=Saint Helena
-CountryKN=Saint Kitts and Nevis
+CountrySH=Sankt Helena
+CountryKN=Saint Kitts og Nevis
 CountryLC=Saint Lucia
-CountryPM=Saint Pierre and Miquelon
-CountryVC=Saint Vincent and Grenadines
+CountryPM=Saint-Pierre og Miquelon
+CountryVC=Saint Vincent og Grenadinene
 CountryWS=Samoa
 CountrySM=San Marino
-CountryST=Sao Tome and Principe
+CountryST=São Tomé og Príncipe
 CountryRS=Serbia
-CountrySC=Seychelles
+CountrySC=Seychellene
 CountrySL=Sierra Leone
 CountrySK=Slovakia
 CountrySI=Slovenia
-CountrySB=Solomon Islands
+CountrySB=Solomon-øyene
 CountrySO=Somalia
-CountryZA=South Africa
-CountryGS=South Georgia and the South Sandwich Islands
+CountryZA=Sør-Afrika
+CountryGS=Sør-Georgia og Sør-Sandwichøyene
 CountryLK=Sri Lanka
 CountrySD=Sudan
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
+CountrySR=Surinam
+CountrySJ=Svalbard og Jan Mayen
 CountrySZ=Swaziland
-CountrySY=Syrian
+CountrySY=Syria
 CountryTW=Taiwan
-CountryTJ=Tajikistan
+CountryTJ=Tadsjikistan
 CountryTZ=Tanzania
 CountryTH=Thailand
-CountryTL=Timor-Leste
+CountryTL=Øst-Timor
 CountryTK=Tokelau
 CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turkey
+CountryTT=Trinidad og Tobago
+CountryTR=Tyrkia
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks- og Caicosøyene
 CountryTV=Tuvalu
 CountryUG=Uganda
-CountryUA=Ukraine
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
+CountryUA=Ukraina
+CountryAE=Forente Arabiske Emirater
+CountryUM=USAs ytre småøyer
 CountryUY=Uruguay
 CountryUZ=Uzbekistan
 CountryVU=Vanuatu
 CountryVE=Venezuela
-CountryVN=Viet Nam
-CountryVG=Virgin Islands, British
-CountryVI=Virgin Islands, U.S.
-CountryWF=Wallis and Futuna
-CountryEH=Western Sahara
-CountryYE=Yemen
+CountryVN=Vietnam
+CountryVG=Jomfruøyene, U.K
+CountryVI=Jomfruøyene, U.S
+CountryWF=Wallis- og Futunaøyene
+CountryEH=Vest-Sahara
+CountryYE=Jemen
 CountryZM=Zambia
 CountryZW=Zimbabwe
 CountryGG=Guernsey
 CountryIM=Isle of Man
 CountryJE=Jersey
 CountryME=Montenegro
-CountryBL=Saint Barthelemy
+CountryBL=Saint-Barthélemy
 CountryMF=Saint Martin
 
 ##### Civilities #####
 CivilityMME=Fru
 CivilityMR=Herr
 CivilityMLE=Frk.
-CivilityMTRE=-
-# CivilityDR=Doctor
-
+CivilityMTRE=Master
+CivilityDR=Doktor
 ##### Currencies #####
 Currencyeuros=Euro
 CurrencyAUD=Australske dollar
-CurrencySingAUD=AU Dollar
-CurrencyCAD=Kanadiske dollar
-CurrencySingCAD=CAN dollar
+CurrencySingAUD=Australske dollar
+CurrencyCAD=Canadiske dollar
+CurrencySingCAD=Canadiske dollar
 CurrencyCHF=Sveitsiske franc
 CurrencySingCHF=Sveitsisk franc
 CurrencyEUR=Euro
@@ -267,63 +266,62 @@ CurrencySingEUR=Euro
 CurrencyFRF=Franske franc
 CurrencySingFRF=Franske franc
 CurrencyGBP=Britiske pund
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indisk rupee
+CurrencySingGBP=Britiske pund
+CurrencyINR=Indiske rupi
+CurrencySingINR=Indisk rupi
 CurrencyMAD=Dirham
 CurrencySingMAD=Dirham
 CurrencyMGA=Ariary
 CurrencySingMGA=Ariary
-CurrencyMUR=Mauritius rupees
-CurrencySingMUR=Mauritius rupee
-CurrencyNOK=NOK
+CurrencyMUR=Mauritius rupi
+CurrencySingMUR=Mauritius rupi
+CurrencyNOK=Norske kroner
 CurrencySingNOK=Norske kroner
-CurrencyTND=TND
+CurrencyTND=Tunisiske dinarer
 CurrencySingTND=Tunisisk dinar
 CurrencyUSD=Amerikanske dollar
-CurrencySingUSD=US Dollar
-CurrencyUAH=Hryvnia
-CurrencySingUAH=Hryvnia
-CurrencyXAF=CFA Francs BEAC
+CurrencySingUSD=Amerikanske dollar
+CurrencyUAH=Hryvnja
+CurrencySingUAH=Hryvnja
+CurrencyXAF=CFA franc BEAC
 CurrencySingXAF=CFA franc BEAC
-CurrencyXOF=CFA Francs BCEAO
+CurrencyXOF=CFA franc BCEAO
 CurrencySingXOF=CFA franc BCEAO
 CurrencyXPF=CFP franc
-CurrencySingXPF=CFP Franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencySingXPF=CFP franc
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=tusendel
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internett
-DemandReasonTypeSRC_CAMP_MAIL=Mailing kampanje
+DemandReasonTypeSRC_CAMP_MAIL=Postkampanje
 DemandReasonTypeSRC_CAMP_EMAIL=E-post-kampanje
-DemandReasonTypeSRC_CAMP_PHO=Telefon kampanje
-DemandReasonTypeSRC_CAMP_FAX=Fax kampanje
-DemandReasonTypeSRC_COMM=Kommersielle kontakt
+DemandReasonTypeSRC_CAMP_PHO=Telefonkampanje
+DemandReasonTypeSRC_CAMP_FAX=Fax-kampanje
+DemandReasonTypeSRC_COMM=Kommersiell kontakt
 DemandReasonTypeSRC_SHOP=Butikk Kontakt
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_WOM=Jungeltelegrafen
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Ansatt
+DemandReasonTypeSRC_SPONSORING=Sponsing
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang
index ce2c7feea42..c1a8498daa8 100644
--- a/htdocs/langs/nb_NO/donations.lang
+++ b/htdocs/langs/nb_NO/donations.lang
@@ -1,43 +1,43 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donasjon
 Donations=Donasjoner
-DonationRef=Donation ref.
+DonationRef=Donasjon ref.
 Donor=Giver
 Donors=Givere
-AddDonation=Create a donation
+AddDonation=Opprett donasjon
 NewDonation=Ny donasjon
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation ?
-ShowDonation=Show donation
+DeleteADonation=Slett en donasjon
+ConfirmDeleteADonation=Er du sikker på at du vil slette denne donasjonen?
+ShowDonation=Vis Donasjon
 DonationPromise=Lovet donasjon
-PromisesNotValid=Ikke godkjente løfter
-PromisesValid=Godkjente løfter
+PromisesNotValid=Ikke validerte løfter
+PromisesValid=Validerte løfter
 DonationsPaid=Betalte donasjoner
 DonationsReceived=Mottatte donasjoner
 PublicDonation=Offentlig donasjon
 DonationsNumber=Donasjonsnummer
 DonationsArea=Donasjonsområde
-DonationStatusPromiseNotValidated=Løftekladd
+DonationStatusPromiseNotValidated=Donasjons-kladd
 DonationStatusPromiseValidated=Godkjent løfte
 DonationStatusPaid=Mottatt donasjon
 DonationStatusPromiseNotValidatedShort=Kladd
 DonationStatusPromiseValidatedShort=Godkjent
 DonationStatusPaidShort=Mottatt
-DonationTitle=Donation receipt
-DonationDatePayment=Payment date
-ValidPromess=Valider lover
-DonationReceipt=Donation receipt
+DonationTitle=Donasjonskvittering
+DonationDatePayment=Dato for betaling
+ValidPromess=Valider løfte
+DonationReceipt=Donasjonskvittering
 BuildDonationReceipt=Opprett kvittering
 DonationsModels=Dokumentmal for donasjonskvitteringer
-LastModifiedDonations=Siste %s endret donasjoner
+LastModifiedDonations=Siste %s endrede donasjoner
 SearchADonation=Søk etter donasjon
-DonationRecipient=Donation recipient
-ThankYou=Thank You
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+DonationRecipient=Donasjonsmottaker
+ThankYou=Tusen takk
+IConfirmDonationReception=Kvittering for mottak av donasjon av følgende beløp
 MinimumAmount=Minstebeløp er %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-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
+FreeTextOnDonations=Bunntekst
+FrenchOptions=Valg for Frankrike
+DONATION_ART200=Vis artikkel 200 fra CGI hvis du er bekymret
+DONATION_ART238=Vis artikkel 238 fra CGI hvis du er bekymret
+DONATION_ART885=Vis artikkel 885 fra CGI hvis du er bekymret
+DonationPayment=Donasjonsbetaling
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 34f72b3833f..0701c248de4 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -6,27 +6,27 @@ DocsElements=Dokumenter elementer
 DocsThirdParties=Dokumenter tredjeparter
 DocsContracts=Dokumenter kontrakter
 DocsProposals=Dokumenter tilbud
-DocsOrders=Dokomenter ordre
+DocsOrders=Dokumenter ordre
 DocsInvoices=Dokumenter fakturaer
 ECMNbOfDocs=Ant. dokumenter i mappen
 ECMNbOfDocsSmall=Ant. dok.
 ECMSection=Mappe
 ECMSectionManual=Manuell mappe
 ECMSectionAuto=Automatisk mappe
-ECMSectionsManual=Manuelle mapper
-ECMSectionsAuto=Automatiske mapper
+ECMSectionsManual=Manuell mappestruktur
+ECMSectionsAuto=Automatisk mappestruktur
 ECMSections=Mapper
 ECMRoot=Rot
 ECMNewSection=Ny mappe
-ECMAddSection=Legg til manuell mappe
+ECMAddSection=Legg til mappe
 ECMNewDocument=Nytt dokument
 ECMCreationDate=Opprettet den
 ECMNbOfFilesInDir=Antall filer i mappen
 ECMNbOfSubDir=Antall undermapper
-ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=Antall filer i undermapper 
 ECMCreationUser=Opprettet av
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=EDM-område
+ECMAreaDesc=EDM (Electronic Document Management)-området gjør at du raskt kan lagre, dele og søke alle typer dokumenter i Dolibarr
 ECMAreaDesc2=* Automatiske mapper fylles automatisk når du legger til dokumenter fra et elementkort.<br>* Manuelle mapper kan du bruke til å lagre dokumenter som ikke er lenket til et spesielt element.
 ECMSectionWasRemoved=Mappen <b>%s</b> er slettet.
 ECMDocumentsSection=Dokument i mappen
@@ -35,16 +35,16 @@ ECMSearchByEntity=Søk på objekt
 ECMSectionOfDocuments=Mapper med dokumenter
 ECMTypeManual=Manuell
 ECMTypeAuto=Automatisk
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Dokumenter lenket til skatter og avgifter
 ECMDocsByThirdParties=Dokumenter knyttet til tredjeparter
 ECMDocsByProposals=Dokumenter knyttet til tilbud
 ECMDocsByOrders=Dokumenter knyttet til kundeordre
 ECMDocsByContracts=Dokumenter knyttet til kontrakter
 ECMDocsByInvoices=Dokumenter knyttet til kundefakturaer
-ECMDocsByProducts=Dokumenter knyttet til produkter
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByProducts=Dokumenter knyttet til varer
+ECMDocsByProjects=Dokumenter relatert til prosjekter
+ECMDocsByUsers=Dokumenter relatert til brukere
+ECMDocsByInterventions=Dokumenter relatert til intervensjoner
 ECMNoDirectoryYet=Ingen mapper opprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
@@ -53,5 +53,5 @@ ECMDirectoryForFiles=Relativ mappe for filer
 CannotRemoveDirectoryContainsFiles=Kunne ikke fjerne mappen, da den inneholder filer
 ECMFileManager=Filbehandler
 ECMSelectASection=Velg en mappe fra treet til venstre...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+DirNotSynchronizedSyncFirst=Denne mappen synes å være opprettet eller endret utenfor ECM-modulen. Du må først klikke på "oppfrisk"-knappen for å synkronisere disken mot databasen for å kunne se innholdet i denne mappen.
 
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 8df21d9b060..688f5f520b3 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=Ingen feil funnet
+NoErrorCommitIsDone=Ingen feil
 # Errors
 Error=Feil
 Errors=Feil
@@ -10,38 +10,38 @@ ErrorBadEMail=E-post %s er feil
 ErrorBadUrl=Url %s er feil
 ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppen %s eksisterer allerede.
-ErrorRecordNotFound=Record ikke funnet.
-ErrorFailToCopyFile=Klarte ikke å kopiere filen <b>«%s</b> 'inn' <b>%s</b> '.
-ErrorFailToRenameFile=Kunne ikke omdøpe filen <b>'%s'</b> inn <b>'%s'.</b>
+ErrorRecordNotFound=Posten ble ikke funnet.
+ErrorFailToCopyFile=Klarte ikke å kopiere filen '<b>«%s</b>' til '<b>%s</b>'.
+ErrorFailToRenameFile=Kunne ikke omdøpe filen '<b>%s</b>' til '<b>%s</b>'
 ErrorFailToDeleteFile=Kunne ikke fjerne filen '<b>%s</b>'.
 ErrorFailToCreateFile=Kunne ikke opprette filen '<b>%s</b>'.
-ErrorFailToRenameDir=Kunne ikke endre navne på mappen '<b>%s</b>' til '<b>%s</b>'.
+ErrorFailToRenameDir=Kunne ikke endre navnet på mappen '<b>%s</b>' til '<b>%s</b>'.
 ErrorFailToCreateDir=Kunne ikke opprette mappen '<b>%s</b>'.
 ErrorFailToDeleteDir=Klarte ikke å slette katalogen <b>«%s</b> '.
-ErrorFailedToDeleteJoinedFiles=Kan ikke slette foretaket fordi det er noe blitt filer. Fjern delta filer først.
-ErrorThisContactIsAlreadyDefinedAsThisType=Denne kontaktperson er allerede definert som kontaktperson for denne typen.
+ErrorFailedToDeleteJoinedFiles=Kan ikke slettes fordi det finnes relaterte filer. Fjern relasjoner først.
+ErrorThisContactIsAlreadyDefinedAsThisType=Denne kontaktperson er allerede definert for denne typen.
 ErrorCashAccountAcceptsOnlyCashMoney=Dette er en kassekonto, så det er kun mulig med kontantinnskudd på den.
-ErrorFromToAccountsMustDiffers=Kilde og målkonto må være forskjellig.
+ErrorFromToAccountsMustDiffers=Kilde- og målkonto må være forskjellig.
 ErrorBadThirdPartyName=Ugyldig verdi for tredjepartens navn
-ErrorProdIdIsMandatory=The %s is mandatory
+ErrorProdIdIsMandatory=%s er obligatorisk
 ErrorBadCustomerCodeSyntax=Ugyldig syntaks for kundekode
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Feil syntaks for strekkode. Du kan ha satt en feil strekkodetype eller du kan ha definert en strekkode-maske som ikke passer verdien du har skannet
 ErrorCustomerCodeRequired=Kundekode påkrevet
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Strekkode påkrevet
 ErrorCustomerCodeAlreadyUsed=Kundekoden er allerede benyttet
-ErrorBarCodeAlreadyUsed=Bar code already used
-ErrorPrefixRequired=Prefix påkrevet
-ErrorUrlNotValid=Nettstedet adressen er feil
-ErrorBadSupplierCodeSyntax=Ugyldig syntax for leverandørkode
+ErrorBarCodeAlreadyUsed=Strekkode allerede brukt
+ErrorPrefixRequired=Prefiks påkrevet
+ErrorUrlNotValid=Nettstedsadressen er feil
+ErrorBadSupplierCodeSyntax=Ugyldig syntaks for leverandørkode
 ErrorSupplierCodeRequired=Leverandørkode påkrevet
 ErrorSupplierCodeAlreadyUsed=Leverandørkode allerede brukt
 ErrorBadParameters=Ugyldige parametere
-ErrorBadValueForParameter=Feil verdi &quot;%s 'for parameter feil' Choice %s 'Choice
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=Verdien '%s' har feil dato format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Kan ike skrive til mappen %s
-ErrorFoundBadEmailInFile=Feil e-postsyntax for %s linjer i filen (for eksempel linje %s med e-post=%s)
+ErrorBadValueForParameter=Feil verdi '%s' for parameter. Feil '%s'
+ErrorBadImageFormat=Bildeformatet støttes ikke (Din PHP støtter ikke konvertering av dette formatet)
+ErrorBadDateFormat=Verdien '%s' har feil datoformat
+ErrorWrongDate=Dato er feil!
+ErrorFailedToWriteInDir=Kan ikke skrive til mappen %s
+ErrorFoundBadEmailInFile=Feil e-postsyntaks for %s linjer i filen (for eksempel linje %s med e-post=%s)
 ErrorUserCannotBeDelete=Brukeren kan ikke slettes. Det kan være at den er knyttet til elementer i Dolibarr.
 ErrorFieldsRequired=Noen påkrevde felt er ikke fylt ut.
 ErrorFailedToCreateDir=Kunne ikke påårette mappen. Kontroller at webserverbrukeren har skriverettigheter i dokumentmappen i Dolibarr. Hvis <b>safe_mode</b> er akivert i PHP, sjekk at webserveren eier eller er med i gruppen for Dolibarr php-filer.
@@ -49,106 +49,106 @@ ErrorNoMailDefinedForThisUser=Ingen e-post angitt for denne brukeren.
 ErrorFeatureNeedJavascript=Denne funksjonen krever javascript for å virke. Endre dette i innstillinger - visning.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen 'Topp' kan ikke ha noen foreldremeny. Skriv 0 i foreldremeny eller velg menytypen 'Venstre'.
 ErrorLeftMenuMustHaveAParentId=En meny av typen 'Venstre' må ha foreldre-ID.
-ErrorFileNotFound=Fant ikke filen (Feil sti, feil tillatelser eller access denied av openbasedir-parameter)
-ErrorDirNotFound=Directory <b>%s</b> ikke funnet (Bad bane, feil rettigheter eller ingen tilgang på PHP openbasedir eller safe_mode parameter)
+ErrorFileNotFound=Fant ikke filen <b>%s</b> (Feil bane, feil tillatelser eller adgang nektet av PHP openbasedir eller safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> ble ikke funnet (feil bane, feil rettigheter eller ingen tilgang til PHP openbasedir eller safe_mode parameter)
 ErrorFunctionNotAvailableInPHP=Funksjonen <b>%s</b> kreves for denne funksjonen, men den er ikke tilgjengelig i denne versjonen/oppsettet av PHP.
 ErrorDirAlreadyExists=En mappe med dette navnet eksisterer allerede.
 ErrorFileAlreadyExists=En fil med dette navnet finnes allerede.
-ErrorPartialFile=Fil ikke mottatt fullstendig av server.
-ErrorNoTmpDir=Midlertidig directy %s ikke eksisterer.
-ErrorUploadBlockedByAddon=Last opp blokkert av en PHP / Apache plugin.
+ErrorPartialFile=Filen ble ikke fullstendig mottatt av server.
+ErrorNoTmpDir=Midlertidig mappe %s finnes ikke.
+ErrorUploadBlockedByAddon=Opplastning blokkert av en PHP/Apache plugin.
 ErrorFileSizeTooLarge=Filstørrelsen er for stor.
-ErrorSizeTooLongForIntType=Størrelse for lang for int type (%s sifre maksimum)
-ErrorSizeTooLongForVarcharType=Størrelse for lang for streng type (%s tegn maksimum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
+ErrorSizeTooLongForIntType=Størrelse for lang for int-type (%s sifre maksimum)
+ErrorSizeTooLongForVarcharType=Størrelse for lang for streng-type (%s tegn maksimum)
+ErrorNoValueForSelectType=Sett inn verdi for å velge liste
+ErrorNoValueForCheckBoxType=Sett inn verdi for å velge avkrysningsboks-liste
+ErrorNoValueForRadioType=Sett i verdi for radioknapp-liste
+ErrorBadFormatValueList=Listeverdien kan ikke føres opp mer enn en gang: <u>%s</u>, men kreves minst en gang
 ErrorFieldCanNotContainSpecialCharacters=Feltet <b>%s</b> kan ikke inneholde spesialtegn.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Feltet <b>%s</b> må ikke inneholde spesialtegn eller store bokstaver
 ErrorNoAccountancyModuleLoaded=Ingen regnskapsmodul aktivert
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Profilnavnet til dette eksport-oppsettet finnes allerede
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP oppsett er ikke komplett.
 ErrorLDAPMakeManualTest=En .ldif fil er opprettet i mappen %s. Prøv å lese den manuelt for å se mer informasjon om feil.
-ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke lagre en handling med "ikke statut startet" hvis feltet "gjort av" er også fylt.
-ErrorRefAlreadyExists=Ref brukes til oppretting finnes allerede.
-ErrorPleaseTypeBankTransactionReportName=Vennligst skriv kvittering fra bank navnet der hvor transaksjonen er rapportert (Format ÅÅÅÅMM eller ÅÅÅÅMMDD)
-ErrorRecordHasChildren=Kunne ikke slette poster siden den har noen Childs.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
-ErrorModuleRequireJavascript=Javascript må ikke deaktiveres å ha denne funksjonen fungerer. For å aktivere / deaktivere Javascript, gå til menyen Home-> Setup-> Display.
-ErrorPasswordsMustMatch=Begge har skrevet passord må samsvare med hverandre
-ErrorContactEMail=En teknisk feil oppsto. Vennligst kontakt administrator for å følge e <b>%s</b> no gi feilmeldingsnumrene <b>%s</b> i meldingen, eller enda bedre ved å legge til en skjerm kopi av denne siden.
-ErrorWrongValueForField=Feil verdi for feltet tall <b>%s</b> (verdien <b>«%s"</b> samsvarer ikke med regex regel <b>%s)</b>
-ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
-ErrorFieldRefNotIn=Feil verdi for feltnummer <b>%s</b> (verdi <b>'%s</b> &quot;er ikke en <b>%s</b> eksisterende ref)
-ErrorsOnXLines=Feil på <b>%s</b> kilde linjer
-ErrorFileIsInfectedWithAVirus=Det antivirus programmet var ikke i stand til å validere filen (filen kan være infisert av et virus)
+ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke lagre en handling med "status ikke startet" hvis feltet "gjort av" også er utfylt.
+ErrorRefAlreadyExists=Ref bruket til oppretting finnes allerede.
+ErrorPleaseTypeBankTransactionReportName=Vennligst skriv navnet på bankkvitteringen der transaksjonen er rapportert (i formatet ÅÅÅÅMM eller ÅÅÅÅMMDD)
+ErrorRecordHasChildren=Kunne ikke slette poster siden den har noen relasjoner.
+ErrorRecordIsUsedCantDelete=Kan ikke slette posten. Den er allerede brukt eller inkludert i et annet objekt
+ErrorModuleRequireJavascript=Javascript må være aktivert for å kunne bruke denne funksjonen. For å aktivere/deaktivere Javascript, gå til menyen Hjem-> Oppsett-> Visning.
+ErrorPasswordsMustMatch=Passordene må samsvare med hverandre
+ErrorContactEMail=En teknisk feil oppsto. Vennligst kontakt administrator på e-post <b>%s</b> og oppgi feilkoden <b>%s</b> i meldingen, eller enda bedre, ved å legge til en skjermdump av denne siden.
+ErrorWrongValueForField=Feil verdi for feltnummeret <b>%s</b> (verdien <b>«%s"</b> samsvarer ikke med regex regel <b>%s)</b>
+ErrorFieldValueNotIn=Feil verdi for feltnummer <b>%s</b> (verdien '<b>%s</b>' er ikke tilgjengelig for feltet <b>%s</b> i tabell <b>%s</b> = <b>%s</b>)
+ErrorFieldRefNotIn=Feil verdi for feltnummer <b>%s</b> (verdien '<b>%s</b>' er ikke en <b>%s</b> eksisterende ref)
+ErrorsOnXLines=Feil på <b>%s</b> kildelinje(r)
+ErrorFileIsInfectedWithAVirus=Antivirus-programmet var ikke i stand til å validere filen (filen kan være infisert av et virus)
 ErrorSpecialCharNotAllowedForField=Spesialtegn er ikke tillatt for feltet "%s"
-ErrorDatabaseParameterWrong=Database setup parameter <b>'%s</b> "har en verdi ikke forenlig å bruke Dolibarr (må ha verdi' <b>%s</b> ').
-ErrorNumRefModel=En referanse finnes i databasen (%s), og er ikke kompatibel med denne nummerering regelen. Fjern posten eller omdøpt referanse for å aktivere denne modulen.
-ErrorQtyTooLowForThisSupplier=Kvantum er for lavt for denne leverandøren eller pris ikke definert på dette produktet for denne leverandøren
-ErrorModuleSetupNotComplete=Oppsett av modul ser ut til å være uncomplete. Gå på Setup - Modules å fullføre.
+ErrorDatabaseParameterWrong=Database setup-parameter '<b>%s</b>' har en verdi som ikke er kompatibel med Dolibarr (må ha verdien '<b>%s</b>').
+ErrorNumRefModel=En referanse finnes i databasen (%s), og er ikke kompatibel med denne nummereringsregelen. Fjern posten eller omdøp referansen for å aktivere denne modulen.
+ErrorQtyTooLowForThisSupplier=Kvantum er for lavt eller pris ikke satt på denne varen for denne leverandøren
+ErrorModuleSetupNotComplete=Oppsett av modul ser ikke ut til å være komplett. Gå på Oppsett - Moduler for å fullføre.
 ErrorBadMask=Feil på maske
 ErrorBadMaskFailedToLocatePosOfSequence=Feil, maske uten sekvensnummer
-ErrorBadMaskBadRazMonth=Feil, dårlig reset verdi
-ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorBadMaskBadRazMonth=Feil, ikke korrekt tilbakestillingsverdi
+ErrorMaxNumberReachForThisMask=Maksimum nummer nådd for denne masken
+ErrorCounterMustHaveMoreThan3Digits=Teller må ha mer enn 3 siffer
 ErrorSelectAtLeastOne=Feil. Velg minst én oppføring.
-ErrorProductWithRefNotExist=Produkt med referansenummer <i>'%s</i> &quot;ikke eksisterer
-ErrorDeleteNotPossibleLineIsConsolidated=Slett ikke mulig fordi posten er knyttet til en bank betalingstransaksjonen som conciliated
-ErrorProdIdAlreadyExist=%s er tilordnet en annen tredje
+ErrorProductWithRefNotExist=Vare med referansenummer '<i>'%s</i>' eksisterer ikke
+ErrorDeleteNotPossibleLineIsConsolidated=Sletting ikke mulig fordi posten er knyttet til en banktransaksjonen som er avstemt
+ErrorProdIdAlreadyExist=%s er tilordnet en annen tredjepart
 ErrorFailedToSendPassword=Klarte ikke å sende passord
-ErrorFailedToLoadRSSFile=Unnlater å få RSS feed. Prøv å legge konstant MAIN_SIMPLEXMLLOAD_DEBUG hvis feilmeldinger ikke gir nok informasjon.
+ErrorFailedToLoadRSSFile=Klarer ikke hente RSS-feed. Prøv å legge konstant MAIN_SIMPLEXMLLOAD_DEBUG hvis feilmeldinger ikke gir nok informasjon.
 ErrorPasswordDiffers=Passordene er forskjellige, prøv igjen
 ErrorForbidden=Tilgang forbudt.<br>Du prøver å nå en side, et område eller en funksjon uten at du er riktig logget inn. Det kan også være at du ikke har tilstrekkelige rettigheter.
 ErrorForbidden2=Tillatelse for denne innloggingen kan settes av Dolibarr-administratoren fra menyen %s->%s.
-ErrorForbidden3=Det ser ut til at Dolibarr ikke brukes gjennom en autensitert sesjon. Du kan lese mer i dokumentasjonen om hvordan du håndterer autensitering (htaccess, mod_auth eller andre...).
-ErrorNoImagickReadimage=Funksjonen imagick_readimage finnes ikke på denne PHP-installaajonen. Forhåndsvisning er da ikke mulig. Administrator kan slå av denne fanen i oppsett - visning.
+ErrorForbidden3=Det ser ut til at Dolibarr ikke brukes gjennom en autentisert sesjon. Du kan lese mer i dokumentasjonen om hvordan du håndterer autentisering (htaccess, mod_auth eller andre...).
+ErrorNoImagickReadimage=Funksjonen imagick_readimage finnes ikke på denne PHP-installasjonen. Forhåndsvisning er da ikke mulig. Administrator kan slå av denne fanen i Oppsett - Visning.
 ErrorRecordAlreadyExists=Posten eksistererer fra før.
 ErrorCantReadFile=Kunne ikke lese filen '%s'
 ErrorCantReadDir=Kunne ikke lese mappen '%s'
-ErrorFailedToFindEntity=Kunne ikke lese enheten '%s'
-ErrorBadLoginPassword=Bad verdi for brukernavn eller passord
+ErrorFailedToFindEntity=Kunne ikke lese miljø '%s'
+ErrorBadLoginPassword=Feil verdi for brukernavn eller passord
 ErrorLoginDisabled=Kontoen din har blitt deaktivert
-ErrorFailedToRunExternalCommand=Kunne kjøre ekstern kommando. Sjekk det er tilgjengelig og kjørbart av din PHP server. Hvis PHP <b>Safe Mode</b> er aktivert, må du kontrollere at kommandoen er inne i en katalog som er definert av parameter <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Kunne ikke kjøre ekstern kommando. Sjekk om det er tilgjengelig og kjørbart av din PHP server. Hvis PHP <b>Safe Mode</b> er aktivert, må du kontrollere at kommandoen er inne i en mappe som er definert av parameter <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Kunne ikke endre passord
-ErrorLoginDoesNotExists=Bruker med logg <b>%s</b> kunne ikke bli funnet.
-ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Behandle avbrutt.
-ErrorBadValueForCode=Bad verdi for sikkerhetskode. Prøv igjen med ny verdi ...
-ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negativt
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> brukes til å utføre web-server har ikke tillatelse til at
+ErrorLoginDoesNotExists=Bruker med loginn <b>%s</b> kunne ikke bli funnet.
+ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Prosess avbrutt.
+ErrorBadValueForCode=Feil verdi for sikkerhetskode. Prøv igjen med ny verdi ...
+ErrorBothFieldCantBeNegative=Feltene %s og %s kan ikke begge være negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Kvantum på linjer i kundefakturaer kan ikke være negativ
+ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> som brukes til å kjøre web-server har ikke tillatelse til det
 ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date can not be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrUnzipFails=Klarte ikke å pakke ut %s med ZipArchive
+ErrNoZipEngine=Ingen applikasjon som kan pakke ut %s i denne PHP
+ErrorFileMustBeADolibarrPackage=Filen %s må være en Dolibarr zip-pakke
+ErrorFileRequired=Må være en Dolibarr zip-pakke
+ErrorPhpCurlNotInstalled=PHP CURL er ikke installert. Denne må være installert for å kommunisere med Paypal
+ErrorFailedToAddToMailmanList=Klarte ikke å legge post %s til Mailman-liste %s eller SPIP-base
+ErrorFailedToRemoveToMailmanList=Klarte ikke å fjerne post %s fra Mailman-liste %s eller SPIP-base
+ErrorNewValueCantMatchOldValue=Ny verdi kan ikke være lik den gamle
+ErrorFailedToValidatePasswordReset=Klarte ikke å initialisere passordet på nytt. Initialiseringen kan allerede ha blitt utført (denne lenken kan bare brukes en gang). Hvis ikke, prøv å starte prosessen på nytt
+ErrorToConnectToMysqlCheckInstance=Kobling til databasen mislykkes. Sjekk at Mysql-serveren kjører (i de fleste tilfeller kan du starte den fra kommandolinjen med 'sudo /etc/init.d/mysql start').
+ErrorFailedToAddContact=Klarte ikke å legge til kontakt
+ErrorDateMustBeBeforeToday=Datoen kan ikke settes til senere enn i dag
+ErrorPaymentModeDefinedToWithoutSetup=En betalingsmodus var satt til å skrive %s, men oppsett av modulen Faktura er ikke ferdig definert for å vise for denne betalingsmodusen.
+ErrorPHPNeedModule=Feil! Din PHP må ha modulen <b>%s</b> installert for  å kunne bruke denne funksjonen.
+ErrorOpenIDSetupNotComplete=Du satte opp Dolibarr config-filen til å tillate OpenID-autentisering, men url til OpenID-tjenesten er ikke definert i konstanten %s
+ErrorWarehouseMustDiffers=Kilde- og målvarehus må være ulike
+ErrorBadFormat=Feil format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Feil! Dette medlemmet er ennå ikke koblet til noen tredjepart. Koble medlemmet mot en eksisterende tredjepart eller opprett en ny tredjepart, før du oppretter et abonnement med faktura
+ErrorThereIsSomeDeliveries=Feil! Det er noen leveringer knyttet til denne forsendelsen. Sletting nektet
+ErrorCantDeletePaymentReconciliated=Kan ikke slette en betaling som har generert en banktransaksjon, og som er blitt avstemt
+ErrorCantDeletePaymentSharedWithPayedInvoice=Kan ikke slette en betaling delt med minst en faktura med status Betalt
+ErrorPriceExpression1=Kan ikke tildele til konstant '%s'
+ErrorPriceExpression2=Kan ikke omdefinere innebygd funksjon '%s'
+ErrorPriceExpression3=Udefinert variabel '%s' i funksjon
+ErrorPriceExpression4=Ulovlig karakter '%s'
+ErrorPriceExpression5=Uventet '%s'
+ErrorPriceExpression6=Feil antall argumenter (%s er gitt, %s er forventet)
+ErrorPriceExpression8=Uventet operator '%s'
+ErrorPriceExpression9=En uventet feil oppsto
+ErrorPriceExpression10=Operator '%s' mangler operand
 ErrorPriceExpression11=Forventet '%s'
 ErrorPriceExpression14=Delt på null
 ErrorPriceExpression17=Udefinert variabel '%s'
@@ -158,35 +158,37 @@ ErrorPriceExpression21=Tomt resultat '%s'
 ErrorPriceExpression22=Negativt resultat '%s'
 ErrorPriceExpressionInternal=Intern feil '%s'
 ErrorPriceExpressionUnknown=Ukjent feil '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorSrcAndTargetWarehouseMustDiffers=Kilde- og målvarehus må være ulik
+ErrorTryToMakeMoveOnProductRequiringBatchData=Feil! Prøver å utføre lageroverføring uten lot/serienummer på et vare som krever dette
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Alle registrerte mottak må først verifiseres (godkjent eller nektet) før dette kan utføres
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Alle registrerte mottak må først verifiseres (godkjent) før dette kan utføres
+ErrorGlobalVariableUpdater0=HTTP forespørsel feilet med meldingen '%s'
+ErrorGlobalVariableUpdater1=Feil JSON format '%s'
+ErrorGlobalVariableUpdater2=Manglende parameter '%s'
+ErrorGlobalVariableUpdater3=Dataene ble ikke funnet i resultatet
+ErrorGlobalVariableUpdater4=SOAP klienten feilet med meldingen '%s'
+ErrorGlobalVariableUpdater5=Ingen global variabel valgt
+ErrorFieldMustBeANumeric=Feltet <b>%s</b> må være en numerisk verdi
+ErrorFieldMustBeAnInteger=Feltet <b>%s</b> må være et heltall
+ErrorMandatoryParametersNotProvided=Obligatorisk(e) parametre ikke angitt
 
 # Warnings
-WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
-WarningSafeModeOnCheckExecDir=Advarsel, PHP alternativet <b>safe_mode</b> er på så kommandere må lagres i en katalog erklært av php parameter <b>safe_mode_exec_dir.</b>
-WarningAllowUrlFopenMustBeOn=Parameteret <b>allow_url_fopen</b> må slås på <b>on</b> i filen <b>php.ini</b> for at denne modulen skal virke ordentlig. Du må endre denne filen manuelt.
-WarningBuildScriptNotRunned=Skriptet <b>%s</b> for å lage grafikk er ikke kjørt, eller det er ikngen data å vise.
+WarningMandatorySetupNotComplete=Obligatoriske parametre er enda ikke satt opp
+WarningSafeModeOnCheckExecDir=Advarsel, PHP alternativet <b>safe_mode</b> er på så kommandere må lagres i en mappe erklært av php parameter <b>safe_mode_exec_dir.</b>
+WarningAllowUrlFopenMustBeOn=Parameteret <b>allow_url_fopen</b> må settes til <b>on</b> i filen <b>php.ini</b> for at denne modulen skal virke ordentlig. Du må endre denne filen manuelt.
+WarningBuildScriptNotRunned=Skriptet <b>%s</b> for å lage grafikk er ikke kjørt, eller det er ingen data å vise.
 WarningBookmarkAlreadyExists=Et bokmerke med denne tittelen eller denne URL'en eksisterer fra før.
 WarningPassIsEmpty=Advarsel: databasepassordet er tomt. Dette er en sikkerhetsrisiko. Du bør passordbeskytte databasen og endre filen conf.php
-WarningConfFileMustBeReadOnly=Advarsel, config <b>(htdocs / conf / conf.php)</b> kan du bli overkjørt av webserveren. Dette er et alvorlig sikkerhetshull. Endre tillatelser på filen for å være i skrivebeskyttet modus for operativsystem bruker brukes av web-server. Hvis du bruker Windows og FAT format for disken din, må du vite at dette filsystemet ikke tillater å legge til tillatelser på filen, så kan ikke være helt sikker.
-WarningsOnXLines=Advarsler på <b>%s</b> kilde linjer
-WarningNoDocumentModelActivated=Ingen modell, for dokument generasjon, har blitt aktivert. En modell vil bli choosed av retten til du sjekke modulen oppsett.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole.
-WarningUntilDirRemoved=Denne advarselen vil være aktivert så lenge denne mappen eksisterer (Den vises kun til administratorer).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningConfFileMustBeReadOnly=Advarsel, config-filen din <b>(htdocs / conf / conf.php)</b> kan overskrives av webserveren. Dette er et alvorlig sikkerhetshull. Endre tillatelser på filen til skrivebeskyttet modus for operativsystem-brukeren brukt av web-server. Hvis du bruker Windows og FAT format for disken din, må du vite at dette filsystemet ikke tillater å legge til tillatelser på filen, så du kan ikke være helt sikker.
+WarningsOnXLines=Advarsler på <b>%s</b> kildelinje(r)
+WarningNoDocumentModelActivated=Ingen modell, for dokumentgenerrering, er blitt aktivert. En modell vil bli valgt som standard til du kontrollerer moduloppsettet.
+WarningLockFileDoesNotExists=ADVARSEL! Når setup er ferdig, må du deaktivere installasjon/migrasjons-verktøy ved å legge til filen <b>install.lock</b> i mappen <b>%s</b>. Uten denne filen er sikkerheten kraftig redusert
+WarningUntilDirRemoved=Alle sikkerhetsadvarsler (synlige for admin-brukere) vil være aktiv så lenge sårbarhet er tilstede (eller at konstant MAIN_REMOVE_INSTALL_WARNING legges i Oppset-> Andre innstillinger).
+WarningCloseAlways=Advarsel! Avsluttes selv om beløpet er forskjellig mellom kilde- og målelementer. Aktiver denne funksjonen med forsiktighet.
+WarningUsingThisBoxSlowDown=Advarsel! Ved å bruke denne boksen vil du gjøre alle sider som bruker den, tregere.
+WarningClickToDialUserSetupNotComplete=Oppsett av KlikkForÅRinge informasjon for din bruker er ikke komplett (Se fanen KlikkForÅRinge på ditt bruker-kort)
+WarningNotRelevant=Irrelevant operasjon for dette datasettet
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Egenskapen er deaktivert når visningsoppsettet er optimalisert for blinde personer eller tekstbaserte nettlesere.
 WarningPaymentDateLowerThanInvoiceDate=Betalingsdato (%s) er tidligere enn fakturadato (%s) for faktura %s.
 WarningTooManyDataPleaseUseMoreFilters=For mange data. Bruk flere filtre
+WarningSomeLinesWithNullHourlyRate=Når brukere ikke legger inn timeprisen riktig, kan 0 bli registrert. Dette kan resultere i feil verdisetting av tidsbruk
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index 2477c01aff7..459dc622b9c 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -5,10 +5,10 @@ NewExport=Ny eksport
 NewImport=Ny import
 ExportableDatas=Eksporterbart datasett
 ImportableDatas=Importerbart datasett
-SelectExportDataSet=Velg det datasett du vil eksportere...
-SelectImportDataSet=Velg dataset du vil importere ...
+SelectExportDataSet=Velg datasettet du vil eksportere...
+SelectImportDataSet=Velg datasettet du vil importere ...
 SelectExportFields=Velg felter for eksport, eller velg en forhåndsdefinert eksportprofil
-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:
+SelectImportFields=Velg feltene du vil importere fra kildefilen og deres mål-felt i databasen, ved å flytte dem opp og ned med %s, eller velg en forhåndsdefinert import-profil:
 NotImportedFields=Felt av kildefilen ikke importert
 SaveExportModel=Lagre denne eksportprofilen hvis du har tenkt å bruke den senere ...
 SaveImportModel=Lagre denne importen profilen hvis du har tenkt å bruke den senere ...
@@ -18,75 +18,75 @@ ExportableFields=Eksporterbare felt
 ExportedFields=Eksporterte felt
 ImportModelName=Import profilnavn
 ImportModelSaved=Importer profilen lagret under navnet <b>%s.</b>
-ImportableFields=Importable felt
+ImportableFields=Importerbare felt
 ImportedFields=Importerte felt
 DatasetToExport=Datasett til eksport
-DatasetToImport=Import-filen til datasettet
+DatasetToImport=Importer filen til datasettet
 NoDiscardedFields=Ingen felt i kildefilen forkastes
 Dataset=Datasett
 ChooseFieldsOrdersAndTitle=Velg feltrekkefølge...
 FieldsOrder=Feltrekkefølge
 FieldsTitle=Felttittel
-FieldOrder=Field bestilling
+FieldOrder=Feltrekkefølge
 FieldTitle=Felt tittel
 ChooseExportFormat=Velg ekportformat
 NowClickToGenerateToBuildExportFile=Trykk på "Opprett" for å lage eksportfilen...
 AvailableFormats=Tilgjengelige formater
 LibraryShort=Bibliotek
-LibraryUsed=Bibliotek
+LibraryUsed=Brukt bibliotek
 LibraryVersion=Versjon
 Step=Trinn
 FormatedImport=Importassistent
 FormatedImportDesc1=I dette området kan du uten teknisk kunnskap importere egne data ved hjelp av en assistent.
 FormatedImportDesc2=Første trinn er å velge type data du vil importere, deretter hvilken fil du vil importere og til slutt hvilke felt du vil importere.
-FormatedExport=Export assistant
-FormatedExportDesc1=I denne området kan du uten teknisk kunnskap eksportere egne data ved hjelp av en assistent.
+FormatedExport=Eksportassistent
+FormatedExportDesc1=I dette området kan du uten teknisk kunnskap eksportere egne data ved hjelp av en assistent.
 FormatedExportDesc2=Første trinn er å velge et forhåndsdefinert datasett, deretter hvilke felt du ønsker å eksportere og i hvilken rekkefølge du vil ha dem.
 FormatedExportDesc3=Når du har valgt hva du vil eksportere velger du hvilket filformat du vil eksportere til.
 Sheet=Ark
 NoImportableData=Ingen importerbare data (ingen modul tillater dataimport)
 FileSuccessfullyBuilt=Eksportfil er opprettet
-SQLUsedForExport=SQL Be brukes til å bygge eksportfilen
-LineId=ID av linje
-LineDescription=Beskrivelse av line
+SQLUsedForExport=SQL forespørsel brukt til å bygge eksportfilen
+LineId=Linje-ID
+LineDescription=Beskrivelse av linje
 LineUnitPrice=Enhetspris på linje
 LineVATRate=MVA-sats på linje
 LineQty=Kvantum for linje
-LineTotalHT=Mengde etter skatt for linje
+LineTotalHT=Netto etter skatt for linje
 LineTotalTTC=Beløp med skatt for linje
-LineTotalVAT=Mengde av merverdiavgift for linje
-TypeOfLineServiceOrProduct=Type line (0 = produkt, en tjeneste =)
+LineTotalVAT=MVA-beløp for linje
+TypeOfLineServiceOrProduct=Linjetype (0=vare, 1=tjeneste)
 FileWithDataToImport=Fil med data som skal importeres
-FileToImport=Kilde filen du vil importere
+FileToImport=Kildefilen du vil importere
 FileMustHaveOneOfFollowingFormat=Filen som skal importeres må ha ett av følgende format
-DownloadEmptyExample=Last ned eksempel på tom kildefilen
+DownloadEmptyExample=Last ned eksempel på tom kildefil
 ChooseFormatOfFileToImport=Velg filformatet du vil bruke som importere filformatet ved å klikke på picto %s å velge den ...
 ChooseFileToImport=Last opp fil klikk picto %s å velge filen som kilde importfil ...
-SourceFileFormat=Kilde filformat
+SourceFileFormat=Kildefil-format
 FieldsInSourceFile=Felt i kildefilen
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
-Field=Field
+FieldsInTargetDatabase=Målfelt i Dolibarr-databasen (uthevet=obligatorisk)
+Field=Felt
 NoFields=Ingen felt
-MoveField=Flytt feltet kolonnenummer %s
-ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Lagre denne importen profilen
-ErrorImportDuplicateProfil=Kunne ikke lagre denne importen profil med dette navnet. En eksisterende profil finnes allerede med dette navnet.
-ImportSummary=Import oppsett sammendrag
-TablesTarget=Målrettet tabeller
-FieldsTarget=Målrettet felt
-TableTarget=Målrettet tabellen
-FieldTarget=Målrettet feltet
-FieldSource=Kilde-feltet
+MoveField=Flytt feltet med kolonnenummer %s
+ExampleOfImportFile=Importfil_eksempel
+SaveImportProfile=Lagre denne import-profilen
+ErrorImportDuplicateProfil=Kunne ikke lagre import-profilen. En eksisterende profil finnes allerede med dette navnet.
+ImportSummary=Sammendragav Import-oppsett 
+TablesTarget=Måltabeller
+FieldsTarget=Målfelt
+TableTarget=Måltabell
+FieldTarget=Målfelt
+FieldSource=Kildefelt
 DoNotImportFirstLine=Ikke importer første linje av kildefilen
 NbOfSourceLines=Antall linjer i kildefilen
 NowClickToTestTheImport=Sjekk import parametre du har definert. Hvis de er riktige, klikker du på knappen <b>"%s"</b> til å lansere en simulering av importen (ingen data vil bli endret i databasen, det er bare en simulering for øyeblikket) ...
-RunSimulateImportFile=Start import simuleringen
-FieldNeedSource=This field requires data from the source file
-SomeMandatoryFieldHaveNoSource=Noen obligatoriske felt er ikke noen kilder fra datafilen
+RunSimulateImportFile=Start import-simuleringen
+FieldNeedSource=Dette feltet krever data fra kildefilen
+SomeMandatoryFieldHaveNoSource=Noen obligatoriske felt har ikke noen kilder fra datafilen
 InformationOnSourceFile=Informasjon om kildefilen
-InformationOnTargetTables=Informasjon om målet felt
-SelectAtLeastOneField=Bytt minst en kilde feltet i kolonnen av felt til eksport
-SelectFormat=Velg denne importen filformatet
+InformationOnTargetTables=Informasjon om målfeltene
+SelectAtLeastOneField=Bytt minst ett kildefelt i kolonnen av felt som skal eksporteres
+SelectFormat=Velg dette filformatet for import
 RunImportFile=Innlede importfil
 NowClickToRunTheImport=Sjekk resultatet av import simulering. Hvis alt er ok, starter definitiv import.
 DataLoadedWithId=Alle data vil bli lastet med følgende import id: <b>%s</b>
@@ -102,33 +102,33 @@ NbOfLinesImported=Antall linjer importert: <b>%s.</b>
 DataComeFromNoWhere=Verdi for å sette inn kommer fra ingensteds i kildefilen.
 DataComeFromFileFieldNb=Verdi for å sette inn kommer fra felt nummer <b>%s</b> i kildefilen.
 DataComeFromIdFoundFromRef=Verdi som kommer fra feltet antall <b>%s</b> av kildefilen vil bli brukt til å finne id av overordnede objektet som skal brukes (Så Objet <b>%s</b> som har dommeren. Fra kildefilen må finnes i Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Koden som kommer fra feltnummer <b>%s</b> i kildefilen vil bli brukt til å finne id til overordnet objekt som skal brukes (koden fra kildefilen må finnes i ordlisten <b>%s</b>). Merk at hvis du kjenner id'en, kan du også bruke den i kildefilen i stedet for koden. Import skal fungere i begge tilfeller.
 DataIsInsertedInto=Data kommer fra kildefil blir satt inn på følgende felt:
 DataIDSourceIsInsertedInto=IDen til overordnede objektet ble funnet ved hjelp av dataene i kildefilen, vil bli satt inn på følgende felt:
 DataCodeIDSourceIsInsertedInto=Id av foreldrene linje funnet fra kode, vil bli satt inn i følgende felt:
 SourceRequired=Dataverdi er obligatorisk
-SourceExample=Eksempel på mulige dataverdi
+SourceExample=Eksempel på mulig dataverdi
 ExampleAnyRefFoundIntoElement=Enhver ref funnet for element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Kode (eller ID) funnet i ordlisten <b>%s</b>
 CSVFormatDesc=<b>Kommadelte Verdi</b> filformatet (. CSV). <br> Dette er en tekstfil format der feltene er atskilt med skilletegn [%s]. Hvis separatoren blir funnet inne i et felt innhold, er felt omgitt av runde tegn [%s]. Escape karakter å unnslippe runde tegn er [%s].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
-CsvOptions=Csv Options
+Excel95FormatDesc=<b>Excel</b> filformat (.xls)<br>Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> filformat (.xlsx)<br>Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tabulator-separert verdi</b> filformat (.tsv)<br>Dette er et tekstfilformat der teksten er separert med tabulator [tab].
+ExportFieldAutomaticallyAdded=Feltet <b>%s</b> ble lagt til automatisk. Det vil forhindre at like linjer blir behandlet som duplikater (med dette feltet vil alle linjer få sin egen ID og dermed være ulike).
+CsvOptions=CSV innstillinger
 Separator=Separator
-Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
+Enclosure=Innbygging
+SuppliersProducts=Leverandørs varer
 BankCode=Bank code (ikke i Norge)
 DeskCode=Desk code (ikke i Norge)
 BankAccountNumber=Kontonummer
 BankAccountNumberKey=Nøkkel
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+SpecialCode=Spesialkode
+ExportStringFilter=%% tillater at at en eller flere karakterer i teksten kan erstattes
+ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD : filtrert etter år/måned/dag<br>ÅÅÅÅ+ÅÅÅÅ, ÅÅÅÅMM+ÅÅÅÅMM, ÅÅÅÅMMDD+ÅÅÅÅMMDD: filtrerer en tidsperiode<br> > ÅÅÅÅ, > ÅÅÅÅMM, > ÅÅÅÅMMDD: filteret velger alle påfølgende år<br> < ÅÅÅÅ, < ÅÅÅÅMM, < ÅÅÅÅMMDD: filteret velger alle foregående år
+ExportNumericFilter='NNNNN' filtrer etter en verdi<br>'NNNNN+NNNNN' filtrerer etter verdirekke<br>'&gt;NNNNN' filtrerer etter synkende verdier<br>'&gt;NNNNN' filtrerer etter stigende verdier
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+SelectFilterFields=Hvis du vil filtrere etter noen verdier, kan du endre dem her
+FilterableFields=Filtrerbar
+FilteredFields=Filtrerte felt
+FilteredFieldsValues=Filterverdi
diff --git a/htdocs/langs/nb_NO/externalsite.lang b/htdocs/langs/nb_NO/externalsite.lang
index a9bb5c5b6b8..7a530d73f28 100644
--- a/htdocs/langs/nb_NO/externalsite.lang
+++ b/htdocs/langs/nb_NO/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Oppsett lenke til ekstern nettside
+ExternalSiteSetup=Oppsett av lenke til ekstern nettside
 ExternalSiteURL=Ekstern nettstedadresse
-ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
+ExternalSiteModuleNotComplete=Modulen Ekstern Side ble ikke riktig konfigurert.
+ExampleMyMenuEntry=Meny overskrift
diff --git a/htdocs/langs/nb_NO/ftp.lang b/htdocs/langs/nb_NO/ftp.lang
index d0601a56610..e6489900da0 100644
--- a/htdocs/langs/nb_NO/ftp.lang
+++ b/htdocs/langs/nb_NO/ftp.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP klient modul oppsett
-NewFTPClient=Ny FTP tilkoblingsoppsettet
-FTPArea=FTP området
+FTPClientSetup=Oppset av FTP-klient modulen
+NewFTPClient=Nytt oppsett av FTP- tilkobling
+FTPArea=FTP område
 FTPAreaDesc=Denne skjermen viser innholdet på en FTP server visning
-SetupOfFTPClientModuleNotComplete=Oppsett av FTP-klient modul synes å være ikke fullstendig
+SetupOfFTPClientModuleNotComplete=Oppsett av FTP-klient modul synes å være ufullstendig
 FTPFeatureNotSupportedByYourPHP=Din PHP støtter ikke FTP-funksjoner
 FailedToConnectToFTPServer=Kunne ikke koble til FTP-server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Klarte å logge inn på FTP-server med definert brukernavn og passord
-FTPFailedToRemoveFile=Klarte å fjerne filen <b>%s.</b>
+FailedToConnectToFTPServerWithCredentials=Klarte ikke å logge inn på FTP-server med angitt brukernavn og passord
+FTPFailedToRemoveFile=Klarte ikke å fjerne filen <b>%s.</b>
 FTPFailedToRemoveDir=Kunne ikke fjerne katalogen <b>%s</b> (Sjekk tillatelser, og at katalogen er tom).
-# FTPPassiveMode=Passive mode
+FTPPassiveMode=Passiv modus
diff --git a/htdocs/langs/nb_NO/help.lang b/htdocs/langs/nb_NO/help.lang
index 64d05df250b..db542e78f54 100644
--- a/htdocs/langs/nb_NO/help.lang
+++ b/htdocs/langs/nb_NO/help.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum / Wiki-støtte
-EMailSupport=Emails støtte
-RemoteControlSupport=Online sanntid / ekstern støtte
-OtherSupport=Annen støtte
-ToSeeListOfAvailableRessources=For å kontakte / se tilgjengelige ressurser:
+CommunitySupport=Forum/Wiki-support
+EMailSupport=Epostsupport
+RemoteControlSupport=Online support
+OtherSupport=Annen support
+ToSeeListOfAvailableRessources=For å se tilgjengelige ressurser:
 ClickHere=Klikk her
 HelpCenter=Brukerstøtte
-DolibarrHelpCenter=Dolibarr Hjelp og støtte
+DolibarrHelpCenter=Dolibarr hjelp og support
 ToGoBackToDolibarr=Ellers, klikk <a href="%s">her for å bruke Dolibarr</a>
-TypeOfSupport=Kilde til støtte
-TypeSupportCommunauty=Community (gratis)
+TypeOfSupport=Kilde til support
+TypeSupportCommunauty=Brukergruppe (gratis)
 TypeSupportCommercial=Kommersiell
 TypeOfHelp=Type
-NeedHelpCenter=Trenger du hjelp eller støtte?
+NeedHelpCenter=Trenger du support?
 Efficiency=Effektivitet
-TypeHelpOnly=Hjelp bare
+TypeHelpOnly=Kun hjelp
 TypeHelpDev=Hjelp + Utvikling
 TypeHelpDevForm=Hjelp + utvikling + Dannelse
-ToGetHelpGoOnSparkAngels1=Noen selskaper kan gi en rask (umiddelbar gang) og mer effektiv online-støtte ved å ta kontroll over datamaskinen. Slike hjelpere kan bli funnet på <b>%s</b> nettsted:
-ToGetHelpGoOnSparkAngels3=Du kan også gå til listen over alle tilgjengelige trenere for Dolibarr, for dette klikk på knappen
-ToGetHelpGoOnSparkAngels2=Noen ganger er det ingen selskap tilgjengelig i det øyeblikket du gjøre søk, så tenk å endre filter for å se etter "alt tilgjengelighet". Du vil kunne sende flere forespørsler.
-BackToHelpCenter=Ellers, her klikker du gå <a href="%s">tilbake til hjemmesiden for brukerstøtten</a> .
-LinkToGoldMember=Du kan ringe en av coach forhåndsvalgt ved Dolibarr for ditt språk (%s) ved å klikke sine Widget (status og høyeste pris er automatisk oppdatert):
+ToGetHelpGoOnSparkAngels1=Noen selskaper kan gi en rask (av og til umiddelbar) og mer effektiv online-support ved å ta kontroll over datamaskinen. Slik hjelp kan bli funnet på <b>%s</b> nettsted:
+ToGetHelpGoOnSparkAngels3=Du kan også gå til listen over alle tilgjengelig support for Dolibarr. For dette, klikk på knappen
+ToGetHelpGoOnSparkAngels2=Noen ganger er det ingen selskap tilgjengelig når du søker. Endre filteret for å se etter "alle tilgjengelige". Du vil da kunne sende flere forespørsler.
+BackToHelpCenter=Ellers, klikk her for å gå <a href="%s">tilbake til hjemmesiden for brukerstøtte</a> .
+LinkToGoldMember=Du kan ringe forhåndsvalgt support fra Dolibarr for ditt språk (%s) ved å klikke dennes Widget (status og maksimumspris blir automatisk oppdatert):
 PossibleLanguages=Støttede språk
-MakeADonation=Hjelp Dolibarr prosjektet, gjøre en donasjon
-# SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-# SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+MakeADonation=Hjelp Dolibarr prosjektet, gjør en donasjon
+SubscribeToFoundation=Hjelp Dolibarr prosjektet, gi en donasjon
+SeeOfficalSupport=For offisiell Dolibarr support på ditt språk: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index 77547730107..48f02058f3b 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -1,148 +1,151 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
-Employe=Employee
+Holidays=Ferier
+CPTitreMenu=Ferier
+MenuReportMonth=Månedlig uttalelse
+MenuAddCP=Ny feriesøknad
+NotActiveModCP=Du må aktivere modulen Ferier for å vise denne siden
+NotConfigModCP=Du må konfigurere modulen Ferier for å vise denne siden.For å gjøre dette, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> klikk her </ a>.
+NoCPforUser=Du har ingen tilgjengelige dager
+AddCP=Opprett feriesøknad
+Employe=Ansatt
 DateDebCP=Startdato
 DateFinCP=Sluttdato
 DateCreateCP=Opprettet den
 DraftCP=Utkast
-ToReviewCP=Awaiting approval
+ToReviewCP=Venter på godkjenning
 ApprovedCP=Godkjent
 CancelCP=Kansellert
 RefuseCP=Nektet
-ValidatorCP=Approbator
-ListeCP=List of leaves
-ReviewedByCP=Will be reviewed by
+ValidatorCP=Godkjenner
+ListeCP=Liste over ferier
+ReviewedByCP=Vil bli gjennomgått av
 DescCP=Beskrivelse
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+SendRequestCP=Opprett feriesøknad
+DelayToRequestCP=Søknader må opprettes minst <b>%s dag(er)</b> før ferien skal starte
+MenuConfCP=Endre feriebalanse
+UpdateAllCP=Oppdater ferier
+SoldeCPUser=Feriebalansen er <b>%s</b> dager.
+ErrorEndDateCP=Sluttdato må være senere en startdato
+ErrorSQLCreateCP=En SQL feil oppsto under opprettelse:
+ErrorIDFicheCP=En feil oppsto. Feriesøknaden finnes ikke
+ReturnCP=Tilbake til forrige side
+ErrorUserViewCP=Du er ikke autorisert for å lese denne feriesøknaden
+InfosCP=Informasjon om feriesøknad
+InfosWorkflowCP=Informasjon om arbeidsflyt
+RequestByCP=Forespurt av
+TitreRequestCP=Feriesøknad
+NbUseDaysCP=Antall brukte feriedager
 EditCP=Rediger
 DeleteCP=Slett
-ActionValidCP=Godkjenn
-ActionRefuseCP=Refuse
+ActionValidCP=Valider
+ActionRefuseCP=Avvis
 ActionCancelCP=Avbryt
 StatutCP=Status
-SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-CantUpdate=You cannot update this leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+SendToValidationCP=Send til validering
+TitleDeleteCP=Slett en feriesøknad
+ConfirmDeleteCP=Bekrefte sletting av denne feriesøknaden?
+ErrorCantDeleteCP=Feil! Du har ikke lov til å slette denne feriesøknaden
+CantCreateCP=Du har ikke lov til å opprette feriesøknader.
+InvalidValidatorCP=Du må velge en godkjenner for din feriesøknad.
+CantUpdate=Du kan ikke oppdatere denne feriesøknaden.
+NoDateDebut=Du må velge en startdato.
+NoDateFin=Du må velge en sluttdato.
+ErrorDureeCP=Perioden du søker for inneholder ikke arbeidsdager
+TitleValidCP=Godkjenn feriesøknaden
+ConfirmValidCP=Er du sikker på at du vil godkjenne feriesøknaden?
+DateValidCP=Godkjent dato
+TitleToValidCP=Send feriesøknad
+ConfirmToValidCP=Er du sikker på at du vil sende feriesøknaden?
+TitleRefuseCP=Avvis feriesøknaden
+ConfirmRefuseCP=Er du sikker på at du vil avvise feriesøknaden?
+NoMotifRefuseCP=Du må velge en årsak for avvisning av søknaden
+TitleCancelCP=Kanseller feriesøknaden
+ConfirmCancelCP=Er du sikker på at du vil kansellere feriesøknaden?
+DetailRefusCP=Avvisningsårsak
+DateRefusCP=Avvist dato
+DateCancelCP=Kansellert dato
+DefineEventUserCP=Tildel ekstraordinær ferie for bruker
+addEventToUserCP=Tildel ferie
 MotifCP=Begrunnelse
 UserCP=Bruker
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
+ErrorAddEventToUserCP=En feil oppsto ved opprettelse av ekstraordinær ferie
+AddEventToUserOkCP=Opprettelse av ekstraordinær ferie er utført
+MenuLogCP=Vis endringslogger
+LogCP=Logg over oppdateringer av tilgjengelige feriedager
+ActionByCP=Utført av
+UserUpdateCP=For bruker
+PrevSoldeCP=Forrige balanse
+NewSoldeCP=Ny balanse
+alreadyCPexist=En feriesøknad er allerede utført for denne perioden
 UserName=Navn
-Employee=Employee
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
+Employee=Ansatt
+FirstDayOfHoliday=Første feriedag
+LastDayOfHoliday=Siste feriedag
+HolidaysMonthlyUpdate=Månedlig oppdatering
+ManualUpdate=Manuell oppdatering
+HolidaysCancelation=Kansellering av feriesøknader
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
-DescOptionCP=Description of the option
+ConfCP=Oppsett av modulen Ferier
+DescOptionCP=Beskrivelse
 ValueOptionCP=Verdi
-GroupToValidateCP=Group with the ability to approve leave requests
+GroupToValidateCP=Gruppe som kan godkjenne feriesøknader
 ConfirmConfigCP=Valider konfigurasjonen
-LastUpdateCP=Last automatic update of leaves allocation
+LastUpdateCP=Siste  automatiske oppdatering av ferietildeling
+MonthOfLastMonthlyUpdate=Måned med siste automatiske oppdatering av ferieallokering
 UpdateConfCPOK=Vellykket oppdatering.
 ErrorUpdateConfCP=En feil oppsto under oppdatering, vennligst prøv igjen.
-AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of leave request
-TitleOptionEventCP=Settings of leave requets for events
-ValidEventCP=Godkjenn
-UpdateEventCP=Update events
+AddCPforUsers=Legg til balanse over ferietildeling. <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikk her</a>.
+DelayForSubmitCP=Siste frist for feriesøknader
+AlertapprobatortorDelayCP=Hindre godkjenning hvis feriesøknaden ikke holder tidsfristen
+AlertValidatorDelayCP=Hindre godkjenning av feriesøknaden hvis overstiger tilgjengelig forsinkelse
+AlertValidorSoldeCP=Hindre godkjenning av feriesøknaden hvis den overstiger balanse
+nbUserCP=Antall brukere støttet i Ferie-modulen
+nbHolidayDeductedCP=Antall dager som skal trekkes fra ved avvikling av ferie
+nbHolidayEveryMonthCP=Antall feriedager som legges til hver måned
+Module27130Name= Håndtering av feriesøknader
+Module27130Desc= Håndtering av feriesøknader
+TitleOptionMainCP=Hovedoppsett av feriesøknader
+TitleOptionEventCP=Innstillinger av feriesøknader ved hendelser
+ValidEventCP=Valider
+UpdateEventCP=Oppdater hendelser
 CreateEventCP=Opprett
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
+NameEventCP=Hendelsesnavn
+OkCreateEventCP=Hendelse lagt til
+ErrorCreateEventCP=Feil ved opprettelse av hendelse
+UpdateEventOkCP=Hendelsen ble oppdatert
+ErrorUpdateEventCP=Feil ved oppdatering av hendelse
+DeleteEventCP=Slett hendelse
+DeleteEventOkCP=Hendelsen er blitt slettet
+ErrorDeleteEventCP=Feil ved sletting av hendelse
+TitleDeleteEventCP=Slett en ekstraordinær ferie
+TitleCreateEventCP=Opprett ekstraordinær ferie
+TitleUpdateEventCP=Endre eller slett en ekstraordinær ferie
 DeleteEventOptionCP=Slett
 UpdateEventOptionCP=Oppdater
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Leaves
+ErrorMailNotSend=En feil oppsto ved sending av e-post:
+NoCPforMonth=Ingen ferie denne måneden
+nbJours=Antall dager
+TitleAdminCP=Oppsett av ferier
+NoticePeriod=Oppsigelsestid
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Hello=Hallo
+HolidaysToValidate=Valider feriesøknader
+HolidaysToValidateBody=Under er en feriesøknad for validering
+HolidaysToValidateDelay=Denne ferien avvikles innen %s dager
+HolidaysToValidateAlertSolde=Brukeren som sendte inn denne feriesøknaden har ikke nok tilgjengelige dager.
+HolidaysValidated=Validerte feriesøknader
+HolidaysValidatedBody=Feriesøknaden din for perioden %s til %s er blitt validert
+HolidaysRefused=Søknad avvist
+HolidaysRefusedBody=Feriesøknaden din for perioden %s til %s er blitt avvist med følgende årsak:
+HolidaysCanceled=Kansellert feriesøknad
+HolidaysCanceledBody=Feriesøknaden din for perioden %s til %s er blitt kansellert.
+Permission20001=Les dine egne feriesøknader
+Permission20002=Opprett/endre dine egne feriesøknader
+Permission20003=Slett feriesøknad
+Permission20004=Les feriesøknader fra alle
+Permission20005=Opprett/endre feriesøknader for alle
+Permission20006=Administrer feriesøknader (oppsett og oppdater balanse)
+NewByMonth=Lagt til pr. måned
+GoIntoDictionaryHolidayTypes=Gå til <strong>Hjem - Oppsett - Ordlister - Ferietyper</strong> for å sette oppforskjellige typer ferier.
diff --git a/htdocs/langs/nb_NO/incoterm.lang b/htdocs/langs/nb_NO/incoterm.lang
index 2396d2acb0e..7c6c1dccec0 100644
--- a/htdocs/langs/nb_NO/incoterm.lang
+++ b/htdocs/langs/nb_NO/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
+Module62000Name=Incoterm
+Module62000Desc=Legg til egenskaper for å administrere Incoterm
+IncotermLabel=Incotermer
+IncotermSetupTitle1=Egenskap
 IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetup=Oppsett av Incoterm-modulen
+IncotermFunctionDesc=Aktiver Incoterm (Tredjepart, Tilbud, Kundeordre, Kundefaktura, Forsendelse, Leverandørordre)
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index 68733baa63f..7a64eb356d5 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -8,9 +8,9 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurasjonsfil <b>%s</b> eksisterer
 ConfFileCouldBeCreated=Konfigurasjonsfil <b>%s</b> kunne bli skapt.
 ConfFileIsNotWritable=Konfigurasjonsfil <b>%s</b> er ikke skrivbar. Sjekk tillatelser. For første installere, må webserveren få innvilget å kunne skrive inn i denne filen under konfigureringen ("chmod 666" for eksempel på en Unix som OS).
 ConfFileIsWritable=Konfigurasjonsfil <b>%s</b> er skrivbar.
-ConfFileReload=Reload all informasjon fra konfigurasjonsfilen.
+ConfFileReload=Last inn all informasjon fra konfigurasjonsfilen igjen.
 PHPSupportSessions=Dette PHP støtter sesjoner.
-PHPSupportPOSTGETOk=Dette PHP støtter variabler POST og GET.
+PHPSupportPOSTGETOk=Dette PHP støtter variablene POST og GET.
 PHPSupportPOSTGETKo=Det er mulig at din PHP-oppsettet støtter ikke variabler POST og / eller GET. Sjekk din parameter <b>variables_order</b> i php.ini.
 PHPSupportGD=Denne PHP-støtte GD grafiske funksjoner.
 PHPSupportUTF8=Denne PHP-støtte UTF8 funksjoner.
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Databaseserveren - Superbruker tilgang
 CheckToCreateDatabase=Boksen hvis databasen finnes ikke og må lages. <br> I dette tilfellet må du fylle login / passord for superuser kontoen nederst på denne siden.
 CheckToCreateUser=Boksen hvis databasen eieren ikke eksisterer og må opprettes. <br> I dette tilfellet må du velge sin login og passord, og også fylle brukernavn / passord for superuser kontoen nederst på denne siden. Hvis denne boksen ikke er avkrysset, eier database og passord må finnes.
 Experimental=(Eksperimentell)
+Deprecated=(utdatert)
 DatabaseRootLoginDescription=Logg inn av brukeren lov til å opprette nye databaser eller nye brukere, ubrukelig hvis databasen og databasen din logikk allerede eksisterer (som når du er vert for en web hosting leverandør).
 KeepEmptyIfNoPassword=La det være tomt hvis bruker har ingen passord (unngå denne)
 SaveConfigurationFile=Lagre verdier
@@ -90,12 +91,12 @@ YouNeedToPersonalizeSetup=Du må konfigurere Dolibarr som passer dine behov (uts
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login <b>'%s'</b> opprettet heldig.
 GoToDolibarr=Gå til Dolibarr
 GoToSetupArea=Gå til Dolibarr (setup-området)
-MigrationNotFinished=Versjon av dtabase din ikke er helt oppdatert, så du må kjøre upgrade prosessen igjen.
-GoToUpgradePage=Gå til side oppgradere igjen
+MigrationNotFinished=Databaseversjonen din ikke er helt oppdatert, så du må kjøre oppgraderingen på nytt.
+GoToUpgradePage=Gå til oppgraderingssiden igjen
 Examples=Eksempler
 WithNoSlashAtTheEnd=Uten skråstrek "/" på slutten
-DirectoryRecommendation=Det er recommanded å bruke en ut av ditt katalogen av websidene dine.
-LoginAlreadyExists=Det finnes allerede
+DirectoryRecommendation=Det er anbefalt å bruke en annen katalog enn den for websidene dine.
+LoginAlreadyExists=Finnes allerede
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr administratorkonto <b>'%s'</b> finnes allerede.
 WarningRemoveInstallDir=Advarsel, av sikkerhetshensyn, når installere eller oppgraderingen er fullført, bør du fjerne <b>installerer katalogen eller endre navnet til install.lock for å unngå den skadelige bruk.</b>
@@ -199,7 +200,7 @@ MigrationBankTransfertsNothingToUpdate=Alle linker er oppdatert
 MigrationShipmentOrderMatching=Sendings kvittering oppdatering
 MigrationDeliveryOrderMatching=Levering kvittering oppdatering
 MigrationDeliveryDetail=Levering oppdatering
-MigrationStockDetail=Oppdater lager verdien av produkter
+MigrationStockDetail=Oppdater lager verdien av varer
 MigrationMenusDetail=Oppdater dynamiske menyer tabeller
 MigrationDeliveryAddress=Oppdater leveringsadresse i leveransene
 MigrationProjectTaskActors=Data migrering for llx_projet_task_actors bord
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index cd64f8484af..db67a38383e 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -3,51 +3,51 @@ Intervention=Intervensjon
 Interventions=Intervensjoner
 InterventionCard=Intervensjonskort
 NewIntervention=Ny intervensjon
-AddIntervention=Create intervention
+AddIntervention=Opprett intervensjon
 ListOfInterventions=Oversikt over intervensjoner
 EditIntervention=Rediger intervensjon
-ActionsOnFicheInter=Handlinger om inngrep
+ActionsOnFicheInter=Handlinger ved intervensjon
 LastInterventions=Siste %s intervensjoner
 AllInterventions=Alle intervensjoner
 CreateDraftIntervention=Lag kladd
-CustomerDoesNotHavePrefix=Kunder har ikke noe prefix
+CustomerDoesNotHavePrefix=Kunder har ikke noen prefix
 InterventionContact=Intervensjonskontakt
 DeleteIntervention=Slett intervensjon
-ValidateIntervention=Godkjenn intervensjon
+ValidateIntervention=Valider intervensjon
 ModifyIntervention=Endre intervensjon
 DeleteInterventionLine=Slett intervensjonslinje
 ConfirmDeleteIntervention=Er du sikker på at du vil slette denne intervensjonen?
-ConfirmValidateIntervention=Er du sikker på at du vil godkjenne denne intervensjonen?
+ConfirmValidateIntervention=Er du sikker på at du vil validere denne intervensjonen under navnet <b>%s</b>?
 ConfirmModifyIntervention=Er du sikker på at du vil endre denne intervensjonen?
 ConfirmDeleteInterventionLine=Er du sikker på at du vil slette denne intervensjonslinjen?
-NameAndSignatureOfInternalContact=Navn og signatur tekniker :
-NameAndSignatureOfExternalContact=Navn og signatutr kunde :
+NameAndSignatureOfInternalContact=Kundebehandlers navn og signatur :
+NameAndSignatureOfExternalContact=Kundes navn og signatur :
 DocumentModelStandard=Standard dokumentet modell for intervensjoner
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Merk "Belastet"
-InterventionClassifyUnBilled=Merk "Ikke belastet"
+InterventionCardsAndInterventionLines=Intervensjoner og intervensjonslinjer
+InterventionClassifyBilled=Merk "Fakturert"
+InterventionClassifyUnBilled=Merk "Ikke fakturert"
 StatusInterInvoiced=Fakturert
 RelatedInterventions=Relaterte intervensjoner
 ShowIntervention=Vis intervensjon
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+SendInterventionRef=Send intervensjon %s
+SendInterventionByMail=Send intervensjon med e-post
+InterventionCreatedInDolibarr=Intervensjon %s opprettet
+InterventionValidatedInDolibarr=Intervensjon %s validert
+InterventionModifiedInDolibarr=Intervensjon %s endret
+InterventionClassifiedBilledInDolibarr=Intervensjon %s satt til fakturert
+InterventionClassifiedUnbilledInDolibarr=Intervensjon %s satt til ufakturert
+InterventionSentByEMail=Intervensjon %s sendt med e-post
+InterventionDeletedInDolibarr=Intervensjon %s ble slettet
+SearchAnIntervention=Søk etter intervensjon
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Ansvarlig for å følge opp intervensjonen
-TypeContact_fichinter_internal_INTERVENING=Tekniker
+TypeContact_fichinter_internal_INTERVENING=Behandler
 TypeContact_fichinter_external_BILLING=Kundens fakturakontakt
-TypeContact_fichinter_external_CUSTOMER=Ansvarlig hos kunden for oppfølging
+TypeContact_fichinter_external_CUSTOMER=Ansvarlig for kundeoppfølging
 # Modele numérotation
 ArcticNumRefModelDesc1=Generisk nummereringsmodell
 ArcticNumRefModelError=Feil ved aktivering
-PacificNumRefModelDesc1=Gir et nummer med formatet %sååmm-nnnn hvor åå er året, mm er måneden og nnnn er et løpenummer som ikke settes tilbake til null
+PacificNumRefModelDesc1=Gir et nummer med formatet %sååmm-nnnn hvor åå er året, mm er måneden og nnnn er et løpenummer som ikke kan settes tilbake til 0
 PacificNumRefModelError=Det finnes allerede et intervensjonskort som starter med  $sååmm, og dette er ikke kompatibelt med denne nummereringsmodellen. Du må fjerne denne for å aktivere denne modellen.
-PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
+PrintProductsOnFichinter=Skriv ut varer på intervensjonskortet
+PrintProductsOnFichinterDetails=intervensjoner generert fra ordre
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 08258b18b0b..43282c5b149 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -2,50 +2,55 @@
 
 Language_ar_AR=Arabisk
 Language_ar_SA=Arabisk
+Language_bn_BD=Bengalsk
 Language_bg_BG=Bulgarsk
 Language_bs_BA=Bosnisk
 Language_ca_ES=Katalansk
-Language_cs_CZ=Czech
+Language_cs_CZ=Tsjekkisk
 Language_da_DA=Dansk
 Language_da_DK=Dansk
 Language_de_DE=Tysk
 Language_de_AT=Tysk (Østerrike)
 Language_de_CH=Tysk (Sveits)
 Language_el_GR=Gresk
-Language_en_AU=English (Australia)
+Language_en_AU=Engelsk (Australia)
 Language_en_CA=Engelsk (Canada)
-Language_en_GB=English (United Kingdom)
-Language_en_IN=English (India)
+Language_en_GB=Engelsk (U.K.)
+Language_en_IN=Engelsk (India)
 Language_en_NZ=Engelsk (New Zealand)
-Language_en_SA=Norsk (Saudi-Arabia)
-Language_en_US=English (United States)
-Language_en_ZA=Norsk (Sør-Afrika)
+Language_en_SA=Engelsk (Saudi-Arabia)
+Language_en_US=Engelsk (USA)
+Language_en_ZA=Engelsk (Sør-Afrika)
 Language_es_ES=Spansk
-Language_es_DO=Spansk (Den Dominikanske republikk)
 Language_es_AR=Spansk (Argentina)
 Language_es_CL=Spansk (Chile)
+Language_es_CO=Spansk (Colombia)
+Language_es_DO=Spansk (Den Dominikanske republikk)
 Language_es_HN=Spansk (Honduras)
 Language_es_MX=Spansk (Mexico)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
-Language_et_EE=Estonian
-Language_eu_ES=Basque
-Language_fa_IR=Persian
-Language_fi_FI=Svømmeføtter
+Language_et_EE=Estonsk
+Language_eu_ES=Baskisk
+Language_fa_IR=Persisk
+Language_fi_FI=Finsk
 Language_fr_BE=Fransk (Belgia)
 Language_fr_CA=Fransk (Canada)
 Language_fr_CH=Fransk (Sveits)
 Language_fr_FR=Fransk
 Language_fr_NC=Fransk (Ny Caledonia)
-Language_he_IL=Hebrew
-Language_hr_HR=Croatian
+Language_he_IL=Hebraisk
+Language_hr_HR=Kroatisk
 Language_hu_HU=Ungarsk
 Language_id_ID=Indonesisk
 Language_is_IS=Islandsk
 Language_it_IT=Italiensk
 Language_ja_JP=Japansk
-Language_ko_KR=Korean
+Language_ka_GE=Georgisk
+Language_kn_IN=Kanadisk
+Language_ko_KR=Koreansk
+Language_lo_LA=Laotisk
 Language_lt_LT=Litauisk
 Language_lv_LV=Latvisk
 Language_mk_MK=Makedonsk
@@ -64,6 +69,7 @@ Language_sv_SV=Svensk
 Language_sv_SE=Svensk
 Language_sq_AL=Albansk
 Language_sk_SK=Slovakisk
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainsk
 Language_uz_UZ=Usbekisk
diff --git a/htdocs/langs/nb_NO/link.lang b/htdocs/langs/nb_NO/link.lang
index 8b1efb75ef3..951f0a60b50 100644
--- a/htdocs/langs/nb_NO/link.lang
+++ b/htdocs/langs/nb_NO/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Koble en ny fil/dokument
+LinkedFiles=Koblede filer og dokumenter
+NoLinkFound=Ingen registrerte koblinger
+LinkComplete=Filkoblingen ble opprettet
+ErrorFileNotLinked=Filen kunne ikke kobles
+LinkRemoved=Koblingen til %s ble fjernet
+ErrorFailedToDeleteLink= Klarte ikke å fjerne kobling'<b>%s</b>'
+ErrorFailedToUpdateLink= Klarte ikke å oppdatere koblingen til '<b>%s</b>'
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
new file mode 100644
index 00000000000..1bbbd6c4e0d
--- /dev/null
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Lån
+Loans=Lån
+NewLoan=Nytt lån
+ShowLoan=Vis lån
+PaymentLoan=Nedbetaling på lån
+ShowLoanPayment=Vis nedbetaling på lån
+Capital=Kapital
+Insurance=Forsikring
+Interest=Rente
+Nbterms=Antall terminer
+LoanAccountancyCapitalCode=Regnskapskode for kapital
+LoanAccountancyInsuranceCode=Regnskapskode for forsikring
+LoanAccountancyInterestCode=Regnskapskode for rente
+LoanPayment=Nedbetaling på lån
+ConfirmDeleteLoan=Bekreft sletting av dette lånet
+LoanDeleted=Lånet ble slettet
+ConfirmPayLoan=Bekreft at dette lånet er klassifisert som betalt
+LoanPaid=Lån nedbetalt
+ErrorLoanCapital=Lånebeløp må være numerisk og større en null
+ErrorLoanLength=Låneperioden må være numerisk og større enn null
+ErrorLoanInterest=Årlig rente må være numerisk og større enn null
+# Calc
+LoanCalc=Lånekalkulator
+PurchaseFinanceInfo=Kjøps- og finansieringsinformasjon
+SalePriceOfAsset=Aktiva salgspris
+PercentageDown=Prosentvis ned
+LengthOfMortgage=Låneperiode
+AnnualInterestRate=Årlig rente
+ExplainCalculations=Forklar utregninger
+ShowMeCalculationsAndAmortization=Vis utregninger og amortisering
+MortgagePaymentInformation=Nedbetalingsinformasjon
+DownPayment=Avdrag
+DownPaymentDesc= <b>Nedbetaling</b> = Lånebeløp * prosent ned / 100 (For 5% ned får man 5/100 eller 0.05)
+InterestRateDesc=<b>Rentefot</b> = Årsrente/100
+MonthlyFactorDesc=<b>Månedsfaktor</b> = Resultatet av følgende formel:
+MonthlyInterestRateDesc=<b>Månedlig rentefot</b> = Årlig rentefot / 12 (mnd)
+MonthTermDesc=<b>Månedsterminer</b> = Låneperiode i år * 12
+MonthlyPaymentDesc=Månedlige nedbetalinger er regnet ut med følgende formel:
+AmortizationPaymentDesc=<a href="#amortization">amortisering</a> bryter ned hvor mye av den månedlige betalingen går til rentebetaling, og hvor mye som går til nedbetaling på lånet ditt.
+AmountFinanced=Finansieringsbeløp
+AmortizationMonthlyPaymentOverYears=Amortisering for månedlige avdrag: <b>%s</b> over %s år
+Totalsforyear=Totalt for året
+MonthlyPayment=Månedlig avdrag
+LoanCalcDesc=Denne <b>lånekalkulatoren</b> kan brukes til å finne ut månedlige utbetalinger på et lån, basert på kjøpspris, ønskede terminer, kjøperens forskuddsbetaling i prosent, og lånets rente. <br> Denne kalkulatoren tar med PMI (Private Mortgage Insurance) for lån hvor mindre enn 20% er satt som egenandel. Eiendomsskatt blir også tatt i betraktning, og dennes effekt på den totale månedlige etalingen. <br>
+GoToInterest=%s vil gå mot INTEREST
+GoToPrincipal=%s vil gå mot PRINCIPAL
+YouWillSpend=Du vil bruke %s på lånet i år %s
+# Admin
+ConfigLoan=Oppset av lån-modulen
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard regnskapskode for kapital
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard regnskapskode for renter
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard regnskapskode for forsikring
diff --git a/htdocs/langs/nb_NO/mailmanspip.lang b/htdocs/langs/nb_NO/mailmanspip.lang
index 7f877890be9..ebfa0937190 100644
--- a/htdocs/langs/nb_NO/mailmanspip.lang
+++ b/htdocs/langs/nb_NO/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed succesfully
-MailmanDeletionSuccess=Unsubscription test was executed succesfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
+MailmanSpipSetup=Oppsett av Mailman- og SPIP-modulen
+MailmanTitle=Mailman system for e-postlister
+TestSubscribe=For å teste abonnement til Mailman-lister
+TestUnSubscribe=For å teste fjerning av abonnement fra Mailman-lister
+MailmanCreationSuccess=Test av nytt abonnement var vellykket
+MailmanDeletionSuccess=Test av fjerning av abonnement var vellykket
+SynchroMailManEnabled=En Mailman-oppdatering vil bli utført
+SynchroSpipEnabled=En SPIP-oppdatering vil bli utført
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator-passord
+DescADHERENT_MAILMAN_URL=URL for Mailman abonnementer
+DescADHERENT_MAILMAN_UNSUB_URL=URL for fjerning av Mailman abonnementer
+DescADHERENT_MAILMAN_LISTS=Liste(r) for automatisk innmelding av nye medlemmer (separert med komma)
+SPIPTitle=Administrasjon av SPIP-innhold
 DescADHERENT_SPIP_SERVEUR=SPIP server
 DescADHERENT_SPIP_DB=SPIP databasenavn
 DescADHERENT_SPIP_USER=SPIP database innlogging
 DescADHERENT_SPIP_PASS=SPIP database passord
 AddIntoSpip=Legg til i SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+AddIntoSpipConfirmation=Er du sikker på at du vil legge dette medlemmet til i SPIP?
+AddIntoSpipError=Klarte ikke å legge til bruker i SPIP
+DeleteIntoSpip=Fjern fra SPIP
+DeleteIntoSpipConfirmation=Er du sikker på at du vil fjerne dette medlemmet fra SPIP?
+DeleteIntoSpipError=Klarte ikke å fjerne brukeren fra SPIP
+SPIPConnectionFailed=Klarte ikke å koble til SPIP
+SuccessToAddToMailmanList=Innmelding av %s til Mailman-liste %s eller SPIP-database utført
+SuccessToRemoveToMailmanList=Utmelding av %s til Mailman-liste %s eller SPIP-database utført
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index f886b9c1129..506a4e2e9bb 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -3,12 +3,12 @@ Mailing=E-postutsendelser
 EMailing=E-postutsendelser
 Mailings=E-postutsendelser
 EMailings=E-postutsendelser
-AllEMailings=Alle eMailings
+AllEMailings=Alle utsendelser
 MailCard=E-postkort
 MailTargets=Målgruppe
 MailRecipients=Mottagere
 MailRecipient=Mottager
-MailTitle=Kampanjetittel
+MailTitle=Beskrivelse
 MailFrom=Avsender
 MailErrorsTo=Feilmeldinger til
 MailReply=Svar til
@@ -23,61 +23,61 @@ ShowEMailing=Vis utsendelse
 ListOfEMailings=Oversikt over utsendelser
 NewMailing=Ny utsendelse
 EditMailing=Rediger utsendelse
-ResetMailing=Send e-post
+ResetMailing=Start utsendelse på nytt
 DeleteMailing=Slett utsendelse
 DeleteAMailing=Slett en utsendelse
 PreviewMailing=Forhåndsvis utsendelse
 PrepareMailing=Klargjør utsendelse
 CreateMailing=Opprett utsendelse
-MailingDesc=Her kan du sende e-postutesendelser til grupper av mottagere.
+MailingDesc=Her kan du sende e-poster til grupper av mottagere.
 MailingResult=Sendingsresultat
-TestMailing=Test utsendelse
-ValidMailing=Godkjenn utsendelse
-ApproveMailing=Aksepter utsendelse
+TestMailing=Test e-post
+ValidMailing=Valider utsendelse
+ApproveMailing=Godkjenn utsendelse
 MailingStatusDraft=Kladd
-MailingStatusValidated=Godkjent
-MailingStatusApproved=Akseptert
+MailingStatusValidated=Validert
+MailingStatusApproved=Godkjent
 MailingStatusSent=Sendt
 MailingStatusSentPartialy=Delvis sendt
-MailingStatusSentCompletely=Sendt fullt ut
+MailingStatusSentCompletely=Utsendelse komplett
 MailingStatusError=Feil
 MailingStatusNotSent=Ikke sendt
 MailSuccessfulySent=E-post ble sendt (fra %s til %s)
-MailingSuccessfullyValidated=Emailing validert
+MailingSuccessfullyValidated=Utsendelse validert
 MailUnsubcribe=Avmelding
 Unsuscribe=Avmelding
-MailingStatusNotContact=Avslutt kontakt
+MailingStatusNotContact=Skal ikke kontaktes flere ganger
 ErrorMailRecipientIsEmpty=E-postmottager er ikke oppgitt
 WarningNoEMailsAdded=Ingen ny e-post å legge til mottagerlisten.
-ConfirmValidMailing=Er du sikker på at du vil godkjenne utsendelsen?
-ConfirmResetMailing=Advarsel ved reinitializing emailing <b>%s,</b> kan du gjøre en masse sending av denne e-en annen gang. Er du sikker på at du dette er hva du vil gjøre?
+ConfirmValidMailing=Er du sikker på at du vil validere utsendelsen?
+ConfirmResetMailing=Advarsel ved reinitialisering av utsendelse <b>%s,</b> kan du gjøre en masseutsendelse av denne e-posten en annen gang. Er du sikker på at det er dette du vil gjøre?
 ConfirmDeleteMailing=Er du sikker på at du vil slette utsendelsen?
 NbOfRecipients=Antall mottagere
 NbOfUniqueEMails=Ant. unike e-poster
 NbOfEMails=Ant. e-poster
-TotalNbOfDistinctRecipients=Antall bestemte mottagere
+TotalNbOfDistinctRecipients=Antall unike mottagere
 NoTargetYet=Ingen mottagere angitt (Gå til fanen 'Mottakere')
 AddRecipients=Legg til mottakere
 RemoveRecipient=Fjern mottaker
-CommonSubstitutions=Vanlige flettefelt
+CommonSubstitutions=Vanlige erstatninger
 YouCanAddYourOwnPredefindedListHere=Les mer om hvordan du lager din egen utvalgsliste her: htdocs/core/modules/mailings/README.
 EMailTestSubstitutionReplacedByGenericValues=Når du er i testmodus blir flettefelt erstattet med generiske verdier
 MailingAddFile=Legg ved denne filen
 NoAttachedFiles=Ingen vedlagte filer
-BadEMail=Ugyldig verdi for Email
-CloneEMailing=Clone Emailing
-ConfirmCloneEMailing=Er du sikker på at du vil klone denne e-post?
-CloneContent=Clone melding
-CloneReceivers=Cloner mottakere
+BadEMail=Ugyldig verdi for e-post
+CloneEMailing=Klon utsendelse
+ConfirmCloneEMailing=Er du sikker på at du vil klone denne utsendelsen?
+CloneContent=Klon melding
+CloneReceivers=Klon mottakere
 DateLastSend=Dato for siste sending
 DateSending=Dato sending
 SentTo=Sendt til <b>%s</b>
 MailingStatusRead=Les
 CheckRead=Les Kvittering
-YourMailUnsubcribeOK=Eposten <b>%s</b> er korrekt meldt av mailinglisten
+YourMailUnsubcribeOK=E-postadressen <b>%s</b> er korrekt avmeldt fra mailinglisten
 MailtoEMail=Link til e-post
 ActivateCheckRead=Tillate å bruke "Avmelding" linken
-ActivateCheckReadKey=Key bruk for å kryptere URL bruk for "Les kvittering" og "melder"-funksjonen
+ActivateCheckReadKey=Nøkkel for å kryptere URL'en brukt til "Les kvittering" og "Avslutt abonnement" egenskapen
 EMailSentToNRecipients=E-post sendt til %s mottakere.
 XTargetsAdded=<b>%s</b> mottakere lagt til i målliste
 EachInvoiceWillBeAttachedToEmail=Et dokument med standard faktura dokumentmal vil bli opprettet og sendt med hver e-post.
@@ -90,10 +90,10 @@ ResultOfMassSending=Resultatet av masse e-post påminnelser sending
 
 # Libelle des modules de liste de destinataires mailing
 MailingModuleDescContactCompanies=Alle tredjeparters kontaktpersoner (kunder, prospekter, leverandører, ...)
-MailingModuleDescDolibarrUsers=Alle Dolibarr-brukere med egen e-post
+MailingModuleDescDolibarrUsers=Dolibarr-brukere
 MailingModuleDescFundationMembers=Medlemmer med e-postadresser
-MailingModuleDescEmailsFromFile=E-poster lest inn fra teksttil (e-post;fornavn;etternavn)
-MailingModuleDescEmailsFromUser=E-post fra brukerundersøkelser (epost, etternavn, fornavn, andre)
+MailingModuleDescEmailsFromFile=E-poster lest inn fra tekstfil (e-post;fornavn;etternavn)
+MailingModuleDescEmailsFromUser=E-poster fra brukere (epost, etternavn, fornavn, andre)
 MailingModuleDescContactsCategories=Alle tredjeparters kontakter (etter kategori)
 MailingModuleDescDolibarrContractsLinesExpired=Tredjeparter med utløpte kontraktens linjer
 MailingModuleDescContactsByCompanyCategory=Kontakter til tredjeparter (av tredjeparter kategori)
@@ -115,7 +115,7 @@ SentBy=Sendt av
 MailingNeedCommand=For sikkerhets skyld sende en e-post er bedre når utføres fra kommandolinjen. Hvis du har en, spør din server administrator å lansere følgende kommando for å sende e-post til alle mottakere:
 MailingNeedCommand2=Du kan imidlertid sende dem online ver å sette parameteret MAILING_LIMIT_SENDBYWEB til en verdi tilsvarende den maksimale antalle e-poster du ønsker å sende i en økt.
 ConfirmSendingEmailing=Hvis du ikke kan eller foretrekker å sende dem med din nettleser, må du bekrefte at du er sikker på at du vil sende e-post nå fra nettleseren din?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Merk: E-postutsendelser fra web-grensenitt er delt opp i flere omganger av sikkerhets-/timeout-hensyn.<b>%s</b> mottakere for hver utsendelse.
 TargetsReset=Tøm liste
 ToClearAllRecipientsClickHere=Trykk på knappen for å tømme mottagerlisten
 ToAddRecipientsChooseHere=Velg i listene for å legge til mottagere
@@ -128,16 +128,17 @@ TagCheckMail=Spor post åpning
 TagUnsubscribe=Avmeldingslink
 TagSignature=Signatur avsender
 TagMailtoEmail=Mottaker e-post
+NoEmailSentBadSenderOrRecipientEmail=Ingen e-post sendt. Feil på avsender eller mottaker. Verifiser brukerprofil
 # Module Notifications
 Notifications=Varsler
 NoNotificationsWillBeSent=Ingen e-postvarsler er planlagt for denne hendelsen/firmaet
 ANotificationsWillBeSent=1 e-postvarsel vil bli sendt med e-post
 SomeNotificationsWillBeSent=%s e-postvarsler vil bli sendt med e-post
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active email notification targets
+AddNewNotification=Aktiver ny målgruppe for epost
+ListOfActiveNotifications=Liste over alle mål for e-postvarsling
 ListOfNotificationsDone=List alle e-postmeldinger sendt
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
+MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
+MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
+MailSendSetupIs3=Ved spørsmål om hvordan du skal sette opp SMTP-serveren din, kontakt %s
+YouCanAlsoUseSupervisorKeyword=Du kan også bruke nøkkelordet <strong>__SUPERVISOREMAIL__</strong> for å sende e-post til brukerens supervisor (supervisoren måha e-postadresse)
+NbOfTargetedContacts=Nåværende antall kontakter på mailinglisten
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index f85c16137a9..5322405f21e 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
-DIRECTION=l
+DIRECTION=ltr
 # Note for Chinese:
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
@@ -25,29 +25,29 @@ FormatDateHourTextShort=%d. %b %Y %H:%M
 FormatDateHourText=%d. %B %Y %H:%M
 DatabaseConnection=Databasetilkobling
 NoTranslation=Ingen oversettelse
-NoRecordFound=Ingen rekord funnet
+NoRecordFound=Ingen post funnet
 NoError=Ingen feil
 Error=Feil
 ErrorFieldRequired=Feltet '%s' er påkrevet
 ErrorFieldFormat=Feltet '%s' har ugyldig verdi
 ErrorFileDoesNotExists=Filen %s finnes ikke
 ErrorFailedToOpenFile=Kunne ikke åpne filen %s
-ErrorCanNotCreateDir=Kunne ikke påårette mappen %s
-ErrorCanNotReadDir=Man ikke lese mappen %s
+ErrorCanNotCreateDir=Kunne ikke opprette mappen %s
+ErrorCanNotReadDir=Kan ikke lese mappen %s
 ErrorConstantNotDefined=Parameter %s er ikke definert
 ErrorUnknown=Ukjent feil
 ErrorSQL=SQL-feil
 ErrorLogoFileNotFound=Fant ikke logofilen '%s'
-ErrorGoToGlobalSetup=Gå til 'Firma/Organisasjon' instillinger for å rette dette
+ErrorGoToGlobalSetup=Gå til 'Firma/Organisasjon' innstillinger for å rette dette
 ErrorGoToModuleSetup=Gå til Modul oppsett for å rette dette
-ErrorFailedToSendMail=Klare ikke å sende epost (avsender=%s, mottager=%s)
+ErrorFailedToSendMail=Klarte ikke å sende epost (avsender=%s, mottager=%s)
 ErrorAttachedFilesDisabled=Vedlegg av filer er slått av på denne serveren
-ErrorFileNotUploaded=Filen ble ikke lastet oppp. Sjekk at den ikke er større en maksimumsgrense, at det er plass igjen på disken og at det ikke ligger en fil med samme navn i katalogen.
+ErrorFileNotUploaded=Filen ble ikke lastet oppp. Sjekk at den ikke er større en maksimumsgrensen, at det er plass igjen på disken og at det ikke ligger en fil med samme navn i katalogen.
 ErrorInternalErrorDetected=Det er opdaget en intern feil
 ErrorNoRequestRan=Ingen forspørsel er utført
 ErrorWrongHostParameter=Feil serverparameter
-ErrorYourCountryIsNotDefined=Landet ditt er ikke definert. Gå til Hjem-Instillinger-Rediger og fyll ut skjemaet igjen.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least on child records.
+ErrorYourCountryIsNotDefined=Landet ditt er ikke definert. Gå til Hjem-Innstillinger-Rediger og fyll ut skjemaet igjen.
+ErrorRecordIsUsedByChild=Kan ikke slette posten. Posten refereres til av minst en annen post.
 ErrorWrongValue=Feil verdi
 ErrorWrongValueForParameterX=Feil verdi for parameter %s
 ErrorNoRequestInError=Ingen forepørsel i feilen
@@ -55,9 +55,9 @@ ErrorServiceUnavailableTryLater=Tjenesten er utilgjengelig for øyeblikket. Prø
 ErrorDuplicateField=Duplikate verdier i unik felttype
 ErrorSomeErrorWereFoundRollbackIsDone=Det ble oppdaget feil. Endringer rulles tilbake.
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> er ikke definert i konfigurasjonsfil <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Fant ikke bruker <b>%s</b> i databasen.
+ErrorCantLoadUserFromDolibarrDatabase=Fant ikke brukeren <b>%s</b> i databasen.
 ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser for landet '%s'.
-ErrorNoSocialContributionForSellerCountry=Feil, ingen sosiale bidrag type definert for landets %s '.
+ErrorNoSocialContributionForSellerCountry=Feil! Ingen skatter og avgifter definert for landet '%s'
 ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen.
 SetDate=Still dato
 SelectDate=Velg en dato
@@ -66,46 +66,46 @@ SeeHere=Se her
 BackgroundColorByDefault=Standard bakgrunnsfarge
 FileNotUploaded=Filen ble ikke lastet opp
 FileUploaded=Opplastningen var vellykket
-FileWasNotUploaded=En fil er valgt for feste, men var ennå ikke lastet opp. Klikk på "Legg ved fil" for dette.
-NbOfEntries=Nb oppføringer
+FileWasNotUploaded=En fil er valgt som vedlegg, men er ennå ikke lastet opp. Klikk på "Legg ved fil" for dette.
+NbOfEntries=Antall oppføringer
 GoToWikiHelpPage=Les elektronisk hjelp (trenger Internett-tilgang)
 GoToHelpPage=Les hjelp
 RecordSaved=Posten er lagret
 RecordDeleted=Oppføring slettet
 LevelOfFeature=Funksjonsnivå
 NotDefined=Ikke angitt
-DefinedAndHasThisValue=Definert til verdienb
+DefinedAndHasThisValue=Definert til verdien
 IsNotDefined=udefinert
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarrs autensitering er satt til <b>%s</b> i konfigurasjonsfilen <b>conf.php</b>.<br>Dette betyr at Dolibarr bruker en ekstern passordatabase, så endringer i dette feltet har muligens ingen effekt.
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarrs autensiteringmåte er satt til <b>%s</b> i konfigurasjonsfilen <b>conf.php</b>.<br>Dette betyr at Dolibarr bruker en ekstern passordatabase, så endringer i dette feltet har muligens ingen effekt.
 Administrator=Administrator
 Undefined=Udefinert
 PasswordForgotten=Glemt passordet?
 SeeAbove=Se ovenfor
 HomeArea=Hjemmeområde
 LastConnexion=Siste tilkobling
-PreviousConnexion=Forrige innlogging
-ConnectedOnMultiCompany=Tilkoblet enhet
+PreviousConnexion=Forrige tilkobling
+ConnectedOnMultiCompany=Tilkoblet miljø
 ConnectedSince=Innlogget siden
-AuthenticationMode=Autensiteringsmåte
-RequestedUrl=Påkrevet URL
-DatabaseTypeManager=Database type manager
-RequestLastAccess=Request for last database access
-RequestLastAccessInError=Request for last database access in error
-ReturnCodeLastAccessInError=Return code for last database access in error
-InformationLastAccessInError=Information for last database access in error
+AuthenticationMode=Autensiteringsmodus
+RequestedUrl=Forespurt URL
+DatabaseTypeManager=Databasetype manager
+RequestLastAccess=Forespørsel etter siste databasetilgang
+RequestLastAccessInError=Forespørsel etter siste databasetilgang med feil
+ReturnCodeLastAccessInError=Returkode etter siste databasetilgang med feil
+InformationLastAccessInError=Informasjon om siste databasetilgang med feil
 DolibarrHasDetectedError=Dolibarr oppdaget en teknisk feil
-InformationToHelpDiagnose=Denn informasjonen kan hjelpe til ved feilsøking
+InformationToHelpDiagnose=Denne informasjonen kan hjelpe til ved feilsøking
 MoreInformation=Mer informasjon
 TechnicalInformation=Teknisk informasjon
 NotePublic=Notat (offentlig)
-NotePrivate=Note (privat)
+NotePrivate=Notat (privat)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr er satt opp til å bruke priser med <b>%s</b> desimaler.
 DoTest=Test
 ToFilter=Filter
 WarningYouHaveAtLeastOneTaskLate=OBS! Du har minst ett forsinket element i listen ovenfor.
 yes=ja
 Yes=Ja
-no=no
+no=nei
 No=Nei
 All=Alle
 Home=Hjem
@@ -151,7 +151,7 @@ ConfirmClone=Velg hvilke data du vil klone :
 NoCloneOptionsSpecified=Det er ikke valgt noen data å klone.
 Of=av
 Go=Gå
-Run=Run
+Run=Kjør
 CopyOf=Kopi av
 Show=Vis
 ShowCardHere=Vis kort
@@ -162,7 +162,7 @@ Approve=Godkjenn
 Disapprove=Underkjenn
 ReOpen=Gjenåpne
 Upload=Send fil
-ToLink=Link
+ToLink=Lenke
 Select=Velg
 Choose=Velg
 ChooseLangage=Velg språk
@@ -176,11 +176,11 @@ Groups=Grupper
 NoUserGroupDefined=Ingen brukergrupper er definert
 Password=Passord
 PasswordRetype=Gjenta passord
-NoteSomeFeaturesAreDisabled=Merk at en masse funksjoner / moduler er deaktivert i denne demonstrasjonen.
+NoteSomeFeaturesAreDisabled=Merk at mange funksjoner/moduler er deaktivert i denne demonstrasjonen.
 Name=Navn
 Person=Person
 Parameter=Parameter
-Parameters=Parametere
+Parameters=Parametre
 Value=Verdi
 GlobalValue=Global verdi
 PersonalValue=Personlig verdi
@@ -193,7 +193,7 @@ MultiLanguage=Flerspråklig
 Note=Notat
 CurrentNote=Gjeldende notat
 Title=Tittel
-Label=Navn
+Label=Etikett
 RefOrLabel=Ref. eller etikett
 Info=Logg
 Family=Familie
@@ -211,8 +211,8 @@ Limit=Grense
 Limits=Grenser
 DevelopmentTeam=Utviklergrupper
 Logout=Logg ut
-NoLogoutProcessWithAuthMode=Ingen anvendbar frakoblingsfunksjon med godkjenning <b>modus %s</b>
-Connection=Innlogging
+NoLogoutProcessWithAuthMode=Ingen anvendbar frakoblingsfunksjon med godkjenningsmodus <b>%s</b>
+Connection=Tilkobling
 Setup=Innstillinger
 Alert=Varsel
 Previous=Forrige
@@ -227,21 +227,21 @@ DateStart=Startdato
 DateEnd=Sluttdato
 DateCreation=Opprettet den
 DateModification=Endret den
-DateModificationShort=Modif. dato
+DateModificationShort=Mod. dato
 DateLastModification=Sist endret den
 DateValidation=Godkjent den
 DateClosing=Lukket den
 DateDue=Forfallsdato
 DateValue=Verdi dato
 DateValueShort=Verdi dato
-DateOperation=Operation date
-DateOperationShort=Ope. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
+DateOperation=Operasjonsdato
+DateOperationShort=Oper. dato
+DateLimit=Grense dato
+DateRequest=Forespørselsdato
+DateProcess=Prosessdato
 DatePlanShort=Planlagt dato
 DateRealShort=Virkelig dato
-DateBuild=Rapport bygge dato
+DateBuild=Rapport byggedato
 DatePayment=Dato for betaling
 DateApprove=Godkjennelsesdato
 DateApprove2=Godkjennelsesdato (2. godkjennelse)
@@ -273,12 +273,12 @@ Yesterday=I går
 Tomorrow=I morgen
 Morning=Morgen
 Afternoon=Ettermiddag
-Quadri=Quadri
-MonthOfDay=Month of the day
+Quadri=Kvartal
+MonthOfDay=Dag i måneden
 HourShort=T
 MinuteShort=mn
-Rate=Timesats
-UseLocalTax=Inkluderer skatt
+Rate=Sats
+UseLocalTax=Inkl. MVA
 Bytes=Bytes
 KiloBytes=Kilobyte
 MegaBytes=Megabyte
@@ -292,8 +292,8 @@ Tb=Tb
 Cut=Klipp ut
 Copy=Kopier
 Paste=Lim inn
-Default=Gjeldende
-DefaultValue=Gjeldende verdi
+Default=Standard
+DefaultValue=Standardverdi
 DefaultGlobalValue=Global verdi
 Price=Pris
 UnitPrice=Enhetspris
@@ -301,22 +301,22 @@ UnitPriceHT=Enhetspris (netto)
 UnitPriceTTC=Enhetspris
 PriceU=Pris
 PriceUHT=Pris (netto)
-AskPriceSupplierUHT=Forespørsel om P.U. HT
-PriceUTTC=Pris
+AskPriceSupplierUHT=Forespørsel om nettopris
+PriceUTTC=U.P. (inkl. avgift)
 Amount=Beløp
 AmountInvoice=Fakturabeløp
 AmountPayment=Betalingsbeløp
 AmountHTShort=Beløp (netto)
-AmountTTCShort=Beløp (inkl. skatt)
+AmountTTCShort=Beløp (inkl. MVA)
 AmountHT=Beløp (eksl. MVA)
 AmountTTC=Beløp (inkl. MVA)
 AmountVAT=MVA beløp
-AmountLT1=Beløp skatt 2
-AmountLT2=Beløp skatt 3
+AmountLT1=Beløp MVA 2
+AmountLT2=Beløp MVA 3
 AmountLT1ES=Beløp RE
 AmountLT2ES=Beløp IRPF
 AmountTotal=Totaltbeløp
-AmountAverage=Gjenomsnitt beløp
+AmountAverage=Gjenomsnittsbeløp
 PriceQtyHT=Pris for denne mengden (eksl. MVA)
 PriceQtyMinHT=Pris for minstekvantum (eksl. MVA)
 PriceQtyTTC=Pris for denne mengden (inkl. MVA)
@@ -325,20 +325,21 @@ Percentage=Prosent
 Total=Totalt
 SubTotal=Subtotal
 TotalHTShort=Totalt (netto)
-TotalTTCShort=Totalt (inkl. skatt)
+TotalTTCShort=Totalt (inkl. MVA)
 TotalHT=Totalt (eksl. MVA)
-TotalHTforthispage=Totalt (netto etter skatt) for denne siden
+TotalHTforthispage=Totalt (eks. MVA) for denne siden
 TotalTTC=Totalt (inkl. MVA)
 TotalTTCToYourCredit=Totalt (inkl. MVA) godskrevet deg
 TotalVAT=Total MVA
-TotalLT1=Sum skatt 2
-TotalLT2=Sum skatt 3
-TotalLT1ES=Totalt RE
-TotalLT2ES=Totalt IRPF
+TotalLT1=Total MVA 2
+TotalLT2=Total MVA 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
 IncludedVAT=Inkludert MVA
 HT=Eksl. MVA
 TTC=Inkl. MVA
 VAT=MVA
+VATs=Salgsavgifter
 LT1ES=RE
 LT2ES=IRPF
 VATRate=MVA-sats
@@ -373,7 +374,7 @@ ActionDoneShort=Fullført
 ActionUncomplete=Ikke komplett
 CompanyFoundation=Firma/Organisasjon
 ContactsForCompany=Kontakter for denne tredjeparten
-ContactsAddressesForCompany=Kontakter / adresser for denne tredjepart
+ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresser for tredjepart
 ActionsOnCompany=Handlinger ifm. denne tredjeparten
 ActionsOnMember=Hendelser om dette medlemmet
@@ -387,7 +388,7 @@ ChartNotGenerated=Graf er ikke opprettet
 GeneratedOn=Generert den %s
 Generate=Generer
 Duration=Varighet
-TotalDuration=Total varighetd
+TotalDuration=Total varighet
 Summary=Oppsummering
 MyBookmarks=Mine bokmerker
 OtherInformationsBoxes=Andre informasjonsbokser
@@ -413,25 +414,27 @@ Qty=Ant
 ChangedBy=Endret av
 ApprovedBy=Godkjent av
 ApprovedBy2=Godkjent av (2. godkjennelse)
+Approved=Godkjent
+Refused=Avvist
 ReCalculate=Rekalkuler
-ResultOk=Success
+ResultOk=Suksess
 ResultKo=Feil
 Reporting=Rapportering
 Reportings=Rapportering
 Draft=Kladd
 Drafts=Kladder
 Validated=Godkjent
-Opened=Åpnet
+Opened=Åpne
 New=Ny
 Discount=Rabatt
 Unknown=Ukjent
-General=Generell
+General=Generelt
 Size=Størrelse
 Received=Mottatt
 Paid=Betalt
 Topic=Emne
-ByCompanies=Av firmaer
-ByUsers=Ab brukere
+ByCompanies=Etter tredjeparter
+ByUsers=Etter brukere
 Links=Lenker
 Link=Lenke
 Receipts=Kvitteringer
@@ -461,17 +464,17 @@ October=Oktober
 November=November
 December=Desember
 JanuaryMin=Jan
-FebruaryMin=Februar
+FebruaryMin=Feb
 MarchMin=Mar
-AprilMin=April
+AprilMin=Apr
 MayMin=Mai
-JuneMin=Juni
-JulyMin=Juli
-AugustMin=August
-SeptemberMin=September
-OctoberMin=Oktober
-NovemberMin=November
-DecemberMin=Desember
+JuneMin=Jun
+JulyMin=Jul
+AugustMin=Aug
+SeptemberMin=Sep
+OctoberMin=Okt
+NovemberMin=Nov
+DecemberMin=Des
 Month01=januar
 Month02=februar
 Month03=mars
@@ -484,18 +487,18 @@ Month09=september
 Month10=oktober
 Month11=november
 Month12=desember
-MonthShort01=januar
-MonthShort02=februar
+MonthShort01=jan
+MonthShort02=feb
 MonthShort03=mar
-MonthShort04=april
-MonthShort05=kan
-MonthShort06=juni
-MonthShort07=juli
-MonthShort08=august
-MonthShort09=september
-MonthShort10=oktober
-MonthShort11=november
-MonthShort12=desember
+MonthShort04=apr
+MonthShort05=mai
+MonthShort06=jun
+MonthShort07=jul
+MonthShort08=aug
+MonthShort09=sep
+MonthShort10=okt
+MonthShort11=nov
+MonthShort12=des
 AttachedFiles=Vedlagte filer og dokumenter
 FileTransferComplete=Filen ble lastet opp!
 DateFormatYYYYMM=ÅÅÅÅ-MM
@@ -504,9 +507,9 @@ DateFormatYYYYMMDDHHMM=ÅÅÅÅ-MM-DD TT:SS
 ReportName=Rapportnavn
 ReportPeriod=Rapport for perioden
 ReportDescription=Beskrivelse
-Report=Rappoer
+Report=Rapport
 Keyword=Nøkkelord
-Legend=Legend
+Legend=Historikk
 FillTownFromZip=Hent poststed fra postnummer
 Fill=Fyll
 Reset=Tilbakestill
@@ -537,16 +540,16 @@ External=Ekstern
 Internals=Intern
 Externals=Ekstern
 Warning=Varsel
-Warnings=Versler
+Warnings=Varsler
 BuildPDF=Lag PDF
 RebuildPDF=Lag PDF på nytt
 BuildDoc=Lag Doc
 RebuildDoc=Lag Doc på nytt
-Entity=Enhet
+Entity=Miljø
 Entities=Enheter
 EventLogs=Logger
 CustomerPreview=Forhåndsvisning kunder
-SupplierPreview=Forhåndsvisning kunder
+SupplierPreview=Forhåndsvisning av leverandør
 AccountancyPreview=Forhåndsvis regnskap
 ShowCustomerPreview=Vis kundeforhåndsvisning
 ShowSupplierPreview=Vis leverandørforhåndsvisning
@@ -572,7 +575,7 @@ SendAcknowledgementByMail=Send bekreftelse med e-post
 NoEMail=Ingen e-post
 NoMobilePhone=Ingen mobiltelefon
 Owner=Eier
-DetectedVersion=Oppdager versjon
+DetectedVersion=Oppdaget versjon
 FollowingConstantsWillBeSubstituted=Følgende konstanter vil bli erstattet med korresponderende verdi.
 Refresh=Oppdater
 BackToList=Tilbake til liste
@@ -592,7 +595,7 @@ Method=Metode
 Receive=Motta
 PartialWoman=Delvis
 PartialMan=Delvis
-TotalWoman=Totalr
+TotalWoman=Total
 TotalMan=Totalt
 NeverReceived=Aldri mottatt
 Canceled=Kansellert
@@ -607,7 +610,7 @@ MenuECM=Dokumenter
 MenuAWStats=AWStats
 MenuMembers=Medlemmer
 MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetup=Dolibarr grense (Menu home-setup-security): %s Kb, PHP grense: %s Kb
 NoFileFound=Ingen dokumenter er lagret i denne mappen
 CurrentUserLanguage=Gjeldende språk
 CurrentTheme=Gjeldende tema
@@ -618,8 +621,8 @@ ForCustomer=For kunde
 Signature=Signatur
 HidePassword=Vis kommando med skjult passord
 UnHidePassword=Vis virkelig kommando med synlig passord
-Root=Root
-Informations=Informasjoner
+Root=Rot
+Informations=Informasjon
 Page=Side
 Notes=Merknader
 AddNewLine=Legg til ny linje
@@ -627,26 +630,26 @@ AddFile=Legg til fil
 ListOfFiles=Liste over tilgjengelige filer
 FreeZone=Fritekst
 FreeLineOfType=Type fritekst
-CloneMainAttributes=Klone objektet med sine viktigste attributter
+CloneMainAttributes=Klon objektet med de viktigste attributtene
 PDFMerge=PDF Flett
 Merge=Flett
-PrintContentArea=Vis nettstedet for å skrive ut hovedinnhold området
+PrintContentArea=Vis nettstedet for å skrive ut innholdet på hovedområdet
 MenuManager=Menymanager
 NoMenu=Ingen undermeny
-WarningYouAreInMaintenanceMode=Advarsel, du er i et vedlikeholds-modus, så bare logikk <b>%s</b> er lov til å bruke programmet for øyeblikket.
-CoreErrorTitle=System error
+WarningYouAreInMaintenanceMode=Advarsel, du er i vedlikeholds-modus, så bare <b>%s</b> har lov til å bruke programmet for øyeblikket.
+CoreErrorTitle=Systemfeil
 CoreErrorMessage=Beklager, det oppstod en feil. Sjekk loggene eller kontakt systemansvarlig.
 CreditCard=Kredittkort
 FieldsWithAreMandatory=Felt med <b>%s</b> er obligatoriske
-FieldsWithIsForPublic=Felt med <b>%s</b> er vist på offentlig liste over medlemmer. Hvis du ikke ønsker dette, sjekk "offentlig".
+FieldsWithIsForPublic=Felt med <b>%s</b> er vist på den offentlige listen over medlemmene. Hvis du ikke ønsker dette, fjern merket "offentlig".
 AccordingToGeoIPDatabase=(Ifølge GeoIP konvertering)
-Line=Line
+Line=Linje
 NotSupported=Støttes ikke
 RequiredField=Obligatorisk felt
 Result=Resultater
 ToTest=Test
 ValidateBefore=Kortet må valideres før du bruker denne funksjonen
-Visibility=Sikt
+Visibility=Synlighet
 Private=Privat
 Hidden=Skjult
 Resources=Ressurser
@@ -654,31 +657,32 @@ Source=Kilde
 Prefix=Prefiks
 Before=Før
 After=Etter
-IPAddress=IP-adressen
+IPAddress=IP-adresse
 Frequency=Frekvens
 IM=Instant messaging
 NewAttribute=Ny attributt
 AttributeCode=Attributt-kode
-OptionalFieldsSetup=Ekstra attributter oppsett
-URLPhoto=Url av foto / logo
+OptionalFieldsSetup=Oppsett av ekstra attributter 
+URLPhoto=Url til bilde/logo
 SetLinkToThirdParty=Lenke til en annen tredjepart
 CreateDraft=Lag utkast
 SetToDraft=Tilbake til kladd
 ClickToEdit=Klikk for å redigere
-ObjectDeleted=Objekt %s slettet
+ObjectDeleted=Objektet %s er slettet
 ByCountry=Etter land
-ByTown=Ved byen
+ByTown=Etter by
 ByDate=Etter dato
-ByMonthYear=Etter måned / år
-ByYear=Av år
+ByMonthYear=Etter måned/år
+ByYear=Etter år
 ByMonth=etter måned
-ByDay=Av dag
-BySalesRepresentative=Av salgsrepresentant
+ByDay=Etter dag
+BySalesRepresentative=Etter salgsrepresentant
 LinkedToSpecificUsers=Knyttet til en bestemt brukerkontakt
 DeleteAFile=Slett en fil
 ConfirmDeleteAFile=Er du sikker på at du vil slette filen
 NoResults=Ingen resultater
-ModulesSystemTools=Verktøy
+SystemTools=Systemverktøy
+ModulesSystemTools=Modulverktøy
 Test=Test
 Element=Element
 NoPhotoYet=Ingen bilder tilgjengelig ennå
@@ -689,7 +693,7 @@ toward=mot
 Access=Tilgang
 HelpCopyToClipboard=Bruk Ctrl + C for å kopiere til utklippstavle
 SaveUploadedFileWithMask=Lagre filen på serveren med navnet <strong>"%s"</strong> (ellers "%s")
-OriginFileName=Original filnavn
+OriginFileName=Originalt filnavn
 SetDemandReason=Sett kilde
 SetBankAccount=Definer Bankkonto
 AccountCurrency=Konto Valuta
@@ -698,26 +702,29 @@ XMoreLines=%s linje(r) skjult
 PublicUrl=Offentlig URL
 AddBox=Legg til boks
 SelectElementAndClickRefresh=Velg et element og klikk Oppfrisk
-PrintFile=Print fil %s
+PrintFile=Skriv fil %s
 ShowTransaction=Vis transaksjon
 GoIntoSetupToChangeLogo=Gå til Hjem - Oppsett - Firma for å skifte logo eller Hjem - Oppsett -  Display for å skjule.
 Deny=Avvis
 Denied=Avvist
+ListOfTemplates=Liste over maler
+Genderman=Mann
+Genderwoman=Kvinne
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
 Wednesday=Onsdag
-Thursday=Torsdaf
+Thursday=Torsdag
 Friday=Fredag
 Saturday=Lørdag
 Sunday=Søndag
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=Vi
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
+MondayMin=M
+TuesdayMin=Ti
+WednesdayMin=O
+ThursdayMin=To
+FridayMin=F
+SaturdayMin=L
+SundayMin=S
 Day1=Mandag
 Day2=Tirsdag
 Day3=Onsdag
@@ -726,9 +733,10 @@ Day5=Fredag
 Day6=Lørdag
 Day0=Søndag
 ShortMonday=M
-ShortTuesday=T
+ShortTuesday=Ti
 ShortWednesday=O
-ShortThursday=T
+ShortThursday=To
 ShortFriday=F
 ShortSaturday=L
 ShortSunday=S
+SelectMailModel=Velg e-postmal
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index c0594ab96cc..24c72d3a537 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
 Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
+Margins=Marginer
+TotalMargin=Totalmargin
+MarginOnProducts=Margin - Varer
+MarginOnServices=Margin - Tjenester
+MarginRate=Margin/påslag
+MarkRate=Dekningsbidrag
+DisplayMarginRates=Vis marginrater
+DisplayMarkRates=Vis dekningsbidrag
+InputPrice=Inngangspris
+margin=Håndtering av overskuddsmarginer
+margesSetup=Oppsett av overskuddsmargin-håndtering
+MarginDetails=Margindetaljer
+ProductMargins=Varemarginer
+CustomerMargins=Kundemarginer
+SalesRepresentativeMargins=Marginer for selgere
+UserMargins=Brukermarginer
 ProductService=Vare eller tjeneste
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
+AllProducts=Alle varer og tjenester
+ChooseProduct/Service=Velg vare eller tjenester
 StartDate=Startdato
 EndDate=Sluttdato
 Launch=Start
-ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+ForceBuyingPriceIfNull=Tving innkjøpspris hvis 0
+ForceBuyingPriceIfNullDetails=hvis "PÅ", vil marginen være null på linjen (innkjøpspris=utsalgspris), ellers ("AV"). Margin vil bli lik utsalgspris (innkjøpspris = 0)
+MARGIN_METHODE_FOR_DISCOUNT=Margin-metode for globale rabatter
+UseDiscountAsProduct=Som vare
+UseDiscountAsService=Som tjeneste
+UseDiscountOnTotal=Subtota
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defineres om en global rabatt skal gjelde for et vare, en tjeneste, eller bare som en subtotal for margin-kalkulasjon
 MARGIN_TYPE=Margin type
-MargeBrute=Raw margin
-MargeNette=Net margin
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-CostPrice=Cost price
-BuyingCost=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+MargeBrute=Bruttomargin
+MargeNette=Nettomargin
+MARGIN_TYPE_DETAILS=Brutto margin = Utsalgspris - Innkjøpspris<br/>Nettomargin = Utsalgspris - Kostpris
+CostPrice=Kostpris
+BuyingCost=Kostpris
+UnitCharges=Enhets-avgifter
+Charges=Avgifter
+AgentContactType=Kommersiell agent kontakttype
+AgentContactTypeDetails=Definer hvilken kontakttype (lenket til fakturaer) som skal brukes for margin-rapport for hver selger
+rateMustBeNumeric=Sats må ha en numerisk verdi
+markRateShouldBeLesserThan100=Dekningsbidrag skal være lavere enn 100
+ShowMarginInfos=Vis info om marginer
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 4b3c4060e72..49c6f3fe589 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -199,8 +199,9 @@ Entreprises=Selskaper
 DOLIBARRFOUNDATION_PAYMENT_FORM=For å gjøre abonnementet innbetaling med en bankoverføring, se side <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Å betale med et kredittkort eller Paypal, klikk på knappen nederst på denne siden. <br>
 ByProperties=Av egenskaper
 MembersStatisticsByProperties=Medlemsstatistikk av egenskaper
-MembersByNature=Medlemmer av natur
+MembersByNature=Dette skjermbildet viser statistikk over medlemmer etter type.
+MembersByRegion=Dette skjermbildet viser statistikk over medlemmer etter region.
 VATToUseForSubscriptions=Mva-sats som skal brukes for abonnementer
 NoVatOnSubscription=Ingen TVA for abonnementer
 MEMBER_PAYONLINE_SENDEMAIL=Send e-post når Dolibarr mottar en bekreftelse på en validert betaling for abonnement
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt brukt for abonnementslinje i faktura: %s
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Vare brukt for abonnementslinje i faktura: %s
diff --git a/htdocs/langs/nb_NO/opensurvey.lang b/htdocs/langs/nb_NO/opensurvey.lang
index d254a7accb1..8c122f722a9 100644
--- a/htdocs/langs/nb_NO/opensurvey.lang
+++ b/htdocs/langs/nb_NO/opensurvey.lang
@@ -9,58 +9,58 @@ AddACommentForPoll=Legg til kommentar i undersøkelsen
 AddComment=Legg til kommentar
 CreatePoll=Opprett undersøkelse
 PollTitle=Undersøkelse tittel
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
+ToReceiveEMailForEachVote=Motta en e-post for hver stemmeavgivning
+TypeDate=Skriv dato
+TypeClassic=Skriv standard
+OpenSurveyStep2=Velg blant de ledige datoene (grå). Valgte dager er grønne. Du kan fjerne valgte dager ved å klikke på dem igjen
+RemoveAllDays=Fjern alle valgte dager
+CopyHoursOfFirstDay=Kopier timene fra første dag
+RemoveAllHours=Fjern alle valgte timer
 SelectedDays=Valgte dager
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=Limit date
-NbOfSurveys=Number of polls
-NbOfVoters=Nb of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Abstention=Abstention
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-ErrorPollDoesNotExists=Error, poll <strong>%s</strong> does not exists.
-OpenSurveyNothingToSetup=There is no specific setup to do.
-PollWillExpire=Your poll will expire automatically <strong>%s</strong> days after the last date of your poll.
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanEditVotes=Can change vote of others
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The voting time of this poll has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+TheBestChoice=Det beste valget er for øyeblikket
+TheBestChoices=De beste valgene er for øyeblikket
+with=med
+OpenSurveyHowTo=Hvis du samtykker i avgi stemme i denne undersøkelsen, må du legge inn navnet ditt, velge de dataene som passer best for deg og validere med + knappen på enden av linjen
+CommentsOfVoters=Kommentarer fra stemmeavgivere
+ConfirmRemovalOfPoll=Er du sikker på at du vil fjerne denne undersøkelsen (og alle svar)?
+RemovePoll=Fjern undersøkelse
+UrlForSurvey=URL for direkte adgang til undersøkelse
+PollOnChoice=Du oppretter en flervalgsundersøkelse. Først må du legge til alle mulige valg:
+CreateSurveyDate=Opprett en undersøkelse med tidsfrist
+CreateSurveyStandard=Opprett en standardundersøkelse
+CheckBox=Enkel avkrysningsboks
+YesNoList=Liste (tom/ja/nei)
+PourContreList=Liste (tom/for/mot)
+AddNewColumn=Legg til ny kolonne
+TitleChoice=Valg-etiket
+ExportSpreadsheet=Eksporter regneark med resultater
+ExpireDate=Datobegrensning
+NbOfSurveys=Antall undersøkelser
+NbOfVoters=Antall stemmeavgivere
+SurveyResults=Resultat
+PollAdminDesc=Du har lov til å endre alle stemmelinjer i denne undersøkelsen med knappen "Rediger". Du kan også fjerne en kolonne eller en linje med %s. Du kan også legge til en ny kolonne med %s.
+5MoreChoices=5 valg til
+Abstention=Ikke avgitt stemme
+Against=Mot
+YouAreInivitedToVote=Du er invitert til å delta i denne undersøkelsen
+VoteNameAlreadyExists=Dette navnet er allerede brukt for denne undersøkelsen
+ErrorPollDoesNotExists=Feil! Undersøkelse <strong>%s</strong> finnes ikke.
+OpenSurveyNothingToSetup=Det behøves ingen oppsett.
+PollWillExpire=Undersøkelsen din utløper automatisk <strong>%s</strong> dager etter den siste datoen for undersøkelsen.
+AddADate=Legg til dato
+AddStartHour=Legg til starttime
+AddEndHour=Legg til sluttime
+votes=Stemme(r)
+NoCommentYet=Ingen kommentarer for denne undersøkelsen enda
+CanEditVotes=Kan endre andres stemmer
+CanComment=Stemmeavgivere kan kommentere i undersøkelsen
+CanSeeOthersVote=Stemmeavgivere kan se andres stemmer
+SelectDayDesc=For hver valgte dag kan du velge møtetidspunkt i følgende format :<br>- empty,<br>- "8h", "8H" eller "8:00" for timen møtet starter,<br>- "8-11", "8h-11h", "8H-11H" eller "8:00-11:00" for å gi møtet start- og sluttime,<br>- "8h15-11h15", "8H15-11H15" eller "8:15-11:15" for å inkludere minutter
+BackToCurrentMonth=Tilbake til gjeldende måned
+ErrorOpenSurveyFillFirstSection=Du har ikke fylt ut den første delen av undersøkelsen under opprettelse
+ErrorOpenSurveyOneChoice=Legg inn minst ett valg
+ErrorOpenSurveyDateFormat=Datoen må ha formatet ÅÅÅÅ-MM-DD
+ErrorInsertingComment=Det oppsto en feil ved opprettelse av kommentaren
+MoreChoices=Legg til flere valg for stemmeavgivere
+SurveyExpiredInfo=Fristen for å stemme i denne undersøkelsen har gått ut.
+EmailSomeoneVoted=%s har fylt ut en linje\nDu kan finne undersøkelsen din med lenken:\n%s
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index ec0b971bcce..7fd24ebc519 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -14,20 +14,20 @@ ToOrder=Lag ordre
 MakeOrder=Lag ordre
 SupplierOrder=Leverandørordre
 SuppliersOrders=Leverandørordre
-SuppliersOrdersRunning=Aktuelle leverandørs ordrer
+SuppliersOrdersRunning=Aktuelle leverandørordre
 CustomerOrder=Kundeordre
 CustomersOrders=Kundeordre
-CustomersOrdersRunning=Aktuelle kundes ordrer
-CustomersOrdersAndOrdersLines=Kundeordrer og ordrelinjer
+CustomersOrdersRunning=Gjeldende kundeordre
+CustomersOrdersAndOrdersLines=Kundeordre og ordrelinjer
 OrdersToValid=Kundeordre til godkjenning
-OrdersToBill=Leverte kundeordre
-OrdersInProcess=Pågående kundeordre
-OrdersToProcess=Kundeordre til fullføring
-SuppliersOrdersToProcess=Leverandørens ordre til behandling
+OrdersToBill=Kundeordre levert
+OrdersInProcess=Kundeordre til behandling
+OrdersToProcess=Kundeordre å behandle
+SuppliersOrdersToProcess=Leverandørordre å behandle
 StatusOrderCanceledShort=Kansellert
 StatusOrderDraftShort=Kladd
 StatusOrderValidatedShort=Godkjent
-StatusOrderSentShort=I prosessen
+StatusOrderSentShort=Under behandling
 StatusOrderSent=Under transport
 StatusOrderOnProcessShort=Bestilt
 StatusOrderProcessedShort=Behandlet
@@ -36,8 +36,8 @@ StatusOrderToBill2Short=Til fakturering
 StatusOrderApprovedShort=Godkjent
 StatusOrderRefusedShort=Avvist
 StatusOrderToProcessShort=Til behandling
-StatusOrderReceivedPartiallyShort=Dellevert
-StatusOrderReceivedAllShort=Fullt levert
+StatusOrderReceivedPartiallyShort=Delvis mottatt
+StatusOrderReceivedAllShort=Alt er mottatt
 StatusOrderCanceled=Kansellert
 StatusOrderDraft=Kladd (trenger godkjenning)
 StatusOrderValidated=Godkjent
@@ -48,19 +48,19 @@ StatusOrderToBill=Levert
 StatusOrderToBill2=Til fakturering
 StatusOrderApproved=Godkjent
 StatusOrderRefused=Avvist
-StatusOrderReceivedPartially=Dellevert
-StatusOrderReceivedAll=Fullt levert
+StatusOrderReceivedPartially=Delvis mottatt
+StatusOrderReceivedAll=Alt er mottatt
 ShippingExist=En forsendelse eksisterer
-ProductQtyInDraft=Produktmengde i ordrekladder
-ProductQtyInDraftOrWaitingApproved=Produktmengde i kladdede/godkjente ordrer som ikke er bestilt enda
-DraftOrWaitingApproved=Utkast eller godkjent ennå ikke bestilt
-DraftOrWaitingShipped=Utkast eller validert ennå ikke levert
+ProductQtyInDraft=Varemengde i ordrekladder
+ProductQtyInDraftOrWaitingApproved=Varemengde i kladdede/godkjente ordrer som ikke er bestilt enda
+DraftOrWaitingApproved=Utkast eller godkjent, men ikke bestilt
+DraftOrWaitingShipped=Utkast eller validert, men ikke sendt
 MenuOrdersToBill=Ordre levert
 MenuOrdersToBill2=Fakturerbare ordre
 SearchOrder=Søk i ordre
 SearchACustomerOrder=Søk etter kundeordre
 SearchASupplierOrder=Søk etter leverandørordre
-ShipProduct=Lever produkt
+ShipProduct=Send vare
 Discount=Rabatt
 CreateOrder=Lag ordre
 RefuseOrder=Avvis ordre
@@ -72,9 +72,10 @@ DeleteOrder=Slett ordre
 CancelOrder=Avbryt ordre
 AddOrder=Opprett ordre
 AddToMyOrders=Legg til mine ordre
-AddToOtherOrders=Lagg til andre ordre
+AddToOtherOrders=Legg til andre ordre
 AddToDraftOrders=Legg til ordreutkast
 ShowOrder=Vis ordre
+OrdersOpened=Ordre å behandle
 NoOpenedOrders=Ingen åpne ordre
 NoOtherOpenedOrders=Ingen andre åpne ordre
 NoDraftOrders=Ingen ordreutkast
@@ -85,21 +86,21 @@ LastSupplierOrders=Siste %s leverandørordrer
 LastModifiedOrders=Siste %s endrede ordre
 LastClosedOrders=Siste %s lukkede ordre
 AllOrders=Alle ordre
-NbOfOrders=Antal ordre
+NbOfOrders=Antall ordre
 OrdersStatistics=Ordrestatistikk
 OrdersStatisticsSuppliers=Statistikk leverandørordre
 NumberOfOrdersByMonth=Antall ordre pr måned
-AmountOfOrdersByMonthHT=Sum bestillinger etter måned (etter skatt)
-ListOfOrders=Ordreoverikt
+AmountOfOrdersByMonthHT=Sum bestillinger etter måned (eks. MVA)
+ListOfOrders=Ordreliste
 CloseOrder=Lukk ordre
-ConfirmCloseOrder=Er du sikker på at du vil lukke denne ordren? Når en ordre er lukket kan den kun faktureres.
+ConfirmCloseOrder=Er du sikker på at du vil lukke denne ordren? Når en ordre er lukket kan den faktureres.
 ConfirmCloseOrderIfSending=Er du sikker på at du vil lukke denne ordren? Du må bare lukke ordren når alle leveringer er utført.
 ConfirmDeleteOrder=Er du sikker på at du vil slette denne ordren?
 ConfirmValidateOrder=Er du sikker på at du vil godkjenne denne ordren under navnet <b>%s</b> ?
-ConfirmUnvalidateOrder=Er du sikker på at du vil gjenopprette orden <b>%s</b> til utkastet status?
+ConfirmUnvalidateOrder=Er du sikker på at du vil gjenopprette orden <b>%s</b> til utkaststatus?
 ConfirmCancelOrder=Er du sikker på at du vil avbryte denne ordren?
 ConfirmMakeOrder=Vil du bekrefte at du lagde denne ordren den <b>%s</b> ?
-GenerateBill=Oppret faktura
+GenerateBill=Opprett faktura
 ClassifyShipped=Klassifiser levert
 ClassifyBilled=Klassifiser "Fakturert"
 ComptaCard=Regnskapskort
@@ -110,41 +111,41 @@ RelatedSupplierOrders=Relaterte leverandørordrer
 OnProcessOrders=Ordre i behandling
 RefOrder=Ref. ordre
 RefCustomerOrder=Ref. kundeordre
-RefCustomerOrderShort=Ref. ordre
-SendOrderByMail=Send ordre i post
+RefCustomerOrderShort=Ref. kundeordre
+SendOrderByMail=Send ordre med post
 ActionsOnOrder=Handlinger ifm. ordre
-NoArticleOfTypeProduct=Der er ingen varer av typen 'product' på ordren så det er ingen varer å sende
-OrderMode=Ordremodus
-AuthorRequest=Request author
+NoArticleOfTypeProduct=Der er ingen varer av typen 'vare' på ordren, så det er ingen varer å sende
+OrderMode=Ordremetode
+AuthorRequest=Finn forfatter
 UseCustomerContactAsOrderRecipientIfExist=Bruk kontaktpersons adresse i stedet for tredjepartens adresse
 RunningOrders=Ordre i behandling
 UserWithApproveOrderGrant=Brukere med rettigheter til å "godkjenne ordre".
 PaymentOrderRef=Betaling av ordre %s
-CloneOrder=Clone bestilling
+CloneOrder=Klon bestilling
 ConfirmCloneOrder=Er du sikker på at du vil klone denne bestillingen <b>%s?</b>
-DispatchSupplierOrder=Motta leverandør bestill %s
+DispatchSupplierOrder=Motta leverandørordre %s
 FirstApprovalAlreadyDone=Første godkjenning allerede utført
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representant oppfølging kundeordre
-TypeContact_commande_internal_SHIPPING=Representant oppfølging shipping
-TypeContact_commande_external_BILLING=Kunden faktura kontakt
-TypeContact_commande_external_SHIPPING=Kunden shipping kontakt
-TypeContact_commande_external_CUSTOMER=Kundekontakt oppfølging rekkefølge
-TypeContact_order_supplier_internal_SALESREPFOLL=Representant oppfølging leverandør bestilling
-TypeContact_order_supplier_internal_SHIPPING=Representant oppfølging shipping
-TypeContact_order_supplier_external_BILLING=Leverandørfaktura kontakt
-TypeContact_order_supplier_external_SHIPPING=Leverandør shipping kontakt
-TypeContact_order_supplier_external_CUSTOMER=Leverandør kontakt oppfølging rekkefølge
+TypeContact_commande_internal_SALESREPFOLL=Representant for oppfølging av kundeordre
+TypeContact_commande_internal_SHIPPING=Representant for oppfølging av levering
+TypeContact_commande_external_BILLING=Kundens fakturakontakt
+TypeContact_commande_external_SHIPPING=Kundens leveransekontakt
+TypeContact_commande_external_CUSTOMER=Kundens ordreoppfølger
+TypeContact_order_supplier_internal_SALESREPFOLL=Representant for oppfølging av leverandørordre
+TypeContact_order_supplier_internal_SHIPPING=Representant for oppfølging av levering
+TypeContact_order_supplier_external_BILLING=Leverandørens fakturakontakt
+TypeContact_order_supplier_external_SHIPPING=Leverandørens leveransekontakt
+TypeContact_order_supplier_external_CUSTOMER=Leverandørens ordreoppfølger
 
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON er ikke definert
 Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON er ikke definert
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Kunne ikke laste modulfilen '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Kunne ikke laste modulfilen '%s'
-Error_OrderNotChecked=Ingen ordre å fakturere valgt
+Error_OrderNotChecked=Ingen ordre til fakturering er valgt
 # Sources
 OrderSource0=Tilbud
 OrderSource1=Internet
-OrderSource2=DM
+OrderSource2=Epostkampanje
 OrderSource3=Telefonkampanje
 OrderSource4=Faxkampanje
 OrderSource5=Egenbestilling
@@ -168,5 +169,5 @@ OrderCreation=Opprett ordre
 Ordered=Bestilt
 OrderCreated=Din ordre har blitt opprettet
 OrderFail=En feil skjedde under opprettelse av din ordre 
-CreateOrders=Lag ordrer
+CreateOrders=Lag ordre
 ToBillSeveralOrderSelectCustomer=For å opprette en faktura for flere ordrer, klikk først på kunden, velg deretter "%s".
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 41434a93b84..58815323c89 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -2,95 +2,96 @@
 SecurityCode=Sikkerhetskode
 Calendar=Kalender
 Tools=Verktøy
-ToolsDesc=Dette området er dedikert til gruppen diverse verktøy ikke er tilgjengelig i andre menyen oppføringer. <br><br> Disse verktøyene kan nås fra menyen på siden.
+ToolsDesc=Dette området er dedikert til gruppen diverse verktøy og er ikke er tilgjengelig i andre menyoppføringer. <br><br> Disse verktøyene kan nås fra menyen på siden.
 Birthday=Fødselsdag
 BirthdayDate=Fødselsdag
 DateToBirth=Fødselsdag
-BirthdayAlertOn= bursdag varsling aktive
-BirthdayAlertOff= bursdag varsling inaktive
-Notify_FICHINTER_VALIDATE=Godkjenn intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_BILL_VALIDATE=Godkjenn faktura
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_ORDER_SUPPLIER_APPROVE=Leverandør bestill godkjent
-Notify_ORDER_SUPPLIER_REFUSE=Leverandør bestill nektet
+BirthdayAlertOn= fødselsdagsvarsling aktiv
+BirthdayAlertOff= fødselsdagsvarsling inaktiv
+Notify_FICHINTER_VALIDATE=Intervensjon validert
+Notify_FICHINTER_SENTBYMAIL=Intervensjon sendt med post
+Notify_BILL_VALIDATE=Kundefaktura validert
+Notify_BILL_UNVALIDATE=Validering fjernet på kundefaktura
+Notify_ORDER_SUPPLIER_VALIDATE=Leverandørordre opptatt
+Notify_ORDER_SUPPLIER_APPROVE=Leverandørordre godkjent
+Notify_ORDER_SUPPLIER_REFUSE=Leverandørordre avvist
 Notify_ORDER_VALIDATE=Kundeordre validert
-Notify_PROPAL_VALIDATE=Kunden forslaget validert
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
-Notify_WITHDRAW_TRANSMIT=Transmission tilbaketrekning
-Notify_WITHDRAW_CREDIT=Credit tilbaketrekning
-Notify_WITHDRAW_EMIT=Isue tilbaketrekning
+Notify_PROPAL_VALIDATE=Kundentilbud validert
+Notify_PROPAL_CLOSE_SIGNED=Lukket tilbud signert
+Notify_PROPAL_CLOSE_REFUSED=Lukket tilbud avvist
+Notify_WITHDRAW_TRANSMIT=Overføring avbrudt
+Notify_WITHDRAW_CREDIT=Kreditt tilbaketrekning
+Notify_WITHDRAW_EMIT=Utfør tilbaketrekning
 Notify_ORDER_SENTBYMAIL=Kundeordre sendt i posten
-Notify_COMPANY_CREATE=Tredjeparts opprettet
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_PROPAL_SENTBYMAIL=Kommersiell forslaget sendes med post
-Notify_BILL_PAYED=Kunden faktura betales
-Notify_BILL_CANCEL=Kunden faktura kansellert
-Notify_BILL_SENTBYMAIL=Kunden faktura sendt i posten
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverandør ordre sendes med post
-Notify_BILL_SUPPLIER_VALIDATE=Leverandør faktura validert
-Notify_BILL_SUPPLIER_PAYED=Leverandør faktura betales
-Notify_BILL_SUPPLIER_SENTBYMAIL=Leverandør faktura sendt i posten
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_COMPANY_CREATE=Tredjepart opprettet
+Notify_COMPANY_SENTBYMAIL=E-poster sendt fra tredjeparts-kort
+Notify_PROPAL_SENTBYMAIL=Tilbud sendt med post
+Notify_BILL_PAYED=Kundefaktura betalt
+Notify_BILL_CANCEL=Kundefaktura kansellert
+Notify_BILL_SENTBYMAIL=Kundefaktura sendt i posten
+Notify_ORDER_SUPPLIER_VALIDATE=Leverandørordre opptatt
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverandørordre sendt med post
+Notify_BILL_SUPPLIER_VALIDATE=Leverandørfaktura validert
+Notify_BILL_SUPPLIER_PAYED=Leverandørfaktura betalt
+Notify_BILL_SUPPLIER_SENTBYMAIL=Leverandørfaktura sendt i posten
+Notify_BILL_SUPPLIER_CANCELED=Leverandørfaktura kansellert
 Notify_CONTRACT_VALIDATE=Kontrakt validert
-Notify_FICHEINTER_VALIDATE=Intervention validert
-Notify_SHIPPING_VALIDATE=Shipping validert
-Notify_SHIPPING_SENTBYMAIL=Shipping sendt i posten
+Notify_FICHEINTER_VALIDATE=Intervensjon validert
+Notify_SHIPPING_VALIDATE=Leveranse validert
+Notify_SHIPPING_SENTBYMAIL=Leveranse sendt i posten
 Notify_MEMBER_VALIDATE=Medlem validert
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Medlem endret
 Notify_MEMBER_SUBSCRIPTION=Medlem abonnerer
-Notify_MEMBER_RESILIATE=Medlem resiliated
+Notify_MEMBER_RESILIATE=Medlem avsluttet abonnement
 Notify_MEMBER_DELETE=Medlem slettet
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See setup of module %s
+Notify_PROJECT_CREATE=Opprettelse av prosjekt
+Notify_TASK_CREATE=Oppgave opprettet
+Notify_TASK_MODIFY=Oppgave endret
+Notify_TASK_DELETE=Oppgave slettet
+SeeModuleSetup=Se oppsett av modul %s
 NbOfAttachedFiles=Antall vedlagte filer/dokumenter
 TotalSizeOfAttachedFiles=Total størrelse på vedlagte filer/dokumenter
 MaxSize=Maksimal størrelse
 AttachANewFile=Legg ved ny fil/dokument
 LinkedObject=Lenkede objekter
 Miscellaneous=Diverse
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
-PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
-PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet testen må være i fet skrift). <br> De to linjene er skilt med en vognretur.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+NbOfActiveNotifications=Antall notifikasjoner (antall e-postmottakere)
+PredefinedMailTest=Dette er en test e-post.\nDe to linjene er adskilt med et linjeskift.\n\n__SIGNATURE__
+PredefinedMailTestHtml=Dette er en <b>test</b> e-post (ordet test må være i fet skrift). <br> De to linjene er skilt med en vognretur.<br><br>__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVedlagt faktura __FACREF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nVi kan ikke se å ha mottatt betaling for faktura __FACREF__ . Som påminnelse sender vi fakturaen på nytt\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVedlagt følger tilbud__PROPREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVedlagt følger prisforespørsel __ASKREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVedlagt faktura __FACREF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVedlagt følger leveranse __SHIPPINGREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVedlagt følger intervensjon __FICHINTERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr er ikke en komplett ERP, men er bygget opp av flere forskjellige moduler. Vi har derfor laget flere forskjellige demoprofiler
+DemoDesc=Dolibarr er en kompakt ERP, bygget opp av flere forskjellige moduler. Vi har laget flere forskjellige demoprofiler
 ChooseYourDemoProfil=Velg demoprofilen som passer til ditt område...
 DemoFundation=Håndtere medlemmer i en organisasjon
 DemoFundation2=Håndtere medlemmer og bankkonti i en organisasjon
-DemoCompanyServiceOnly=Lede en freelancevirksomhet som kun selger tjenester
-DemoCompanyShopWithCashDesk=Lede en butikk med kontantomsetning/kasse
-DemoCompanyProductAndStocks=Lede en liten eller mellomstor bedrift som selger produkter
-DemoCompanyAll=Lede en liten eller mellomstor bedrift med mange aktiviteter (alle hovedmoduler)
+DemoCompanyServiceOnly=Administrer en freelancevirksomhet som kun selger tjenester
+DemoCompanyShopWithCashDesk=Administrer en butikk med kontantomsetning/kasse
+DemoCompanyProductAndStocks=Administrer en liten eller mellomstor bedrift som selger varer
+DemoCompanyAll=Administrer en liten eller mellomstor bedrift med mange aktiviteter (alle hovedmoduler)
 GoToDemo=Gå til demo
 CreatedBy=Laget av %s
 ModifiedBy=Endret av %s
 ValidatedBy=Godkjent av %s
 CanceledBy=Kansellert av %s
-ClosedBy=Luket av %s
-CreatedById=User id who created
-ModifiedById=User id who made last change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made last change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+ClosedBy=Lukket av %s
+CreatedById=Bruker-ID som opprettet
+ModifiedById=Bruker-ID som utførte siste endring
+ValidatedById=Bruker-ID som validerte
+CanceledById=Bruker-ID som kansellerte
+ClosedById=Bruker-ID som lukket
+CreatedByLogin=Bruker-login som opprettet
+ModifiedByLogin=Bruker-login som utførte siste endring
+ValidatedByLogin=Bruker-login som validerte
+CanceledByLogin=Bruker-login som kansellerte
+ClosedByLogin=Bruker-login som lukket
 FileWasRemoved=Filen ble slettet
 DirWasRemoved=Mappen ble slettet
 FeatureNotYetAvailableShort=Tilgjengelig i en neste versjon
@@ -100,9 +101,9 @@ FeatureDevelopment=Funksjon under utvikling. Ikke stabil i denne versjonen
 FeaturesSupported=Støttede funksjoner
 Width=Bredde
 Height=Høyde
-Depth=dybde
+Depth=Dybde
 Top=Topp
-Bottom=Bottom
+Bottom=Bunn
 Left=Venstre
 Right=Høyre
 CalculatedWeight=Beregnet vekt
@@ -121,19 +122,19 @@ LengthUnitcm=cm
 LengthUnitmm=mm
 Surface=Område
 SurfaceUnitm2=m2
-SurfaceUnitdm2=DM2
+SurfaceUnitdm2=dm2
 SurfaceUnitcm2=cm2
 SurfaceUnitmm2=mm2
-SurfaceUnitfoot2=ft2
-SurfaceUnitinch2=in2
+SurfaceUnitfoot2=fot2
+SurfaceUnitinch2=tommer2
 Volume=Volum
-TotalVolume=Totalr volum
+TotalVolume=Totalvolum
 VolumeUnitm3=m3
 VolumeUnitdm3=dm3
 VolumeUnitcm3=cm3
 VolumeUnitmm3=mm3
-VolumeUnitfoot3=ft3
-VolumeUnitinch3=in3
+VolumeUnitfoot3=fot3
+VolumeUnitinch3=tommer3
 VolumeUnitounce=unse
 VolumeUnitlitre=liter
 VolumeUnitgallon=gallon
@@ -142,90 +143,91 @@ SizeUnitm=m
 SizeUnitdm=dm
 SizeUnitcm=cm
 SizeUnitmm=mm
-SizeUnitinch=tommers
-SizeUnitfoot=foten
-SizeUnitpoint=point
-BugTracker=Bug tracker
+SizeUnitinch=tommer
+SizeUnitfoot=fot
+SizeUnitpoint=punkt
+BugTracker=Feilsporing (bugtracker)
 SendNewPasswordDesc=Her kan du be om et nytt passord. Det nye passordet vil bli sendt til din e-postadresse.<br>Endringen vil først tre i kraft etter at du har trykket på bekreftelseslenken i den mottatte e-posten.<br>Sjekk e-postmeldingene dine.
 BackToLoginPage=Tilbake til innloggingssiden
 AuthenticationDoesNotAllowSendNewPassword=Autensitering er satt til <b>%s</b>.<br>Det betyr at Dolibarr ikke kan vite eller endre passordet ditt.<br>Kontakt systemadministrator hvis du vil endre passordet ditt.
-EnableGDLibraryDesc=Installer eller slå på GD library i PHP for å bruke denne funksjonen.
-EnablePhpAVModuleDesc=Du må installeren en modul som er kompatibel med anti-virusprogrammet. (Clamav : php4-clamavlib eller php5-clamavlib)
+EnableGDLibraryDesc=Installer eller slå på GD bibliotek i PHP for å bruke denne funksjonen.
+EnablePhpAVModuleDesc=Du må installeren en modul som er kompatibel med anti-virusprogrammet ditt. (Clamav : php4-clamavlib eller php5-clamavlib)
 ProfIdShortDesc=<b>Prof Id %s</b> er avhengig av tredjepartens land.<br>For eksempel er det for <b>%s</b>, koden <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistikk i antall produkter / tjenester enheter
+StatsByNumberOfUnits=Statistikk i antall varer / tjenester enheter
 StatsByNumberOfEntities=Statistikk i antall henvisende enheter
-NumberOfProposals=Antall forslag på 12 siste måned
-NumberOfCustomerOrders=Antall kundeordre på siste 12 mnd
-NumberOfCustomerInvoices=Antall kundefakturaer på siste 12 mnd
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
-NumberOfSupplierInvoices=Antall leverandørfakturaer på siste 12 mnd
-NumberOfUnitsProposals=Antall enheter på forslag på siste 12 mnd
-NumberOfUnitsCustomerOrders=Antall enheter på kundeordrer på siste 12 mnd
-NumberOfUnitsCustomerInvoices=Antall enheter på kundenes fakturaer på siste 12 mnd
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
-NumberOfUnitsSupplierInvoices=Antall enheter på leverandørfakturaer på siste 12 mnd
+NumberOfProposals=Antall forslag 12 siste måned
+NumberOfCustomerOrders=Antall kundeordre siste 12 mnd
+NumberOfCustomerInvoices=Antall kundefakturaer siste 12 mnd
+NumberOfSupplierOrders=Antall leverandørordre siste 12 måneder
+NumberOfSupplierInvoices=Antall leverandørfakturaer siste 12 mnd
+NumberOfUnitsProposals=Antall enheter i tilbud siste 12 mnd
+NumberOfUnitsCustomerOrders=Antall enheter i kundeordrer siste 12 mnd
+NumberOfUnitsCustomerInvoices=Antall enheter i kundenes fakturaer siste 12 mnd
+NumberOfUnitsSupplierOrders=Antall enheter i leveradørordre siste 12 måneder
+NumberOfUnitsSupplierInvoices=Antall enheter i leverandørfakturaer siste 12 mnd
 EMailTextInterventionValidated=Intervensjonen %s har blitt validert.
 EMailTextInvoiceValidated=Fakturaen %s har blitt validert.
-EMailTextProposalValidated=Forslaget %s har blitt validert.
+EMailTextProposalValidated=Tilbudet %s har blitt validert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Ordren %s er godkjent.
-EMailTextOrderValidatedBy=The order %s has been recorded by %s.
+EMailTextOrderValidatedBy=Ordren %s er blitt registrert av %s
 EMailTextOrderApprovedBy=Ordren %s er godkjent av %s.
-EMailTextOrderRefused=Ordren %s har blitt nektet.
-EMailTextOrderRefusedBy=Ordren %s har blitt nektet av %s.
-EMailTextExpeditionValidated=The shipping %s has been validated.
-ImportedWithSet=Innførsel datasett
+EMailTextOrderRefused=Ordren %s har blitt avvist.
+EMailTextOrderRefusedBy=Ordren %s har blitt avvist av %s.
+EMailTextExpeditionValidated=Leveransen %s er blitt validert
+ImportedWithSet=Datasett for import
 DolibarrNotification=Automatisk varsling
-ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
+ResizeDesc=Skriv inn ny bredde <b>eller</b> ny høyde. BxH forhold vil bli beholdt .
 NewLength=Ny bredde
 NewHeight=Ny høyde
 NewSizeAfterCropping=Ny størrelse etter beskjæring
-DefineNewAreaToPick=Definer nytt område på bildet for å plukke (venstre klikk på bildet og dra til du kommer til motsatt hjørne)
+DefineNewAreaToPick=Definer nytt område på bildet for å hente (venstreklikk på bildet og dra til du kommer til motsatt hjørne)
 CurrentInformationOnImage=Informasjon om gjeldende bilde
-ImageEditor=Image Editor
+ImageEditor=Billedbehandler
 YouReceiveMailBecauseOfNotification=Du mottar denne meldingen fordi din e-post har blitt lagt til listen over mål for å bli informert om spesielle hendelser i %s programvare av %s.
 YouReceiveMailBecauseOfNotification2=Denne hendelsen er følgende:
-ThisIsListOfModules=Dette er en liste over moduler forhåndsvalgt av denne demoen profilen (bare de vanligste modulene er synlige i denne demoen). Rediger denne å ha en mer personlig demo og klikk på &quot;Start&quot;.
+ThisIsListOfModules=Dette er en liste over moduler forhåndsvalgt av denne demoprofilen (bare de vanligste modulene er synlige i denne demoen). Rediger denne for å få en mer personlig demo og klikk på &quot;Start&quot;.
 ClickHere=Klikk her
-UseAdvancedPerms=Bruk den avanserte tillatelser av noen moduler
+UseAdvancedPerms=Bruk avanserte tillatelser av noen moduler
 FileFormat=Filformat
 SelectAColor=Velg en farge
 AddFiles=Legg til filer
-StartUpload=Starte opplasting
+StartUpload=Start opplasting
 CancelUpload=Avbryt opplasting
-FileIsTooBig=Filer er for stor
-PleaseBePatient=Vær tålmodig ...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
+FileIsTooBig=Filene er for store
+PleaseBePatient=Vent et øyeblikk eller to...
+RequestToResetPasswordReceived=Forespørsel om å endre Dolibarr-passordet ditt er blitt mottatt
+NewKeyIs=Dette er din nye innloggingsnøkkel
+NewKeyWillBe=Ny nøkkel for innlogging er
 ClickHereToGoTo=Klikk her for å gå til %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
+YouMustClickToChange=Du må først klikke på følgende lenke for å validere passord-endringen
+ForgetIfNothing=Hvis det ikke er du som har bedt om endringen, kan du glemme denne e-posten. Dine opplysninger er trygge
+IfAmountHigherThan=Hvis beløpet er høyere enn<strong>%s</strong>
+SourcesRepository=Oppbevaring av kilder
 
 ##### Calendar common #####
 AddCalendarEntry=Legg oppføring til kalender %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Tredjepart %s lagt til
+ContractValidatedInDolibarr=Kontrakt %s validert
+ContractCanceledInDolibarr=Kontrakt %s kansellert
+ContractClosedInDolibarr=Kontrakt %s lukket
+PropalClosedSignedInDolibarr=Tilbud %s signert
+PropalClosedRefusedInDolibarr=Tilbud %s avvist
+PropalValidatedInDolibarr=Tilbud %s validert
+PropalClassifiedBilledInDolibarr=Tilbud %s klassifisert betalt
+InvoiceValidatedInDolibarr=Faktura %s validert
+InvoicePaidInDolibarr=Faktura %s endret til betalt
+InvoiceCanceledInDolibarr=Faktura %s kansellert
+PaymentDoneInDolibarr=Betaling %s utført
+CustomerPaymentDoneInDolibarr=Kundebetaling %s utført
+SupplierPaymentDoneInDolibarr=Leverandørbetaling %s utført
+MemberValidatedInDolibarr=Medlem %s validert
+MemberResiliatedInDolibarr=Medlem %s avsluttet abonnementet
+MemberDeletedInDolibarr=Medlem %s slettet
+MemberSubscriptionAddedInDolibarr=Abonnement for medlem %s lagt til
+ShipmentValidatedInDolibarr=Leveranse %s validert
+ShipmentDeletedInDolibarr=Leveranse %s slettet
 ##### Export #####
 Export=Eksport
 ExportsArea=Eksportområde
diff --git a/htdocs/langs/nb_NO/paybox.lang b/htdocs/langs/nb_NO/paybox.lang
index 0509a95252c..516afb87f20 100644
--- a/htdocs/langs/nb_NO/paybox.lang
+++ b/htdocs/langs/nb_NO/paybox.lang
@@ -1,40 +1,40 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox modul oppsett
-PayBoxDesc=Denne modulen tilbudet sider å tillate betaling på <a href="http://www.paybox.com" target="_blank">Paybox</a> av kunder. Dette kan brukes for en gratis betaling eller for en betaling på en bestemt Dolibarr objekt (faktura, ordre, ...)
-FollowingUrlAreAvailableToMakePayments=Følgende nettadresser er klare med en side til en kunde til å foreta en betaling på Dolibarr objekter
-PaymentForm=Betaling form
+PayBoxSetup=Oppsett av PayBox-modul 
+PayBoxDesc=Denne modulen setter oppmulighet for betaling på <a href="http://www.paybox.com" target="_blank">Paybox</a> av kunder. Dette kan brukes for gratis betaling eller for betaling på et bestemt Dolibarr objekt (faktura, ordre, ...)
+FollowingUrlAreAvailableToMakePayments=Følgende nettadresser er tilgjengelige for kundene til å foreta betalinger for Dolibarr objekter
+PaymentForm=Betalingskjema
 WelcomeOnPaymentPage=Velkommen på våre elektroniske betalingstjenester
-ThisScreenAllowsYouToPay=Dette skjermbildet kan du foreta en online betaling for å %s.
-ThisIsInformationOnPayment=Dette er informasjon om betaling å gjøre
+ThisScreenAllowsYouToPay=I detteskjermbildet kan du foreta en online betaling til %s.
+ThisIsInformationOnPayment=Betalingsinformasjon
 ToComplete=For å fullføre
 YourEMail=E-post for betalingsbekreftelsen
 Creditor=Kreditor
-PaymentCode=Betaling kode
-PayBoxDoPayment=Gå på betaling
-YouWillBeRedirectedOnPayBox=Du vil bli omdirigert på sikrede Paybox siden for å inndataene du kredittkortinformasjonen
-PleaseBePatient=Vær, være tålmodig
+PaymentCode=Betalingskode
+PayBoxDoPayment=Gå til betaling
+YouWillBeRedirectedOnPayBox=Du vil bli omdirigert til den sikrede Paybox siden for innlegging av kredittkortinformasjon
+PleaseBePatient=Vent et øyeblikk
 Continue=Neste
 ToOfferALinkForOnlinePayment=URL for %s betaling
-ToOfferALinkForOnlinePaymentOnOrder=URL for å tilby en %s online betaling brukergrensesnitt for en bestilling
-ToOfferALinkForOnlinePaymentOnInvoice=URL for å tilby en %s online betaling brukergrensesnitt for en faktura
-ToOfferALinkForOnlinePaymentOnContractLine=URL for å tilby en %s online betaling brukergrensesnitt for en kontrakt linje
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL for å tilby en %s online betaling brukergrensesnitt for et fritt beløp
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL for å tilby en %s online betaling brukergrensesnitt for et medlem abonnement
-YouCanAddTagOnUrl=Du kan også legge til url parameter <b>& tag = <i>verdien</i></b> til noen av disse URL (kreves kun gratis betaling) for å legge til dine egne betalingen kommentar taggen.
-SetupPayBoxToHavePaymentCreatedAutomatically=Oppsettet ditt PayBox med url <b>%s</b> å få betaling opprettes automatisk når validert av paybox.
+ToOfferALinkForOnlinePaymentOnOrder=URL for å tilby et %s brukergrensesnitt for online betaling av kundeordre
+ToOfferALinkForOnlinePaymentOnInvoice=URL for å tilby et %s brukergrensesnitt for online betaling av kundefaktura
+ToOfferALinkForOnlinePaymentOnContractLine=URL for å tilby et %s brukergrensesnitt for online betaling av en kontraktlinje
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL for å tilby et %s brukergrensesnitt for online betaling av et fribeløp beløp
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL for å tilby et %s brukergrensesnitt for online betaling av medlemsabonnement
+YouCanAddTagOnUrl=Du kan også legge til URL-parameter <b>&tag=<i>verdier</i></b> til noen av disse URLene (kreves kun ved betaling av fribeløp) for å legge til dine egne merknader til betalingen kommentar.
+SetupPayBoxToHavePaymentCreatedAutomatically=Oppsett av din PayBox med url <b>%s</b> for å få betaling opprettet automatisk når  den er validert av paybox.
 YourPaymentHasBeenRecorded=Denne siden bekrefter at din betaling er registrert. Takk.
-YourPaymentHasNotBeenRecorded=Du betaling ikke er registrert og transaksjonen har blitt kansellert. Takk.
-AccountParameter=Konto parametere
-UsageParameter=Parametere for bruk
+YourPaymentHasNotBeenRecorded=Din betaling ble ikke registrert og transaksjonen har blitt kansellert.
+AccountParameter=Kontoparametre
+UsageParameter=Parametre for bruk
 InformationToFindParameters=Hjelp til å finne din %s kontoinformasjon
-PAYBOX_CGI_URL_V2=Url av PAYBOX CGI modul for betaling
+PAYBOX_CGI_URL_V2=Url til PAYBOX CGI-modul for betaling
 VendorName=Navn på leverandøren
-CSSUrlForPaymentForm=CSS-stilark url for betalingsformen
-MessageOK=Melding på godkjent betaling retur siden
-MessageKO=Melding om avbrutt betaling retur siden
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+CSSUrlForPaymentForm=URL til CSS-stilark for betalingsskjema
+MessageOK=Returside for melding om validert betaling
+MessageKO=Returside for melding om avbrutt betaling
+NewPayboxPaymentReceived=Ny Paybox-betaling mottatt
+NewPayboxPaymentFailed=Ny Paybox-betaling forsøkt, men feilet
+PAYBOX_PAYONLINE_SENDEMAIL=Epost for varling etter betaling (vellykket eller feilet)
+PAYBOX_PBX_SITE=Verdi for PBX SITE
+PAYBOX_PBX_RANG=Verdi for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Verdi for PBX ID
diff --git a/htdocs/langs/nb_NO/paypal.lang b/htdocs/langs/nb_NO/paypal.lang
index d90f0cbc7c9..28a6b66789b 100644
--- a/htdocs/langs/nb_NO/paypal.lang
+++ b/htdocs/langs/nb_NO/paypal.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal modul oppsett
-PaypalDesc=Denne modulen tilbyr sider for å tillate betaling på <a href="http://www.paypal.com" target="_blank">PayPal</a> av kunder. Dette kan brukes til en gratis betaling eller for en betaling på en bestemt Dolibarr objekt (faktura, ordre, ...)
+PaypalSetup=PayPal moduloppsett
+PaypalDesc=Denne modulen tilbyr sider for å tillate betaling på <a href="http://www.paypal.com" target="_blank">PayPal</a> av kunder. Dette kan brukes til en gratis betaling eller for et bestemt Dolibarr objekt (faktura, ordre, ...)
 PaypalOrCBDoPayment=Betal med kredittkort eller Paypal
 PaypalDoPayment=Betal med Paypal
 PaypalCBDoPayment=Betal med kredittkort
-PAYPAL_API_SANDBOX=Mode test / sandkasse
+PAYPAL_API_SANDBOX=Test-/sandkasse-modus
 PAYPAL_API_USER=API brukernavn
 PAYPAL_API_PASSWORD=API passord
 PAYPAL_API_SIGNATURE=API signatur
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer betaling &quot;integrert&quot; (Kredittkort + Paypal) eller &quot;Paypal&quot; bare
-PaypalModeIntegral=Integral
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Tilby &quot;integrert&quot betaling; (Kredittkort + Paypal) eller bare &quot;Paypal&quot; 
+PaypalModeIntegral=Integrert
 PaypalModeOnlyPaypal=Kun PayPal
-PAYPAL_CSS_URL=Optionnal Url av CSS-stilark på betaling side
-ThisIsTransactionId=Dette er id av transaksjonen: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Legg til url av Paypal betaling når du sender et dokument i posten
+PAYPAL_CSS_URL=Vis url av CSS-stilark på betalingsside
+ThisIsTransactionId=Transaksjons-ID: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Legg til url av Paypal-betaling når du sender et dokument i posten
 PAYPAL_IPN_MAIL_ADDRESS=E-post adressen for øyeblikkelig varsling av betaling (IPN)
 PredefinedMailContentLink=Du kan klikke på den sikre linken nedenfor for å betale (PayPal) hvis det ikke allerede er gjort. \n\n\n%s\n\n
-YouAreCurrentlyInSandboxMode=Du er for øyeblikket i &quot;sandbox&quot;-modus
+YouAreCurrentlyInSandboxMode=Du er for øyeblikket i "sandbox"-modus
 NewPaypalPaymentReceived=Ny Paypal betaling mottatt
 NewPaypalPaymentFailed=Ny Paypal betaling mislyktes
-PAYPAL_PAYONLINE_SENDEMAIL=E-post-varsel etter en betaling (suksess eller ikke)
-ReturnURLAfterPayment=Retur URL etter betaling
+PAYPAL_PAYONLINE_SENDEMAIL=E-post-varsel etter en betaling (vellykket eller ikke)
+ReturnURLAfterPayment=Retur-URL etter betaling
 ValidationOfPaypalPaymentFailed=Validering av Paypal betaling mislyktes
-PaypalConfirmPaymentPageWasCalledButFailed=Betalingsbekreftelsen for Paypal ble hentet av Paypal, men bekreftelse mislyktes
+PaypalConfirmPaymentPageWasCalledButFailed=Betalingsbekreftelse ble forsøkt hentet av Paypal, men mislyktes
diff --git a/htdocs/langs/nb_NO/printing.lang b/htdocs/langs/nb_NO/printing.lang
index f0cd2a40292..4a4bffc44a3 100644
--- a/htdocs/langs/nb_NO/printing.lang
+++ b/htdocs/langs/nb_NO/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
+Module64000Name=Direkteutskrift
+Module64000Desc=Aktiver direkteutskrift
+PrintingSetup=Oppsett av direkteutskrift-system
+PrintingDesc=Denne modulen legger til en Skriv-knapp for  å sende dokumenter direkte til en skriver (uten å åpne dokumentet i et program) i forskjellige moduler
+ModuleDriverSetup=Oppsett av drivere
+PrintingDriverDesc=Oppsett av skrivervariabler
+ListDrivers=Liste over drivere
+PrintTestDesc=Liste over skrivere
+FileWasSentToPrinter=Filen %s ble sendt til skriveren
+NoActivePrintingModuleFound=Ingen aktiv modul for utskrift
+PleaseSelectaDriverfromList=Velg en skriver fra listen
+SetupDriver=Oppsett av driver
 TestDriver=Test
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
+TargetedPrinter=Aktiv skriver
+UserConf=Oppsett pr. bruker
 PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
+PrintGCPDesc=Denne driveren gjør at du kan sende dokumenter direkte til skrivere tilknyttet Google Cloud Print.
+PrintingDriverDescprintgcp=Variabler for skriverdriver tilknyttet Google Cloud Print
+PrintTestDescprintgcp=Skrivere tilknyttet Google Cloud Print
+PRINTGCP_LOGIN=Google brukernavn
+PRINTGCP_PASSWORD=Google passord
 STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
+STATE_UNKNOWN=Ukjent
 STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
+STATE_DORMANT=Offline ganske lenge
 TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
+TYPE_HP=HP skriver
 TYPE_DOCS=DOCS
-TYPE_DRIVE=Google Drive
+TYPE_DRIVE=Google Disk
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
-PrintTestDescprintipp=List of Printers for driver PrintIPP.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
+GCP_Name=Navn
+GCP_displayName=Visningsnavn
+GCP_Id=Skriver ID
+GCP_OwnerName=Eiernavn
+GCP_State=Skriverstatus
+GCP_connectionStatus=Online status
+GCP_Type=Skrivertype
+PRINTIPP=PrintIPP driver
+PrintIPPSetup=Oppsett av direkteutskrift-modul
+PrintIPPDesc=Denne driveren gjør det mulig å sende dokumenter direkte til en skriver. Den krever et Linux-system med CUPS installert
+PrintingDriverDescprintipp=Oppsettsvariabler for skriverdriver PrintIPP
+PrintTestDescprintipp=Liste over skrivere til PrintIPP-driveren
+PRINTIPP_ENABLED=Vi "Direkteutskrift" ikon i dokumentlister
+PRINTIPP_HOST=Skriver-server
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+PRINTIPP_USER=Logg inn
+PRINTIPP_PASSWORD=Passord
+NoPrinterFound=Ingen skrivere funnet (sjekk CUPS-oppsettet)
+NoDefaultPrinterDefined=Ingen standardskriver definert
+DefaultPrinter=Standardskriver
+Printer=Skriver
+CupsServer=CUPS server
+IPP_Uri=Skriver url
+IPP_Name=Skrivernavn
+IPP_State=Skriverstatus
+IPP_State_reason=Status årsak
+IPP_State_reason1=Status årsak1
 IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
-STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
-STATE_IPP_none=None
-MEDIA_IPP_stationery=Stationery
-MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+IPP_Color=Farge
+IPP_Device=Enhet
+IPP_Media=Skriver media
+IPP_Supported=Mediatype
+STATE_IPP_idle=Venter
+STATE_IPP_stopped=Stoppet
+STATE_IPP_paused=Pauset
+STATE_IPP_toner-low-report=Lavt toner-nivå
+STATE_IPP_none=Ingen
+MEDIA_IPP_stationery=Stasjonær
+MEDIA_IPP_thermal=Termisk
+IPP_COLOR_print-black=BW skriver
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index 6914b40308b..bef61da1939 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -5,18 +5,18 @@ ProductStatusNotOnBatch=Nei (lot/serienummer ikke i bruk)
 ProductStatusOnBatchShort=Ja
 ProductStatusNotOnBatchShort=Nei
 Batch=Lot/serienummer
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+atleast1batchfield=Siste forbruksdato, siste salgsdato eller lot/serienummer
 batch_number=Lot/serienummer
-BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Lot/serienummer detaljer
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+BatchNumberShort=Lot/serienummer
+l_eatby=Siste forbruksdato
+l_sellby=Siste salgsdato
+DetailBatchNumber=Lot/serienummer-detaljer
+DetailBatchFormat=Lot/Serienummer: %s - Siste forbruksdato: %s - Siste salgsdato: %s (Ant: %d)
+printBatch=Lot/Serienummer: %s
+printEatby=Siste forbruksdato: %s
+printSellby=Siste salgsdato: %s
+printQty=Ant: %d
+AddDispatchBatchLine=Legg til en linje for holdbarhetsdato
+BatchDefaultNumber=Udefinert
+WhenProductBatchModuleOnOptionAreForced=Når Lot/serienummer-modulen er aktivert, vil øk/minsk lager være tvunget til siste valg, og kan ikke modifiseres. Alle andre opsjoner kan endres
+ProductDoesNotUseBatchSerial=Denne varen har ikke lot/serienummer
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 690d5e8bcfa..54082694b4b 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Produkt Ref.
-ProductLabel=Etiketten
+ProductRef=Vare ref.
+ProductLabel=Vareetikett
 ProductServiceCard=Kort for Varer/Tjenester
 Products=Varer
-Services=Tjenster
-Product=Varer
+Services=Tjenester
+Product=Vare
 Service=Tjenester
 ProductId=Vare/tjeneste-ID
 Create=Opprett
@@ -13,26 +13,26 @@ NewProduct=Ny vare
 NewService=Ny tjeneste
 ProductCode=Varekode
 ServiceCode=Tjenestekode
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Revisjon kode (kjøpe)
-ProductAccountancySellCode=Revisjon kode (selge)
+ProductVatMassChange=Masse MVA-endring
+ProductVatMassChangeDesc=Denne siden kan brukes til å endre en MVA-sats på varer eller tjenester fra en verdi til en annen. Advarsel, er denne endringen gjort i alle databasene.
+MassBarcodeInit=Masse strekkode-endring
+MassBarcodeInitDesc=Denne siden kan brukes til å lage strekkoder for objekter som ikke har dette. Kontroller at oppsett av modulen Strekkoder er fullført.
+ProductAccountancyBuyCode=Regnskapskode (kjøp)
+ProductAccountancySellCode=Regnskapskode (salg)
 ProductOrService=Vare eller tjeneste
 ProductsAndServices=Varer og tjenester
 ProductsOrServices=Varer eller tjenester
-ProductsAndServicesOnSell=Produkter og tjenester for salg eller innkjøp
-ProductsAndServicesNotOnSell=Produkter og tjenester ute av salg
+ProductsAndServicesOnSell=Varer og tjenester for salg eller innkjøp
+ProductsAndServicesNotOnSell=Varer og tjenester ikke i salg
 ProductsAndServicesStatistics=Statistikk over varer og tjenester
 ProductsStatistics=Varestatistikk
-ProductsOnSell=Produkt for salg eller innkjøp
-ProductsNotOnSell=Produkt ute av salg og innkjøp
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-InternalRef=Inter referanse
+ProductsOnSell=Vare for salg eller innkjøp
+ProductsNotOnSell=Vare ikke for salg og ikke for innkjøp
+ProductsOnSellAndOnBuy=Varer for kjøp og salg
+ServicesOnSell=Tjenester for salg eller innkjøp
+ServicesNotOnSell=Tjenester ikke for salg
+ServicesOnSellAndOnBuy=Tjenester for kjøp og salg
+InternalRef=Intern referanse
 LastRecorded=Siste registrerte varer/tjenester i salg
 LastRecordedProductsAndServices=Siste %s registrerte varer/tjenester
 LastModifiedProductsAndServices=Siste %s endrede varer/tjenester
@@ -44,7 +44,7 @@ CardProduct1=Tjenestekort
 CardContract=Kontraktkort
 Warehouse=Lager
 Warehouses=Lagere
-WarehouseOpened=Lager åpnet
+WarehouseOpened=Lager åpent
 WarehouseClosed=Lager lukket
 Stock=Beholdning
 Stocks=Beholdninger
@@ -52,60 +52,60 @@ Movement=Bevegelse
 Movements=Bevegelser
 Sell=Salg
 Buy=Kjøp
-OnSell=I salg
-OnBuy=Kjøpt
+OnSell=For salg
+OnBuy=For kjøp
 NotOnSell=Ikke i salg
-ProductStatusOnSell=I salg
-ProductStatusNotOnSell=Ikke i salg
-ProductStatusOnSellShort=I salg
-ProductStatusNotOnSellShort=Ikke i salg
-ProductStatusOnBuy=Tilgjengelig
-ProductStatusNotOnBuy=Foreldet
-ProductStatusOnBuyShort=Tilgjengelig
-ProductStatusNotOnBuyShort=Foreldet
+ProductStatusOnSell=For salg
+ProductStatusNotOnSell=Ikke for salg
+ProductStatusOnSellShort=For salg
+ProductStatusNotOnSellShort=Ikke for salg
+ProductStatusOnBuy=For kjøp
+ProductStatusNotOnBuy=Ikke for kjøp
+ProductStatusOnBuyShort=For kjøp
+ProductStatusNotOnBuyShort=Ikke for kjøp
 UpdatePrice=Oppdater pris
 AppliedPricesFrom=Gjeldende priser fra
 SellingPrice=Salgspris
-SellingPriceHT=Salgspris (etter skatt)
-SellingPriceTTC=Salgspris (inkl. skatt)
+SellingPriceHT=Salgspris (eks. MVA)
+SellingPriceTTC=Salgspris (inkl. MVA)
 PublicPrice=Veiledende pris
 CurrentPrice=Gjeldende pris
 NewPrice=Ny pris
-MinPrice=Minim. salgspris
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
-CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for dette produktet (%s uten skatt)
+MinPrice=Minste utsalgspris
+MinPriceHT=Minste utsalgspris (eks. MVA)
+MinPriceTTC=Minste utsalgspris (inkl. MVA)
+CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for denne varen (%s uten avgifter)
 ContractStatus=Kontraktstatus
 ContractStatusClosed=Lukket
-ContractStatusRunning=Løpende
+ContractStatusRunning=Pågående
 ContractStatusExpired=utløpt
-ContractStatusOnHold=Ikke i gang
-ContractStatusToRun=To get running
-ContractNotRunning=Denne kontrakten er ikke i gang
+ContractStatusOnHold=Venter
+ContractStatusToRun=Sett pågående
+ContractNotRunning=Denne kontrakten er ikke pågående
 ErrorProductAlreadyExists=En vare med varenummere %s eksisterer allerede.
-ErrorProductBadRefOrLabel=Ugyldig varenummer eller navn.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorProductBadRefOrLabel=Ugyldig verdi for referanse eller etikett.
+ErrorProductClone=Det oppsto et problem ved forsøk på å klone varen eller tjenesten.
+ErrorPriceCantBeLowerThanMinPrice=Feil! Pris kan ikke være lavere enn minstepris
 Suppliers=Leverandører
-SupplierRef=Leverandør ref.
+SupplierRef=Leverandørs varereferanse.
 ShowProduct=Vis vare
 ShowService=Vis tjeneste
 ProductsAndServicesArea=Område for varer/tjenester
 ProductsArea=Vareområde
 ServicesArea=Tjenesteområde
-AddToMyProposals=Legg til mine tilbud
-AddToOtherProposals=Legg til endre tilbud
-AddToMyBills=Legg til mine fakturaer
-AddToOtherBills=Legg til andre fakturaer
+AddToMyProposals=Legg til i mine tilbud
+AddToOtherProposals=Legg til i andre tilbud
+AddToMyBills=Legg til i mine fakturaer
+AddToOtherBills=Legg til i andre fakturaer
 CorrectStock=Korriger beholdning
 AddPhoto=Legg til bilde
 ListOfStockMovements=Vis lagerbevegelser
 BuyingPrice=Innkjøpspris
 SupplierCard=Leverandørkort
 CommercialCard=Handelskort
-AllWays=Sti til varebeholdning
+AllWays=Bane til varebeholdning
 NoCat=Varen er ikke lagt inn i noen kategori
-PrimaryWay=Hovedsti
+PrimaryWay=Hovedbane
 PriceRemoved=Pris fjernet
 BarCode=Strekkode
 BarcodeType=Strekkodetype
@@ -114,25 +114,25 @@ BarcodeValue=Strekkodeverdi
 NoteNotVisibleOnBill=Notat (vises ikke på fakturaer, tilbud...)
 CreateCopy=Lag kopi
 ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
-MultiPricesAbility=Several level of prices per product/service
-MultiPricesNumPrices=Prisnummer
+MultiPricesAbility=Flere prisnivåer pr. vare/tjeneste
+MultiPricesNumPrices=Pris antall
 MultiPriceLevelsName=Priskategorier
-AssociatedProductsAbility=Activate the virtual package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
-ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
-EditAssociate=Tilknytninger
+AssociatedProductsAbility=Aktiver komponentvare-egenskaper
+AssociatedProducts=Komponentvare
+AssociatedProductsNumber=Antall varer i denne komponentvaren
+ParentProductsNumber=Antall foreldre-komponentvarer
+IfZeroItIsNotAVirtualProduct=Hvis 0, er dette ikke en komponentvare
+IfZeroItIsNotUsedByVirtualProduct=Hvis 0, er denne varen ikke med i en komponentvare
+EditAssociate=Tilknytt
 Translation=Oversettelse
 KeywordFilter=Nøkkelordfilter
 CategoryFilter=Kategorifilter
 ProductToAddSearch=Finn vare å legge til
-AddDel=Ny/slett
+AddDel=Legg til/slett
 Quantity=Mengde
 NoMatchFound=Ingen treff
-ProductAssociationList=Overikt over tilknyttede varer/tjenester: navn på vare/tjeneste (mengdepåvirket)
-ProductParentList=List of package products/services with this product as a component
+ProductAssociationList=Liste over varer/tjenester som er med i denne tenkte komponentvaren
+ProductParentList=Liste over komponentvarer med denne varen som en av komponentene
 ErrorAssociationIsFatherOfThis=En av de valgte varene er foreldre til gjeldende vare
 DeleteProduct=Slett vare/tjeneste
 ConfirmDeleteProduct=Er du sikker på at du vil slette valgte vare/tjeneste?
@@ -141,129 +141,158 @@ DeletePicture=Slett et bilde
 ConfirmDeletePicture=Er du sikker på at du vil slette bildet?
 ExportDataset_produit_1=Varer og tjenester
 ExportDataset_service_1=Tjenester
-ImportDataset_produit_1=Produkter
+ImportDataset_produit_1=Varer
 ImportDataset_service_1=Tjenester
 DeleteProductLine=Slett varelinje
 ConfirmDeleteProductLine=Er du sikker på at du vil slette denne varelinjen?
 NoProductMatching=Ingen varer/tjenester passer til dine kriterier
-MatchingProducts=Matchende varer/tjenester
-NoStockForThisProduct=Ingen beholdning på dene varen
+MatchingProducts=Like varer/tjenester
+NoStockForThisProduct=Ingen beholdning av denne varen
 NoStock=Ingen beholdning
 Restock=Fyll opp lager
 ProductSpecial=Spesial
-QtyMin=Minimum Qty
+QtyMin=Minste kvantum
 PriceQty=Pris for dette kvantum
-PriceQtyMin=Price for this min. qty (w/o discount)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Standard
+PriceQtyMin=Pris for minstekvantum (uten rabatt)
+VATRateForSupplierProduct=MVA-sats (for denne leverandøren/varen)
+DiscountQtyMin=Standard kvantumsrabatt
 NoPriceDefinedForThisSupplier=Ingen pris/mengde definert for denne leverandør/varekombinasjonen
 NoSupplierPriceDefinedForThisProduct=Ingen leverandørpris/mengde definert for varen
 RecordedProducts=Registrerte varer
 RecordedServices=Registrerte tjenester
 RecordedProductsAndServices=Registrete varer/tjenester
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToSell=Salg av forhåndsdefinerte varer
+PredefinedServicesToSell=Salg av forhåndsdefinerte tjenester
+PredefinedProductsAndServicesToSell=Salg av forhåndsdefinerte varer/tjenester
+PredefinedProductsToPurchase=Kjøp av forhåndsdefinert vare
+PredefinedServicesToPurchase=Kjøp av forhåndsdefinerte tjenester
+PredefinedProductsAndServicesToPurchase=Kjøp av forhåndsdefinerte varer/tjenester
 GenerateThumb=Lag miniatyrbilde
 ProductCanvasAbility=Bruk spesielle "canvas" tillegg
 ServiceNb=Tjeneste #%s
-ListProductServiceByPopularity=Liste over produkter / tjenester etter popularitet
-ListProductByPopularity=Vareer/tjenester etter popularitet
+ListProductServiceByPopularity=Liste over varer/tjenester etter popularitet
+ListProductByPopularity=Liste over varer/tjenester etter popularitet
 ListServiceByPopularity=Liste av tjenester etter popularitet
 Finished=Ferdigvare
 RowMaterial=Råvare
-CloneProduct=Klon produkt eller tjeneste
-ConfirmCloneProduct=Er du sikker på at du vil klone produktet eller tjenesten <b>%s?</b>
-CloneContentProduct=Klon alle de viktigste informasjoner av produkt / tjeneste
-ClonePricesProduct=Klone viktigste informasjon og priser
-CloneCompositionProduct=Clone packaged product/services
-ProductIsUsed=Dette produktet brukes
-NewRefForClone=Ref. av nye produkt / tjeneste
-CustomerPrices=Kunder priser
-SuppliersPrices=Leverandører priser
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
-CustomCode=Tollkodeks
-CountryOrigin=Opprinnelseslandet
-HiddenIntoCombo=Gjemt i enkelte lister
+CloneProduct=Klon vare eller tjeneste
+ConfirmCloneProduct=Er du sikker på at du vil klone varen eller tjenesten <b>%s</b>?
+CloneContentProduct=Klon alle de viktigste informasjoner av vare/tjeneste
+ClonePricesProduct=Klon viktigste informasjon og priser
+CloneCompositionProduct=Klon komponentvare/tjeneste
+ProductIsUsed=Denne varen brukes
+NewRefForClone=Ref. av nye vare/tjeneste
+CustomerPrices=Kundepriser
+SuppliersPrices=Leverandørpriser
+SuppliersPricesOfProductsOrServices=Leverandørpriser (varer og tjenester)
+CustomCode=Tollkode
+CountryOrigin=Opprinnelsesland
+HiddenIntoCombo=Skjult i valgte lister
 Nature=Natur
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-AddThisProductCard=Opprett produktkort
-HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
+ShortLabel=Kort etikett
+Unit=Enhet
+p= stk
+set=sett
+se=sett
+second=sekund
+s=s
+hour=time
+h=t
+day=dag
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linjær meter
+lm=lm
+square meter=kvadratmeter
+m2=m²
+cubic meter=kubikkmeter
+m3=m³
+liter=liter
+l=l
+ProductCodeModel=Vare ref.mal
+ServiceCodeModel=Tjeneste ref.mal
+AddThisProductCard=Opprett varekort
+HelpAddThisProductCard=Dette alternativet tillater deg å opprette eller klone en vare
 AddThisServiceCard=Opprett tjenestekort
-HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-PriceByQuantityRange=Quantity range
-ProductsDashboard=Products/Services summary
-UpdateOriginalProductLabel=Modify original label
-HelpUpdateOriginalProductLabel=Allows to edit the name of the product
+HelpAddThisServiceCard=Dette alternativet tillater deg å opprette eller klone en tjeneste
+CurrentProductPrice=Gjeldende pris
+AlwaysUseNewPrice=Bruk alltid gjeldende pris på vare/tjeneste
+AlwaysUseFixedPrice=Bruk den faste prisen
+PriceByQuantity=Prisen varierer med mengde
+PriceByQuantityRange=Kvantumssatser
+ProductsDashboard=Oppsummering varer og tjenester
+UpdateOriginalProductLabel=Endre original etikett
+HelpUpdateOriginalProductLabel=Tillat å endre varenavn
 ### composition fabrication
-Building=Production and items dispatchment
-Build=Produce
-BuildIt=Produce & Dispatch
-BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action)
+Building=Produksjon og elementutsendelse
+Build=Produser
+BuildIt=Produser og send ut
+BuildindListInfo=Tilgjengelig produksjonskvantum pr lager (sett til 0 for ingen ytterligere tiltak)
 QtyNeed=Ant
-UnitPmp=Net unit VWAP
-CostPmpHT=Net total VWAP
-ProductUsedForBuild=Auto consumed by production
-ProductBuilded=Production completed
-ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly VWAP
-ServiceSellByQuarterHT=Services turnover quarterly VWAP
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-DynamicPriceConfiguration=Dynamic price configuration
-GlobalVariables=Global variables
-GlobalVariableUpdaters=Global variable updaters
+UnitPmp=Netto enhet VWAP
+CostPmpHT=Netto total VWAP
+ProductUsedForBuild=Automatisk brukt i produksjon
+ProductBuilded=Produksjon komplett
+ProductsMultiPrice=Vare multi-pris
+ProductsOrServiceMultiPrice=Kundepriser (varer og tjenseter, multi-priser)
+ProductSellByQuarterHT=Kvartalsvis vareomsetning VWAP
+ServiceSellByQuarterHT=Kvartalsvis tjenesteomsetning VWAP
+Quarter1=1. kvartal
+Quarter2=2. kvartal
+Quarter3=3. kvartal
+Quarter4=4. kvartal
+BarCodePrintsheet=Skriv ut strekkode
+PageToGenerateBarCodeSheets=Med dette verktøyet kan du skrive ut ark med strekkode klistremerker. Velg arkformat, type strekkode og strekkodeverdi. Klikk deretter på knappen <b>%s</b>.
+NumberOfStickers=Antall klistremerker som skal skrives ut på siden
+PrintsheetForOneBarCode=Skriv ut flere klistremerker for hver strekkode
+BuildPageToPrint=Generer side for utskrift
+FillBarCodeTypeAndValueManually=Fyll inn strekkode type og verdi manuelt
+FillBarCodeTypeAndValueFromProduct=Fyll inn strekkode type og verdi fra strekkoden på en vare.
+FillBarCodeTypeAndValueFromThirdParty=Fyll inn strekkode type og verdi fra strekkoden på en tredjepart
+DefinitionOfBarCodeForProductNotComplete=Definisjon av strekkode type eller verdi for varen %s er ikke komplett.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definering av strekkode type eller verdi for uferdig tredjepart %s.
+BarCodeDataForProduct=Strekkodeinformasjon for vare %s:
+BarCodeDataForThirdparty=Strekkodeinformasjon for tredjepart %s:
+ResetBarcodeForAllRecords=Lag strekkode-verdier for alle poster (dette vil overskrive strekkoder som allerede er definert)
+PriceByCustomer=Ulik pris for hver kunde
+PriceCatalogue=Unik pris pr. vare/tjeneste
+PricingRule=Regler for kundepriser
+AddCustomerPrice=Legg til pris for kunde
+ForceUpdateChildPriceSoc=Sett samme pris for kundens datterselskaper
+PriceByCustomerLog=Pris fra kundens logg
+MinimumPriceLimit=Minstepris kan ikke være lavere enn %s
+MinimumRecommendedPrice=Anbefalt minstepris er %s
+PriceExpressionEditor=Pris-formel editor
+PriceExpressionSelected=Valgt formel for pris
+PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" for å sette prisen. Bruk semikolon for å skille uttrykk
+PriceExpressionEditorHelp2=Du kan bruke EkstraFelt med variabler som <b>#ekstrafelt_mittekstrafeltnøkkel#</b> og globale variabler med <b>#global_minkode#</b>
+PriceExpressionEditorHelp3=I både varer/tjenester og leverandørpriser er disse variablene tilgjengelige:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Kun i vare/tjeneste-pris:<b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Tilgjengelige globale verdier:
+PriceMode=Prismodus
+PriceNumeric=Nummer
+DefaultPrice=Standardpris
+ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
+ComposedProduct=Sub-vare
+MinSupplierPrice=Minste leverandørpris
+DynamicPriceConfiguration=Dynamisk pris-konfigurering
+GlobalVariables=Globale variabler
+GlobalVariableUpdaters=Oppdatering av globale variabler
 GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterHelp0=Parser JSON data fra angitt URL, VALUE spesifiserer lokasjonen til relevant verdi.
+GlobalVariableUpdaterHelpFormat0=formatet er {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
+GlobalVariableUpdaterHelp1=Parser WebService-data fra angitt URL, NS spesifiserer navnerom, VERDI angir plasseringen av relevant verdi, DATA inneholder data som skal sendes og METHOD kaller WS-metode
+GlobalVariableUpdaterHelpFormat1=formatet er {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Oppdateringsintervall (minutter)
+LastUpdated=Sist oppdatert
+CorrectlyUpdated=Korrekt oppdatert
+PropalMergePdfProductActualFile=Filer brukt for å legge til i PDF Azur er
+PropalMergePdfProductChooseFile=Velg PDF-filer
+IncludingProductWithTag=Inkludert vare med merke
+DefaultPriceRealPriceMayDependOnCustomer=Standardpris, virkelig pris avhenger av kunde
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index ec9d88be647..6a6a63abcca 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -1,68 +1,69 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Ref. prosjekt
+ProjectId=Prosjekt-ID
 Project=Prosjekt
 Projects=Prosjekter
-ProjectStatus=Project status
+ProjectStatus=Prosjektstatus
 SharedProject=Alle
 PrivateProject=Kontaktpersoner for prosjektet
-MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for (hva er den type).
+MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for (uansett type).
 ProjectsPublicDesc=Denne visningen presenterer alle prosjektene du har lov til å lese.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
-ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gi deg tillatelse til å vise alt).
-MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for (hva er den type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+ProjectsPublicTaskDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
+ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gir deg tillatelse til å vise alt).
+MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for (uansett type).
+OnlyOpenedProject=Kun åpne prosjekter er synlige (prosjektkladder og lukkede prosjekter er ikke synlige).
 TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
-TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gi deg tillatelse til å vise alt).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gir deg tillatelse til å vise alt).
+AllTaskVisibleButEditIfYouAreAssigned=Alle oppgaver for et slikt prosjekt er synlige, men du kan angi tid bare for oppgaven du er tildelt. Tildel oppgaven til deg hvis du ønsker å legge inn tid på den.
+OnlyYourTaskAreVisible=Kun oppgaver tildelt deg er synlige
 ProjectsArea=Prosjektområde
 NewProject=Nytt prosjekt
-AddProject=Create project
+AddProject=Opprett prosjekt
 DeleteAProject=Slett et prosjekt
-DeleteATask=Slette en oppgave
+DeleteATask=Slett en oppgave
 ConfirmDeleteAProject=Er du sikker på at du vil slette dette prosjektet?
 ConfirmDeleteATask=Er du sikker på at du vil slette denne oppgaven?
-OfficerProject=Officer prosjekt
+OfficerProject=Bas/formann for prosjektet
 LastProjects=Siste %s prosjekter
 AllProjects=Alle prosjekter
 ProjectsList=Oversikt over prosjekter
 ShowProject=Vis prosjekt
 SetProject=Sett prosjekt
 NoProject=Ingen prosjekter definert
-NbOpenTasks=Ant. åpne oppgaver
-NbOfProjects=Ant. prosjekter
+NbOpenTasks=Antall åpne oppgaver
+NbOfProjects=Antall prosjekter
 TimeSpent=Tid brukt
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Tid bruk av deg
+TimeSpentByUser=Tid brukt av bruker
 TimesSpent=Tid brukt
 RefTask=Ref. oppgave
-LabelTask=Oppgave
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+LabelTask=Oppgaveetikett
+TaskTimeSpent=Tid brukt på oppgaver
+TaskTimeUser=Bruker
+TaskTimeNote=Notat
+TaskTimeDate=Dato
+TasksOnOpenedProject=Oppgaver i åpne prosjekter
+WorkloadNotDefined=Arbeidsmengde ikke definert
 NewTimeSpent=Ny tid brukt
 MyTimeSpent=Mitt tidsforbruk
 MyTasks=Mine oppgaver
 Tasks=Oppgaver
 Task=Oppgave
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Oppgave startdato
+TaskDateEnd=Oppgave sluttdato
+TaskDescription=Oppgave beskrivelse
 NewTask=Ny oppgave
-AddTask=Create task
+AddTask=Opprett oppgave
 AddDuration=Legg til varighet
 Activity=Aktivitet
-Activities=Oppgaver / aktiviteter
+Activities=Oppgaver/aktiviteter
 MyActivity=Min aktivitet
-MyActivities=Mine oppgaver / aktiviteter
+MyActivities=Mine oppgaver/aktiviteter
 MyProjects=Mine prosjekter
 DurationEffective=Effektiv varighet
-Progress=Progress
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+Progress=Progresjon
+ProgressDeclared=Erklært progresjon
+ProgressCalculated=Kalkulert progresjon
 Time=Tid
 ListProposalsAssociatedProject=Oversikt over tilbud relatert til dette prosjektet
 ListOrdersAssociatedProject=Oversikt over ordre relatert til dette prosjektet
@@ -71,76 +72,85 @@ ListPredefinedInvoicesAssociatedProject=Liste over kundens forhåndsdefinerte fa
 ListSupplierOrdersAssociatedProject=Liste over leverandørens ordre knyttet til prosjektet
 ListSupplierInvoicesAssociatedProject=Liste over leverandørens fakturaer knyttet til prosjektet
 ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet
-ListFichinterAssociatedProject=Liste over tiltak knyttet til prosjektet
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
-ListDonationsAssociatedProject=List of donations associated with the project
-ListActionsAssociatedProject=Liste over tiltak knyttet til prosjektet
+ListFichinterAssociatedProject=Liste over intervensjoner knyttet til prosjektet
+ListExpenseReportsAssociatedProject=Liste over utgiftsrapporter tilknyttet prosjektet
+ListDonationsAssociatedProject=Liste over donasjoner tilknyttet prosjektet
+ListActionsAssociatedProject=Liste over hendelser knyttet til prosjektet
+ListTaskTimeUserProject=Liste over tidsbruk på oppgaver i prosjektet
+TaskTimeUserProject=Tidsbruk på prosjektoppgaver
 ActivityOnProjectThisWeek=Aktiviteter i prosjektet denne uke
 ActivityOnProjectThisMonth=Aktiviteter i prosjektet denne måned
-ActivityOnProjectThisYear=Aktiviteter i prosjektet dette år
-ChildOfTask=barn av oppgaven
-NotOwnerOfProject=Ikke eier av denne private prosjektet
-AffectedTo=Berørte til
-CantRemoveProject=Dette prosjektet kan ikke fjernes da det er referert av noen andre objekter (faktura, bestillinger eller annet). Se referanser kategorien.
-ValidateProject=Valider projet
-ConfirmValidateProject=Er du sikker på at du vil godkjenne dette prosjektet?
+ActivityOnProjectThisYear=Aktivitet i prosjektet dette år
+ChildOfTask=Tilhører prosjekt/oppgave
+NotOwnerOfProject=Ikke eier av dette private prosjektet
+AffectedTo=Tildelt
+CantRemoveProject=Dette prosjektet kan ikke fjernes da det er referert til av andre objekter (faktura, bestillinger eller annet). Se referanse-kategorien.
+ValidateProject=Valider prosjekt
+ConfirmValidateProject=Er du sikker på at du vil validere dette prosjektet?
 CloseAProject=Lukk prosjektet
 ConfirmCloseAProject=Er du sikker på at du vil lukke dette prosjektet?
-ReOpenAProject=Åpne prosjektet
-ConfirmReOpenAProject=Er du sikker på at du ønsker å åpne dette prosjektet?
+ReOpenAProject=Åpne prosjekt
+ConfirmReOpenAProject=Er du sikker på at du ønsker å gjenåpne dette prosjektet?
 ProjectContact=Prosjekt kontakter
-ActionsOnProject=Handlinger på prosjektet
-YouAreNotContactOfProject=Du er ikke en kontakt på denne private prosjektet
+ActionsOnProject=Handlinger i prosjektet
+YouAreNotContactOfProject=Du er ikke en kontakt tilhørende dette private prosjektet
 DeleteATimeSpent=Slett tidsbruk
-ConfirmDeleteATimeSpent=Er du sikker på at du vil slette denne gangen brukt?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+ConfirmDeleteATimeSpent=Er du sikker på at du vil slette tidsforbruket?
+DoNotShowMyTasksOnly=Se oppgaver som tilhører andre, også
+ShowMyTasksOnly=Vis kun oppgaver som tilhører meg
 TaskRessourceLinks=Ressurser
-ProjectsDedicatedToThisThirdParty=Prosjekter dedikert til denne tredje part
+ProjectsDedicatedToThisThirdParty=Prosjekter dedikert til denne tredjepart
 NoTasks=Ingen oppgaver for dette prosjektet
-LinkedToAnotherCompany=Knyttet opp til andre tredjepart
-TaskIsNotAffectedToYou=Task not assigned to you
-ErrorTimeSpentIsEmpty=Tid brukt er tom
-ThisWillAlsoRemoveTasks=Denne handlingen vil også slette alle oppgaver av prosjektet <b>(%s</b> oppgaver for øyeblikket) og alle innganger av medgått tid.
-IfNeedToUseOhterObjectKeepEmpty=Dersom noen objekter (faktura, orden, ...), som tilhører en annen tredjepart, må knyttes til prosjektet for å lage, beholde denne tomme for å få prosjektet blir flere tredjeparter.
-CloneProject=Clone project
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
-ConfirmCloneProject=Are you sure to clone this project ?
-ProjectReportDate=Change task date according project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+LinkedToAnotherCompany=Knyttet opp til annen tredjepart
+TaskIsNotAffectedToYou=Oppgave tilhører ikke deg
+ErrorTimeSpentIsEmpty=Tidsbruk er tom
+ThisWillAlsoRemoveTasks=Denne handlingen vil også slette alle oppgaver i prosjektet (<b>%s</b> oppgaver for øyeblikket), og all tidsregistrering slettes
+IfNeedToUseOhterObjectKeepEmpty=Dersom noen objekter (faktura, ordre, ...), tilhørende en annen tredjepart, må tilknyttes prosjektet, behold denne tom. Prosjektet kan da knyttes til flere tredjeparter.
+CloneProject=Klon prosjekt
+CloneTasks=Klon oppgaver
+CloneContacts=Klon kontakter
+CloneNotes=Klon notater
+CloneProjectFiles=Klon prosjekt-tilknyttede filer
+CloneTaskFiles=Klon oppgave-tilknyttede fil(er) (hvis oppgave(r) er klonet)
+CloneMoveDate=Oppdater prosjekter/oppgaver fra nå?
+ConfirmCloneProject=Er du sikker på at du vil klone dette prosjektet?
+ProjectReportDate=Endre oppgave-dato til prosjekt-startdato
+ErrorShiftTaskDate=Kan ikke skifte oppgave-dato etter nytt prosjekt-startdato
+ProjectsAndTasksLines=Prosjekter og oppgaver
+ProjectCreatedInDolibarr=Prosjekt %s opprettet
+TaskCreatedInDolibarr=Oppgave %s opprettet
+TaskModifiedInDolibarr=Oppgave %s endret
+TaskDeletedInDolibarr=Oppgave %s slettet
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Prosjektleder
 TypeContact_project_external_PROJECTLEADER=Prosjektleder
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_task_internal_TASKEXECUTIVE=Oppgave Executive
-TypeContact_project_task_external_TASKEXECUTIVE=Oppgave Executive
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Bidragsyter
+TypeContact_project_external_PROJECTCONTRIBUTOR=Bidragsyter
+TypeContact_project_task_internal_TASKEXECUTIVE=Oppgavel-leder
+TypeContact_project_task_external_TASKEXECUTIVE=Oppgavel-leder
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragsyter
+TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsyter
+SelectElement=Velg element
+AddElement=Lenke til element
 UnlinkElement=Koble fra element
 # Documents models
-DocumentModelBaleine=En komplett prosjektets rapport modell (logo. ..)
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+DocumentModelBaleine=En komplett prosjekts-rapportmodell (logo. ..)
+PlannedWorkload=Planlagt arbeidsmengde
+PlannedWorkloadShort=Arbeidsmengde
+WorkloadOccupation=Tildeling av arbeidsmengde
+ProjectReferers=Refererende objekter
+SearchAProject=Søk etter prosjekt
+ProjectMustBeValidatedFirst=Prosjektet må valideres først
+ProjectDraft=Prosjektkladder
+FirstAddRessourceToAllocateTime=Tilknytt ressurs til å sette av tid
+InputPerDay=Tidsbruk pr. dag
+InputPerWeek=Tidsbruk pr. uke
+InputPerAction=Tidsbruk pr. aktivitet
+TimeAlreadyRecorded=Allerede registrert tidsforbruk for denne oppgaven/dagen og bruker %s
+ProjectsWithThisUserAsContact=Prosjekter med denne brukeren som kontakt
+TasksWithThisUserAsContact=Oppgaver tildelt denne brukeren
+ResourceNotAssignedToProject=Ikke tildelt til prosjekt
+ResourceNotAssignedToTask=Ikke tildelt til oppgave
+AssignTaskToMe=Tildel oppgaven til meg
+AssignTask=Tildel
+ProjectOverview=Oversikt
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index aa0d6278d4e..f98e7eb0f00 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - propal
 Proposals=Tilbud
 Proposal=Tilbud
-ProposalShort=Forslag
+ProposalShort=Tilbud
 ProposalsDraft=Tilbudskladder
 ProposalDraft=Tilbudskladd
-ProposalsOpened=Åpnede tilbud
+ProposalsOpened=Åpne tilbud
 Prop=Tilbud
 CommercialProposal=Tilbud
 CommercialProposals=Tilbud
-ProposalCard=Forslag kort
+ProposalCard=Tilbudskort
 NewProp=Nytt tilbud
 NewProposal=Nytt tilbud
 NewPropal=Nytt tilbud
 Prospect=Prospekt
 ProspectList=Prospektliste
 DeleteProp=Slett tilbud
-ValidateProp=Godkjenn tilbud
-AddProp=Lag tilbud
+ValidateProp=Valider tilbud
+AddProp=Skriv tilbud
 ConfirmDeleteProp=Er du sikker på at du vil slette dette tilbudet?
-ConfirmValidateProp=Er du sikker på at du vil godkjenne dette tilbudet?
+ConfirmValidateProp=Er du sikker på at du vil validere dette tilbudet under navnet <b>%s</b> ?
 LastPropals=Siste %s tilbud
 LastClosedProposals=Siste %s lukkede tilbud
-LastModifiedProposals=Sist endret forslag %s
+LastModifiedProposals=Sist endrede tilbud %s
 AllPropals=Alle tilbud
 LastProposals=Siste tilbud
 SearchAProposal=Søk i tilbud
@@ -31,24 +31,24 @@ AmountOfProposalsByMonthHT=Tilbudsbeløp pr måned (eksl. MVA)
 NbOfProposals=Antall tilbud
 ShowPropal=Vis tilbud
 PropalsDraft=Kladder
-PropalsOpened=Åpnede
+PropalsOpened=Åpne
 PropalsNotBilled=Lukkede men ikke fakturerte
-PropalStatusDraft=Kladd (trenger godkjenning)
-PropalStatusValidated=Godkjent (tilbudet er åpnet)
-PropalStatusOpened=Godkjent (tilbudet er åpnet)
+PropalStatusDraft=Kladd (trenger validering)
+PropalStatusValidated=Godkjent (tilbudet er åpent)
+PropalStatusOpened=Godkjent (tilbudet er åpent)
 PropalStatusClosed=Lukket
-PropalStatusSigned=Lukket (akseptert)
-PropalStatusNotSigned=Lukket (avslått)
+PropalStatusSigned=Akseptert(kan faktureres)
+PropalStatusNotSigned=Ikke akseptert(lukket)
 PropalStatusBilled=Fakturert
 PropalStatusDraftShort=Kladd
-PropalStatusValidatedShort=Godkjent
-PropalStatusOpenedShort=Åpnet
+PropalStatusValidatedShort=Validert
+PropalStatusOpenedShort=Åpne
 PropalStatusClosedShort=Lukket
-PropalStatusSignedShort=Akseptert
-PropalStatusNotSignedShort=Avslått
+PropalStatusSignedShort=Signert
+PropalStatusNotSignedShort=Ikke signert
 PropalStatusBilledShort=Fakturert
-PropalsToClose=Åpne tilbud
-PropalsToBill=Aksepterte tilbud
+PropalsToClose=Tilbud som skal lukkes
+PropalsToBill=Aksepterte tilbud til fakturering
 ListOfProposals=Oversikt over tilbud
 ActionsOnPropal=Handlinger i forbindelse med tilbud
 NoOpenedPropals=Ingen åpne tilbud
@@ -57,28 +57,28 @@ RefProposal=Tilbudsreferanser
 SendPropalByMail=Send tilbud med e-post
 AssociatedDocuments=Dokumenter relatert til tilbudet:
 ErrorCantOpenDir=Kan ikke åpne mappen
-DatePropal=Dato for forslaget
+DatePropal=Tilbudsdato
 DateEndPropal=Gyldig til
 DateEndPropalShort=Utløpsdato
-ValidityDuration=Gyldighet
+ValidityDuration=Gyldighetstid
 CloseAs=Lukk med status
 ClassifyBilled=Sett som fakturert
 BuildBill=Lag faktura
-ErrorPropalNotFound=Tilbud %s ble ikke funnet
+ErrorPropalNotFound=Tilbudet %s ble ikke funnet
 Estimate=Estimat:
-EstimateShort=Estimate
+EstimateShort=Estimat
 OtherPropals=Andre tilbud
 AddToDraftProposals=Legg til tilbudsutkast
 NoDraftProposals=Ingen tilbudsutkast
-CopyPropalFrom=Opprett tilbud ved å kopiere et eksisterende tilbud
-CreateEmptyPropal=Opprett tomt tilbud eller fra fra en liste over produkter/tjenester
+CopyPropalFrom=Opprett nytt tilbud ved å kopiere et eksisterende
+CreateEmptyPropal=Opprett tomt tilbud eller fra en liste over varer/tjenester
 DefaultProposalDurationValidity=Standard gyldighetstid for tilbud (dager)
 UseCustomerContactAsPropalRecipientIfExist=Bruk kontaktpersonens adresse (hvis den er definert) i stedet for tredjepartens adresse
-ClonePropal=Clone kommersielle forslag
-ConfirmClonePropal=Er du sikker på at du vil klone denne kommersielle forslaget <b>%s?</b>
-ConfirmReOpenProp=Er du sikker på at du vil åpne igjen de kommersielle forslag <b>%s?</b>
-ProposalsAndProposalsLines=Kommersielle forslaget og linjer
-ProposalLine=Forslag linje
+ClonePropal=Klon tilbud
+ConfirmClonePropal=Er du sikker på at du vil klone dette tilbudet <b>%s?</b>
+ConfirmReOpenProp=Er du sikker på at du vil gjenåpne tilbudet <b>%s?</b>
+ProposalsAndProposalsLines=Tilbud og linjer
+ProposalLine=Tilbudslinje
 AvailabilityPeriod=Tilgjengelighet forsinkelse
 SetAvailability=Sett tilgjengelighet forsinkelse
 AfterOrder=etter bestilling
@@ -89,12 +89,13 @@ AvailabilityTypeAV_2W=2 uker
 AvailabilityTypeAV_3W=3 uker
 AvailabilityTypeAV_1M=En måned
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representant oppfølging forslag
-TypeContact_propal_external_BILLING=Kunden faktura kontakt
-TypeContact_propal_external_CUSTOMER=Kundekontakt oppfølging forslag
+TypeContact_propal_internal_SALESREPFOLL=Representant for oppfølging av tilbud
+TypeContact_propal_external_BILLING=Kundens fakturakontakt
+TypeContact_propal_external_CUSTOMER=Kundens tilbudsoppfølger
 # Document models
 DocModelAzurDescription=En fullstendig tilbudsmodell (logo...)
 DocModelJauneDescription=Jaune tilbudsmodell
 DefaultModelPropalCreate=Standard modellbygging
-DefaultModelPropalToBill=Standard mal når du lukker et tilbud (som skal faktureres)
-DefaultModelPropalClosed=Standard mal når du lukker et tilbud (ufakturert)
+DefaultModelPropalToBill=Standardmal når du lukker et tilbud (som skal faktureres)
+DefaultModelPropalClosed=Standardmal når du lukker et tilbud (ufakturert)
+ProposalCustomerSignature=Skriftlig aksept, firmastempel, dato og signatur
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index acec7945e2a..3f72469fac0 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Vis lønnsutbetaling
 THM=Gjennomsnittlig timepris
 TJM=Gjennomsnittlig dagskost
 CurrentSalary=Nåværende lønn
+THMDescription=Denne verdien kan brukes til å kalkulere tidsforbruket på et prosjekt hvis prosjekt-modulen er i bruk
+TJMDescription=Dene verdien er foreløpig brukt til informasjon, og er ikke brukt i noen kalkulasjoner
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 954684d1e15..54fe0750a24 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -2,11 +2,11 @@
 RefSending=Ref. levering
 Sending=Levering
 Sendings=Leveringer
-AllSendings=All Shipments
+AllSendings=Alle forsendelser
 Shipment=Levering
 Shipments=Skipninger
-ShowSending=Show Sending
-Receivings=Receipts
+ShowSending=Vis forsendelse
+Receivings=Kvitteringer
 SendingsArea=Leveringsområde
 ListOfSendings=Oversikt over leveringer
 SendingMethod=Leveringsmåte
@@ -15,8 +15,8 @@ LastSendings=Siste %s leveringer
 SearchASending=Finn levering
 StatisticsOfSendings=Statistikk
 NbOfSendings=Antall leveringer
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
+NumberOfShipmentsByMonth=Antall forsendelser pr. måned
+SendingCard=Pakkseddel
 NewSending=Ny levering
 CreateASending=Lag en levering
 CreateSending=Lag levering
@@ -24,7 +24,7 @@ QtyOrdered=Ant. bestilt
 QtyShipped=Ant. levert
 QtyToShip=Ant. å levere
 QtyReceived=Ant. mottatt
-KeepToShip=Remain to ship
+KeepToShip=Gjenstår å sende
 OtherSendingsForSameOrder=Andre leveringer på denne ordren
 DateSending=Leveringsdato
 DateSendingShort=Leveringsdato
@@ -39,7 +39,7 @@ StatusSendingCanceledShort=Kansellert
 StatusSendingDraftShort=Kladd
 StatusSendingValidatedShort=Godkjent
 StatusSendingProcessedShort=Behandlet
-SendingSheet=Shipment sheet
+SendingSheet=Pakkseddel
 Carriers=Transportører
 Carrier=Transportør
 CarriersArea=Transportørområde
@@ -51,24 +51,24 @@ GenericTransport=Standardtransport
 Enlevement=Hentet av kunde
 DocumentModelSimple=ENkel dokumentmodell
 DocumentModelMerou=Merou A5 modell
-WarningNoQtyLeftToSend=Advarsel, ingen produkter venter sendes.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planlagt levering innen
+WarningNoQtyLeftToSend=Advarsel, ingen varer venter sendes.
+StatsOnShipmentsOnlyValidated=Statistikk utført bare på validerte forsendelser. Dato for validering av forsendelsen brukes (planlagt leveringsdato er ikke alltid kjent).
+DateDeliveryPlanned=Planlagt leveringsdato
 DateReceived=Dato levering mottatt
 SendShippingByEMail=Send forsendelse via e-post
-SendShippingRef=Submission of shipment %s
+SendShippingRef=Innsending av forsendelse %s
 ActionsOnShipping=Hendelser på forsendelse
 LinkToTrackYourPackage=Lenke for å spore pakken
 ShipmentCreationIsDoneFromOrder=For øyeblikket er opprettelsen av en ny forsendelse gjort fra ordren kortet.
-RelatedShippings=Related shipments
-ShipmentLine=Shipment line
-CarrierList=List of transporters
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+RelatedShippings=Relaterte forsendelser
+ShipmentLine=Forsendelseslinje
+CarrierList=Liste over transportører
+SendingRunning=Varer fra bestilte kundeordre
+SuppliersReceiptRunning=Varer fra bestilte leverandørordre
+ProductQtyInCustomersOrdersRunning=Varekvantum i åpnede kundeordre
+ProductQtyInSuppliersOrdersRunning=Varekvantum i åpnede leverandørordre
+ProductQtyInShipmentAlreadySent=Varekvantum i åpnede kundeordre som er sendt
+ProductQtyInSuppliersShipmentAlreadyRecevied=Varekvantum i åpnede leverandørordre som er mottatt
 
 # Sending methods
 SendingMethodCATCH=Catch av kunde
@@ -78,8 +78,8 @@ SendingMethodCOLSUI=Colissimo
 DocumentModelSirocco=Enkelt dokument modellen for levering kvitteringer
 DocumentModelTyphon=Mer fullstendig dokument modellen for levering kvitteringer (logo. ..)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke definert
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum varevolum
+SumOfProductWeights=Sum varevekt
 
 # warehouse details
 DetailWarehouseNumber= Varehusdetaljer
diff --git a/htdocs/langs/nb_NO/sms.lang b/htdocs/langs/nb_NO/sms.lang
index 66c255d0c19..dace1efea98 100644
--- a/htdocs/langs/nb_NO/sms.lang
+++ b/htdocs/langs/nb_NO/sms.lang
@@ -1,53 +1,53 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
 SmsSetup=Sms oppsett
-SmsDesc=Denne siden lar deg definere globals alternativer på SMS-funksjoner
+SmsDesc=Denne siden lar deg definere globale SMS alternativer
 SmsCard=SMS-kort
-AllSms=Alle SMS campains
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
+AllSms=Alle SMS-kampanjer
+SmsTargets=Mål
+SmsRecipients=Mål
+SmsRecipient=Mål
 SmsTitle=Beskrivelse
 SmsFrom=Avsender
-SmsTo=Target
-SmsTopic=Emne av SMS
+SmsTo=Mål
+SmsTopic=SMS-emne 
 SmsText=Melding
 SmsMessage=SMS
-ShowSms=Show Sms
-ListOfSms=Liste SMS campains
-NewSms=Ny SMS campain
-EditSms=Edit Sms
+ShowSms=Vis SMS
+ListOfSms=Liste over SMS-kampanjer
+NewSms=Ny SMS-kampanje
+EditSms=Endre SMS
 ResetSms=Ny sending
-DeleteSms=Slett SMS campain
-DeleteASms=Fjerne en Sms campain
-PreviewSms=Previuw Sms
+DeleteSms=Slett SMS kampanje
+DeleteASms=Fjern en SMS-kampanje
+PreviewSms=Forhåndsvis SMS
 PrepareSms=Forbered Sms
 CreateSms=SMS
-SmsResult=Resultat av sms sending
-TestSms=Test Sms
-ValidSms=Valider Sms
-ApproveSms=Godkjenne Sms
+SmsResult=Resultat av SMS-sending
+TestSms=Test SMS
+ValidSms=Valider SMS
+ApproveSms=Godkjenn SMS
 SmsStatusDraft=Utkast
 SmsStatusValidated=Validert
 SmsStatusApproved=Godkjent
 SmsStatusSent=Sendt
-SmsStatusSentPartialy=Sendt delvis
-SmsStatusSentCompletely=Sendt helt
+SmsStatusSentPartialy=Delvis sendt
+SmsStatusSentCompletely=Sendt
 SmsStatusError=Feil
 SmsStatusNotSent=Ikke sendt
-SmsSuccessfulySent=Sms korrekt sendt (fra %s til %s)
-ErrorSmsRecipientIsEmpty=Antall mål er tom
-WarningNoSmsAdded=Ingen nye telefonnummer for å legge til målet liste
+SmsSuccessfulySent=SMS korrekt utsendt (fra %s til %s)
+ErrorSmsRecipientIsEmpty=Mål-nummer er tomt
+WarningNoSmsAdded=Ingen nye telefonnummer for å legge til i mållisten
 ConfirmValidSms=Bekrefter du validering av dette campain?
-ConfirmResetMailing=Advarsel, hvis du gjør en reinit av sms campain <b>%s,</b> vil du tillate å lage en masse å sende det en gang til. Er det virkelig det du wan å gjøre?
+ConfirmResetMailing=Advarsel! Hvis du gjør en reinitiering av SMS-kampanjen <b>%s</b>, setter du i gang en ny masseutsendelse. Er det virkelig det du vil å gjøre?
 ConfirmDeleteMailing=Bekrefter du fjerning av campain?
 NbOfRecipients=Antall mål
-NbOfUniqueSms=NB DOF unike telefonnumre
-NbOfSms=Nbre av Phon tall
+NbOfUniqueSms=Antall unike telefonnumre
+NbOfSms=Antall telefonnumre
 ThisIsATestMessage=Dette er en testmelding
 SendSms=Send SMS
-SmsInfoCharRemain=Nb av gjenværende tegn
-SmsInfoNumero= (Format internasjonal dvs.: 33899701761)
+SmsInfoCharRemain=Antall gjenværende tegn
+SmsInfoNumero= (Internasjonal prefix dvs.: +4711223344)
 DelayBeforeSending=Forsinkelse før sending (minutter)
-SmsNoPossibleRecipientFound=Ingen mål tilgjengelig. Sjekk oppsettet av SMS-leverandør.
+SmsNoPossibleRecipientFound=Ingen mål tilgjengelig. Sjekk oppsettet fra din SMS-leverandør.
 
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index bdaedd32a99..b3e6dd916cc 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -5,18 +5,18 @@ Warehouses=Lagere
 NewWarehouse=Nytt lager
 WarehouseEdit=Endre lager
 MenuNewWarehouse=Nytt lager
-WarehouseOpened=Lager åpnet
+WarehouseOpened=Varehus åpent
 WarehouseClosed=Lager lukket
 WarehouseSource=Kildelager
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
+WarehouseSourceNotDefined=Ingen varehus definert
+AddOne=Legg til
 WarehouseTarget=Mållager
 ValidateSending=Godkjenn levering
 CancelSending=Avbryt levering
 DeleteSending=Slett levering
 Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Lager etter lot/serienummer
 Movement=Bevegelse
 Movements=Bevegelser
 ErrorWarehouseRefRequired=Du må angi et navn på lageret
@@ -24,34 +24,34 @@ ErrorWarehouseLabelRequired=du må angi en merkelapp for lageret
 CorrectStock=Riktig beholdning
 ListOfWarehouses=Oversikt over lagere
 ListOfStockMovements=Oversikt over bevegelser
-StocksArea=Warehouses area
+StocksArea=Område for varehus
 Location=Lokasjon
 LocationSummary=Kort navn på lokasjon
-NumberOfDifferentProducts=Number of different products
-NumberOfProducts=Totalt antall produkter
+NumberOfDifferentProducts=Antall forskjellige varer
+NumberOfProducts=Totalt antall varer
 LastMovement=Siste bevegelse
 LastMovements=Siste bevegelser
 Units=Enheter
 Unit=Enhet
 StockCorrection=Korriger lagerbeholdning
-StockTransfer=Stock transfer
+StockTransfer=Lageroverførsel
 StockMovement=Overføring
 StockMovements=Lageroverføring
-LabelMovement=Movement label
+LabelMovement=Bevegelse-etikett
 NumberOfUnit=Atntall enheter
-UnitPurchaseValue=Unit purchase price
+UnitPurchaseValue=Enhets innkjøpspris
 TotalStock=Tottal beholdning
 StockTooLow=For lav beholdning
-StockLowerThanLimit=Stock lower than alert limit
+StockLowerThanLimit=Lagerbeholdning lavere en varslingsgrense
 EnhancedValue=Verdi
 PMPValue=Veid gjennomsnittlig pris
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett lager automatisk når en bruker opprettes
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Varelager og sub-varelager er uavhengig av hverandre
 QtyDispatched=Antall sendt
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=Mengde utsendt
+QtyToDispatchShort=Mengde for utsendelse
 OrderDispatch=Ordre sendt
 RuleForStockManagementDecrease=Regel for lagerreduksjon
 RuleForStockManagementIncrease=Regel for lagerøkning
@@ -61,13 +61,13 @@ DeStockOnShipment=reduser virkelig beholdning ved forsendelse (anbefalt)
 ReStockOnBill=Øk virkelig beholdning ut fra faktura/kreditnota
 ReStockOnValidateOrder=Øk virkelig beholdning ut fra ordre
 ReStockOnDispatchOrder=Øk virkelige aksjer på manuelle sende ut i lagerbygninger, etter leverandør bestill mottak
-ReStockOnDeleteInvoice=Increase real stocks on invoice deletion
-OrderStatusNotReadyToDispatch=Bestill har ikke ennå, eller ikke mer en status som gjør at ekspedering av produkter på lager lager.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
-NoPredefinedProductToDispatch=Ingen forhåndsdefinerte produkter for dette objektet. Så nei utsending på lager er nødvendig.
+ReStockOnDeleteInvoice=Øk lagerbeholdning ved sletting av faktura
+OrderStatusNotReadyToDispatch=Bestill har ikke ennå, eller ikke mer en status som gjør at ekspedering av varer på lager lager.
+StockDiffPhysicTeoric=Forklaring av differanse mellom fysisk og teoretisk lagerbeholdning
+NoPredefinedProductToDispatch=Ingen forhåndsdefinerte varer for dette objektet. Så nei utsending på lager er nødvendig.
 DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Varslingsgrense
+StockLimit=Varslingsgrense for lagerbeholdning
 PhysicalStock=Fysisk beholdning
 RealStock=Virkelig beholdning
 VirtualStock=Virtuell beholdning
@@ -79,7 +79,7 @@ IdWarehouse=Id lager
 DescWareHouse=Beskrivelse av lager
 LieuWareHouse=Lagerlokasjon
 WarehousesAndProducts=Lager og varer
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+WarehousesAndProductsBatchDetail=Varehus og varer (med detaljer pr. lot/serienummer)
 AverageUnitPricePMPShort=Veid gjennomsnittlig inngang pris
 AverageUnitPricePMP=Veid gjennomsnittlig inngang pris
 SellPriceMin=Selge Enhetspris
@@ -93,47 +93,48 @@ PersonalStock=Personlig lager %s
 ThisWarehouseIsPersonalStock=Dette lageret representerer personlige lager av %s %s
 SelectWarehouseForStockDecrease=Velg lageret til bruk for lager nedgang
 SelectWarehouseForStockIncrease=Velg lageret til bruk for lager økning
-NoStockAction=No stock action
-LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
-AlertOnly= Alerts only
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-MassStockMovement=Mass stock movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
-MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+NoStockAction=Ingen lagerhendelser
+LastWaitingSupplierOrders=Ordre som venter på varer
+DesiredStock=Ønsket minstebeholdning
+DesiredMaxStock=Ønsket maksimumsbeholdning
+StockToBuy=For bestilling
+Replenishment=Påfylling av varer
+ReplenishmentOrders=Påfyllingsordre
+VirtualDiffersFromPhysical=Ifølge lagerøkning-/reduksjon-opsjoner, kan fysisk lager og virtuelt lager (fysiske + gjeldende ordre) variere
+UseVirtualStockByDefault=Bruk virtuelt lager som standard i stedet for fysisk, for lagerfyllingsegenskapen
+UseVirtualStock=Bruk teoretisk lagerbeholdning
+UsePhysicalStock=Bruk fysisk varebeholdning
+CurentSelectionMode=Gjeldende valgmodus
+CurentlyUsingVirtualStock=Teoretisk varebeholdning
+CurentlyUsingPhysicalStock=Fysisk varebeholdning
+RuleForStockReplenishment=Regler for lågerpåfylling
+SelectProductWithNotNullQty=Velg minst en vare, med beholdning > 0, og en leverandør
+AlertOnly= Kun varsler
+WarehouseForStockDecrease=Varehuset <b>%s</b> vil bli brukt til reduksjon av varebeholdning
+WarehouseForStockIncrease=Varehuset <b>%s</b> vil bli brukt til økning av varebeholdning
+ForThisWarehouse=For dette varehuset
+ReplenishmentStatusDesc=Dette er en liste over alle produkter med et lager lavere enn ønsket(eller lavere enn varslingsverdi hvis boksen "kun varsel" er krysset av), og foreslår å opprette leverandørordre om å fylle lager.
+ReplenishmentOrdersDesc=Dette er en liste over alle åpne leverandørbestillinger inkludert forhåndsdefinerte varer. Bare åpnede ordre med forhåndsdefinerte varer, slik at ordre som kan påvirke lagerbeholdning, er synlige her.
+Replenishments=Lagerpåfyllinger
+NbOfProductBeforePeriod=Beholdning av varen %s før valgte periode (< %s)
+NbOfProductAfterPeriod=Beholdning av varen %s før etter periode (< %s)
+MassMovement=Massebevegelse
+MassStockMovement=Masse varebevegelser
+SelectProductInAndOutWareHouse=Velg en vare, etnkvantum, et kildelager og et mållager, og klikk deretter på "%s". Når dette er gjort for alle nødvendige bevegelser, klikk på "%s".
+RecordMovement=Post overført
+ReceivingForSameOrder=Kvitteringer for denne ordren
+StockMovementRecorded=Registrerte varebevegelser
+RuleForStockAvailability=Regler og krav for lagerbeholdning
+StockMustBeEnoughForInvoice=Varebeholdning kan ikke være lavere enn antall i faktura
+StockMustBeEnoughForOrder=Varebeholdning kan ikke være lavere enn antall i ordre
+StockMustBeEnoughForShipment= Varebeholdning kan ikke være lavere enn antall i forsendelse
+MovementLabel=Bevegelsesetikett
+InventoryCode=Bevegelse eller varelager
+IsInPackage=Innhold i pakken
+ShowWarehouse=Vis varehus
+MovementCorrectStock=Lagerkorreksjon for var %s
+MovementTransferStock=Lageroverførsel av vare %s til annet varehus
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Kildelageret må defineres her når Varelot-modul er aktiv. Den vil bli brukt til å liste hvilke lot/serienummer som er tilgjengelig for varer som krever lot/serienummer for bevegelse. Hvis du ønsker å sende produkter fra forskjellige varehus, del opp forsendelsen i flere trinn.
+InventoryCodeShort=Lag./bev.-kode
+NoPendingReceptionOnSupplierOrder=Ingen ventende mottak grunnet åpen leverandørordre
+ThisSerialAlreadyExistWithDifferentDate=Dette lot/serienummeret (<strong>%s</strong>) finnes allerede, men med ulik "best før" og "siste forbruksdag" (funnet <strong>%s</strong> , men tastet inn <strong>%s</strong>).
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 8196c6d43a3..f0a18da92d3 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -9,38 +9,38 @@ ListOfSuppliers=Leverandøroversikt
 ShowSupplier=Vis leverandør
 OrderDate=Bestillingsdato
 BuyingPrice=Innkjøpspris
-BuyingPriceMin=Minste kjøpskurs
-BuyingPriceMinShort=Min kjøpskurs
-TotalBuyingPriceMin=Totalt underprodukters innkjøpspriser
-SomeSubProductHaveNoPrices=Noen underprodukter har ingen pris definert
+BuyingPriceMin=Laveste innkjøpspris
+BuyingPriceMinShort=Laveste innkjøpspris
+TotalBuyingPriceMin=Totalt sub-vare innkjøpspriser
+SomeSubProductHaveNoPrices=Noen sub-varer har ingen pris definert
 AddSupplierPrice=Legg til leverandørpris
 ChangeSupplierPrice=Endre leverandørpris
-ErrorQtyTooLowForThisSupplier=Mengden er for lav for denne leverandørem, eller det er ikke definert noen pris for dette produktet for denne leverandøren
+ErrorQtyTooLowForThisSupplier=Mengden er for lav for denne leverandøren, eller det er ikke definert noen pris for denne varen for denne leverandøren
 ErrorSupplierCountryIsNotDefined=Det er ikke angitt noe land for denne leverandøren. Du må gjøre dette først.
-ProductHasAlreadyReferenceInThisSupplier=Dette produktet har allerede en referanse hos denne leverandøren
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne referansen leverandøren er allerede tilknyttet en referanse: %s
+ProductHasAlreadyReferenceInThisSupplier=Denne varen har allerede en referanse hos denne leverandøren
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne leverandørreferansen er allerede tilknyttet en referanse: %s
 NoRecordedSuppliers=Ingen leverandører registrert
 SupplierPayment=Leverandørbetaling
 SuppliersArea=Leverandørområde
 RefSupplierShort=Ref. leverandør
 Availability=Tilgjengelighet
-ExportDataset_fournisseur_1=Oversikt over leverandørfakturaer ig varelinjer
+ExportDataset_fournisseur_1=Oversikt over leverandørfakturaer og varelinjer
 ExportDataset_fournisseur_2=Leverandørfakturaer og betalinger
 ExportDataset_fournisseur_3=Leverandør ordrer og ordrelinjer
 ApproveThisOrder=Godkjenn denne innkjøpsordren
-ConfirmApproveThisOrder=Er du sikker på at du vil godkjenne denne innkjøpsordren?
+ConfirmApproveThisOrder=Er du sikker på at du vil godkjenne innkjøpsordre <b>%s</b> ?
 DenyingThisOrder=Avvis denne ordren
 ConfirmDenyingThisOrder=Er du sikker på at du vil avvise denne innkjøpsordren?
-ConfirmCancelThisOrder=Er du sikker på at du vil avbryte denne innkjøpsordren?
+ConfirmCancelThisOrder=Er du sikker på at du vil kansellere denne innkjøpsordren?
 AddCustomerOrder=Opprett kundeordre
 AddCustomerInvoice=Opprett kundefaktura
 AddSupplierOrder=Opprett innkjøpsordre
-AddSupplierInvoice=Opprett innkjøpsfaktura
-ListOfSupplierProductForSupplier=Oversikt over produkter og priser for leverandøren <b>%s</b>
-NoneOrBatchFileNeverRan=Ingen eller batch <b>%s</b> ikke løp nylig
+AddSupplierInvoice=Opprett leverandørfaktura
+ListOfSupplierProductForSupplier=Oversikt over varer og priser for leverandøren <b>%s</b>
+NoneOrBatchFileNeverRan=Ingen eller batch <b>%s</b> er ikke kjørt i det siste
 SentToSuppliers=Sendt til leverandører
 ListOfSupplierOrders=Liste over leverandørordre
 MenuOrdersSupplierToBill=Leverandørordre til faktura
 NbDaysToDelivery=Leveringsforsinkelse i dager
-DescNbDaysToDelivery=Lengste forsinkelse er vist i ordre-produktliste
-UseDoubleApproval=Bruk dobbel godkjenning ( den andre godkjennelsen kan gjøres av alle brukere med riktig adgang)
+DescNbDaysToDelivery=Største leveringsforsinkelse av varer fra denne ordren
+UseDoubleApproval=Bruk dobbel godkjenning (den andre godkjennelsen kan gjøres av alle brukere med riktig adgang)
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index 488a49692a9..b5947ff0c79 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -40,11 +40,10 @@ TF_BUS=Buss
 TF_CAR=Bil
 TF_PEAGE=Toll
 TF_ESSENCE=Drivstoff
-TF_HOTEL=Overnatting
+TF_HOTEL=Hotell
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Du har opprettet en annen reiseregning i overlappende tidsperiode
-ListTripsAndExpenses=Liste over reiseregninger
 AucuneNDF=Ingen reiseregning funnet etter disse kriteriene
 AucuneLigne=Ingen reiseregning er opprettet enda
 AddLine=Legg til linje
@@ -56,12 +55,12 @@ ModePaiement=Betalingsmåte
 Note=Notat
 Project=Prosjekt
 
-VALIDATOR=Bruker som skal informeres for godkjenning
+VALIDATOR=Bruker som er ansvarlig for godkjenning
 VALIDOR=Godkjent av
 AUTHOR=Registrert av
 AUTHORPAIEMENT=Betalt av
 REFUSEUR=Avvist av
-CANCEL_USER=Kansellert av
+CANCEL_USER=Slettet av
 
 MOTIF_REFUS=Grunn
 MOTIF_CANCEL=Grunn
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Betalt dato
 
 TO_PAID=Betal
 BROUILLONNER=Gjenåpne
-SendToValid=Sendt for godkjenning
+SendToValid=Sendt til godkjenning
 ModifyInfoGen=Endre
 ValidateAndSubmit=Valider og send til godkjenning
+ValidatedWaitingApproval=Validert (venter på godkjenning)
 
 NOT_VALIDATOR=Du har ikke tillatelse til å godkjenne denne reiseregningen
 NOT_AUTHOR=Reiseregningener ikke opprettet av deg. Operasjonen avbrutt.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Er du sikker på at du vil endre status til "betalt" for denne r
 CancelTrip=Kanseller en reiseregning
 ConfirmCancelTrip=Er du sikker på at du vil kansellere denne reiseregningen?
 
-BrouillonnerTrip=Endre status på reiseregning til "Kladd"
+BrouillonnerTrip=Endre reiseregning til "kladd"
 ConfirmBrouillonnerTrip=Er du sikker på at du vil endre status til "Kladd" for denne reiseregningen?
 
 SaveTrip=Godkjenn reiseregning
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 2ba7de19731..0e20de632ec 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Fjern fra gruppe
 PasswordChangedAndSentTo=Passordet er endret og sendt til <b>%s</b>.
 PasswordChangeRequestSent=Anmodning om å endre passordet for <b>%s</b> er sendt til <b>%s</b>.
 MenuUsersAndGroups=Brukere og grupper
+MenuMyUserCard=Mitt brukerkort
 LastGroupsCreated=Siste %s opprettede grupper
 LastUsersCreated=Siste %s opprettede brukere
 ShowGroup=Vis gruppe
@@ -71,15 +72,15 @@ UsersToAdd=Brukere å legge til i denne gruppen
 GroupsToAdd=Grupper å legge til denne brukeren
 NoLogin=Ingen innlogging
 LinkToCompanyContact=Lenke til tredjepart / kontakt
-LinkedToDolibarrMember=Link til medlem
-LinkedToDolibarrUser=Link til Dolibarr brukeren
-LinkedToDolibarrThirdParty=Link til Dolibarr tredjepart
+LinkedToDolibarrMember=Lenke til medlem
+LinkedToDolibarrUser=Lenke til Dolibarr brukeren
+LinkedToDolibarrThirdParty=Lenke til Dolibarr tredjepart
 CreateDolibarrLogin=Lag Dolibarrkonto
 CreateDolibarrThirdParty=Lag en tredjepart
-LoginAccountDisable=Kontoen er deaktivert, put a new login to activate it.
+LoginAccountDisable=Kontoen er deaktivert, en annen bruker må aktivere den.
 LoginAccountDisableInDolibarr=Kontoen er deaktivert i Dolibarr.
 LoginAccountDisableInLdap=Kontoen er deaktivert i domenet.
-UsePersonalValue=Bruk personlig verdie
+UsePersonalValue=Bruk personlig verdi
 GuiLanguage=Språk
 InternalUser=Intern bruker
 MyInformations=Mine data
@@ -87,21 +88,21 @@ ExportDataset_user_1=Dolibarr brukere og egenskaper
 DomainUser=Domenebruker %s
 Reactivate=Reaktiver
 CreateInternalUserDesc=Med dette skjemaet kan du opprette en intern bruker til din bedrift / stiftelse. For å lage en ekstern bruker (kunde, leverandør, osv), bruk knappen 'Lag Dolibarr bruker' fra tredjeparts kontaktkort
-InternalExternalDesc=En <b>intern</b> bruker er er en som er en del av firmaet/organisasjonen.<br>En <b>ekstern</b> bruker er en kunde, leverandør eller annen tredjeperson.<br><br>I begge tilfelle styres brukeren av Dolibarr-rettigheter. Dessuten kan eksterne brukere ha en annen menybehandler enn interne brukere (Se Hjem - Instillinger - Visning)
+InternalExternalDesc=En <b>intern</b> bruker er er en som er en del av firmaet/organisasjonen.<br>En <b>ekstern</b> bruker er en kunde, leverandør eller annen tredjeperson.<br><br>I begge tilfelle styres brukeren av Dolibarr-rettigheter. Dessuten kan eksterne brukere ha en annen menybehandler enn interne brukere (Se Hjem - Oppsett - Visning)
 PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe.
 Inherited=Arvet
 UserWillBeInternalUser=Opprettet bruker vil være en intern bruker (fordi ikke knyttet til en bestemt tredjepart)
 UserWillBeExternalUser=Opprettet bruker vil være en ekstern bruker (fordi knyttes til et bestemt tredjepart)
-IdPhoneCaller=ID phone caller
+IdPhoneCaller=Telefon ID
 UserLogged=Brukeren %s er logget inn
-UserLogoff=Bruker %s utlogging
+UserLogoff=Bruker %s utlogget
 NewUserCreated=Brukeren %s er opprettet
 NewUserPassword=Passord er endret for %s
 EventUserModified=Brukeren %s er endret
 UserDisabled=Brukeren %s er deaktivert
 UserEnabled=Brukeren %s er aktivert
 UserDeleted=Brukeren %s er fjernet
-NewGroupCreated=Gruppen %s er oprettet
+NewGroupCreated=Gruppen %s er opprettet
 GroupModified=Gruppe %s endret
 GroupDeleted=Gruppen %s er fjernet
 ConfirmCreateContact=Er du sikker på at du vil lage en Dolibarr-konto til denne kontaktpersonen?
@@ -109,9 +110,9 @@ ConfirmCreateLogin=Er du sikker på at du vil opprette en Dolibarr konto for med
 ConfirmCreateThirdParty=Er du sikker på at du vil opprette en tredje part for medlemmet?
 LoginToCreate=Brukernavn å opprette
 NameToCreate=Navn på tredjepart til å lage
-YourRole=Din roller
+YourRole=Dine roller
 YourQuotaOfUsersIsReached=Din kvote på aktive brukere er nådd!
-NbOfUsers=Nb av brukere
+NbOfUsers=Antall brukere
 DontDowngradeSuperAdmin=Bare en superadmin kan nedgradere en superadmin
 HierarchicalResponsible=Veileder
 HierarchicView=Hierarkisk visning
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 2775c7f68b7..475881e8e5a 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-StandingOrdersArea=Område for utestående ordre
-CustomersStandingOrdersArea=Område for utestående kundeordre
-StandingOrders=Utestående ordre
-StandingOrder=Utestående ordre
-NewStandingOrder=Ny utestående ordre
-StandingOrderToProcess=Å behandle
+StandingOrdersArea=Område for faste ordre
+CustomersStandingOrdersArea=Område for faste ordre
+StandingOrders=Faste ordre
+StandingOrder=Faste ordre
+NewStandingOrder=Ny fast ordre
+StandingOrderToProcess=Til behandling
 StandingOrderProcessed=Behandlet
-Withdrawals=Innbetalinger
-Withdrawal=Innbetaling
-WithdrawalsReceipts=Kvitteringer
-WithdrawalReceipt=Kvittering
+Withdrawals=Tilbakekallinger
+Withdrawal=Tilbakekalling
+WithdrawalsReceipts=Kvitteringer på tilbakekallinger
+WithdrawalReceipt=Kvittering på tilbakekalling
 WithdrawalReceiptShort=Kvittering
-LastWithdrawalReceipts=Siste %s kvitteringer
-WithdrawedBills=Betalte fakturaer
-WithdrawalsLines=Betalte linjer
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-CustomersStandingOrders=Utestående kundeordre
-CustomerStandingOrder=Utestående kundeordre
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Vaktura venter på betaling
-AmountToWithdraw=Beløp å betale
+LastWithdrawalReceipts=Siste %s kvitteringer på tilbakekallinger
+WithdrawedBills=Tilbakekalte fakturaer
+WithdrawalsLines=Tilbakekallingslinjer
+RequestStandingOrderToTreat=Forespørsel om behandling av faste ordre
+RequestStandingOrderTreated=Forespørsel om behandlede faste ordre
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ennå ikke mulig. Tilbaketrekkings-status må være satt til 'kreditert' før fjerning fra spesifikke linjer.
+CustomersStandingOrders=Faste kundeordre
+CustomerStandingOrder=Fast kundeordre
+NbOfInvoiceToWithdraw=Antall fakturaer som er forespurt tilbaketrukket
+NbOfInvoiceToWithdrawWithInfo=Antall fakturaer med tilbaketrekkings-forespørsel for kunder som har definert bankkontoinformasjon
+InvoiceWaitingWithdraw=Faktura som venter på tilbakekalling
+AmountToWithdraw=Beløp å tilbakekalle
 WithdrawsRefused=Betaling avvist
 NoInvoiceToWithdraw=Ingen kundefakturaer er i betalingsmodus. Gå til "Betaling" på fakturakortet for å endre dette.
 ResponsibleUser=Ansvarlig bruker
@@ -40,14 +40,14 @@ TransData=Dato Transmission
 TransMetod=Metode Transmission
 Send=Send
 Lines=Linjer
-StandingOrderReject=Utstede en avvise
+StandingOrderReject=Utsted en avvisning
 WithdrawalRefused=Uttak Refuseds
 WithdrawalRefusedConfirm=Er du sikker på at du vil angi en tilbaketrekning avslag for samfunnet
 RefusedData=Dato for avvisning
 RefusedReason=Årsak til avslag
 RefusedInvoicing=Fakturering avvisningen
 NoInvoiceRefused=Ikke lad avvisningen
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Faktura avvist (Kunden skal belastes for avvisningen)
 Status=Status
 StatusUnknown=Ukjent
 StatusWaiting=Venter
@@ -76,14 +76,19 @@ WithBankUsingRIB=For bankkontoer bruker RIB
 WithBankUsingBANBIC=For bankkontoer bruker IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Bankkonto til å motta trekker seg
 CreditDate=Kreditt på
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Kan ikke ikke generere kvitteringsfil for tilbaketrekking for landet ditt %s (Landet er ikke støttet)
 ShowWithdraw=Vis Angrerett
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men hvis faktura har minst én tilbaketrekning betaling ennå ikke behandlet, vil det ikke bli satt som utbetales å tillate å administrere uttak før.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
-StatisticsByLineStatus=Statistics by status of lines
+DoStandingOrdersBeforePayments=Under denne fanen kan du be om en fast ordre. Når dette er gjort, kan du gå inn i menyen Bank> Uttak for å håndtere faste ordre. Når du faste ordre er lukket, vil betaling på fakturaen automatisk bli registrert, og fakturaen lukkes hvis restbeløpet er null.
+WithdrawalFile=Tilbaketrekkingsfil
+SetToStatusSent=Sett status til "Fil Sendt"
+ThisWillAlsoAddPaymentOnInvoice=Dette vil også gjelde fakturainnbetalinger og vil klassifisere dem som "Betalt"
+StatisticsByLineStatus=Statistikk etter linjestatus
+RUM=RUM
+RUMWillBeGenerated=RUM-nummer vil bli generert så snart bankkonto-info er lagret
+WithdrawMode=Tilbaketrekkingsmodus (FRST eller RECUR)
+WithdrawRequestAmount=Beløp på tilbaketrekkingsforespørsel
+WithdrawRequestErrorNilAmount=Kan ikke lage tilbaketrekkingsforespørsel ved null-beløp
 
 ### Notifications
 InfoCreditSubject=Betaling av fast oppdrag %s av banken
@@ -93,5 +98,5 @@ InfoTransMessage=Den stående ordre %s har blitt transmited til banken ved %s %s
 InfoTransData=Beløp: %s <br> Metode: %s <br> Dato: %s
 InfoFoot=Dette er en automatisk melding som sendes av Dolibarr
 InfoRejectSubject=Stående ordre nektet
-InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectMessage=Hallo, <br><br> den faste ordren med faktura %s relatert til selskapet %s, med beløpet %s har blitt avvist av banken <br><br>--<br>%s
 ModeWarning=Mulighet for reell modus ble ikke satt, stopper vi etter denne simuleringen
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index bb6ee561f38..22d418d0779 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
-WorkflowSetup=Arbeidsflyt modulen oppsett
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Det er ingen arbeidsflyt kan du endre for modul du har aktivert.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Lag en kundeordre automatisk etter en kommersiell forslag er signert
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Lag en kunde faktura automatisk etter en kommersiell forslag er signert
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Lag en kunde faktura automatisk etter en kontrakt er validert
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Lag en kunde faktura automatisk etter en kundeordre er stengt
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+WorkflowSetup=Oppsett av Arbeidsflyt-modulen 
+WorkflowDesc=Denne modulen er laget for å sette opp automatiske hendelser i programmet. Som standard er arbeidsflyt-modulen åpen (du kan gjøre ting i de rekkefølgen du ønsker). Du kan aktivere de automatiske hendelsene du vil.
+ThereIsNoWorkflowToModify=Det er ingen arbeidsflyt-modifikasjoner tilgjengelig med aktiverte moduler.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatisk opprettelse av kundeordre etter at et tilbud er signert
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically Opprett faktura etter at et tilbud er signert
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically Opprett faktura etter at en kontrakt er validert
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically Opprett faktura etter at en ordre er lukket
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassifiser tilbud som fakturert når kundeordre er satt til betalt
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassifiser kundeordre(r) som fakturert når faktura er satt til betalt
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassifiser kundeordre(r) som fakturert når faktura er satt til validert
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index f9146e16840..138dd4a4e4e 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Gebruikersmenu
 LangFile=.lang bestand
 System=Systeem
 SystemInfo=Systeeminformatie
-SystemTools=Systeemwerkset
 SystemToolsArea=Systeemwerksetoverzicht
 SystemToolsAreaDesc=Dit gedeelte biedt administratieve functionaliteit. Gebruik het menu om de functionaliteit in te stellen die u nodig heeft.
 Purge=Leegmaken
@@ -232,8 +231,8 @@ Security=Beveiliging
 Passwords=Wachtwoorden
 DoNotStoreClearPassword=Geen onversleutelde wachtwoorden opslaan in de database, maar alleen versleutelde (Activering aanbevolen)
 MainDbPasswordFileConfEncrypted=Databasewachtwoord versleuteld opslaan in conf.php (Activering aanbevolen)
-InstrucToEncodePass=Vervang om het wachtwoord versleuteld op te slaan in <b>conf.php</b>, de regel <br><b>$dolibarr_main_db_pass="..."</b><br>door<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Vervang om het wachtwoord onversleuteld (leesbaar) op te slaan in <b>conf.php</b>, de regel<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>door<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Bescherming van gecreëerde PDF files. (Activering NIET aanbevolen, omdat dit de aanmaak van meerdere bestanden onmogelijk maakt)
 ProtectAndEncryptPdfFilesDesc=Bescherming van PDF files, deze kunnen gelezen en afgedrukt worden met behulp van een PDF-lezer. Echter, het bewerken en kopiëren is niet meer mogelijk. Let op dat door het gebruik van deze functionaliteit, de bouw van een globale gecumuleerde pdf niet werkt (zoals bij onbetaalde facturen).
 Feature=Functionaliteit
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Dit is ingesteld op de verwerking van:
 ThisIsAlternativeProcessToFollow=Dit is een alternatieve instelling te verwerken:
 StepNb=Stap %s
 FindPackageFromWebSite=Vind een pakket die u de functionaliteit geeft die u wilt (bijvoorbeeld op de officiële website van %s).
-DownloadPackageFromWebSite=Download pakket  %s.
-UnpackPackageInDolibarrRoot=Pak het pakketbestand uit in Dolibarr's map bestemd voor externe modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Installatie is voltooid en Dolibarr is gereed voor het gebruik van de nieuwe functionaliteit.
 NotExistsDirect=De alternatieve root directory is niet bepaald.<br>
 InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren.  Dit laat je toe om op dezelfde plaats zowel plug-ins als eigen templates te bewaren. <br>Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).<br>
 InfDirExample=<br>Kondig die dan aan in het bestand conf.php<br> $dolibarr_main_url_root_alt='http://myserver/aanpassing'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/aanpassing'<br>*Deze lijnen zijn inactief gemaakt met een "#" teken, verwijder dat teken om ze te aktiveren.
-YouCanSubmitFile=Kies module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Ga naar de pagina die de databasestructuur en gegevens bijwerkt: %s.
 LastStableVersion=Laatste stabiele versie
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Een parameterlijst afkomstig van een tabel<br>Syntax
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Bibliotheek om PDF's te maken
 WarningUsingFPDF=Opgelet: je <br>conf.php</b> bevat de instelling <b>dolibarr_pdf_force_fpdf=1</b>.  Dat betekent dat je de FPDF bibliotheek gebruikt om PDF bestanden te maken.  Deze bibliotheek is oud, en ondersteunt een aantal mogelijkheden niet (Unicode, transparantie in beelden, cyrillische, arabische en aziatische talen, ...), dus er kunnen fouten optreden bij het maken van PDF's.  <br>Om dat op te lossen, en om volledige ondersteuning van PDF-maken te hebben, download aub <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, en dan verwijder of maak commentaar van de lijn <b>$dolibarr_pdf_force_fpdf=1</b>, en voeg in plaats daarvan <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b> toe.
-LocalTaxDesc=Sommige landen gebruiken 2 of 3 belastingen op iedere factuurregel. Als dit het geval is, kies type voor tweede en derde belasting en het tarief. Mogelijke typen zijn: <br>1 : Locale belasting van toepassing op producten en diensten zonder btw (btw wordt niet toegepast op locale belasting)<br>2 : Locale belasting van toepassing op producten en diensten voor btw (btw wordt berekend op bedrag + locale belasting )<br>3 : Locale belasting van toepassing op producten zonder btw  (btw wordt niet toegepast op locale belasting)<br>4 : Locale belasting van toepassing op producten voor btw (btw wordt berekend op bedrag + locale belasting)<br>5 : Locale belasting van toepassing op diensten zonder btw  (btw wordt niet toegepast op locale belasting)<br>6 :  Locale belasting van toepassing op diensten voor btw  (btw wordt berekend op bedrag + locale belasting )
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Geef een telefoonnummer om de ClickToDial link te testen voor gebruiker <strong>%s</strong>
 RefreshPhoneLink=Herladen link
@@ -430,8 +429,8 @@ Module20Name=Zakelijke voorstellen / Offertes
 Module20Desc=Beheer van offertes
 Module22Name=EMailings
 Module22Desc=Administratie en verzending van bulk-e-mails
-Module23Name= Energie
-Module23Desc= Monitoring van het verbruik van energie
+Module23Name=Energie
+Module23Desc=Monitoring van het verbruik van energie
 Module25Name=Bestellingen klanten
 Module25Desc=Beheer van de bestellingen door klanten
 Module30Name=Facturen
@@ -492,8 +491,8 @@ Module400Name=Projecten/Kansen/Leads
 Module400Desc=Beheer van projecten, kansen of leads. U kunt elk willekeurig element (factuur, order, offerte, interventie, ...) toewijzen aan een project en een transversale weergave krijgen van de projectweergave.
 Module410Name=Webkalender
 Module410Desc=Integratie van een webkalender
-Module500Name=Bijzondere uitgaven (BTW, sociale lasten, dividenden)
-Module500Desc=Beheer van diverse uitgaven, zoals belastingen, sociale bijdragen, dividenden en salarissen
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salarissen
 Module510Desc=Beheer van de werknemers salarissen en betalingen
 Module520Name=Lening
@@ -502,7 +501,7 @@ Module600Name=Kennisgevingen
 Module600Desc=Stuur EMail notificaties van bepaalde Dolibarr zakelijke gebeurtenissen naar derde-partijen contacten (setup gedefinieerd in iedere derde-partij)
 Module700Name=Giften
 Module700Desc=Donatiebeheer
-Module770Name=Onkostennota's 
+Module770Name=Expense reports
 Module770Desc=Management en vordering onkostennota's (vervoer, maaltijden, ...)
 Module1120Name=Leverancier commerciële voorstel
 Module1120Desc=Leverancier verzoek commerciële voorstel en prijzen
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Acties-, taken- en agendabeheer
 Module2500Name=Electronic Content Management
 Module2500Desc=Opslaan en delen van documenten
-Module2600Name=Webdiensten
-Module2600Desc=Activeer de Dolibarr webdienstenserver
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=Webdiensten
 Module2650Desc=Schakel de Dolibarr webservices client aan (Kan worden gebruikt om gegevens en / of aanvragen duwen naar externe servers. Leverancier bestellingen alleen ondersteund voor het moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Creëer / wijzig producten / diensten
 Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
-Permission41=Bekijk projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Creëer / wijzig projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
 Permission44=Verwijder projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
 Permission61=Bekijk interventies
@@ -599,10 +600,10 @@ Permission86=Verzend afnemersopdrachten
 Permission87=Sluit afnemersopdrachten
 Permission88=Annuleer afnemersopdrachten
 Permission89=Verwijder afnemersopdrachten
-Permission91=Bekijk sociale bijdragen en BTW
-Permission92=Creëer / wijzig sociale bijdragen en BTW
-Permission93=Verwijder sociale bijdragen en BTW
-Permission94=Exporteer sociale bijdragen
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Bekijk de verslagen
 Permission101=Bekijk verzendingen
 Permission102=Creëer / wijzig verzendingen
@@ -620,9 +621,9 @@ Permission121=Bekijk derde partijen gelinkt aan de gebruiker
 Permission122=Creëer / wijzig derden gelinkt aan gebruiker
 Permission125=Verwijderen van derden gelinkt aan gebruiker
 Permission126=Exporteer derden
-Permission141=Bekijk projecten (ook privé waarvoor ik geen contactpersoon ben)
-Permission142=Creëer / bewerk projecten (ook privé waarvoor ik geen contactpersoon ben)
-Permission144=Verwijder projecten (ook privé waarvoor ik geen contactpersoon ben)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Bekijk leveranciers
 Permission147=Bekijk statistieken
 Permission151=Bekijk doorlopende opdrachten
@@ -800,7 +801,7 @@ DictionaryCountry=Landen
 DictionaryCurrency=Valuta
 DictionaryCivility=Aanspreektitel
 DictionaryActions=Type agenda evenementen
-DictionarySocialContributions=Sociale bijdrage types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
 DictionaryRevenueStamp=Bedrag van de fiscale zegels
 DictionaryPaymentConditions=Betalingsvoorwaarden
@@ -817,6 +818,9 @@ DictionarySource=Oorsprong van offertes / bestellingen
 DictionaryAccountancyplan=Rekeningschema
 DictionaryAccountancysystem=Modellen voor rekeningschema
 DictionaryEMailTemplates=Email documentensjablonen
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Instellingen opgeslagen
 BackToModuleList=Terug naar moduleoverzicht
 BackToDictionaryList=Terug naar de woordenboeken lijst
@@ -936,13 +940,14 @@ CompanyZip=Postcode
 CompanyTown=Plaats
 CompanyCountry=Land
 CompanyCurrency=Belangrijkste valuta
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Niet tonen
 DoNotSuggestPaymentMode=Geen betalingswijze voorstellen
 NoActiveBankAccountDefined=Geen actieve bankrekening ingesteld
 OwnerOfBankAccount=Eigenaar van bankrekening %s
 BankModuleNotActive=Bankrekeningen module niet ingeschakeld
-ShowBugTrackLink=Toon link 'Rapporteer een fout'
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Toon 'werkbank' op homepage
 Alerts=Kennisgevingen
 Delays=Vertragingen
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Maximaal aantal decimalen voor eenheidsprijzen
 MAIN_MAX_DECIMALS_TOT=Maximaal aantal decimalen voor de totale prijs
 MAIN_MAX_DECIMALS_SHOWN=Maximaal aantal decimalen voor de prijzen weergegeven op het scherm (Voeg <b>...</b> toe na dit nummer als u <b>...</b> wilt zien als het nummer wordt afgekapt op het scherm)
 MAIN_DISABLE_PDF_COMPRESSION=Gebruik PDF-compressie voor gegenereerde PDF-bestanden.
-MAIN_ROUNDING_RULE_TOT= Grootte van het afrondingsbereik (voor de zeldzame landen waar afronden anders wordt gedaan dan op basis 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Prijs per eenheid van een product
 TotalPriceAfterRounding=Totale prijs inclusief na afronding
 ParameterActiveForNextInputOnly=De instelling word pas actief voor de volgende invoer
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Totaal aantal geactiveerde  <b>modules: %s</b>
 YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 ClassNotFoundIntoPathWarning=Classe %s niet gevonden in PHP pad
 YesInSummer=Ja in de zomer
-OnlyFollowingModulesAreOpenedToExternalUsers=Let op, alleen volgende modules worden opengesteld voor externe gebruikers (ongeacht de rechten van zulke gebruikers):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Sessie opslag geencrypteerd door Suhosin
 ConditionIsCurrently=Voorwaarde is momenteel %s
 YouUseBestDriver=U gebruikt driver %s die momenteel meest geschikt is.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Maximaal aantal producten in 'combo-lijsten' (0 = on
 ConfirmDeleteProductLineAbility=Om bevestiging vragen bij het verwijderen van productregels in formulieren
 ModifyProductDescAbility=Personalisatie van productomschrijvingen in formulieren
 ViewProductDescInFormAbility=Visualisatie van de productomschrijvingen in de formulieren (anders getoond als popup-tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualisatie van producten die beschrijvingen in de thirdparty taal
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Gebruik een zoekformulier om een ​​product te kiezen (in plaats van een drop-down lijst).
 UseEcoTaxeAbility=Ondersteuning voor Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Standaard streepjescodetype voor produkten
 SetDefaultBarcodeTypeThirdParties=Standaard streepjescodetype voor derde partijen
+UseUnits=Support units
 ProductCodeChecker= Module om product codes te genereren en te controleren (product of dienst)
 ProductOtherConf= Product / dienst configuratie
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Streepjescodetype UPC
 BarcodeDescISBN=Streepjescodetype ISBN
 BarcodeDescC39=Streepjescodetype C39
 BarcodeDescC128=Streepjescodetype C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Opdrachtregelprogramma voor streepjescodegeneratie (gebruikt door interne generator voor sommige barcode types). Moet compatible zijn met "genbarcode". <br>vb: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Beheerder om automatisch barcode nummers te bepalen.
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Weet u zeker dat u het menu-item <b>%s</b> wilt verwijderen?
 DeleteLine=Verwijderen regel
 ConfirmDeleteLine=Weet u zeker dat u deze regel wilt verwijderen?
 ##### Tax #####
-TaxSetup=Moduleinstellingen voor belastingen, sociale bijdragen en dividenden
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=BTW verplicht
 OptionVATDefault=Kasbasis
 OptionVATDebitOption=Transactiebasis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webdienstenmoduleinstellingen
 WebServicesDesc=Door het inschakelen van deze module, word Dolibarr een webdienstenserver voor het verrichten van diverse webdiensten.
 WSDLCanBeDownloadedHere='WSDL descriptor'-bestanden van de aangeboden diensten kunnen hier gedownload worden
 EndPointIs='SOAP cliënten' moeten hun verzoeken versturen naar het 'Dolibarr endpoint' beschikbaar op URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bankmoduleinstellingen
 FreeLegalTextOnChequeReceipts=Eigen tekst op cheque-ontvangsten
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projectenmoduleinstellingen
 ProjectsModelModule=Projectenrapportagedocumentsjabloon
 TasksNumberingModules=Taken nummering module
 TaskModelModule=Taken rapporten documentmodel
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatische boom map en document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open het boekjaar
 CloseFiscalYear=Sluit boekjaar
 DeleteFiscalYear=Verwijder het boekjaar
 ConfirmDeleteFiscalYear=Weet u zeker dat u dit boekjaar wilt verwijderen?
-Opened=Geopend
+Opened=Open
 Closed=Gesloten
 AlwaysEditable=Kan altijd worden bewerkt
 MAIN_APPLICATION_TITLE=Forceer zichtbare naam van de toepassing (waarschuwing: het instellen van uw eigen naam hier kan het automatisch aanvullen van de inlog functie breken wanneer gebruik wordt van de mobiele applicatie DoliDroid)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mo
 SomethingMakeInstallFromWebNotPossible2=Om deze reden, is het upgrade process hier beschreven alleen in handmatige stappen door een bevoorrechte gebruiker te doen.
 InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand <strong>%s</strong>  te verwijderen om deze functie mogelijk te maken.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 5508ad1be0f..e575cb06839 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Bestelling %s is gefactureerd
 OrderApprovedInDolibarr=Bestel %s goedgekeurd
 OrderRefusedInDolibarr=Order %s is geweigerd
 OrderBackToDraftInDolibarr=Bestel %s terug te gaan naar ontwerp-status
-OrderCanceledInDolibarr=Bestel %s geannuleerd
 ProposalSentByEMail=Offerte %s verzonden per e-mail
 OrderSentByEMail=Afnemersopdracht %s verzonden per e-mail
 InvoiceSentByEMail=Afnemersfactuur %s verzonden per e-mail
@@ -96,3 +95,5 @@ AddEvent=Creëer gebeurtenis/taak
 MyAvailability=Beschikbaarheid
 ActionType=Taak type
 DateActionBegin=Begindatum
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 7cb1835e4aa..6ebda8a263d 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Afstemmen
 Conciliation=Afstemming
 ConciliationForAccount=Deze rekeing afstemmen
 IncludeClosedAccount=Inclusief opgeheven rekeningen
-OnlyOpenedAccount=Alleen open rekeningen
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Te crediteren rekening
 AccountToDebit=Te debiteren rekening
 DisableConciliation=Afstemming van deze rekening uitschakelen
 ConciliationDisabled=Afstemming voor deze rekening is uitgeschakeld
-StatusAccountOpened=Geopend
+StatusAccountOpened=Open
 StatusAccountClosed=Opgeheven
 AccountIdShort=Aantal
 EditBankRecord=Bewerk bankregel
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Afnemersbetaling
 CustomerInvoicePaymentBack=Terugbetaling klant
 SupplierInvoicePayment=Leveranciersbetaling
 WithdrawalPayment=Intrekking betaling
-SocialContributionPayment=Sociale bijdrage betaling
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Dagboek van financiële rekening
 BankTransfer=Bankoverboeking
 BankTransfers=Bankoverboeking
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 5619ad5f954..9e68d8d137d 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Aantal facturen
 NumberOfBillsByMonth=Aantal facturen per maand
 AmountOfBills=Bedrag van de facturen
 AmountOfBillsByMonthHT=Aantal facturen per maand (BTW)
-ShowSocialContribution=Toon sociale verzekeringsbijdrage
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Toon factuur
 ShowInvoice=Toon factuur
 ShowInvoiceReplace=Toon vervangingsfactuur
@@ -270,7 +270,7 @@ BillAddress=Factuuradres
 HelpEscompte=Deze korting wordt toegekend aan de afnemer omdat de betaling werd gemaakt ruim voor de termijn.
 HelpAbandonBadCustomer=Dit bedrag is verlaten (afnemer beschouwt als slechte betaler) en wordt beschouwd als een buitengewoon verlies.
 HelpAbandonOther=Dit bedrag is verlaten, omdat het een fout was (verkeerde afnemer of factuur vervangen door een andere bijvoorbeeld)
-IdSocialContribution=Sociale premiebijdrage id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Betalings id
 InvoiceId=Factuur id
 InvoiceRef=Factuurreferentie
@@ -430,5 +430,5 @@ NotLastInCycle=Deze factuur niet de laatste in de cyclus en mag niet worden gewi
 DisabledBecauseNotLastInCycle=De volgende situatie bestaat al.
 DisabledBecauseFinal=Deze situatie is definitief.
 CantBeLessThanMinPercent=De voortgang kan niet kleiner zijn dan de waarde in de voorgaande situatie.
-NoSituations=Geen geopend situaties
+NoSituations=No open situations
 InvoiceSituationLast=Finale en algemene factuur
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index 1d2bcc4305b..b9acf16fbc0 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Laatste contracten
 BoxLastContacts=Laatste contacten / adressen
 BoxLastMembers=Laatste leden
 BoxFicheInter=Laatste tussenkomsten
-BoxCurrentAccounts=Rekening geopend
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Omzet
 BoxTotalUnpaidCustomerBills=Totaal aantal onbetaalde afnemersfacturen
 BoxTotalUnpaidSuppliersBills=Totaal aantal onbetaalde leveranciersfacturen
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Laatste %s leden
 BoxTitleLastFicheInter=Laatste tussenkomst %e aanpassingen
 BoxTitleOldestUnpaidCustomerBills=Oudste %s onbetaalde klant facturen
 BoxTitleOldestUnpaidSupplierBills=Oudste %s onbetaalde leveranciersfacturen
-BoxTitleCurrentAccounts=Saldo van de geopende rekeningen\n
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Omzet
 BoxTitleTotalUnpaidCustomerBills=Onbetaalde klant facturen
 BoxTitleTotalUnpaidSuppliersBills=Onbetaalde leveranciersfacturen
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index aac03a49e40..bc45a391c71 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Onmogelijk om de tag / categorie toe te voegen
 ImpossibleAssociateCategory=Onmogelijk om de tag / categorie koppelen aan
 WasAddedSuccessfully=<b>%s</b> is succesvol toegevoegd.
 ObjectAlreadyLinkedToCategory=Element is al verbonden met deze tag / categorie.
-CategorySuccessfullyCreated=Deze tag / categorie %s is toegevoegd met succes.
-ProductIsInCategories=Product/dienst behoort tot volgende tags / categorieën
-SupplierIsInCategories=Relatie behoort tot volgende leveranciers tags / categorieën
-CompanyIsInCustomersCategories=Deze relatie behoort tot volgende klanten/prospects tags/categorieën
-CompanyIsInSuppliersCategories=Deze relatie behoort tot volgende leveranciers tags / categorieën
-MemberIsInCategories=Dit lid behoort tot volgende leden tags / categorieën
-ContactIsInCategories=Dit contact behoort tot volgende contacten tags / categorieën
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=Dit product / dienst staat niet in tags / categorieën
 SupplierHasNoCategory=Deze leverancier staat in geen enkele tags / categorieën
-CompanyHasNoCategory=Dit bedrijf staat in geen tags / categorieën
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=Dit lid staat in geen tags / categorieën
 ContactHasNoCategory=Dit contact staat in geen tags / categorieën
-ClassifyInCategory=Classificeer in tag / categorie
+ClassifyInCategory=Add to tag/category
 NoneCategory=Geen
 NotCategorized=Zonder tag / categorie
 CategoryExistsAtSameLevel=Deze categorie bestaat al op hetzelfde niveau
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Inhoud is niet zichtbaar voor iedereen
 CategoriesTree=Tags / categorieën boom
 DeleteCategory=Delete tag / categorie
 ConfirmDeleteCategory=Weet je zeker dat je deze tag / categorie wilt verwijderen?
-RemoveFromCategory=Verwijder koppeling met tag / categorie
-RemoveFromCategoryConfirm=Weet u zeker dat u wilt verband tussen de transactie en de tag / categorie verwijderen?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=Geen tag / categorie gedefinieerd
-SuppliersCategoryShort=Leveranciers tags / categorie
-CustomersCategoryShort=Klanten tags / categorie
-ProductsCategoryShort=Producten tags / categorie
-MembersCategoryShort=Leden tags / categorie
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Leveranciers tags / categorieën
 CustomersCategoriesShort=Klanten tags / categorieën
 CustomersProspectsCategoriesShort=Afnemers- / Prospectencategorie
@@ -94,7 +94,7 @@ CatSupList=Lijst van leverancier tags / categorieën
 CatCusList=Lijst van de klant/prospect tags/categorieën
 CatProdList=Lijst van producten tags / categorieën
 CatMemberList=Lijst leden tags / categorieën
-CatContactList=Lijst van contact tags / categorieën en contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Koppelingen tussen leveranciers en tags / categorieën
 CatCusLinks=Koppelingen tussen klanten / prospects en tags / categorieën
 CatProdLinks=Koppelingen tussen producten / diensten en tags / categorieën
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index feff1443af9..b540ec2eca6 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Contactpersoon van Klant
 StatusContactValidated=Status van contactpersoon
 Company=Bedrijf
 CompanyName=Bedrijfsnaam
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Bedrijven
 CountryIsInEEC=Lidstaat van de Europese Unie
 ThirdPartyName=Naam van Klant
@@ -410,5 +411,10 @@ OutstandingBillReached=Maximum bereikt voor openstaande rekening
 MonkeyNumRefModelDesc=Geeft een nummer als %syymm-nnnn voor afnemerscodes en %sjjmm-nnnn voor leverancierscodes waar jj het jaar is, mm de maand en nnnn een opeenvolgend nummer vanaf 0.
 LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd.
 ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...)
-SearchThirdparty=Zoek relatie
+SearchThirdparty=Search third party
 SearchContact=Zoek contactpersoon
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index f5f521d6edf..ec674036ed4 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Geïnde  BTW
 ToPay=Te betalen
 ToGet=Om terug te komen
 SpecialExpensesArea=Ruimte voor alle bijzondere betalingen
-TaxAndDividendsArea=Belastingen-, sociale bijdragen- en dividendenoverzicht
-SocialContribution=Sociale bijdragen
-SocialContributions=Sociale bijdragen
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Speciale uitgaven
 MenuTaxAndDividends=Belastingen en dividenden
 MenuSalaries=Salarissen
-MenuSocialContributions=Sociale premies
-MenuNewSocialContribution=Nieuwe bijdrage
-NewSocialContribution=Nieuwe sociale bijdrage
-ContributionsToPay=Te betalen bijdragen
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Treasury- (schatkist) / boekhoudingsoverzicht
 AccountancySetup=Boekhoudingsinstellingen
 NewPayment=Nieuwe betaling
 Payments=Betalingen
 PaymentCustomerInvoice=Afnemersfactuur betaling
 PaymentSupplierInvoice=Leveranciersfactuur betaling
-PaymentSocialContribution=Sociale bijdrage betaling
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=BTW betaling
 PaymentSalary=Salarisbetaling
 ListPayment=Betalingenlijst
@@ -91,7 +91,7 @@ LT1PaymentES=RE Betaling
 LT1PaymentsES=RE Betalingen
 VATPayment=BTW-betaling
 VATPayments=BTW-betalingen
-SocialContributionsPayments=Betalingen van sociale bijdragen
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Toon BTW-betaling
 TotalToPay=Totaal te voldoen
 TotalVATReceived=Totale BTW ontvangsten
@@ -116,11 +116,11 @@ NewCheckDepositOn=Creeer een kwitantie voor de storting op rekening: %s
 NoWaitingChecks=Geen cheques die op storting wachten
 DateChequeReceived=Ontvangstdatum cheque
 NbOfCheques=Aantal cheques
-PaySocialContribution=Betaal een sociale bijdrage
-ConfirmPaySocialContribution=Weet u zeker dat u deze sociale bijdrage als betaald wilt aanmerken ?
-DeleteSocialContribution=Verwijder een sociale bijdrage
-ConfirmDeleteSocialContribution=Weet u zeker dat u deze sociale bijdrage wilt verwijderen?
-ExportDataset_tax_1=Sociale premies en betalingen
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sBTW op verbintenissenboekhouding %s.</b>
 CalcModeVATEngagement=Mode <b>%sBTW op de inkomens-uitgaven %s.</b>
 CalcModeDebt=Mode <b>%sClaims-Schulden%s</b> zei <b>verbintenis boekhouding.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een <b>kas boukhoudings-modus</b> is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van <b>betrokkenheid accountancy-modus</b> (zie setup van boukhoud module).
 CalculationMode=Berekeningswijze
 AccountancyJournal=Dagboek van financiële rekening
-ACCOUNTING_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw
 ACCOUNTING_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties
 ACCOUNTING_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties
-CloneTax=Kloon een sociale bijdrage
-ConfirmCloneTax=Bevestig het klonen van een sociale bijdrage
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Kloon het voor volgende maand
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 9308defa42a..3af81e99ba1 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -4,10 +4,10 @@ About = Over
 CronAbout = Over Cron
 CronAboutPage = Over Cron pagina
 # Right
-Permission23101 = Lees geplande taak
-Permission23102 = Maak/wijzig geplande taak
-Permission23103 = Verwijder geplande taak
-Permission23104 = Voer geplande taak uit
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Beheer taakplanning
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Commando
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Taak
@@ -39,8 +39,8 @@ CronDtStart=Begindatum
 CronDtEnd=Einddatum
 CronDtNextLaunch=Volgende uitvoering
 CronDtLastLaunch=Laatste uitvoering
-CronFrequency=Frequentie
-CronClass=Klasse
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Methode
 CronModule=Module
 CronAction=Aktie
@@ -55,9 +55,9 @@ CronEach=Elke
 JobFinished=Taak gestart en be-eindigd
 #Page card
 CronAdd= Taak toevoegen
-CronHourStart= Start uur en datum van de taak
-CronEvery= Taak uitvoeren elke
-CronObject= Instantie/Object om te creeren
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instantie/Object om te creeren
 CronArgs=Instellingen
 CronSaveSucess=Save succesfully
 CronNote=Reactie
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informatie
 # Common
-CronType=Taak type
+CronType=Job type
 CronType_method=Aanroep methode van Dolibarr Class
 CronType_command=Shell commando
 CronMenu=Cron
 CronCannotLoadClass=Kan klasse %s of object %s niet laden
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index 52f6582bfbe..1c376a9c3f1 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Zoek op object
 ECMSectionOfDocuments=Mappen van documenten
 ECMTypeManual=Handmatig
 ECMTypeAuto=Automatisch
-ECMDocsBySocialContributions=Documenten in verband met de sociale bijdragen
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documenten gekoppeld aan derden
 ECMDocsByProposals=Documenten gekoppeld aan offertes / voorstellen
 ECMDocsByOrders=Documenten gekoppeld aan afnemersorders
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 5d263dc1e58..97f052e082b 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index 7986b74bc44..6d529c91ece 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reden
 UserCP=Gebruiker
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Waardering
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/nl_NL/incoterm.lang b/htdocs/langs/nl_NL/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/nl_NL/incoterm.lang
+++ b/htdocs/langs/nl_NL/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index 9d73ad2717a..4976d993e70 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Databaseserver - Superuser toegang (root toegang)
 CheckToCreateDatabase=Vink deze optie aan wanneer de database nog niet bestaat en gecreëerd moet worden.<br>In dit geval, moet u de velden gebruikersnaam en wachtwoord voor het superuser (root) account onderaan deze pagina ook invullen.
 CheckToCreateUser=Vink deze optie aan wanneer de databasegebruiker nog niet bestaat en gecreëerd moet worden.<br>In dit geval, moet u de velden gebruikersnaam en wachtwoord voor het superuser (root) account onderaan deze pagina ook invullen. Wanneer deze optie niet aangevinkt wordt, moeten de gebruikersnaam, het wachtwoord en de database van de  eigenaar bestaan.
 Experimental=(Experimenteel)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Gebruikersnaam van de gebruiker die gemachtigd is om nieuwe databases of gebruikers aan te maken, nutteloos wanneer uw database en gebruiker al bestaan (zoals het geval wanneer u een webhosting provider gebruikt).
 KeepEmptyIfNoPassword=Laat dit veld leeg wanneer de gebruiker geen wachtwoord heeft (vermijd dit)
 SaveConfigurationFile=Waarden opslaan
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index 040b3d64322..bbf22d985b8 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabisch
 Language_ar_SA=Arabisch
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgaarse
 Language_bs_BA=Bosnisch
 Language_ca_ES=Catalaans
@@ -21,9 +22,10 @@ Language_en_SA=Engels (Saoedi-Arabië)
 Language_en_US=Engels (Verenigde Staten)
 Language_en_ZA=Engels (Zuid-Afrika)
 Language_es_ES=Spaans
-Language_es_DO=Spaans (Dominicaanse Republiek)
 Language_es_AR=Spaans (Argentinië)
 Language_es_CL=Spaans (Chili)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spaans (Dominicaanse Republiek)
 Language_es_HN=Spaans (Honduras)
 Language_es_MX=Spaans (Mexico)
 Language_es_PY=Spaans (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesisch
 Language_is_IS=IJslands
 Language_it_IT=Italiaans
 Language_ja_JP=Japans
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Koreaans
+Language_lo_LA=Lao
 Language_lt_LT=Litouws
 Language_lv_LV=Lets
 Language_mk_MK=Macedonisch
@@ -64,6 +69,7 @@ Language_sv_SV=Zweeds
 Language_sv_SE=Zweeds
 Language_sq_AL=Albanees
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Oekraïens
 Language_uz_UZ=Oezbeeks
diff --git a/htdocs/langs/nl_NL/loan.lang b/htdocs/langs/nl_NL/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/nl_NL/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 7917a240c14..e5057416f6b 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Leesbevestiging
 YourMailUnsubcribeOK=De e-mail<b>%s</b> is correct uitgeschreven uit de mailinglijst
 MailtoEMail=Hyper link naar e-mail
 ActivateCheckRead=Laat gebruik link "Unsubcribe" toe
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-mail verzonden naar %s ontvangers.
 XTargetsAdded=<b>%s</b> ontvangers toegevoegd in bestemming-lijst
 EachInvoiceWillBeAttachedToEmail=Een document met behulp van standaard factuur document sjabloon wordt gemaakt en aan elke e-mail toegevoegd.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Uitschrijf link
 TagSignature=Ondertekening verzendende gebruiker
 TagMailtoEmail=Ontvanger e-mail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Kennisgevingen
 NoNotificationsWillBeSent=Er staan geen e-mailkennisgevingen gepland voor dit evenement en bedrijf
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 1d3f1e6aef4..98df67dde00 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Fouten gevonden. Wij draaien de veranderin
 ErrorConfigParameterNotDefined=<b>Parameter %s</b> is niet gedefinieerd binnen Dolibarr configuratiebestand <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Kan <b>gebruiker %s</b> niet in de Dolibarr database vinden.
 ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land '%s'.
-ErrorNoSocialContributionForSellerCountry=Fout, geen sociale bijdrage gedefinieerd voor het land '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Fout, bestand opslaan mislukt.
 SetDate=Stel datum in
 SelectDate=Selecteer een datum
@@ -301,8 +301,8 @@ UnitPriceHT=Eenheidsprijs (netto)
 UnitPriceTTC=Eenheidsprijs (bruto)
 PriceU=E.P.
 PriceUHT=EP (netto)
-AskPriceSupplierUHT=E.P. excl aangevraagd
-PriceUTTC=EP (bruto)
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Hoeveelheid
 AmountInvoice=Factuurbedrag
 AmountPayment=Betalingsbedrag
@@ -339,6 +339,7 @@ IncludedVAT=Inclusief BTW
 HT=Exclusief BTW
 TTC=Inclusief BTW
 VAT=BTW
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=BTW-tarief
@@ -413,6 +414,8 @@ Qty=Aantal
 ChangedBy=Veranderd door
 ApprovedBy=Goedgekeurd door
 ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
+Approved=Approved
+Refused=Refused
 ReCalculate=Herberekenen
 ResultOk=Succes
 ResultKo=Mislukking
@@ -421,7 +424,7 @@ Reportings=Rapportage
 Draft=Concept
 Drafts=Concepten
 Validated=Gevalideerd
-Opened=Geopend
+Opened=Open
 New=Nieuw
 Discount=Korting
 Unknown=Onbekend
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Gekoppeld aan een bepaalde gebruiker contact
 DeleteAFile=Een bestand verwijderen
 ConfirmDeleteAFile=Weet u zeker dat u van het wissen van bestand
 NoResults=Geen resultaten
+SystemTools=System tools
 ModulesSystemTools=Modules gereedschappen
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Toon transactie
 GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om logo te wijzigen of ga naar Home - Instellingen - Scherm om te verbergen.
 Deny=Wijgeren
 Denied=Gewijgerd
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
@@ -732,3 +739,4 @@ ShortThursday=Do
 ShortFriday=Vr
 ShortSaturday=Za
 ShortSunday=Zo
+SelectMailModel=Select email template
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 4b290bdb74c..aa3d159c116 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -199,7 +199,8 @@ Entreprises=Bedrijven
 DOLIBARRFOUNDATION_PAYMENT_FORM=Om uw abonnement betalen via een bankoverschrijving, zie pagina <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Betalen met een creditcard of Paypal, klik op de knop onderaan deze pagina. <br>
 ByProperties=Volgens eigenschappen
 MembersStatisticsByProperties=Leden statistiek volgens eigenschappen
-MembersByNature=Leden volgens aard
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=BTW tarief voor inschrijvingen
 NoVatOnSubscription=Geen BTW bij inschrijving
 MEMBER_PAYONLINE_SENDEMAIL=E-mail om te verwittigen dat Dolibarr een bericht ontvangen heeft voor een bevestigde betaling van een inschrijving
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 7ea72e81709..ade52a138c2 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Leveranciersopdracht
 SuppliersOrders=Leveranciersopdrachten
 SuppliersOrdersRunning=Huidige leveranciersopdrachten
 CustomerOrder=Afnemersopdracht
-CustomersOrders=Klant bestellingen
-CustomersOrdersRunning=Lopende afnemersopdrachten
-CustomersOrdersAndOrdersLines=Afnemersopdrachten en opdrachtregels
-OrdersToValid=Klant bestellingen te valideren
-OrdersToBill=Klant bestellingen geleverd
-OrdersInProcess=Klant bestellingen in uitvoering
-OrdersToProcess=Klant bestellingen te verwerken
-SuppliersOrdersToProcess=Te verwerken leveranciersopdrachten
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Geannuleerd
 StatusOrderDraftShort=Concept
 StatusOrderValidatedShort=Gevalideerd
@@ -75,8 +75,9 @@ AddToMyOrders=Toevoegen aan mijn opdrachten
 AddToOtherOrders=Toevoegen aan andere opdrachten
 AddToDraftOrders=Voeg toe aan order in aanmaak
 ShowOrder=Toon opdracht
-NoOpenedOrders=Geen lopende opdrachten
-NoOtherOpenedOrders=Geen enkele andere opdracht geopend
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Geen orders in aanmaak
 OtherOrders=Andere opdrachten
 LastOrders=Laatste %s klantbestellingen
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 3ac896537f8..b4cf31b81d3 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Interventie gevalideerd
 Notify_FICHINTER_SENTBYMAIL=Interventie via mail verzonden
 Notify_BILL_VALIDATE=Klant factuur gevalideerd
 Notify_BILL_UNVALIDATE=Klantenfactuur niet gevalideerd
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverancier te zijn goedgekeurd
 Notify_ORDER_SUPPLIER_REFUSE=Leverancier bestellen geweigerd
 Notify_ORDER_VALIDATE=Bestelling van de klant gevalideerd
@@ -203,6 +204,7 @@ ClickHereToGoTo=Klik hier om naar %s
 YouMustClickToChange=Je moet echter wel eerst klikken op de volgende link om de wachtwoord wijziging te valideren
 ForgetIfNothing=Als u deze wijziging niet heeft aangevraagd, negeer deze e-mail. Uw referenties blijven veilig bewaard.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Nieuwe vermelding in de agenda %s
diff --git a/htdocs/langs/nl_NL/printing.lang b/htdocs/langs/nl_NL/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/nl_NL/printing.lang
+++ b/htdocs/langs/nl_NL/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 60e1403e200..ba235ee6984 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Aantal: %d
 AddDispatchBatchLine=Voeg een regel toe voor houdbaarheids ontvangst
 BatchDefaultNumber=Onbepaald
 WhenProductBatchModuleOnOptionAreForced=Als module Lot / Serienummer actief is, verhogen/verlagen voorraad modus wordt geforceerd en kan niet worden bewerkt. Andere opties kunnen worden gedefinieerd als u wilt.
-ProductDoesNotUseBatchSerial=Dit product is niet lot/serienummer ingesteld
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index c1eba78b754..506738a2906 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product of Dienst
 ProductsAndServices=Producten en Diensten
 ProductsOrServices=Producten of diensten
 ProductsAndServicesOnSell=Producten en diensten voor verkoop of aankoop
-ProductsAndServicesNotOnSell=Producten en diensten niet voor verkoop
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Producten- en dienstenstatistieken
 ProductsStatistics=Productenstatistieken
-ProductsOnSell=Product voor verkoop of aankoop
-ProductsNotOnSell=Product niet voor verkoop en niet voor aankoop
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Producten voor verkoop en aankoop
 ServicesOnSell=Diensten voor verkoop of aankoop
-ServicesNotOnSell=Diensten niet voor verkoop
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Diensten voor verkoop en aankoop
 InternalRef=Interne referentie
 LastRecorded=Laatste geregistreerde verkochte producten / diensten
@@ -44,7 +44,7 @@ CardProduct1=Dienstdetails
 CardContract=Contractdetails
 Warehouse=Magazijn
 Warehouses=Magazijnen
-WarehouseOpened=Magazijn geopend
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magazijn gesloten
 Stock=Voorraad
 Stocks=Voorraden
@@ -71,21 +71,21 @@ SellingPriceTTC=Verkoopprijs (inclusief belastingen)
 PublicPrice=Adviesprijs
 CurrentPrice=Huidige prijs
 NewPrice=Nieuwe prijs
-MinPrice=Minimum verkoopprijs
-MinPriceHT=Min. verkoopprijs (na belastingen)
-MinPriceTTC=Min. verkoopprijs (incl. BTW)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting)
 ContractStatus=Contractstatus
 ContractStatusClosed=Gesloten
-ContractStatusRunning=Lopende
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Verstreken
-ContractStatusOnHold=Niet actief
-ContractStatusToRun=Lopende maken
-ContractNotRunning=Dit contract is niet actief
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Een product met verwijzing %s bestaat reeds.
 ErrorProductBadRefOrLabel=Verkeerde waarde voor de referentie of label.
 ErrorProductClone=Er was een probleem bij het clonen van het product of de dienst.
-ErrorPriceCantBeLowerThanMinPrice=Fout, prijs kan niet lager zijn dan minimumprijs.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Leveranciers
 SupplierRef=Leveranciersreferentie
 ShowProduct=Toon product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid:
 MultiPricesAbility=Verschillende prijs niveaus product/dienst
 MultiPricesNumPrices=Aantal prijzen
 MultiPriceLevelsName=Prijscategorieën
-AssociatedProductsAbility=Activeer de pakket functie
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Pakket product
-AssociatedProductsNumber=Aantal producten waaruit dit pakket product bestaat
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Aantal ouder pakket producten
-IfZeroItIsNotAVirtualProduct=Als 0, dit product is geenl pakket product
-IfZeroItIsNotUsedByVirtualProduct=Als 0, wordt dit product niet gebruikt door een pakket product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associatie
 Translation=Vertaling
 KeywordFilter=Trefwoord filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Zoek product om toe te voegen
 AddDel=Toevoegen / verwijderen
 Quantity=Hoeveelheid
 NoMatchFound=Geen resultaten gevonden
-ProductAssociationList=Lijst van gerelateerde producten / diensten: naam van het product / de dienst (hoeveelheid geaffecteerd)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Lijst van pakket producten met dit product als onderdeel
 ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product
 DeleteProduct=Verwijderen een product / dienst
@@ -179,16 +179,41 @@ CloneProduct=Kopieer product of dienst
 ConfirmCloneProduct=Weet u zeker dat u het product of de dienst <b>%s</b> wilt klonen?
 CloneContentProduct=Kloon alle hoofdinformatie van het product / de dienst
 ClonePricesProduct=Kloon hoofdinformatie en prijzen
-CloneCompositionProduct=Kloon pakket product/diensten
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Dit product wordt gebruikt
 NewRefForClone=Referentie naar nieuw produkt / dienst
-CustomerPrices=Consumentenprijs
-SuppliersPrices=Leveranciersprijs
-SuppliersPricesOfProductsOrServices=Leverancier prijzen (van producten of diensten)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Code op maat
 CountryOrigin=Land van herkomst
 HiddenIntoCombo=Verborgen in selectielijsten
 Nature=Natuur
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Productcode sjabloon
 ServiceCodeModel=Diensten ref template
 AddThisProductCard=Maak product kaart
@@ -214,7 +239,7 @@ CostPmpHT=Netto VWAP totaal
 ProductUsedForBuild=Automatisch opgebruiken bij productie
 ProductBuilded=Productie klaar
 ProductsMultiPrice=Multi-prijs product
-ProductsOrServiceMultiPrice=Klant prijzen (van producten of diensten, multi-prijzen)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=VWAP kwartaalomzet producten
 ServiceSellByQuarterHT=VWAP kwartaalomzet diensten
 Quarter1=1e kwartaal
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Definieer streepjescode waarde voor alle records (dit
 PriceByCustomer=Verschillende prijs voor elke klant
 PriceCatalogue=Unieke prijs per product/dienst
 PricingRule=Regels voor prijzen klant
-AddCustomerPrice=Prijs per klant toevoegen
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Stel dezelfde prijs in dochterondernemingen klant
 PriceByCustomerLog=Prijs per klant log
-MinimumPriceLimit=Minimumprijs niet lager kan zijn dan %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimaal aanbevolen prijs is:% s
 PriceExpressionEditor=Prijs expressie editor
 PriceExpressionSelected=Geselecteerde prijs uitdrukking
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=formaat is  {"URL": "http://example.com/urlofws
 UpdateInterval=Update-interval (minuten)
 LastUpdated=Laatst bijgewerkt
 CorrectlyUpdated=Correct bijgewerkt
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 967492753ab..f621d8a50cc 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Deze weergave toont alle projecten waarvoor u gerechtigd bent
 ProjectsPublicTaskDesc=Deze weergave toont alle projecten en taken die je mag lezen.
 ProjectsDesc=Deze weergave toont alle projecten (Uw gebruikersrechten staan het u toe alles in te zien).
 MyTasksDesc=Deze weergave is beperkt tot projecten en taken waarvoor u een contactpersoon bent (ongeacht het type).
-OnlyOpenedProject=Alleen geopende projecten zijn zichtbaar (projecten met een ontwerp of gesloten status worden niet zichtbaar).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien.
 TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien).
-AllTaskVisibleButEditIfYouAreAssigned=Alle taken voor een dergelijk project zijn zichtbaar, maar je kunt de tijd alleen ingeven voor de taak die u zijn toegewezen.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projectenoverzicht
 NewProject=Nieuw project
 AddProject=Nieuw project
@@ -29,7 +30,7 @@ ProjectsList=Projectenlijst
 ShowProject=Toon project
 SetProject=Stel project in
 NoProject=Geen enkel project gedefinieerd of in eigendom
-NbOpenTasks=Aantal geopende taken
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Aantal projecten
 TimeSpent=Bestede tijd
 TimeSpentByYou=Uw tijdsbesteding
@@ -41,7 +42,7 @@ TaskTimeSpent=Tijd besteed aan taken
 TaskTimeUser=Gebruiker
 TaskTimeNote=Notitie
 TaskTimeDate=Datum
-TasksOnOpenedProject=Taken op geopende projecten
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload niet gedefinieerd
 NewTimeSpent=Nieuwe bestede tijd
 MyTimeSpent=Mijn bestede tijd
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Lijst van aan het project verbonden interventies
 ListExpenseReportsAssociatedProject=Lijst van onkostennota's in verband met het project
 ListDonationsAssociatedProject=Lijst van donaties in verband met het project
 ListActionsAssociatedProject=Lijst van aan het project verbonden acties
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Projectactiviteit in deze week
 ActivityOnProjectThisMonth=Projectactiviteit in deze maand
 ActivityOnProjectThisYear=Projectactiviteit in dit jaar
@@ -95,7 +98,7 @@ DeleteATimeSpent=Verwijder gespendeerde tijd
 ConfirmDeleteATimeSpent=Weet u zeker dat u de gespendeerde tijd wilt verwijderen?
 DoNotShowMyTasksOnly=Bekijk ook taken niet aan mij toegewezen
 ShowMyTasksOnly=Bekijk alleen taken die aan mij toegewezen
-TaskRessourceLinks=Bronnen
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projecten gewijd aan deze derde partij
 NoTasks=Geen taken voor dit project
 LinkedToAnotherCompany=Gekoppeld aan een andere derde partij
@@ -139,8 +142,15 @@ ProjectReferers=Verwijzende objecten
 SearchAProject=Zoek een project
 ProjectMustBeValidatedFirst=Project moet eerst worden gevalideerd
 ProjectDraft=Ontwerp projecten
-FirstAddRessourceToAllocateTime=Associëer een resource om tijd toe te wijzen
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per dag
 InputPerWeek=Input per week
 InputPerAction=Input per actie
 TimeAlreadyRecorded=Tijd besteed reeds opgenomen voor deze taak / dag en gebruiker %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index 98509c106d0..9641854a4ce 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -4,7 +4,7 @@ Proposal=Offerte
 ProposalShort=Offerte
 ProposalsDraft=Conceptofferte
 ProposalDraft=Conceptofferte
-ProposalsOpened=Geopende offertes
+ProposalsOpened=Open commercial proposals
 Prop=Offertes
 CommercialProposal=Offerte
 CommercialProposals=Offertes
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Bedrag per maand (exclusief belastingen)
 NbOfProposals=Aantal offertes
 ShowPropal=Toon offerte
 PropalsDraft=Concepten
-PropalsOpened=Geopend
+PropalsOpened=Open
 PropalsNotBilled=Gesloten niet gefactureerd
 PropalStatusDraft=Concept (moet worden gevalideerd)
 PropalStatusValidated=Gevalideerd (Offerte staat open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Niet ondertekend (gesloten)
 PropalStatusBilled=Gefactureerd
 PropalStatusDraftShort=Concept
 PropalStatusValidatedShort=Gevalideerd
-PropalStatusOpenedShort=Geopend
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Gesloten
 PropalStatusSignedShort=Ondertekend
 PropalStatusNotSignedShort=Niet ondertekend
@@ -51,8 +51,8 @@ PropalsToClose=Te sluiten offertes
 PropalsToBill=Ondertekende offertes die gefactureerd moeten worden
 ListOfProposals=Offertelijst
 ActionsOnPropal=Offerte-acties
-NoOpenedPropals=Aantal openstaande offertes
-NoOtherOpenedPropals=Geen enkel andere openstaande offerte
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Offertereferentie
 SendPropalByMail=Stuur offerte per e-mail
 AssociatedDocuments=Documenten gelinkt aan de offerte:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune offertemodel
 DefaultModelPropalCreate=Standaard model aanmaken
 DefaultModelPropalToBill=Standaard sjabloon bij het sluiten van een zakelijk voorstel (te factureren)
 DefaultModelPropalClosed=Standaard sjabloon bij het sluiten van een zakelijk voorstel (nog te factureren)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index b408d121960..b727a5431b9 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Toon salarisbetaling
 THM=Gemiddelde uurprijs
 TJM=Gemiddelde dagprijs
 CurrentSalary=Huidige salaris
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index e83b25e092c..7cc0ea95dd4 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Eenvoudig documentmodel
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Waarschuwing, geen producten die op verzending wachten.
 StatsOnShipmentsOnlyValidated=Statistiek op verzendingen die bevestigd zijn.  Datum is de datum van bevestiging van de verzending (geplande leverdatum is niet altijd bekend).
-DateDeliveryPlanned=Geplande leveringsdatum
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Datum leveringsonvangst
 SendShippingByEMail=Stuur verzending per e-mail
 SendShippingRef=Indiening van de zending %s
@@ -67,7 +67,7 @@ SendingRunning=Product uit bestelde klantbestellingen
 SuppliersReceiptRunning=Product van bestelde leverancier bestellingen
 ProductQtyInCustomersOrdersRunning=Hoeveelheid producte in geopende klant bestellingen
 ProductQtyInSuppliersOrdersRunning=Hoeveelheid producten in geopende leveranciers bestellingen
-ProductQtyInShipmentAlreadySent=Hoeveelheid producten uit open bestelling van de klant al verstuurd
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Hoeveelheid producte uit geopende leverancier bestelling reeds ontvangen
 
 # Sending methods
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 614c5693bce..35e4c9c4bf0 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Magazijnen
 NewWarehouse=Nieuw magazijn / Vooraadoverzicht
 WarehouseEdit=Magazijn wijzigen
 MenuNewWarehouse=Nieuw magazijn
-WarehouseOpened=Magazijn geopend
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magazijn gesloten
 WarehouseSource=Bronmagazijn
 WarehouseSourceNotDefined=Geen magazijn bepaald
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Kies magazijn te gebruiken voor voorraad daling
 SelectWarehouseForStockIncrease=Kies magazijn te gebruiken voor verhoging van voorraad
 NoStockAction=Geen stockbeweging
 LastWaitingSupplierOrders=Orders wachtend op ontvangst
-DesiredStock=Gewenste voorraad
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Te bestellen
 Replenishment=Bevoorrading
 ReplenishmentOrders=Bevoorradingsorder
-VirtualDiffersFromPhysical=Volgens verhogen/verlagen stock opties, fysieke voorraad en virtuele voorraad (fysieke + lopende bestellingen) kan verschilllen
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Gebruik virtuele voorraad standaard, in plaats van de fysieke voorraad, voor de aanvul functie
 UseVirtualStock=Gebruik virtuele voorraad
 UsePhysicalStock=Gebruik fysieke voorraad
-CurentSelectionMode=Huidige selectie modus
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual voorraad
 CurentlyUsingPhysicalStock=Fysieke voorraad
 RuleForStockReplenishment=Regels voor bevoorrading
@@ -112,8 +113,8 @@ AlertOnly= Enkel waarschuwingen
 WarehouseForStockDecrease=De voorraad van magazijn <b>%s</b> zal verminderd worden
 WarehouseForStockIncrease=De voorraad van magazijn <b>%s</b> zal verhoogd worden
 ForThisWarehouse=Voor dit magazijn
-ReplenishmentStatusDesc=Dit is een lijst van alle productgroepen met een voorraad lager dan gewenst voorraad (of lager dan de alarm waarde als checkbox "alleen alarm" is aangevinkt), aan te raden  dat je een leverancier bestelling maakt om het verschil aan te vullen.
-ReplenishmentOrdersDesc=Dit is de lijst van alle geopende leverancier bestellingen met inbegrip van vooraf gedefinieerde producten. Alleen geopend bestellingen met vooraf gedefinieerde producten, dus bestellingen die voorraden beinvloeden, zijn zichtbaar hier.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
 NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
@@ -124,16 +125,16 @@ RecordMovement=Kaart overbrengen
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
 RuleForStockAvailability=Regels op voorraad vereisten
-StockMustBeEnoughForInvoice=Stock niveau moet voldoende zijn om het product/dienst toe te voegen aan de factuur
-StockMustBeEnoughForOrder=Voorraadniveau moet genoeg zijn om het product/dienst toe te voegen aan order.
-StockMustBeEnoughForShipment= Stock niveau moet voldoende zijn om het product/dienst toe te voegen aan de verzending
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label van de verplaatsing
 InventoryCode=Verplaatsing of inventaris code
 IsInPackage=Vervat in pakket
 ShowWarehouse=Toon magazijn
-MovementCorrectStock=Stock correctie voor product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Voorraad overdracht van het product %s in een ander magazijn
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Bron magazijn moet hier worden gedefinieerd als "Product lot" module is ingeschakeld. Het zal worden gebruikt om een ​​lijst van welke partij / serial is beschikbaar voor product dat veel / seriële data die nodig zijn voor beweging. Als u wilt sturen producten uit verschillende magazijnen, gewoon de zending in verschillende stappen.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Verpl. code
-NoPendingReceptionOnSupplierOrder=Geen wachtende ontvangsten als gevolg van openstaande leverancier bestelling
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=Deze lot/serienummer (<strong>%s</strong>) bestaat al, maar met verschillende verval of verkoopen voor datum <strong>(gevonden %s</strong> maar u gaf in<strong>%s</strong>).
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index f8a4dfe16bd..9dfd27d52fc 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Stuur naar leveranciers
 ListOfSupplierOrders=Lijst van leverancier bestellingen
 MenuOrdersSupplierToBill=Leverancier bestellingen te factureren
 NbDaysToDelivery=Levering vertraging in de dagen
-DescNbDaysToDelivery=De langste levertermijn van de producten besteld in deze opdracht.
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Gebruik dubbele goedkeuring (de tweede goedkeuring kan worden gedaan door elke gebruiker met de speciale toestemming)
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index a3dea0dad7c..0eea7bf16cf 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Vergoedingenlijst
 NewTrip=New expense report
 CompanyVisited=Bedrijf / stichting bezocht
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index f279694a06f..defbfbf6117 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Verwijderen uit groep
 PasswordChangedAndSentTo=Wachtwoord veranderd en verstuurd naar <b>%s</b>.
 PasswordChangeRequestSent=Verzoek om wachtwoord te wijzigen van <b>%s</b> verstuurt naar <b>%s</b>.
 MenuUsersAndGroups=Gebruikers & groepen
+MenuMyUserCard=My user card
 LastGroupsCreated=Laatste %s gemaakte groep(en)
 LastUsersCreated=Laatste %s gemaakte gebruiker(s)
 ShowGroup=Toon groep
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 24019c213e4..ff7a5a850f3 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Betaling van periodieke overboeking %s door de bank
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index ed9a7f22b85..0b75b1081ea 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=Deze module is ontworpen om het gedrag van automatische acties te wijzigen. Standaard is de workflow open (je eigen volgorde). U kunt de automatische acties die voor u interessant zijn te activeren.
-ThereIsNoWorkflowToModify=Er is geen workflow die u kunt aanpassen aan je module hebt geactiveerd.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatisch een bestelling van de klant na een commerciële voorstel is ondertekend
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatisch een factuur klant na een commerciële voorstel is ondertekend
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatisch een factuur nadat de klant een contract is gevalideerd
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatisch een factuur klant na een bestelling van de klant wordt gesloten
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificeer gekoppelde bron offerte om gefactureerd te worden wanneer bestelling van de klant is ingesteld op betaald
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bron klant bestelling(en) gefactureerd wanneer de klant factuur is ingesteld op betaald
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bron klantbestelling(en) gefactureerd wanneer de klantfactuur wordt gevalideerd
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index b9536aee4af..bf58f2d2339 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Księgowość
 Globalparameters=Parametry globalne
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Długość z rachunków osób trzecich
 
 ACCOUNTING_SELL_JOURNAL=Sprzedam czasopisma
 ACCOUNTING_PURCHASE_JOURNAL=Zakup czasopisma
-ACCOUNTING_BANK_JOURNAL=Czasopismo Banku
-ACCOUNTING_CASH_JOURNAL=Czasopismo Gotówka
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Inne czasopisma
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Czasopismo Społecznego
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto transferu
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index df4bce98ad5..d7ff8a7f623 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu dla użytkowników
 LangFile=Plik. Lang
 System=System
 SystemInfo=Informację systemowe
-SystemTools=Narzędzia systemowe
 SystemToolsArea=Obszar narzędzi systemowych
 SystemToolsAreaDesc=Obszar ten stanowi funkcję administracyjne. Użyj menu, aby wybrać tę funkcję, której szukasz.
 Purge=Czyszczenie
@@ -232,8 +231,8 @@ Security=Bezpieczeństwo
 Passwords=Hasła
 DoNotStoreClearPassword=Nie przechowuj w bazie danych niezakodowanych haseł. Przechowuj jedynie hasła zakodowane.
 MainDbPasswordFileConfEncrypted=Hasło bazy danych zakodowane w conf.php
-InstrucToEncodePass=Aby zakodować hasło w pliku <b>conf.php</b> , zamień linię <br> <b>$ Dolibarr_main_db_pass =&quot;...&quot;</b> <br> przez <br> <b>$ Dolibarr_main_db_pass = &quot;zaszyfrowane: %s&quot;</b>
-InstrucToClearPass=Aby odkodować hasło (wyczyścić) w pliku <b>conf.php</b>, zamień linię <br> <b>$ Dolibarr_main_db_pass = &quot;zaszyfrowane :...&quot;</b> <br> przez <br> <b>$ Dolibarr_main_db_pass = &quot;%s&quot;</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Ochrona generowanych plików PDF (Aktywowany nie jest zalecany, przerwa masowe generowanie plików pdf)
 ProtectAndEncryptPdfFilesDesc=Ochrona dokument PDF udostępnia go do odczytu i druku z wykorzystaniem dowolnej przeglądarki plików PDF. Jednakże, edycja i kopiowanie nie jest już możliwe. Należy pamiętać, że korzystając z tej funkcji, budowa globalnego,  skumulowanego pliku PDF nie jest możliwa (np. zestawienie niezapłaconych faktur).
 Feature=Funkcja
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Jest to proces konfiguracji do:
 ThisIsAlternativeProcessToFollow=To jest alternatywna konfiguracja do procesu:
 StepNb=Krok %s
 FindPackageFromWebSite=Odnajdź pakiet, który zapewnia wybraną przez Ciebię funkcję (np. na oficjalnej stronie internetowej %s).
-DownloadPackageFromWebSite=Pobierz paczkę %s
-UnpackPackageInDolibarrRoot=Wypakuj pliki paczki do katalogu przeznaczonego dla zewnętrznych modułów: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Instalacja została zakończona. Dolibarr jest gotowy do użycia z nowym elementem.
 NotExistsDirect=Alternatywna ścieżka główna nie została zdefiniowana.<br>
 InfDirAlt=Od wersji 3, możliwe jest zdefiniowanie alternatywnego katalogu głównego.Pozwala to na przechowywanie wtyczek i szablonów niestandardowych. <br> Wystarczy utworzyć katalog w katalogu głównym Dolibarr (np: na zamówienie). <br>
 InfDirExample=<br> Następnie deklarowany w pliku conf.php  <br> $ Dolibarr_main_url_root_alt = "http: // myserver / custom" <br> $ Dolibarr_main_document_root_alt = "/ ścieżka / z / Dolibarr / htdocs / obyczaju" <br> * Linie te są skomentowane z "#", aby usunąć komentarz należy jedynie usunąć znak.
-YouCanSubmitFile=Wybierz moduł:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Aktualna wersja Dolibarr
 CallUpdatePage=Wejdź na stronę aktualizacji struktury bazy danych i danych %s.
 LastStableVersion=Ostatnia wersja stabilna
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Lista parametrów przychodzi z tabeli <br> Składnia:
 ExtrafieldParamHelpchkbxlst=Lista parametrów przychodzi z tabeli <br> Składnia: nazwa_tabeli: label_field: id_field :: Filtr <br> Przykład: c_typent: libelle: id :: Filtr <br><br> Filtr może być prosty test (np aktywny = 1), aby wyświetlić tylko aktywne wartości <br> jeśli chcesz filtrować extrafields używać syntaxt extra.fieldcode = ... (gdzie kod pole jest kod extrafield) <br><br> W celu uzyskania listy zależności od drugiego: <br> c_typent: libelle: id: parent_list_code | parent_column: filtr
 LibraryToBuildPDF=Biblioteka wykorzystana do generowania plików PDF
 WarningUsingFPDF=Uwaga: Twój <b>conf.php</b> zawiera dyrektywę <b>dolibarr_pdf_force_fpdf = 1.</b> Oznacza to, że korzystasz z biblioteki FPDF do generowania plików PDF. Ta biblioteka jest nieaktualna i nie obsługuje wielu funkcji (Unicode, przejrzystości obrazu, cyrylicy, czcionek arabskich oraz azjatyckich ...), więc mogą wystąpić błędy podczas generowania pliku PDF. <br> Aby rozwiązać ten problem i mieć pełne wsparcie przy generowaniu plików PDF, należy pobrać <a href="http://www.tcpdf.org/" target="_blank">bibliotekę TCPDF</a> , następnie linię umieścić wewnątrz komentarza lub usunąć <b>$ dolibarr_pdf_force_fpdf = 1,</b> i dodać zamiast <b>$ dolibarr_lib_TCPDF_PATH = "path_to_TCPDF_dir"</b>
-LocalTaxDesc=Niektóre państwa do każdej pozycji na fakturze dodają 2 lub 3 stawki podatkowe. Jeżeli w tym leży problem, wybierz typ dla drugiego i trzeciego podatku oraz ich wysokość. Prawdopodobne typy to:<br>1 : podatek lokalny należny od produktów i usług bez podatku VAT (podatek lokalny jest naliczany na podstawie ilości bez uwzględnienia podatku)...
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Wprowadź numer telefonu, aby zobaczyć link do przetestowania url ClickToDial dla <strong>użytkownika% s</strong>
 RefreshPhoneLink=Odśwież link
@@ -430,8 +429,8 @@ Module20Name=Propozycje
 Module20Desc=Zarządzanie propozycjami reklam
 Module22Name=Masowe wysyłanie E-maili
 Module22Desc=Zarządzanie masową wysyłką E-maili
-Module23Name= Energia
-Module23Desc= Monitorowanie zużycia energii
+Module23Name=Energia
+Module23Desc=Monitorowanie zużycia energii
 Module25Name=Zamówienia klientów
 Module25Desc=Zarządzanie zamówieniami klienta
 Module30Name=Faktury
@@ -492,8 +491,8 @@ Module400Name=Projekty / Możliwości / Wskazówki
 Module400Desc=Zarządzanie projektami, możliwości lub wskazówki. Następnie możesz przypisać dowolny element (faktury, zamówienia, propozycje, interwencje, ...) do projektu i uzyskać widok poprzeczny z widoku projektu.
 Module410Name=Webcalendar
 Module410Desc=Integracja Webcalendar
-Module500Name=Koszty specjalne (podatek, składki na ubezpieczenie zdrowotne, dywidendy)
-Module500Desc=Zarządzanie kosztami specjalnymi takimi jak podatki, składki na ubezpieczenie zdrowotne, dywidend i wynagrodzenia
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Wynagrodzenia
 Module510Desc=Zarządzanie pracownikami wynagrodzenia i płatności
 Module520Name=Pożyczka
@@ -502,7 +501,7 @@ Module600Name=Powiadomienia
 Module600Desc=Wyślij informację poprzez e-mail odnośnie niektórych zdarzeń biznesowych związanych z Dolibarr do stron trzecich (ustawienia zdefiniowane dla każdej strony trzeciej)
 Module700Name=Darowizny
 Module700Desc=Zarządzanie darowiznami
-Module770Name=Kosztorys
+Module770Name=Expense reports
 Module770Desc=Zarządzanie i roszczenia raporty wydatków (transport, posiłek, ...)
 Module1120Name=Dostawca propozycja handlowa
 Module1120Desc=Dostawca komercyjnych i wniosek propozycja ceny
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Zarządzanie zdarzeniami / zadaniami oraz agendą
 Module2500Name=Zarządzanie zawartością elektroniczną (ECM)
 Module2500Desc=Zapisz i udostępnij dokumenty
-Module2600Name=WebServices
-Module2600Desc=Włącz serwer usług internetowych Dolibarr
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (klient)
 Module2650Desc=Włącz Dolibarr serwisów internetowych klienta (może być używany do pchania danych / wnioski o dopuszczenie do zewnętrznych serwerów. Zamówień Dostawca obsługiwane tylko na chwilę)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Tworzenie / modyfikacja produktów
 Permission34=Usuwanie produktów
 Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
-Permission41=Czytaj projekty (projekty współdzielone oraz projekty, w których biorę udział)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Tworzenie / modyfikacja projektów (projekty współdzielone oraz projekty, w których biorę udział)
 Permission44=Usuwanie projektów (projekty współdzielone oraz projekty, w których biorę udział)
 Permission61=Czytaj interwencje
@@ -599,10 +600,10 @@ Permission86=Wyślij zamówienia klientów
 Permission87=Zamknij zamówienia klientów
 Permission88=Anuluj zamówienia klientów
 Permission89=Usuń zamówienia klientów
-Permission91=Czytaj składki na ubezpieczenie zdrowotne i podatek VAT
-Permission92=Tworzenie / modyfikacja składek na ubezpieczenie zdrowotne i podatek VAT
-Permission93=Usuń składki na ubezpieczenie zdrowotne i podatek VAT
-Permission94=Eksport składek na ubezpieczenie zdrowotne
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Przeczytaj raporty
 Permission101=Czytaj ustawienia
 Permission102=Utwórz / modyfikuj ustawienia
@@ -620,9 +621,9 @@ Permission121=Czytaj strony trzecie związane z użytkownikiem
 Permission122=Tworzenie / modyfikacja stron trzecich związanych z użytkownikiem
 Permission125=Usuń strony trzecie związane z użytkownikiem
 Permission126=Eksport stron trzecich
-Permission141=Czytaj projekty (również prywatne, których nie jestem uczestnikiem)
-Permission142=Tworzenie / modyfikacja projektów (również prywatnych, których nie jestem uczestnikiem)
-Permission144=Usuwanie projektów (również prywatnych, których nie jestem uczestnikiem)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Czytaj dostawców
 Permission147=Czytaj statystyki
 Permission151=Czytaj zlecenia stałe
@@ -800,7 +801,7 @@ DictionaryCountry=Kraje
 DictionaryCurrency=Waluty
 DictionaryCivility=Tytuł Grzeczność
 DictionaryActions=Rodzaj wydarzenia porządku obrad
-DictionarySocialContributions=Rodzaje składek na ubezpieczenia społeczne
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT ceny lub podatku od sprzedaży ceny
 DictionaryRevenueStamp=Ilość znaczków opłaty skarbowej
 DictionaryPaymentConditions=Warunki płatności
@@ -817,6 +818,9 @@ DictionarySource=Pochodzenie wniosków / zleceń
 DictionaryAccountancyplan=Plan kont
 DictionaryAccountancysystem=Modele dla planu kont
 DictionaryEMailTemplates=Szablony wiadomości e-mail
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Konfiguracja zapisana
 BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Powrót do listy słowników
@@ -936,13 +940,14 @@ CompanyZip=Kod pocztowy
 CompanyTown=Miasto
 CompanyCountry=Kraj
 CompanyCurrency=Główna waluta
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Nie pokazuj
 DoNotSuggestPaymentMode=Nie proponuj
 NoActiveBankAccountDefined=Brak zdefiniowanego aktywnego konta bankowego
 OwnerOfBankAccount=Właściciel konta bankowego %s
 BankModuleNotActive=Moduł Rachunków bankowych jest nie aktywny
-ShowBugTrackLink=Pokaż link "Zgłoś błąd"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Pokaż "warsztat" na stronie głównej
 Alerts=Alarmy
 Delays=Opóźnienia
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max dziesiętnych na ceny jednostkowe
 MAIN_MAX_DECIMALS_TOT=Max dziesiętnych dla całkowitej ceny
 MAIN_MAX_DECIMALS_SHOWN=Max dziesiętnych ceny wyświetlane na ekranie (Dodaj <b>...</b> po ten numer, jeśli chcesz zobaczyć <b>...</b> kiedy liczba jest obcięty przy wyświetlane na ekranie)
 MAIN_DISABLE_PDF_COMPRESSION=Użyj PDF kompresji generowanych plików PDF.
-MAIN_ROUNDING_RULE_TOT= Wielkość zaokrąglenia zakres (na nielicznych krajów, gdzie dokonuje się zaokrąglenia na coś innego niż o podstawie 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Cena netto jednostki produktu
 TotalPriceAfterRounding=Łączna cena (netto / VAT / wraz z podatku) po zaokrągleniu
 ParameterActiveForNextInputOnly=Parametr skuteczne wejście tylko dla najbliższych
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Łączna liczba aktywowanych modułów <b>funkcji:
 YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
 ClassNotFoundIntoPathWarning=Klasa% s nie znaleziono na drodze PHP
 YesInSummer=Tak w lecie
-OnlyFollowingModulesAreOpenedToExternalUsers=Uwaga, tylko następujące moduły są otwarte dla użytkowników zewnętrznych (co mają pozwolenie takich użytkowników):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Przechowywania sesji szyfrowane Suhosin
 ConditionIsCurrently=Stan jest obecnie% s
 YouUseBestDriver=Za pomocą sterownika% s, który jest najlepszym kierowcą dostępne obecnie.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=Mak
 ConfirmDeleteProductLineAbility=Potwierdzenie usunięcia linii produkuje w formach
 ModifyProductDescAbility=Personalizacja opisy produkowanych w formach
 ViewProductDescInFormAbility=Wizualizacja opisy produktów w formach (inaczej jak popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Wizualizacja produktów opisów w thirdparty języku
 UseSearchToSelectProductTooltip=Także jeśli masz dużą ilość produktu (> 100 000), można zwiększyć prędkość przez ustawienie stałej PRODUCT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
 UseSearchToSelectProduct=Użyj wyszukiwarki aby wybrać produkt (zamiast listy rozwijanej).
 UseEcoTaxeAbility=Wsparcie Eko-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Domyślny kod kreskowy typu użyć do produktów
 SetDefaultBarcodeTypeThirdParties=Domyślny kod kreskowy typu do użytku dla osób trzecich
+UseUnits=Support units
 ProductCodeChecker= Moduł do generowania kodu produktu i sprawdzeniu (produkt lub usługa)
 ProductOtherConf= Konfiguracja produktu / usługi
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Kod kreskowy typu UPC
 BarcodeDescISBN=Kod kreskowy typu ISBN
 BarcodeDescC39=Kod kreskowy typu C39
 BarcodeDescC128=Kod kreskowy typu C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar generowanie kodu narzędzie wiersza polecenia (używany przez silnik wewnętrznego dla niektórych typów kodów kreskowych). Muszą być zgodne z "genbarcode". <br> Na przykład: / usr / local / bin / genbarcode
 BarcodeInternalEngine=Silnik wewnętrznego
 BarCodeNumberManager=Manager auto zdefiniować numery kodów kreskowych
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Czy na pewno chcesz usunąć <b>menu %s?</b>
 DeleteLine=Usuń wiersz
 ConfirmDeleteLine=Czy na pewno chcesz usunąć ten wiersz?
 ##### Tax #####
-TaxSetup=Podatków, składek na ubezpieczenia społeczne i dywidendy konfiguracji modułu
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Opcja d'exigibilit de TVA
 OptionVATDefault=Kasowej
 OptionVATDebitOption=Memoriału
@@ -1552,6 +1561,15 @@ WebServicesSetup=WebServices konfiguracji modułu
 WebServicesDesc=Umożliwiając tym module Dolibarr stać się serwis serwera świadczenia różnorodnych usług internetowych.
 WSDLCanBeDownloadedHere=Hasło pliku WSDL świadczonych serviceses można pobrać tutaj
 EndPointIs=SOAP klienci muszą wysłać swoje wnioski do Dolibarr punktem końcowym dostępne na Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank konfiguracji modułu
 FreeLegalTextOnChequeReceipts=Darmowy czek tekst na wpływy
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekt instalacji modułu
 ProjectsModelModule=Wzór dokumentu projektu sprawozdania
 TasksNumberingModules=Zadania numeracji modułu
 TaskModelModule=Zadania raporty modelu dokumentu
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Konfiguracja GED
 ECMAutoTree = Automatyczne drzewa folderów i dokumentów
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Otwórz rok obrotowy
 CloseFiscalYear=Blisko rok obrotowy
 DeleteFiscalYear=Usuń rok obrotowy
 ConfirmDeleteFiscalYear=Czy na pewno usunąć ten rok podatkowy?
-Opened=Otwierany
+Opened=Open
 Closed=Zamknięte
 AlwaysEditable=Zawsze może być edytowany
 MAIN_APPLICATION_TITLE=Wymusza widoczną nazwę aplikacji (ostrzeżenie: ustawienie własnej nazwy tutaj może złamać Autouzupełnianie funkcji logowania przy użyciu DoliDroid aplikację mobilną)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pom
 SomethingMakeInstallFromWebNotPossible2=Z tego powodu, proces uaktualnienia tutaj opisany jest jednie krokiem manualnym, który wykonać może uprawniony użytkownik.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku <strong>%s</strong> aby włączyć odpowiednią funkcję.
 ConfFileMuseContainCustom=Instalacja zewnętrznego modułu z poziomu aplikacji, zapisuje pliki w katlogu <strong>%s</strong>. Abu katalog ten był przetwarzany przez Dolibarr, musisz skonfigurować Twój plik <strong>conf/conf.php</strong>by w opcji <br>- <strong>$dolibarr_main_url_root_alt</strong> ustawić wartość <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> ustawić wartość <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index a2bef22d4fb..0b9b521ecce 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID zdarzenia
-Actions=Działania
-ActionsArea=Obszar działań (Zdarzenia i zadania)
+Actions=Wydarzenia
+ActionsArea=Obszar wydarzeń (akcje i zadania)
 Agenda=Agenda
 Agendas=Agendy
 Calendar=Kalendarz
 Calendars=Kalendarze
-LocalAgenda=Kalendarz Wewnętrzne
+LocalAgenda=Kalendarz wewnętrzny
 ActionsOwnedBy=Wydarzenie własnością
 AffectedTo=Przypisany do
 DoneBy=Wykonane przez
@@ -17,53 +17,52 @@ MyEvents=Moje zdarzenia
 OtherEvents=Inne zdarzenia
 ListOfActions=Lista zdarzeń
 Location=Lokalizacja
-EventOnFullDay=Zdarzenie całodniowe
+EventOnFullDay=Wydarzenia całodniowe
 SearchAnAction= Szukaj zdarzenia/zadania
 MenuToDoActions=Wszystkie zdarzenia niekompletne
 MenuDoneActions=Wszystkie zdarzenia zakończone
 MenuToDoMyActions=Moje działania niekompletne
 MenuDoneMyActions=Moje zdarzenia zakończone
 ListOfEvents=Lista zdarzeń (wewnętrzny kalendarz)
-ActionsAskedBy=Akcje zostały zarejestrowane przez
+ActionsAskedBy=Wydarzenia zarejestrowane przez
 ActionsToDoBy=Zdarzenia przypisane do
 ActionsDoneBy=Zdarzenia wykonane przez
-ActionsForUser=Imprezy dla użytkowników
-ActionsForUsersGroup=Imprezy dla wszystkich użytkowników grupy
-ActionAssignedTo=Przypisany do zdarzenia
+ActionsForUser=Wydarzenie dla użytkownika
+ActionsForUsersGroup=Wydarzenia dla wszystkich użytkowników grupy
+ActionAssignedTo=Wydarzenie przypisane do
 AllMyActions= Wszystkie moje zdarzenia/zadania
 AllActions= Wszystkie zdarzenia/zadania
 ViewList=Widok listy
 ViewCal=Pokaż miesiąc
 ViewDay=Pokaż dzień
 ViewWeek=Pokaż tydzień
-ViewPerUser=Za widzenia użytkownika
+ViewPerUser=Za wglądem użytkownika
 ViewWithPredefinedFilters= Widok ze zdefiniowanymi filtrami
 AutoActions= Automatyczne wypełnianie
-AgendaAutoActionDesc= Określ zdarzenia, dla których Dolibarr ma tworzyć automatycznie wpisy w agendzie. Jeżeli nie jest zaznaczone (domyślnie), w agendzie zostaną utworzone wpisy wyłącznie dla działań manualnych.
-AgendaSetupOtherDesc= Ta strona zawiera opcje, pozwalające eksportować Twoje zdarzenia Dolibarr do zewnętrznego kalendarza (Thunderbird, Google Calendar, ...)
-AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendarzy, aby zobaczyć uwzględnić zapisane tam zdarzenia w agendzie Dolibarr.
+AgendaAutoActionDesc= Określ tu wydarzenia, dla których Dolibarr ma tworzyć automatycznie wpisy w agendzie. Jeżeli nic nie jest zaznaczone (domyślnie), w agendzie zostaną utworzone wpisy wyłącznie dla działań ręcznych.
+AgendaSetupOtherDesc= Ta strona zawiera opcje, pozwalające eksportować Twoje zdarzenia Dolibarr'a do zewnętrznego kalendarza (Thunderbird, Google Calendar, ...)
+AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendarzy, aby zobaczyć uwzględnić zapisane tam zdarzenia w agendzie Dolibarr'a.
 ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie
 PropalValidatedInDolibarr=Zatwierdzenie oferty %s
 InvoiceValidatedInDolibarr=Zatwierdzenie faktury %s
-InvoiceValidatedInDolibarrFromPos=Faktura% s potwierdzone z POS
-InvoiceBackToDraftInDolibarr=Zmiana statusu faktura %s na draft
+InvoiceValidatedInDolibarrFromPos=Faktura %s potwierdzona z POS
+InvoiceBackToDraftInDolibarr=Zmiana statusu faktura %s na szkic
 InvoiceDeleteDolibarr=Usunięcie faktury %s
 OrderValidatedInDolibarr=Zatwierdzenie zamówienia %s
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Zamówienie %s sklasyfikowanych dostarczonych.
 OrderCanceledInDolibarr=Anulowanie zamówienia %s
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Zamówienie %s sklasyfikowanego obciążonego
 OrderApprovedInDolibarr=Akceptacja zamówienia %s
-OrderRefusedInDolibarr=Zamówienie% s odmówił
+OrderRefusedInDolibarr=Zamówienie %s odmówione
 OrderBackToDraftInDolibarr=Zmiana statusu zamówienia %s na draft
-OrderCanceledInDolibarr=Anulowanie zamówienia %s
 ProposalSentByEMail=Oferta %s wysłana e-mailem
-OrderSentByEMail=Zamówienie %s Klienta wysłane e-mailem
+OrderSentByEMail=Zamówienie klienta %s wysłane e-mailem
 InvoiceSentByEMail=Faktura %s wysłana e-mailem
-SupplierOrderSentByEMail=Zamówienie %s wysłane do dostawcy e-mailem
-SupplierInvoiceSentByEMail=Faktura %s wysłana do dostawcy e-mailem
-ShippingSentByEMail=Przesyłka% s wysłane e-mailem
-ShippingValidated= Przesyłka% s potwierdzone
-InterventionSentByEMail=% Interwencja y wysyłane e-mailem
+SupplierOrderSentByEMail=Zamówienie dostawcy %s wysłane e-mailem
+SupplierInvoiceSentByEMail=Faktura dostawcy %s wysłana e-mailem
+ShippingSentByEMail=Przesyłka %s wysłana e-mailem
+ShippingValidated= Przesyłka %s potwierdzona
+InterventionSentByEMail=Interwencja %s wysłana mailem
 NewCompanyToDolibarr= Stworzono kontrahenta
 DateActionPlannedStart= Planowana data rozpoczęcia
 DateActionPlannedEnd= Planowana data zakończenia
@@ -72,27 +71,29 @@ DateActionDoneEnd= Rzeczywista data zakończenia
 DateActionStart= Data rozpoczęcia
 DateActionEnd= Data zakończenia
 AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy:
-AgendaUrlOptions2=<b>logowanie =% s,</b> aby ograniczyć wyjścia do działań stworzonych przez lub przypisanych do <b>użytkownika% s.</b>
-AgendaUrlOptions3=<b>Logina =% s,</b> aby ograniczyć wyjścia do działań będących <b>własnością%</b> użytkownika <b>s.</b>
-AgendaUrlOptions4=<b>logint=%s,</b> aby ograniczyć wyjścia do działań przypisanych do użytkownika <b>%s.</b>
-AgendaUrlOptionsProject=<b>Projekt = PROJECT_ID</b> ograniczyć wyjścia do działań związanych z projektem <b>PROJECT_ID.</b>
+AgendaUrlOptions2=<b>login=%s</b> aby ograniczyć wyjścia do działań stworzonych lub przypisanych do użytkownika <b>%s</b>.
+AgendaUrlOptions3=<b>logina =%s</b>, aby ograniczyć wyjścia do działań będących własnością użytkownika <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> aby ograniczyć wyjścia do działań przypisanych do użytkownika <b>%s</b>
+AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> by ograniczyć wyjścia do działań związanych z projektem <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Pokaż urodziny kontaktów
-AgendaHideBirthdayEvents=Ukryj urodzin kontaktów
+AgendaHideBirthdayEvents=Ukryj urodziny kontaktów
 Busy=Zajęty
 ExportDataset_event1=Lista zdarzeń w agendzie
-DefaultWorkingDays=Domyślne dni roboczych wahać w tym tygodniu (przykład: 1-5, 1-6)
-DefaultWorkingHours=Domyślnie godziny pracy w dni (przykład: 9-18)
+DefaultWorkingDays=Domyślne zakres dni roboczych w tygodniu (przykład: 1-5, 1-6)
+DefaultWorkingHours=Domyślnie zakres godzin pracy w dniu (przykład: 9-18)
 # External Sites ical
 ExportCal=Eksport kalendarza
 ExtSites=Import zewnętrznych kalendarzy
-ExtSitesEnableThisTool=Pokaż kalendarze zewnętrznych (zdefiniowane w globalnej konfiguracji) do porządku obrad. Nie ma wpływu na kalendarze zewnętrzne zdefiniowane przez użytkowników.
+ExtSitesEnableThisTool=Pokaż zewnętrzne kalendarze (zdefiniowane w globalnej konfiguracji) do agendy Nie ma wpływu na zewnętrzne kalendarze zdefiniowane przez użytkowników.
 ExtSitesNbOfAgenda=Ilość kalendarzy
-AgendaExtNb=Kalendarz nb %s
-ExtSiteUrlAgenda=URL dostępu. Plik iCal
+AgendaExtNb=Kalendarz nr %s
+ExtSiteUrlAgenda=URL dostępu do pliku .ical
 ExtSiteNoLabel=Brak opisu
 WorkingTimeRange=Zakres czasu pracy
-WorkingDaysRange=Dni robocze w zakresie
+WorkingDaysRange=Zakres dni roboczych
 AddEvent=Utwórz wydarzenie
 MyAvailability=Moja dostępność
-ActionType=Event type
-DateActionBegin=Start event date
+ActionType=Typ wydarzenia
+DateActionBegin=Data startu wydarzenia
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 567010eb212..2fda0f3ebe2 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Ugłaskać
 Conciliation=Pojednawczy
 ConciliationForAccount=Zjednać sobie tego konta
 IncludeClosedAccount=Dołącz zamkniętych rachunków
-OnlyOpenedAccount=Tylko otworzyła rachunek
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Konto do kredytów
 AccountToDebit=Konto do obciążania
 DisableConciliation=Wyłącz funkcję pojednawczą dla tego konta
 ConciliationDisabled=Pojednawczy funkcji niepełnosprawnych
-StatusAccountOpened=Czynny
+StatusAccountOpened=Open
 StatusAccountClosed=Zamknięte
 AccountIdShort=Liczba
 EditBankRecord=Edycja rekordu
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Klient płatności
 CustomerInvoicePaymentBack=Płatności z powrotem klienta
 SupplierInvoicePayment=Dostawca płatności
 WithdrawalPayment=Wycofanie płatności
-SocialContributionPayment=Społeczny wkład płatności
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Rachunek finansowy dziennika
 BankTransfer=Przelew bankowy
 BankTransfers=Przelewy bankowe
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 9c9ed95b557..35dd5d432b9 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb faktur
 NumberOfBillsByMonth=Nb faktur przez miesiąc
 AmountOfBills=Kwota faktury
 AmountOfBillsByMonthHT=Kwota faktur przez miesiąc (netto)
-ShowSocialContribution=Pokaż społecznego wkładu
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Pokaż fakturę
 ShowInvoice=Pokaż fakturę
 ShowInvoiceReplace=Pokaż zastępująca faktury
@@ -270,7 +270,7 @@ BillAddress=Bill adres
 HelpEscompte=Ta zniżka zniżki przyznawane klienta, ponieważ jego paiement został złożony przed terminem.
 HelpAbandonBadCustomer=Kwota ta została opuszczonych (klient mówi się, że zły klient) i jest uważany za exceptionnal luźne.
 HelpAbandonOther=Kwota ta została opuszczonych, ponieważ był to błąd (zły klient otrzymuje fakturę lub inny na przykład)
-IdSocialContribution=Społeczny wkład id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Płatność id
 InvoiceId=Faktura id
 InvoiceRef=Faktura nr ref.
@@ -430,5 +430,5 @@ NotLastInCycle=Ta faktura nie ostatni w cyklu i nie mogą być modyfikowane.
 DisabledBecauseNotLastInCycle=Następna sytuacja już istnieje.
 DisabledBecauseFinal=Sytuacja ta jest ostateczna.
 CantBeLessThanMinPercent=Postęp nie może być mniejsza niż wartość w poprzedniej sytuacji.
-NoSituations=Brak otwarte sytuacje
+NoSituations=No open situations
 InvoiceSituationLast=Ostateczna i ogólnie faktury
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 4b7d3b9e1c2..cf18a00c3eb 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Ostatnia umowa/kontrakt
 BoxLastContacts=Ostatnie kontakty / adresy
 BoxLastMembers=Ostatni użytkownicy
 BoxFicheInter=Ostatnie interwencje
-BoxCurrentAccounts=Saldo otwartych kont
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Obrót
 BoxTotalUnpaidCustomerBills=Suma niezapłaconych faktur przez klientów
 BoxTotalUnpaidSuppliersBills=Suma niezapłaconych faktur dostawcy
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Ostatnich %s użytkowników
 BoxTitleLastFicheInter=Ostatnich %s zmodyfikowanych interwencji
 BoxTitleOldestUnpaidCustomerBills=Najstarszych %s niezapłaconych faktur klienta
 BoxTitleOldestUnpaidSupplierBills=Najstarszych %s niezapłaconych faktur dostawcy
-BoxTitleCurrentAccounts=Otworzone salda na koncie
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Obrót sprzedaży
 BoxTitleTotalUnpaidCustomerBills=Niezapłacone faktury klienta
 BoxTitleTotalUnpaidSuppliersBills=Niezapłacone faktury dostawcy
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 09bb7efef99..5bd355f5db8 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-NoCategoryYet=No tag/category of this type created
+Rubrique=Tag / Kategoria
+Rubriques=Tagi / Kategorie
+categories=tags / kategorie
+TheCategorie=Tag / kategoria
+NoCategoryYet=No tag / kategoria tego typu tworzone
 In=W
 AddIn=Dodaj w
 modify=modyfikować
 Classify=Klasyfikacja
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
+CategoriesArea=Tagi / obszar Kategorie
+ProductsCategoriesArea=Produkty / Usługi tagi / obszar kategorie
+SuppliersCategoriesArea=Dostawcy tagi / obszar kategorie
+CustomersCategoriesArea=Klienci tagi / obszar kategorie
+ThirdPartyCategoriesArea=Osoby trzecie tagi / obszar kategorie
+MembersCategoriesArea=Użytkownicy tagi / obszar kategorie
+ContactsCategoriesArea=Kontakt tagi / obszar kategorie
+MainCats=Kategorie główne tagów /
 SubCats=Podkategorie
 CatStatistics=Statystyki
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CatList=Lista tagów / kategorii
+AllCats=Wszystkie tagi / kategorie
+ViewCat=Zobacz tag / kategoria
+NewCat=Dodaj tag / kategorię
+NewCategory=Nowy tag / kategoria
+ModifCat=Modyfikacja tag / kategorię
+CatCreated=Tag / kategoria stworzona
+CreateCat=Stwórz tag / kategorię
+CreateThisCat=Tworzenie ten tag / kategorię
 ValidateFields=Validate pola
 NoSubCat=Brak podkategorii.
 SubCatOf=Podkategoria
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
+FoundCats=Znaleziono tagów / kategorie
+FoundCatsForName=Tagi / kategorie Znaleziono imię:
+FoundSubCatsIn=Znalezione w podkategorii tag / kategorii
+ErrSameCatSelected=Wybrałeś sam tag / kilka razy kategorii
+ErrForgotCat=Zapomniałeś wybrać tag / kategorię
 ErrForgotField=Zapomniałeś o zakresie
 ErrCatAlreadyExists=Ta nazwa jest już używany
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
+AddProductToCat=Dodaj ten produkt do znacznika / kategorii?
+ImpossibleAddCat=Niemożliwe, aby dodać tag / kategorię
+ImpossibleAssociateCategory=Niemożliwe, aby skojarzyć tag / kategorię
 WasAddedSuccessfully=<b> %s</b> został dodany pomyślnie.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ObjectAlreadyLinkedToCategory=Element jest już powiązane z tym tagiem / kategorii.
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=Ten produkt / usługa nie jest w żadnych tagów / kategorii
+SupplierHasNoCategory=Ten dostawca nie jest w żadnych tagów / kategorii
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
+MemberHasNoCategory=Ten użytkownik nie jest w żadnych tagów / kategorii
+ContactHasNoCategory=Ten kontakt nie jest w żadnym z tagów / kategorii
+ClassifyInCategory=Add to tag/category
 NoneCategory=Żaden
-NotCategorized=Without tag/category
+NotCategorized=Bez znaczników / kategorii
 CategoryExistsAtSameLevel=Ta kategoria już istnieje w tym samym miejscu
 ReturnInProduct=Powrót do produktów / usług karty
 ReturnInSupplier=Powrót do dostawcy kart
@@ -64,22 +64,22 @@ ReturnInCompany=Powrót do klienta / perspektywa karty
 ContentsVisibleByAll=Zawartość będzie widoczny przez wszystkich
 ContentsVisibleByAllShort=Zawartość widoczna przez wszystkie
 ContentsNotVisibleByAllShort=Treść nie jest widoczna dla wszystkich
-CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
+CategoriesTree=Tagi / kategorie drzewo
+DeleteCategory=Usuń tag / kategorię
+ConfirmDeleteCategory=Czy na pewno chcesz usunąć ten tag / kategorię?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
+NoCategoriesDefined=No tag / kategoria ustalona
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Dostawcy tagów / kategorie
+CustomersCategoriesShort=Klienci tagów / kategorie
 CustomersProspectsCategoriesShort=Custo. / prosp. kategorie
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
+ProductsCategoriesShort=Produkty tagów / kategorie
+MembersCategoriesShort=Użytkownicy tagów / kategorii
+ContactCategoriesShort=Kontakt tagów / kategorii
 ThisCategoryHasNoProduct=Ta kategoria nie zawiera żadnych produktów.
 ThisCategoryHasNoSupplier=Ta kategoria nie zawiera żadnego dostawcy.
 ThisCategoryHasNoCustomer=Ta kategoria nie zawiera żadnych klientów.
@@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Ta kategoria nie zawiera żadnego kontaktu.
 AssignedToCustomer=Przypisany do klienta
 AssignedToTheCustomer=Przypisany do klienta
 InternalCategory=Inernal kategorii
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
-DeletePicture=Obraz usunięcia
+CategoryContents=Tag / kategoria treści
+CategId=Tag / ID kategorii
+CatSupList=Lista dostawców tagów / kategorii
+CatCusList=Lista klientów / perspektywa tagów / kategorii
+CatProdList=Lista produktów tagów / kategorii
+CatMemberList=Lista członków tagów / kategorii
+CatContactList=List of contact tags/categories
+CatSupLinks=Powiązania między dostawcami i tagów / kategorii
+CatCusLinks=Powiązania między klientami / perspektyw i tagów / kategorii
+CatProdLinks=Powiązania między produktów / usług oraz tagów / kategorii
+CatMemberLinks=Związki między członkami i tagów / kategorii
+DeleteFromCat=Usuń z tagów / kategorii
+DeletePicture=Usuń obraz
 ConfirmDeletePicture=Potwierdź usunięcie obrazu?
 ExtraFieldsCategories=Atrybuty uzupełniające
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
+CategoriesSetup=Tagi / kategorie Konfiguracja
+CategorieRecursiv=Związek z dominującą tag / kategorii automatycznie
 CategorieRecursivHelp=Jeśli aktywna, produkt będzie również związany z kategorii nadrzędnej podczas dodawania do podkategorii
 AddProductServiceIntoCategory=Dodaj następujący produkt / usługę
-ShowCategory=Show tag/category
+ShowCategory=Pokaż tag / kategoria
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 460076d7f8e..d54baeede99 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Kontakty/adresy kontrahenta
 StatusContactValidated=Status kontaktu/adresu
 Company=Firma
 CompanyName=Nazwa firmy
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Firmy
 CountryIsInEEC=Kraj należy do Europejskiej Strefy Ekonomicznej
 ThirdPartyName=Nazwa kontrahenta
@@ -410,5 +411,10 @@ OutstandingBillReached=Osiągnieto maksimum niezapłaconych rachunków
 MonkeyNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn klienta i kod %syymm-nnnn dla dostawcy kod yy gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0.\nZwraca numer w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie yy to rok, mm to miesiąc i nnnn jest sekwencją bez przerwy, bez powrotu do 0.
 LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
-SearchThirdparty=Szukaj zamówienia
+SearchThirdparty=Search third party
 SearchContact=Znajdz kontakt
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 62e5fde531e..9cc41630b7c 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT zebrane
 ToPay=Aby zapłacić
 ToGet=Aby powrócić
 SpecialExpensesArea=Obszar dla wszystkich specjalnych płatności
-TaxAndDividendsArea=Podatek, składki na ubezpieczenie społeczne i dywidendy obszarze
-SocialContribution=Społeczny wkład
-SocialContributions=Składek na ubezpieczenia społeczne
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Koszty specjalne
 MenuTaxAndDividends=Podatki i dywidendy
 MenuSalaries=Wynagrodzenia
-MenuSocialContributions=Składek na ubezpieczenia społeczne
-MenuNewSocialContribution=Nowe Wkład
-NewSocialContribution=Nowe społecznego wkładu
-ContributionsToPay=Składki do zapłaty
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Księgowość / Skarbu obszarze
 AccountancySetup=Księgowość konfiguracji
 NewPayment=Nowa płatność
 Payments=Płatności
 PaymentCustomerInvoice=Klient płatności faktury
 PaymentSupplierInvoice=Dostawca płatności faktury
-PaymentSocialContribution=Społeczny wkład płatności
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Zapłaty podatku VAT
 PaymentSalary=Wypłata wynagrodzenia
 ListPayment=Wykaz płatności
@@ -91,7 +91,7 @@ LT1PaymentES=RE: Płatność
 LT1PaymentsES=RE Płatności
 VATPayment=Zapłaty podatku VAT
 VATPayments=Płatności VAT
-SocialContributionsPayments=Płatności składek na ubezpieczenia społeczne
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Pokaż zapłaty podatku VAT
 TotalToPay=Razem do zapłaty
 TotalVATReceived=Razem VAT otrzymana
@@ -116,11 +116,11 @@ NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s
 NoWaitingChecks=Nie czekając na kontrole depozytów.
 DateChequeReceived=Czek odbiór daty wejścia
 NbOfCheques=Nb czeków
-PaySocialContribution=Płacić składki społeczne
-ConfirmPaySocialContribution=Czy na pewno chcesz sklasyfikować ten społecznego wkładu wypłatę?
-DeleteSocialContribution=Usuń społecznego wkładu
-ConfirmDeleteSocialContribution=Czy na pewno chcesz usunąć ten wkład społeczny?
-ExportDataset_tax_1=Składek na ubezpieczenia społeczne i płatności
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=<b>Tryb% Svat na rachunkowości zaangażowanie% s.</b>
 CalcModeVATEngagement=<b>Tryb% Svat na dochody-wydatki% s.</b>
 CalcModeDebt=<b>Tryb% sClaims-Długi% s</b> powiedział <b>rachunkowości zobowiązania.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=wg dostawcy, wybierz odpowiednią metodę zastosowa
 TurnoverPerProductInCommitmentAccountingNotRelevant=Raport obroty na produkcie, w przypadku korzystania z trybu <b>rachunkowości gotówki,</b> nie ma znaczenia. Raport ten jest dostępny tylko w przypadku korzystania z trybu <b>zaangażowanie rachunkowości</b> (patrz konfiguracja modułu księgowego).
 CalculationMode=Tryb Obliczanie
 AccountancyJournal=Kod Księgowość czasopisma
-ACCOUNTING_VAT_ACCOUNT=Domyślny kod rachunkowe poboru VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Domyślny kod księgowość dla płacenia podatku VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Kod Księgowość domyślnie dla thirdparties klientów
 ACCOUNTING_ACCOUNT_SUPPLIER=Kod Księgowość domyślnie dla thirdparties dostawca
-CloneTax=Clone wkład społeczny
-ConfirmCloneTax=Potwierdź klon wkładu społecznego
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Sklonować go na następny miesiąc
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 15a149f8379..e6900b0e5ac 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -4,10 +4,10 @@ About = O
 CronAbout = O Cron
 CronAboutPage = Cron o stronie
 # Right
-Permission23101 = Czytaj Zaplanowane zadanie
-Permission23102 = Tworzenie / aktualizacja Zaplanowane zadania
-Permission23103 = Usuwanie zaplanowanego zadania
-Permission23104 = Wykonanie zaplanowanego zadania
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Zaplanowana konfiguracja zarządzanie zadaniami
 URLToLaunchCronJobs=Adres URL, aby sprawdzić i uruchomić wymagane cron, jeśli
@@ -26,21 +26,21 @@ CronLastOutput=Ostatnie wyjście prowadzony
 CronLastResult=Ostatni kod wynikowy
 CronListOfCronJobs=Lista zaplanowanych zadań
 CronCommand=Komenda
-CronList=Scheduled job
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
-CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
-CronInfo=Scheduled job module allow to execute job that have been planned
-CronWaitingJobs=Waiting jobs
+CronList=Scheduled jobs
+CronDelete=Usuwanie zaplanowanych zadań
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronExecute=Zaplanowanej pracy
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronInfo=Moduł Zaplanowane pracy uprawniają do wykonywania pracy, które były planowane
+CronWaitingJobs=Kelnerzy
 CronTask=Praca
 CronNone=Żaden
 CronDtStart=Data rozpoczęcia
 CronDtEnd=Data zakończenia
 CronDtNextLaunch=Następna realizacja
 CronDtLastLaunch=Ostatnia egzekucja
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metoda
 CronModule=Moduł
 CronAction=Akcja
@@ -55,9 +55,9 @@ CronEach=Każdy
 JobFinished=Praca rozpoczął i zakończył
 #Page card
 CronAdd= Dodaj miejsca pracy
-CronHourStart= Początek godzina i data zadania
-CronEvery= I wykonać każde zadanie
-CronObject= Instance / Obiekt do tworzenia
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance / Obiekt do tworzenia
 CronArgs=Parametry
 CronSaveSucess=Zapisz pomyślnie
 CronNote=Komentarz
@@ -75,14 +75,15 @@ CronObjectHelp=Nazwa obiektu, aby załadować. <BR> Dla exemple sprowadzić meto
 CronMethodHelp=Metoda obiektu, aby uruchomić. <BR> Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów /htdocs/product/class/product.class.php, wartość metody jest to <i>fecth</i>
 CronArgsHelp=Argumenty metody. <BR> Reprezentują np sprowadzić sposób Dolibarr obiektu Product /htdocs/product/class/product.class.php, wartość paramters może wynosić <i>0, ProductRef</i>
 CronCommandHelp=System linii poleceń do wykonania.
-CronCreateJob=Create new Scheduled Job
+CronCreateJob=Utwórz nowe zaplanowane zadanie
+CronFrom=From
 # Info
 CronInfoPage=Informacja
 # Common
-CronType=Typ zadania
+CronType=Job type
 CronType_method=Wywołanie metody z klasy Dolibarr
 CronType_command=Polecenie powłoki
 CronMenu=Cron
 CronCannotLoadClass=Nie można załadować klasy% s% s lub obiektu
 UseMenuModuleToolsToAddCronJobs=Wejdź w menu "Home - modułów narzędzi - Lista zadań", aby zobaczyć i edytować zaplanowane zadania.
-TaskDisabled=Zadanie wyłączony
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index a547d974dae..aeed807b09f 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Szukaj wg obiektu
 ECMSectionOfDocuments=Katalogi dokumentów
 ECMTypeManual=Podręcznik
 ECMTypeAuto=Automatyczne
-ECMDocsBySocialContributions=Dokumenty związane ze składek na ubezpieczenia społeczne
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumenty związane z trzecim
 ECMDocsByProposals=Dokumenty związane z wnioskami
 ECMDocsByOrders=Dokumenty związane z zamówień klientów
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index d1df79a635c..08a2df82ff0 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=Klient SOAP nie powiodło się z powodu błędu '% s
 ErrorGlobalVariableUpdater5=Globalna zmienna wybrana
 ErrorFieldMustBeANumeric=Pole <b>%s</b> musi mieć wartość numeryczną
 ErrorFieldMustBeAnInteger=Pole <b>%s</b> musi być liczbą całkowitą
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Parametry konfiguracyjne obowiązkowe nie są jeszcze określone
@@ -190,3 +191,4 @@ WarningNotRelevant=Bez znaczenia dla tej operacji zbiorze
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funkcja wyłączona podczas konfiguracji wyświetlacz jest zoptymalizowana dla osoby niewidomej lub tekstowych przeglądarek.
 WarningPaymentDateLowerThanInvoiceDate=Termin płatności (% s) jest wcześniejsza niż dzień wystawienia faktury (% s) dla faktury% s.
 WarningTooManyDataPleaseUseMoreFilters=Zbyt wiele danych. Proszę używać więcej filtrów
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 42b65f717e6..787397df40a 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Liście
 CPTitreMenu=Liście
 MenuReportMonth=Oświadczenie miesięczny
-MenuAddCP=Złożyć wniosek do urlopu
+MenuAddCP=New leave request
 NotActiveModCP=Musisz włączyć liście modułów do strony.
 NotConfigModCP=Musisz skonfigurować moduł Liście do strony. Aby to zrobić, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">kliknij tutaj</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">,</a>
 NoCPforUser=Nie mają żadnych dzień.
@@ -71,7 +71,7 @@ MotifCP=Powód
 UserCP=Użytkownik
 ErrorAddEventToUserCP=Wystąpił błąd podczas dodawania wyjątkowy urlop.
 AddEventToUserOkCP=Dodanie wyjątkowe prawo zostało zakończone.
-MenuLogCP=Zobacz dzienniki wniosków urlopowych
+MenuLogCP=View change logs
 LogCP=Zaloguj o aktualizacjach dostępnych dni urlopu
 ActionByCP=Wykonywane przez
 UserUpdateCP=Dla użytkownika
@@ -93,6 +93,7 @@ ValueOptionCP=Wartość
 GroupToValidateCP=Grupa ze zdolnością do zatwierdzenia wniosków urlopowych
 ConfirmConfigCP=Weryfikacja konfiguracji
 LastUpdateCP=Ostatni automatyczna aktualizacja alokacji liści
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Zaktualizowane.
 ErrorUpdateConfCP=Wystąpił błąd podczas aktualizacji, spróbuj ponownie.
 AddCPforUsers=Proszę dodać równowagę liście przydziału użytkowników, <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikając tutaj</a> .
@@ -127,6 +128,7 @@ ErrorMailNotSend=Wystąpił błąd podczas wysyłania wiadomości e-mail:
 NoCPforMonth=Nie opuścić ten miesiąc.
 nbJours=Liczba dni
 TitleAdminCP=Konfiguracja Liście
+NoticePeriod=Notice period
 #Messages
 Hello=Halo
 HolidaysToValidate=Weryfikacja wniosków urlopowych
@@ -139,10 +141,11 @@ HolidaysRefused=Zapytanie zaprzeczył
 HolidaysRefusedBody=Twoje zapytanie urlopu dla% s do% s została odrzucona z następującego powodu:
 HolidaysCanceled=Anulowane liściasta wniosek
 HolidaysCanceledBody=Twoje zapytanie urlopu% s do% s została anulowana.
-Permission20000=Czytaj jesteś właścicielem wniosków urlopowych
-Permission20001=Tworzenie / modyfikowanie wniosków urlopowych
-Permission20002=Tworzenie / modyfikacja wniosków urlopowych dla wszystkich
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Usuń wniosków urlopowych
-Permission20004=Ustawienia dostępne użytkowników dni urlopu
-Permission20005=Dziennik Przegląd zmodyfikowanych wniosków urlopowych
-Permission20006=Przeczytaj pozostawia raport miesięczny
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/pl_PL/incoterm.lang b/htdocs/langs/pl_PL/incoterm.lang
index 2396d2acb0e..e5a3482ba95 100644
--- a/htdocs/langs/pl_PL/incoterm.lang
+++ b/htdocs/langs/pl_PL/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
+IncotermLabel=Formuły handlowe
+IncotermSetupTitle1=Funkcja
 IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetup=Konfiguracja modułu formuły handlowej
+IncotermFunctionDesc=Aktywuj funkcje formuły handlowe (oferta handlowa, zamówienie klienta, faktury klienta, wysyłka, zamówienie dla dostawcy)
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 96f1f87c958..ea90392d78c 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Baza danych z dostępem na prawach superużytkownika
 CheckToCreateDatabase=Zaznacz jeśli baza danych nie istnieje i musi zostać utworzona.<br>W przypadku takim na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika.
 CheckToCreateUser=Zaznacz jeśli użytkownik nie istnieje i musi zostać utworzony.<br>W przypadku takim na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika.
 Experimental=(eksperymentalnie, na własną odpowiedzialność)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login użytkownika mogącego tworzyć nowe bazy lub nowych użytkowników, wymagane jeśli baza danych oraz jej właściciel nie istnieją.
 KeepEmptyIfNoPassword=Zostaw puste jeśli użytkownik nie posiada hasła (unikaj takiej sytuacji)
 SaveConfigurationFile=Zapis wartości
@@ -156,7 +157,7 @@ LastStepDesc=<strong>Ostatni krok:</strong> Zdefiniuj tutaj nazwę i hasło, kt
 ActivateModule=Aktywuj moduł %s
 ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert)
 WarningUpgrade=Uwaga:\nPamiętaj o zrobieniu kopi zapasowej bazy!\nWysoko rekomendowane: dla przykładu,  podczas wystąpienia błędu w bazie danych systemu (dla przykładu w wersji 5.5.40 mySQL), niektóre dane lub tabele mogą zostać stracone podczas tego procesu. Rekomendowane jest by zrobic kopię swojej bazy przed migracją.\n\nNaciśnij OK by zacząć migrację...
-ErrorDatabaseVersionForbiddenForMigration=Twoja wersja bazy danych% s. Ma krytycznej utraty danych podejmowania błąd jeśli się zmianę struktury na bazie danych, tak jak jest to wymagane przez proces migracji. Na jego powodu migracji nie zostaną dopuszczone do aktualizacji bazy danych do wyższej wersji stałej (lista znanych wersji podsłuch:% s)
+ErrorDatabaseVersionForbiddenForMigration=Twoja wersja bazy danych to %s. Ma krytyczną lukę utraty danych jeśli się zmieni struktury na bazie danych, tak jak jest to wymagane podczas procesu migracji. Z tego powodu migracje nie zostaną dopuszczone dopóki nie ulepszysz bazy danych do wyższej wersji  (lista znanych wersji z lukami: %s)
 
 #########
 # upgrade
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 558c43cd66a..21aaae24068 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabski
 Language_ar_SA=Arabski
+Language_bn_BD=Bengali
 Language_bg_BG=Bułgarski
 Language_bs_BA=Bośniacki
 Language_ca_ES=Kataloński
@@ -21,9 +22,10 @@ Language_en_SA=Angielski (Arabia Saudyjska)
 Language_en_US=Angielski (Stany Zjednoczone)
 Language_en_ZA=Angielski (Republika Południowej Afryki)
 Language_es_ES=Hiszpański
-Language_es_DO=Hiszpański (Dominikana)
 Language_es_AR=Hiszpański (Argentyna)
 Language_es_CL=Hiszpański (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Hiszpański (Dominikana)
 Language_es_HN=Hiszpański (Honduras)
 Language_es_MX=Hiszpański (Meksyk)
 Language_es_PY=Hiszpański (Paragwaj)
@@ -45,7 +47,10 @@ Language_id_ID=Indonezyjski
 Language_is_IS=Islandzki
 Language_it_IT=Włoski
 Language_ja_JP=Japoński
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Koreański
+Language_lo_LA=Lao
 Language_lt_LT=Litewski
 Language_lv_LV=Łotewski
 Language_mk_MK=Macedoński
@@ -64,6 +69,7 @@ Language_sv_SV=Szwedzki
 Language_sv_SE=Szwedzki
 Language_sq_AL=Albański
 Language_sk_SK=Słowacki
+Language_sw_SW=Kiswahili
 Language_th_TH=Tajski
 Language_uk_UA=Ukraiński
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/pl_PL/loan.lang b/htdocs/langs/pl_PL/loan.lang
new file mode 100644
index 00000000000..cdd9bdba731
--- /dev/null
+++ b/htdocs/langs/pl_PL/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Pożyczka
+Loans=Kredyty
+NewLoan=Nowa pożyczka
+ShowLoan=Pokaż Pożyczka
+PaymentLoan=Spłata kredytu
+ShowLoanPayment=Pokaż Pożyczka Płatność
+Capital=Kapitał
+Insurance=Ubezpieczenie
+Interest=Odsetki
+Nbterms=Liczba składników
+LoanAccountancyCapitalCode=Kapitał Kod Księgowość
+LoanAccountancyInsuranceCode=Ubezpieczenie Kod Księgowość
+LoanAccountancyInterestCode=Zainteresowanie Kod Księgowość
+LoanPayment=Spłata kredytu
+ConfirmDeleteLoan=Potwierdź usunięcie tego kredytu
+LoanDeleted=Pożyczka została usunięta
+ConfirmPayLoan=Potwierdź sklasyfikować wypłacane pożyczka
+LoanPaid=Pożyczka Płatny
+ErrorLoanCapital=Kwota kredytu musi być numeryczny i większa od zera.
+ErrorLoanLength=Długość pożyczka musi być numeryczne, a większy od zera.
+ErrorLoanInterest=Roczne odsetki musi być numeryczne, a większy od zera.
+# Calc
+LoanCalc=Kredyty bankowe Kalkulator
+PurchaseFinanceInfo=Zakup i Finansowanie informacji
+SalePriceOfAsset=Cena sprzedaży aktywów
+PercentageDown=Procent w dół
+LengthOfMortgage=Długość hipoteczny
+AnnualInterestRate=Roczna stopa procentowa
+ExplainCalculations=Wyjaśnij Obliczenia
+ShowMeCalculationsAndAmortization=Pokaż mi obliczenia i amortyzację
+MortgagePaymentInformation=Informacje hipoteczny Płatność
+DownPayment=Zaliczka
+DownPaymentDesc=<b>Zaliczka</b> = cena domu pomnożona przez procent w dół, podzielona przez 100 (dla 5% w dół staje 5/100 lub 0,05)
+InterestRateDesc=<b>Oprocentowanie</b> = Roczna wartość procentowa odsetek podzielony przez 100
+MonthlyFactorDesc=<b>Miesięczna czynnikiem</b> = wynik wzoru
+MonthlyInterestRateDesc=<b>Miesięczna stopa procentowa</b> = roczna stopa procentowa podzielona przez 12 (za 12 miesięcy w roku)
+MonthTermDesc=<b>Miesięcy okres</b> kredytowania w miesiącach = ilość lat wziąłeś kredyt się do czasów 12
+MonthlyPaymentDesc=Miesięczny płatności zorientowali się, stosując następujący wzór
+AmortizationPaymentDesc=<a href="#amortization">Amortyzacja</a> zepsuje, ile miesięczne płatności idzie w kierunku zainteresowania banku, a ile idzie do spłaty kwoty głównej pożyczki.
+AmountFinanced=Kwota Finansowane
+AmortizationMonthlyPaymentOverYears=Amortyzacja miesięczną <b>spłatę:% s</b> na% s lat
+Totalsforyear=Sumy dla roku
+MonthlyPayment=Miesięczny Płatność
+LoanCalcDesc=<b>Kalkulator kredytu hipotecznego</b> może być używany, aby dowiedzieć miesięcznych wypłat kredytu hipotecznego w domu, w oparciu o cenę domu na sprzedaż w, okres kredytowania pożądanym, dół procent płatności kupującego, i stopy procentowej kredytu. <br> Ten kalkulator czynniki PMI (Private Mortgage Insurance) dla kredytów w których mniej niż 20% jest umieszczone jako zaliczki. Brane pod uwagę również to podatki od nieruchomości miasto, a ich wpływ na łączne miesięczne płatności hipotecznych. <br>
+GoToInterest=% s zostanie przeznaczona INTERESÓW
+GoToPrincipal=% s zostanie przeznaczona PODSTAWOWA
+YouWillSpend=Spędzisz% s na dom w rok% s
+# Admin
+ConfigLoan=Konfiguracja modułu pożyczki
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Kapitał Kod domyślnie Rachunkowości
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Zainteresowanie Kod domyślnie Rachunkowości
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Ubezpieczenie Kod domyślnie Rachunkowości
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index b02bff7a0d4..f95ed0fd628 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -1,116 +1,116 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=E-maila
-EMailing=E-maila
-Mailings=EMailings
-EMailings=EMailings
-AllEMailings=Wszystkie eMailings
-MailCard=Pocztą elektroniczną kartę
+Mailing=Mailingi
+EMailing=Mailing
+Mailings=Mailingi
+EMailings=Mailingi
+AllEMailings=Wszystkie Mailingi
+MailCard=Karta Mailingu
 MailTargets=Cele
 MailRecipients=Odbiorcy
 MailRecipient=Odbiorca
-MailTitle=Tytuł
+MailTitle=Opis
 MailFrom=Nadawca
-MailErrorsTo=Błędów
-MailReply=Odpowiedz
-MailTo=Receiver (s)
+MailErrorsTo=Błędów do
+MailReply=Odpowiedz do
+MailTo=Odbiorca(y)
 MailCC=Kopiuj do
-MailCCC=Kopii do
-MailTopic=EMail tematu
+MailCCC=Kopi w pamięci do
+MailTopic=Temat maila
 MailText=Wiadomość
 MailFile=Dołączone pliki
 MailMessage=EMail ciała
-ShowEMailing=Pokaż e-maila
-ListOfEMailings=Lista emailings
-NewMailing=Nowy e-maila
-EditMailing=Edytuj e-maila
-ResetMailing=Wyślij e-maila
-DeleteMailing=Usuń e-maila
-DeleteAMailing=Usunąć e-maila
-PreviewMailing=Podgląd e-maila
-PrepareMailing=Przygotowanie e-maila
-CreateMailing=Tworzenie e-maila
-MailingDesc=Ta strona umożliwia wysłanie emailings do grupy osób.
-MailingResult=Wysyłanie e-maili wynik
-TestMailing=Test e-maila
-ValidMailing=Aktualny e-maila
-ApproveMailing=Zatwierdź e-maila
+ShowEMailing=Pokaż mailingi
+ListOfEMailings=Lista mailingów
+NewMailing=Nowy mailing
+EditMailing=Edytuj mailing
+ResetMailing=Wyślij ponownie mailing
+DeleteMailing=Usuń mailing
+DeleteAMailing=Usunąć ten mailing
+PreviewMailing=Podgląd mailingu
+PrepareMailing=Przygotowanie mailingu
+CreateMailing=Tworzenie mailingu
+MailingDesc=Ta strona umożliwia wysłanie mailingow do grupy osób.
+MailingResult=Wysyłanie wyników mailingów
+TestMailing=Test maila
+ValidMailing=Aktualny mailing
+ApproveMailing=Zatwierdź mailing
 MailingStatusDraft=Szkic
-MailingStatusValidated=Zatwierdzona
+MailingStatusValidated=Sprawdzone
 MailingStatusApproved=Zatwierdzony
 MailingStatusSent=Wysłany
 MailingStatusSentPartialy=Wysłane częściowo
 MailingStatusSentCompletely=Wysłane całkowicie
 MailingStatusError=Błąd
 MailingStatusNotSent=Nie wysłano
-MailSuccessfulySent=E-mail wysłany successfuly (od %s do %s)
-MailingSuccessfullyValidated=Wysyłanie pomyślnie zweryfikowane
-MailUnsubcribe=Wyrejestrowanie
-Unsuscribe=Wyrejestrowanie
+MailSuccessfulySent=Mail wysłany prawidłowo (od %s do %s)
+MailingSuccessfullyValidated=Mailing pomyślnie zweryfikowany
+MailUnsubcribe=Wypisz
+Unsuscribe=Wypisz
 MailingStatusNotContact=Nie kontaktuj się więcej
-ErrorMailRecipientIsEmpty=E-mail odbiorcy jest pusty
-WarningNoEMailsAdded=Brak nowych wiadomości e-mail, aby dodać adres do listy.
-ConfirmValidMailing=Czy na pewno chcesz, aby potwierdzić tego e-maila?
-ConfirmResetMailing=Ostrzeżenie przez reinitializing pocztą <b>elektroniczną %s,</b> można pozwolić, aby masowego wysyłania tej wiadomości innym razem. Czy na pewno jest to, co chcesz zrobić?
-ConfirmDeleteMailing=Czy na pewno chcesz usunąć tę emailling?
+ErrorMailRecipientIsEmpty=Odbiorca maila jest pusty
+WarningNoEMailsAdded=Brak nowych wiadomości mail, aby dodać adres do listy.
+ConfirmValidMailing=Czy na pewno chcesz potwierdzić tego maila?
+ConfirmResetMailing=Ostrzeżenie przez brak połączenia z pocztą <b>elektroniczną %s,</b>  pozwalasz, by masowe wysyłanie tej wiadomości odbyło się innym razem. Czy na pewdno chcesz to zrobić?
+ConfirmDeleteMailing=Czy na pewno chcesz usunąć tego mailla?
 NbOfRecipients=Liczba odbiorców
-NbOfUniqueEMails=Nb unikatowych wiadomości e-mail
-NbOfEMails=Nb-mail
+NbOfUniqueEMails=Nr unikatowych wiadomości mail
+NbOfEMails=Nr-maili
 TotalNbOfDistinctRecipients=Liczba różnych odbiorców
 NoTargetYet=Nie określono jeszcze odbiorców (Przejdź na kartę "Odbiorcy")
 AddRecipients=Dodaj odbiorców
 RemoveRecipient=Usuń odbiorcę
-CommonSubstitutions=Wspólne zastępstw
-YouCanAddYourOwnPredefindedListHere=Aby utworzyć swój adres e-mail wyboru modułu, patrz htdocs / includes / modules / mailing / README.
-EMailTestSubstitutionReplacedByGenericValues=Przy użyciu testu trybie zastępstwa zmienne otrzymują uniwersalne wartości
+CommonSubstitutions=Wspólne zastępstwa
+YouCanAddYourOwnPredefindedListHere=Aby utworzyć swój mail wyboru modułu, patrz htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=Podczas korzystania z trybu testowego, podstawienia zmiennych zastępują wartości generycznych
 MailingAddFile=Dołącz ten plik
-NoAttachedFiles=Nie załączone pliki
-BadEMail=Zła wartość EMail
-CloneEMailing=Clone e-mail
-ConfirmCloneEMailing=Czy na pewno chcesz klon tego e-maila?
-CloneContent=Clone wiadomość
-CloneReceivers=Cloner odbiorców
-DateLastSend=Data ostatniej wysyłanie
+NoAttachedFiles=Nie załączono plików
+BadEMail=Zła wartość dla Maila
+CloneEMailing=Kopia maila
+ConfirmCloneEMailing=Czy na pewno chcesz kopię tego e-maila?
+CloneContent=Kopia wiadomości
+CloneReceivers=Skopiuj odbiorców
+DateLastSend=Data ostatniej wysyłki
 DateSending=Data wysłania
 SentTo=Wysłane do <b>%s</b>
 MailingStatusRead=Czytać
-CheckRead=Czytaj Otrzymanie
-YourMailUnsubcribeOK=<b>E-mail% s</b> jest prawidłowo unsubcribe z listy mailingowej
-MailtoEMail=Hyper link e-mail
-ActivateCheckRead=Pozwól, aby skorzystać z linku "Unsubcribe"
-ActivateCheckReadKey=Klucz do szyfrowania wykorzystanie wykorzystanie URL dla "Czytaj Pokwitowanie" oraz funkcja "Unsubcribe"
-EMailSentToNRecipients=Napisz e-mail wysłany do% s odbiorców.
+CheckRead=Czytaj Otrzymane
+YourMailUnsubcribeOK=Mail <b>%s</b> poprawnie wypisano z listy mailingowej
+MailtoEMail=Hyper link do maila
+ActivateCheckRead=Pozwól korzystać z linku "Unsubcribe/Wypisz"
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
+EMailSentToNRecipients=Mail wysłany do %s odbiorców.
 XTargetsAdded=<b>% s</b> dodany do listy odbiorców docelowych
-EachInvoiceWillBeAttachedToEmail=Dokument za pomocą domyślnej faktury szablon dokumentu będą tworzone i dołączone do każdego maila.
-MailTopicSendRemindUnpaidInvoices=Przypomnienie faktury% s (% s)
-SendRemind=Wyślij przypomnienie poprzez e-maile
-RemindSent=Przypominamy% s (e) wysłany
-AllRecipientSelectedForRemind=Zaznacz wszystkie thirdparties i jeśli e-mail jest ustawiony (zauważ, że jeden elektronicznej za faktury będą wysyłane)
-NoRemindSent=Bez przypomnienia e-mail wysłany
-ResultOfMassSending=Wynik przypomnienia masowe wysyłanie wiadomości e-mail
+EachInvoiceWillBeAttachedToEmail=Dokument używa domyślnego szablonu faktury i będą tworzone i dołączone do każdego maila w przyszłości.
+MailTopicSendRemindUnpaidInvoices=Przypomnienie faktury %s (%s)
+SendRemind=Wyślij przypomnienie poprzez Maila
+RemindSent=%s przypomnie(n)ie wysłano
+AllRecipientSelectedForRemind=Wszystkie zaznaczone strony trzecie i jeśli mail jest ustawiony (zauważ, że jeden mail na fakturę zostanie wysyłany)
+NoRemindSent=Brak przypomnienia o wysłanym mailu
+ResultOfMassSending=Wynik przypomnień wysłanych masowych maili 
 
 # Libelle des modules de liste de destinataires mailing
-MailingModuleDescContactCompanies=Kontakty wszystkich stron trzecich (klienta, perspektywa, dostawca, ...)
-MailingModuleDescDolibarrUsers=Wszystkie Dolibarr użytkownikom wiadomości e-mail
-MailingModuleDescFundationMembers=Fundacja użytkowników z e-maili
-MailingModuleDescEmailsFromFile=E-maile z pliku tekstowego (e-mail, imię, nazwisko)
-MailingModuleDescEmailsFromUser=E-maili od danych wejściowych użytkownika (e-mail; Nazwisko; imię, inne)
-MailingModuleDescContactsCategories=Kontakty wszystkich stron trzecich (według kategorii)
-MailingModuleDescDolibarrContractsLinesExpired=Trzecim minął zamówienia linie
-MailingModuleDescContactsByCompanyCategory=Kontakt trzecich (przez osoby trzecie kategoria)
+MailingModuleDescContactCompanies=Kontakty/adresy wszystkich stron trzecich (klienta, oferty, dostawca, ...)
+MailingModuleDescDolibarrUsers=Użytkownicy Dolibarra
+MailingModuleDescFundationMembers=Użytkownicy fundacji z mailami
+MailingModuleDescEmailsFromFile=Maile z pliku tekstowego (mail;imię;nazwisko)
+MailingModuleDescEmailsFromUser=Maili od danych wejściowych użytkownika (e-mail;Nazwisko;imię;inne)
+MailingModuleDescContactsCategories=Strony trzecie /dostawcy/oferty/kontrachenci (według kategorii)
+MailingModuleDescDolibarrContractsLinesExpired=Stronom trzecim /dostawcy/oferty/kontrachenci wygasła linia zamówienia.
+MailingModuleDescContactsByCompanyCategory=Kontakty/adresy stron trzecich 
 MailingModuleDescContactsByCategory=Kontakt / adresy stron trzecich według kategorii
-MailingModuleDescMembersCategories=Członkowie Fundacji (o kategorie)
-MailingModuleDescContactsByFunction=Kontakt trzecich (według pozycji / funkcji)
+MailingModuleDescMembersCategories=Członkowie Fundacji (przez kategorie)
+MailingModuleDescContactsByFunction=Kontakty/adresy stron trzecich (według pozycji / funkcji)
 LineInFile=Linia w pliku %s
-RecipientSelectionModules=Definiowane wnioski dla odbiorców wyboru
-MailSelectedRecipients=Wybrane odbiorców
-MailingArea=EMailings obszarze
-LastMailings=Ostatnia %s emailings
+RecipientSelectionModules=Definiowane wnioski dla wybranych odbiorców
+MailSelectedRecipients=Wybrani odbiorcy
+MailingArea=Obszar mailingów
+LastMailings=Ostatnia %s Mailingów
 TargetsStatistics=Celów statystycznych
-NbOfCompaniesContacts=Unikalne kontaktów firm
-MailNoChangePossible=Odbiorców potwierdzone e-maila nie można zmienić
-SearchAMailing=Szukaj mailowych
-SendMailing=Wyślij e-maila
-SendMail=Wyślij e-mail
+NbOfCompaniesContacts=Unikalne kontakty firm
+MailNoChangePossible=Odbiorcy dla potwierdzonych mailingów nie mogą być zmienieni
+SearchAMailing=Szukaj mailingu
+SendMailing=Wyślij mailing
+SendMail=Wyślij mail
 SentBy=Wysłane przez
 MailingNeedCommand=Ze względów bezpieczeństwa, wysyłając e-maila jest lepiej, gdy wykonywane z linii poleceń. Jeśli masz, poproś administratora serwera, aby uruchomić następujące polecenie, aby wysłać e-maila do wszystkich odbiorców:
 MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji.
@@ -119,25 +119,26 @@ LimitSendingEmailing=Uwaga: Wysyłanie Emailings z interfejsu WWW jest wykonywan
 TargetsReset=Wyczyść listę
 ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk
 ToAddRecipientsChooseHere=Aby dodać odbiorców, wybierz w tych wykazach
-NbOfEMailingsReceived=Masa emailings otrzymała
-NbOfEMailingsSend=Masowe Emailings wysłane
+NbOfEMailingsReceived=Masowe mailingi otrzymane
+NbOfEMailingsSend=Masowe mailingi wysłane
 IdRecord=ID rekordu
-DeliveryReceipt=Odbiór dostawy
-YouCanUseCommaSeparatorForSeveralRecipients=Możesz używać <b>przecinka</b> separator określić kilku odbiorców.
-TagCheckMail=Utwór otwierający elektronicznej
-TagUnsubscribe=Wypisz odnośnik
-TagSignature=Podpis wysyłania użytkownika
-TagMailtoEmail=E-mail odbiorcy
+DeliveryReceipt=Dostarczono odbiorcy
+YouCanUseCommaSeparatorForSeveralRecipients=Możesz używać <b>przecinka</b> aby określić kilku odbiorców.
+TagCheckMail=Obserwuj otwarcie maila
+TagUnsubscribe=Link do wypisania
+TagSignature=Podpis wysyłającego użytkownika
+TagMailtoEmail=Mail odbiorcy
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Powiadomienia
-NoNotificationsWillBeSent=Brak powiadomień e-mail są planowane dla tego wydarzenia i spółka
+NoNotificationsWillBeSent=Brak planowanych powiadomień mailowych dla tego wydarzenia i firmy
 ANotificationsWillBeSent=1 zgłoszenie zostanie wysłane pocztą elektroniczną
 SomeNotificationsWillBeSent=%s powiadomienia będą wysyłane przez e-mail
 AddNewNotification=Aktywuj nowy cel powiadomienia e-mail
 ListOfActiveNotifications=Lista wszystkich aktywnych celów powiadomienia e-mail
-ListOfNotificationsDone=Lista wszystkich powiadomień e-mail wysłany
+ListOfNotificationsDone=Lista wszystkich powiadomień wysłanych maili
 MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
 MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr <strong>'% s'</strong> na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
 MailSendSetupIs3=Jeśli masz jakieś pytania na temat jak skonfigurować serwer SMTP, możesz poprosić o% s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
+YouCanAlsoUseSupervisorKeyword=Możesz również dodać <strong>__SUPERVISOREMAIL__</strong> słów kluczowych posiadania e-mail są wysyłane do opiekuna użytkownika (działa tylko wtedy, gdy e-mail jest określona w tym przełożonego)
+NbOfTargetedContacts=Aktualna liczba ukierunkowanych maili kontaktowych
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index fcf5afdd545..e3f506cb384 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Znaleziono błedy. Cofam zmiany
 ErrorConfigParameterNotDefined=<b>Parametr %s</b> nie jest zdefiniowany wewnątrz pliku konfiguracyjnego <b>conf.php.</b> Dollibara
 ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć <b>użytkownika %s</b> Dolibarra w bazie danych.
 ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraju " %s".
-ErrorNoSocialContributionForSellerCountry=Błąd, społeczny wkład określony dla kraju %s niezdefiniowany.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
 SetDate=Ustaw datę
 SelectDate=Wybierz datę
@@ -301,8 +301,8 @@ UnitPriceHT=Cena jednostkowa (netto)
 UnitPriceTTC=Cena jednostkowa
 PriceU=cen/szt.
 PriceUHT=cen/szt (netto)
-AskPriceSupplierUHT=Zapytanie P.U HT
-PriceUTTC=cena/szt.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Ilość
 AmountInvoice=Kwota faktury
 AmountPayment=Kwota płatności
@@ -339,6 +339,7 @@ IncludedVAT=Zawiera VAT
 HT=Bez VAT
 TTC=z VAT
 VAT=Sprzedaż opodatkowana VAT
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Stawka VAT
@@ -413,6 +414,8 @@ Qty=Ilosc
 ChangedBy=Zmieniona przez
 ApprovedBy=Zatwierdzony przez
 ApprovedBy2=Zatwierdzony przez (drugie zatwierdzenie)
+Approved=Approved
+Refused=Refused
 ReCalculate=Przelicz
 ResultOk=Sukces
 ResultKo=Porażka
@@ -421,7 +424,7 @@ Reportings=Raportowanie
 Draft=Szkic
 Drafts=Robocze
 Validated=Zatwierdzona
-Opened=Czynny
+Opened=Open
 New=Nowy
 Discount=Rabat
 Unknown=Nieznany
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Podpięty do kontaktu współużytkownika
 DeleteAFile=Usuń plik
 ConfirmDeleteAFile=Czy na pewno chcesz usunąć ten plik?
 NoResults=Brak wyników
+SystemTools=System tools
 ModulesSystemTools=Narzędzia modułów
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Pokaż transakcje
 GoIntoSetupToChangeLogo=Wejdź w Strona główna - Ustawienia- Firma by zmienić logo lub przejdź do Strona główna- Ustawienia - Wyświetl do ukrycia.
 Deny=Zabraniać
 Denied=Zabroniony
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
@@ -732,3 +739,4 @@ ShortThursday=Cz
 ShortFriday=Pi
 ShortSaturday=So
 ShortSunday=Ni
+SelectMailModel=Select email template
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index d2e8dfa1c5f..5f06a49d1e4 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -199,7 +199,8 @@ Entreprises=Firmy
 DOLIBARRFOUNDATION_PAYMENT_FORM=Aby dokonać płatności abonamentu za pomocą przelewu bankowego, patrz strona <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Aby zapłacić za pomocą karty kredytowej lub PayPal, kliknij przycisk na dole tej strony. <br>
 ByProperties=Według cech
 MembersStatisticsByProperties=Użytkownicy statystyki cech
-MembersByNature=Użytkownicy z natury
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Stawka VAT użyć do subskrypcji
 NoVatOnSubscription=Nie TVA subskrypcji
 MEMBER_PAYONLINE_SENDEMAIL=E-mail, aby ostrzec, gdy Dolibarr otrzymać potwierdzenie zatwierdzonej płatności subskrypcji
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 1e65fc4772b..daa010a5f1e 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Dostawca celu
 SuppliersOrders=Dostawcy zleceń
 SuppliersOrdersRunning=Aktualna dostawców zleceń
 CustomerOrder=Zamówieniem
-CustomersOrders=Zamówienia klientów
-CustomersOrdersRunning=Aktualna klientów zleceń
-CustomersOrdersAndOrdersLines=Zamówień i zleceń linii
-OrdersToValid=Zamówienia klientów, aby potwierdzić
-OrdersToBill=Zamówienia klientów są dostarczane
-OrdersInProcess=Zamówienia klientów w procesie
-OrdersToProcess=Zamówienia klientów na przetwarzanie
-SuppliersOrdersToProcess=Dostawcy zamówienia na przetwarzanie
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Odwołany
 StatusOrderDraftShort=Szkic
 StatusOrderValidatedShort=Zatwierdzona
@@ -75,8 +75,9 @@ AddToMyOrders=Dodaj do mojego zamówienia
 AddToOtherOrders=Dodaj do zamówienia
 AddToDraftOrders=Dodaj do projektu porządku
 ShowOrder=Pokaż zamówienie
-NoOpenedOrders=Nie otworzył zamówień
-NoOtherOpenedOrders=Żadne inne otwarte zamówienia
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Brak projektów zamówienia
 OtherOrders=Inne zamówienia
 LastOrders=Ostatnie %s zamówień klienta
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 7d5e57fab69..8a1d21d682f 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate interwencji
 Notify_FICHINTER_SENTBYMAIL=Interwencja wysyłane pocztą
 Notify_BILL_VALIDATE=Sprawdź rachunki
 Notify_BILL_UNVALIDATE=Faktura klienta nie- zwalidowane
+Notify_ORDER_SUPPLIER_VALIDATE=Kolejność Dostawca rejestrowane
 Notify_ORDER_SUPPLIER_APPROVE=Dostawca celu zatwierdzone
 Notify_ORDER_SUPPLIER_REFUSE=Dostawca odmówił celu
 Notify_ORDER_VALIDATE=Zamówienie Klienta potwierdzone
@@ -203,6 +204,7 @@ ClickHereToGoTo=Kliknij tutaj, aby przejść do% s
 YouMustClickToChange=Trzeba jednak najpierw kliknąć na poniższy link, aby potwierdzić tę zmianę hasła
 ForgetIfNothing=Jeśli nie zwrócić tę zmianę, po prostu zapomnieć ten e-mail. Twoje dane są przechowywane w sposób bezpieczny.
 IfAmountHigherThan=Jeśli kwota wyższa niż <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Dodaj wpis w kalendarzu %s
diff --git a/htdocs/langs/pl_PL/printing.lang b/htdocs/langs/pl_PL/printing.lang
index f0cd2a40292..876a9816b80 100644
--- a/htdocs/langs/pl_PL/printing.lang
+++ b/htdocs/langs/pl_PL/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Ustawienia Direct Printing System
+PrintingDesc=Moduł ten dodaje przycisk Drukuj, aby wysłać dokumenty bezpośrednio do drukarki (bez otwierania dokumentu do aplikacji) z różnych modułów.
+ModuleDriverSetup=Konfiguracja modułu sterownika
+PrintingDriverDesc=Zmienne konfiguracyjne dla drukowania sterownika.
+ListDrivers=Lista kierowców
+PrintTestDesc=Lista drukarek.
+FileWasSentToPrinter=Plik% s został wysłany do drukarki
+NoActivePrintingModuleFound=Nie aktywny moduł do drukowania dokumentu
+PleaseSelectaDriverfromList=Proszę wybrać sterownik z listy.
+SetupDriver=Ustawień sterownika
 TestDriver=Test
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
+TargetedPrinter=Ukierunkowane drukarki
+UserConf=Ustawienia na użytkownika
 PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
+PrintGCPDesc=Sterownik ten pozwala na wysyłanie dokumentów bezpośrednio do drukarki z Google Cloud Print.
+PrintingDriverDescprintgcp=Zmienne konfiguracyjne dla sterownika drukowania Google Cloud Print.
+PrintTestDescprintgcp=Lista drukarek dla Google Cloud Print.
+PRINTGCP_LOGIN=Google Logowanie
+PRINTGCP_PASSWORD=Konto Google hasło
 STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
+STATE_UNKNOWN=Nieznany
 STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
+STATE_DORMANT=Nieaktywny przez dłuższy czas
 TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
+TYPE_HP=Drukarka HP
 TYPE_DOCS=DOCS
-TYPE_DRIVE=Google Drive
+TYPE_DRIVE=Dysk Google
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
-PrintTestDescprintipp=List of Printers for driver PrintIPP.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
+GCP_Name=Nazwa
+GCP_displayName=Nazwa wyświetlana
+GCP_Id=Drukarka Id
+GCP_OwnerName=Nazwa właściciela
+GCP_State=Stan drukarki
+GCP_connectionStatus=Stan online
+GCP_Type=Typ drukarki
+PRINTIPP=PrintIPP kierowcy
+PrintIPPSetup=Konfiguracja modułu Direct Print
+PrintIPPDesc=Sterownik ten pozwala na wysyłanie dokumentów bezpośrednio do drukarki. To wymaga systemu Linux z CUPS zainstalowanych.
+PrintingDriverDescprintipp=Zmienne konfiguracyjne dla sterownika drukowania PrintIPP.
+PrintTestDescprintipp=Lista drukarek dla kierowcy PrintIPP.
+PRINTIPP_ENABLED=Pokaż ikonę "Druk bezpośredni" na listach dokumentów
+PRINTIPP_HOST=Serwer druku
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+PRINTIPP_PASSWORD=Hasło
+NoPrinterFound=Nie znaleziono drukarki (sprawdź konfigurację CUPS)
+NoDefaultPrinterDefined=Nie drukarka domyślna zdefiniowana
+DefaultPrinter=Drukarka domyślna
+Printer=Drukarka
+CupsServer=Serwer CUPS
+IPP_Uri=Drukarka Uri
+IPP_Name=Nazwa drukarki
+IPP_State=Stan drukarki
+IPP_State_reason=Powodem państwa
+IPP_State_reason1=Reason1 państwowe
 IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
-STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
-STATE_IPP_none=None
-MEDIA_IPP_stationery=Stationery
-MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+IPP_Color=Kolor
+IPP_Device=Urządzenie
+IPP_Media=Media do drukarek
+IPP_Supported=Typ nośnika
+STATE_IPP_idle=Bezczynny
+STATE_IPP_stopped=Zatrzymany
+STATE_IPP_paused=Wstrzymany
+STATE_IPP_toner-low-report=Niski poziom tonera
+STATE_IPP_none=Żaden
+MEDIA_IPP_stationery=Materiały biurowe
+MEDIA_IPP_thermal=Termiczny
+IPP_COLOR_print-black=BW drukarki
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 6ce701c1288..74bdbf9c554 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Ilość: %d
 AddDispatchBatchLine=Dodaj linię dla przedłużenia wysyłki
 BatchDefaultNumber=Niezdefiniowano
 WhenProductBatchModuleOnOptionAreForced=Gdy moduł lot / numer seryjny jest aktywny, zwiększenie / zmniejszenie Tryb magazynowy jest wymuszony do ostatniego wyboru i nie może być edytowany. Inne opcje można określić, jak chcesz.
-ProductDoesNotUseBatchSerial=Ten produkt nie używa pliku/wsadu/numeru seryjnego
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 904b8cd697d..10308579b82 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produkt lub usługa
 ProductsAndServices=Produkty i usługi
 ProductsOrServices=Produkty lub Usługi
 ProductsAndServicesOnSell=Produkty i usługi na sprzedaż lub do zakupu
-ProductsAndServicesNotOnSell=Produkty i usługi spośród sprzedaży
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Statystyki produktów i usług
 ProductsStatistics=Statystyki produktów
-ProductsOnSell=Produkt na sprzedaż lub do pruchase
-ProductsNotOnSell=Produkt na sprzedaż i na zakup
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Produkty na sprzedaż i do zakupu
 ServicesOnSell=Usługi na sprzedaż lub do zakupu
-ServicesNotOnSell=Usługi spośród sprzedaży
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Usługi na sprzedaż i do zakupu
 InternalRef=Wewnętrzny nr referencyjny
 LastRecorded=Ostatnie produkty / usługi na sprzedaż rejestrowana
@@ -44,7 +44,7 @@ CardProduct1=Karta usługi
 CardContract=Karta zamówienia
 Warehouse=Magazyn
 Warehouses=Magazyny
-WarehouseOpened=Magazyn otwarty
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magazyn zamknięty
 Stock=Zapas
 Stocks=Zapasy
@@ -71,21 +71,21 @@ SellingPriceTTC=Cena sprzedaży (z podatkiem)
 PublicPrice=Cena publiczna
 CurrentPrice=Aktualna cena
 NewPrice=Nowa cena
-MinPrice=Min. cena sprzedaży
-MinPriceHT=Minim. Cena sprzedaży (po odliczeniu podatku)
-MinPriceTTC=Minim. Cena sprzedaży (inc. podatku)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
 ContractStatus=Status zamówienia
 ContractStatusClosed=Zamknięte
-ContractStatusRunning=W trakcie realizacji
+ContractStatusRunning=Ongoing
 ContractStatusExpired=minął
-ContractStatusOnHold=Nie działa
-ContractStatusToRun=Aby uzyskać działa
-ContractNotRunning=Zamówienie nie jest realizowane
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Produkt o numerze referencyjnym %s już istnieje.
 ErrorProductBadRefOrLabel=Błędna wartość referencyjna lub etykieta.
 ErrorProductClone=Podczas próby sklonowania produktu lub usługi wystąpił problem.
-ErrorPriceCantBeLowerThanMinPrice=Błąd cena nie może być niższa niż cena minimalna.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Dostawcy
 SupplierRef=Nr referencyjny dostawcy produktu
 ShowProduct=Pokaż produkt
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwani
 MultiPricesAbility=Kilka poziom cen na produkt / usługę
 MultiPricesNumPrices=Ilość cen
 MultiPriceLevelsName=Kategorie cenowe
-AssociatedProductsAbility=Włączanie funkcji pakietu wirtualnego
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Produkt w opakowaniu
-AssociatedProductsNumber=Liczba produktów komponując ten produkt wirtualny pakiet
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Liczba dominującej opakowaniu produktu
-IfZeroItIsNotAVirtualProduct=Jeśli 0, ten produkt nie jest produktem wirtualny pakiet
-IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, produkt ten nie jest używany przez produkt wirtualnego pakietu
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Współpracownik
 Translation=Tłumaczenie
 KeywordFilter=Filtr słów kluczowych
@@ -131,7 +131,7 @@ ProductToAddSearch=Szukaj produktu do dodania
 AddDel=Dodaj / Usuń
 Quantity=Ilość
 NoMatchFound=Nie znaleziono odpowiednika
-ProductAssociationList=Lista powiązanych produktów / usług: nazwa produktu / usługi (ma wpływ na ilość)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Lista produktów / usług pakietowych z tym produktem jako składnika
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bierzącego
 DeleteProduct=Usuń produkt / usługę
@@ -179,16 +179,41 @@ CloneProduct=Duplikuj produkt lub usługę
 ConfirmCloneProduct=Czy na pewno chcesz wykonać duplikat produktu <b>lub usługi %s?</b>?
 CloneContentProduct=Sklonuj wszystkie główne informacje dot. produktu / usługi
 ClonePricesProduct=Clone główne informacje i ceny
-CloneCompositionProduct=Clone pakowane produkty / usługi
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Ref. nowych produktów / usług
-CustomerPrices=Ceny klientów
-SuppliersPrices=Ceny dostawców
-SuppliersPricesOfProductsOrServices=Ceny dostawców (wyrobów lub usług)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Kod taryfy celnej
 CountryOrigin=Kraj pochodzenia
 HiddenIntoCombo=Ukryty na listach wyboru
 Nature=Natura
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Szablon sędzią wyrobów
 ServiceCodeModel=Serwis szablon sędzią
 AddThisProductCard=Stwórz kartę produktu
@@ -214,7 +239,7 @@ CostPmpHT=Łączna VWAP netto
 ProductUsedForBuild=Automatycznie zużyte przez produkcję
 ProductBuilded=Produkcja została zakończona
 ProductsMultiPrice=Multi-cena produktu
-ProductsOrServiceMultiPrice=Ceny klientów (produktów lub usług, multi-ceny)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Obroty kwartalne VWAP produktów
 ServiceSellByQuarterHT=Obroty kwartalne VWAP usług
 Quarter1=1-szy Kwartał
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Definiowanie wartości kodów kreskowych dla wszystkic
 PriceByCustomer=Inna cena dla każdego klienta
 PriceCatalogue=Wyjątkowa cena za produkt / usługę
 PricingRule=Zasady cen z klientami
-AddCustomerPrice=Dodaj cenę przez klientów
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Ustaw sama cena na zależnych klientów
 PriceByCustomerLog=Cena od dziennika klienta
-MinimumPriceLimit=Cena minimalna nie może być niższa niż% s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Cena minimalna zalecana jest:% s
 PriceExpressionEditor=Edytor Cena wyraz
 PriceExpressionSelected=Wybrany wyraz cena
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=Format jest {"URL": "http://example.com/urlofws
 UpdateInterval=Aktualizacja co (min)
 LastUpdated=Ostatnia aktualizacja
 CorrectlyUpdated=Poprawnie zaktualizowane
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 7d20faf8d6e..a758d9a61e5 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz prze
 ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone do czytania.
 ProjectsDesc=Ten widok przedstawia wszystkie projekty (twoje uprawnienia użytkownika pozwalają wyświetlać wszystko).
 MyTasksDesc=Ten widok jest ograniczony do projektów lub zadań, dla których jesteś kontaktem (cokolwiek jest w typie).
-OnlyOpenedProject=Tylko otwarte projekty są widoczne (projekty z szkicu lub stanu zamkniętego nie są widoczne).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Ten widok przedstawia wszystkie projekty i zadania, które możesz przeczytać.
 TasksDesc=Ten widok przedstawia wszystkie projekty i zadania (twoje uprawnienia mają dostępu do wglądu we wszystko).
-AllTaskVisibleButEditIfYouAreAssigned=Wszystkie zadania dla takiego projektu są widoczne, ale można wprowadzić czas tylko do zadań do których jesteś przypisany.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Obszar projektów
 NewProject=Nowy projekt
 AddProject=Tworzenie projektu
@@ -29,7 +30,7 @@ ProjectsList=Lista projektów
 ShowProject=Pokaż projekt
 SetProject=Ustaw projekt
 NoProject=Żadny projekt niezdefiniowany lub nie jest twoją własnością
-NbOpenTasks=Liczba otwartych zadań
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Liczba projektów
 TimeSpent=Czas spędzony
 TimeSpentByYou=Czas spędzony przez Ciebie
@@ -41,7 +42,7 @@ TaskTimeSpent=Czas spędzony na zadaniach
 TaskTimeUser=Użytkownik
 TaskTimeNote=Uwaga
 TaskTimeDate=Data
-TasksOnOpenedProject=Zadania na otwartych projektach
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Czas pracy nie zdefiniowany
 NewTimeSpent=Nowy czas spędzony
 MyTimeSpent=Mój czas spędzony
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem
 ListExpenseReportsAssociatedProject=Lista raportów o wydatkach związanych z projektem
 ListDonationsAssociatedProject=Lista dotacji związanych z projektem
 ListActionsAssociatedProject=Wykaz działań związanych z projektem
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Aktywność w projekcie w tym tygodniu
 ActivityOnProjectThisMonth=Aktywność na projekcie w tym miesiącu
 ActivityOnProjectThisYear=Aktywność na projekcie w tym roku
@@ -95,7 +98,7 @@ DeleteATimeSpent=Usuń czas spędzony
 ConfirmDeleteATimeSpent=Czy na pewno chcesz usunąć ten spędzony czas?
 DoNotShowMyTasksOnly=Zobacz również zadania nie przypisane do mnie
 ShowMyTasksOnly=Wyświetl tylko zadania przypisane do mnie
-TaskRessourceLinks=Zasoby
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej stronie trzeciej
 NoTasks=Brak zadań dla tego projektu
 LinkedToAnotherCompany=Powiązane z innymą częścią trzecią
@@ -139,8 +142,15 @@ ProjectReferers=Odnoszących się obiektów
 SearchAProject=Szukaj projektu
 ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzony
 ProjectDraft=Szkic projekty
-FirstAddRessourceToAllocateTime=Skojarze zasoby do przeznaczonego czasu
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Wejścia na dzień
 InputPerWeek=Wejścia w tygodniu
 InputPerAction=Wejścia na działanie
 TimeAlreadyRecorded=Czas spędzony (zarejestrowany do tej pory) dla tego zadanie / dzień i użytkownik %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index ac6d41946be..2ba4f951c48 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial wniosku
 ProposalShort=Wniosek
 ProposalsDraft=Projekt propozycji
 ProposalDraft=Projekt wniosku handlowych
-ProposalsOpened=Czynny propozycji
+ProposalsOpened=Open commercial proposals
 Prop=Commercial propozycje
 CommercialProposal=Commercial wniosku
 CommercialProposals=Commercial propozycje
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Kwota przez miesiąc (po odliczeniu podatku)
 NbOfProposals=Liczba propozycji
 ShowPropal=Pokaż wniosku
 PropalsDraft=Robocze
-PropalsOpened=Czynny
+PropalsOpened=Open
 PropalsNotBilled=Zamknięte nie rozliczone
 PropalStatusDraft=Projekt (musi zostać zatwierdzone)
 PropalStatusValidated=Zatwierdzona (projekt jest otwarty)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nie podpisały (zamknięte)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Szkic
 PropalStatusValidatedShort=Zatwierdzona
-PropalStatusOpenedShort=Czynny
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Zamknięte
 PropalStatusSignedShort=Podpisano
 PropalStatusNotSignedShort=Nie podpisała
@@ -51,8 +51,8 @@ PropalsToClose=Propozycji, aby zamknąć
 PropalsToBill=Podpisano propozycji do rachunku
 ListOfProposals=Lista propozycji
 ActionsOnPropal=Działania na wniosek
-NoOpenedPropals=Nie otworzył propozycji
-NoOtherOpenedPropals=Żadne inne otwarte propozycji
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial wniosku ref
 SendPropalByMail=Wyślij handlowych wniosku pocztą
 AssociatedDocuments=Dokumenty związane z projektem:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune propozycję modelu
 DefaultModelPropalCreate=Domyślny model kreacji.
 DefaultModelPropalToBill=Domyślny szablon po zamknięciu wniosku biznesowego ( do zafakturowania)
 DefaultModelPropalClosed=Domyślny szablon po zamknięciu projektu biznesowego ( weryfikowane )
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index 43b8413af9a..520cfd14234 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -10,4 +10,6 @@ SalariesPayments=Wypłaty wynagordzeń
 ShowSalaryPayment=Pokaż wypłaty wynagrodzeń
 THM=Średnia cena za godzine
 TJM=Średnia cena za dzień
-CurrentSalary=Current salary
+CurrentSalary=Aktualne wynagrodzenie
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 6408c15d0d0..50de12cc965 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -2,7 +2,7 @@
 RefSending=Nr ref. wysyłanie
 Sending=Wysyłanie
 Sendings=Sendings
-AllSendings=All Shipments
+AllSendings=Wszystkie wysyłki
 Shipment=Wysyłanie
 Shipments=Wysyłek
 ShowSending=Pokaż Wysyłanie
@@ -53,7 +53,7 @@ DocumentModelSimple=Prosty wzór dokumentu
 DocumentModelMerou=Mérou model A5
 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie.
 StatsOnShipmentsOnlyValidated=Statystyki prowadzone w sprawie przesyłania tylko potwierdzone. Data używany jest data uprawomocnienia przesyłki (planowanym terminem dostawy nie zawsze jest znana).
-DateDeliveryPlanned=Strugane daty dostawy
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Data otrzymania dostawy
 SendShippingByEMail=Wyślij przesyłki przez e-mail
 SendShippingRef=Złożenie przesyłki% s
@@ -67,7 +67,7 @@ SendingRunning=Produkt z zamówionych zleceń klientów
 SuppliersReceiptRunning=Produkt z zamówionych zleceń dostawca
 ProductQtyInCustomersOrdersRunning=Ilość produktów w otwartych zleceń klientów
 ProductQtyInSuppliersOrdersRunning=Ilość produktów w otwartych dostawców zamówień
-ProductQtyInShipmentAlreadySent=Ilość produktów z opended zamówienie klienta już wysłane
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Ilość produktów z otwartego zlecenia dostawca otrzymał już
 
 # Sending methods
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 9772d213f24..29dafcd23e2 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Magazyny
 NewWarehouse=Nowy magazyn / obszar magazynowania
 WarehouseEdit=Modyfikacja magazynu
 MenuNewWarehouse=Nowy magazyn
-WarehouseOpened=Magazyn otwarty
+WarehouseOpened=Warehouse open
 WarehouseClosed=Magazyn zamknięte
 WarehouseSource=Źródło magazynu
 WarehouseSourceNotDefined=Nie zdefiniowano magazynu,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Wybierz magazyn użyć do zmniejszenia czas
 SelectWarehouseForStockIncrease=Wybierz magazyn użyć do zwiększenia czas
 NoStockAction=Brak akcji stock
 LastWaitingSupplierOrders=Zamówienia oczekujące na przyjęcia
-DesiredStock=Pożądany Zdjęcie
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Na zamówienie
 Replenishment=Uzupełnianie
 ReplenishmentOrders=Zamówień towarów
-VirtualDiffersFromPhysical=Według zwiększyć / zmniejszyć opcje zdjęcia, fizyczną i wirtualną akcji akcji (fizyczne + zamówień bieżących) może różni
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Użyj wirtualnej akcji domyślnie, zamiast fizycznego magazynie, do uzupełniania funkcji
 UseVirtualStock=Użyj wirtualnej akcji
 UsePhysicalStock=Użyj fizycznej akcji
-CurentSelectionMode=Tryb wyboru curent
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Wirtualny Zdjęcie
 CurentlyUsingPhysicalStock=Zdjęcie fizyczny
 RuleForStockReplenishment=Reguła dla uzupełnienia zapasów
@@ -112,8 +113,8 @@ AlertOnly= Tylko alarmy
 WarehouseForStockDecrease=<b>Magazyn% s</b> zostaną wykorzystane do zmniejszenia magazynie
 WarehouseForStockIncrease=<b>Magazyn% s</b> zostaną wykorzystane do zwiększenia magazynie
 ForThisWarehouse=W tym magazynie
-ReplenishmentStatusDesc=To jest lista wszystkich produktów z zapasów niższej niż pożądanym stanie (lub niższa niż wartość alertu, jeśli pole wyboru "Alarm tylko" jest zaznaczona), i sugerują tworzenie zamówień dostawca do wypełnienia różnicę.
-ReplenishmentOrdersDesc=To jest lista wszystkich otwartych zleceń dostawca tym predefiniowanych produktów. Tylko otwarty rozkazy z góry określonych produktów, tak, że mogą mieć wpływ na zapasy, są widoczne tutaj.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Uzupełnianie
 NbOfProductBeforePeriod=Ilość produktów w magazynie% s przed wybrany okres (<% s)
 NbOfProductAfterPeriod=Ilość produktów w magazynie% s po wybraniu okres (>% s)
@@ -124,16 +125,16 @@ RecordMovement=Rekord transfert
 ReceivingForSameOrder=Wpływy do tego celu
 StockMovementRecorded=Zbiory zapisane ruchy
 RuleForStockAvailability=Zasady dotyczące wymagań dotyczących
-StockMustBeEnoughForInvoice=Poziom zapasów musi być na tyle, aby dodać produkt / usługę na fakturze
-StockMustBeEnoughForOrder=Poziom zapasów musi być na tyle, aby dodać produkt / usługę na zamówienie
-StockMustBeEnoughForShipment= Poziom zapasów musi być na tyle, aby dodać produkt / usługę do wysyłki
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Wytwórnia ruchu
 InventoryCode=Kod Ruch i inwentaryzacji
 IsInPackage=Zawarte w pakiecie
 ShowWarehouse=Pokaż magazyn
-MovementCorrectStock=Korekta treści Zdjęcie za produkt% s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Transfer Zdjęcie produktu% s do innego magazynu
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Źródło magazynu musi być zdefiniowane tutaj kiedy "Lot produktu" jest włączony. Zostanie wykorzystany do wylistowania który lot / serial jest dostępny dla produktu który wymaga lot /serial daty przesunięcia. Jeśli chcesz wysłać produkty z różnych magazynów, zrób wysyłkę w kilku krokach - etapach nie pogubisz się. 
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Kod Fv/ Przesunięcia 
-NoPendingReceptionOnSupplierOrder=Brak oczekujących odbiorów podczas otwartych zamówień produktów.
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=Ten lot/numer seryjny (<strong>%s</strong>) już istnieje ale z inna data do wykorzystania lub sprzedania (znaleziono  <strong>%s</strong> a wszedłeś w <strong>%s</strong>)
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index 2c42cf0d161..39b6e4b46b7 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Wysyłane do dostawców
 ListOfSupplierOrders=Lista zleceń dostawca
 MenuOrdersSupplierToBill=Zamówienia dostawca do faktury
 NbDaysToDelivery=Opóźnienie dostawy w dni
-DescNbDaysToDelivery=Największe opóźnienie wyświetlania listy produktów wśród zamówienia
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Użyj podwójnego zatwierdzenia (drugie zezwolenie może być wykonane przez dowolnego użytkownika z dedykowanymi uprawnieniami)
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 5b8f620d066..daa47d4c980 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Koszty raporty
 TripsAndExpensesStatistics=Statystyki raporty wydatków
 TripCard=Koszty karta raport
 AddTrip=Tworzenie raportu wydatków
-ListOfTrips=Lista raporcie wydatków
+ListOfTrips=List of expense reports
 ListOfFees=Wykaz opłat
 NewTrip=Nowy raport z wydatków
 CompanyVisited=Firm / fundacji odwiedzonych
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Osoba do informowania o jej potwierdzenie.
 TripSociete=Informacje o firmie
 TripSalarie=Informacje użytkownika
 TripNDF=Informacje raport z wydatków
-DeleteLine=Usuwanie ligne raportu wydatków
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Czy na pewno chcesz usunąć ten wiersz?
 PDFStandardExpenseReports=Standardowy szablon do generowania dokumentu PDF do raportu wydatków
 ExpenseReportLine=Linia raport z wydatków
@@ -40,11 +40,10 @@ TF_BUS=Autobus
 TF_CAR=Samochód
 TF_PEAGE=Myto
 TF_ESSENCE=Paliwo
-TF_HOTEL=Schronisko
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Masz oświadczył kolejny raport wydatków do podobnego zakresu dat.
-ListTripsAndExpenses=Wykaz raportów kosztowych
 AucuneNDF=Brak raporty wydatków znalezione dla tych kryteriów
 AucuneLigne=Nie ma jeszcze raportu wydatki deklarowane
 AddLine=Dodaj linię
@@ -56,12 +55,12 @@ ModePaiement=Sposób płatności
 Note=Uwaga
 Project=Projekt
 
-VALIDATOR=Użytkownik poinformować o zatwierdzenie
+VALIDATOR=User responsible for approval
 VALIDOR=Zatwierdzony przez
 AUTHOR=Nagrany przez
-AUTHORPAIEMENT=Paied przez
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Odmowa przez
-CANCEL_USER=Anulowane przez
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Powód
 MOTIF_CANCEL=Powód
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Termin płatności
 
 TO_PAID=Płacić
 BROUILLONNER=Otworzyć na nowo
-SendToValid=Wysłany do zatwierdzenia
+SendToValid=Sent on approval
 ModifyInfoGen=Edycja
 ValidateAndSubmit=Weryfikacja i przedkłada do zatwierdzenia
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Nie masz uprawnień do zatwierdzania tego raportu wydatków
 NOT_AUTHOR=Nie jesteś autorem tego raportu wydatków. Operacja anulowana.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Czy na pewno chcesz się status tego raportu wydatków do "Paid"
 CancelTrip=Anuluj raport wydatków
 ConfirmCancelTrip=Czy na pewno chcesz anulować to raport wydatków?
 
-BrouillonnerTrip=Cofnąć raportu wydatków do statusu "Projekt" n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Czy na pewno chcesz przenieść ten raport wydatków do statusu "projektu"?
 
 SaveTrip=Weryfikacja raportu wydatków
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index c1208006aac..a8b292b7fb1 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Usuń z grupy
 PasswordChangedAndSentTo=Hasło zmieniło i wysyłane <b>do %s.</b>
 PasswordChangeRequestSent=Wniosek o zmianę hasła <b>dla %s</b> wysłane <b>do %s.</b>
 MenuUsersAndGroups=Użytkownicy i grupy
+MenuMyUserCard=My user card
 LastGroupsCreated=Ostatnia %s utworzonych grup
 LastUsersCreated=Ostatnia %s użytkowników utworzonych
 ShowGroup=Pokaż grupy
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 1fd493ae683..b82ff88c1b7 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Plik Wycofanie
 SetToStatusSent=Ustaw status "Plik Wysłane"
 ThisWillAlsoAddPaymentOnInvoice=Odnosi się to także płatności faktur i będzie je sklasyfikować jako "Paid"
 StatisticsByLineStatus=Statystyki według stanu linii
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Płatność z %s zamówienia stojących przez bank
diff --git a/htdocs/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang
index 90ce3d2d91f..3e191a0f5b5 100644
--- a/htdocs/langs/pl_PL/workflow.lang
+++ b/htdocs/langs/pl_PL/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Konfiguracja modułu przepływu pracy
-WorkflowDesc=Moduł ten zaprojektowany został do zmiany zachowania automatycznych działań w aplikacjach. Domyślnie, przepływ pracy jest otwarty (zrobisz co chcesz w zamówieniach). Możesz aktywować automatyczne czynności, które cię interesują.
-ThereIsNoWorkflowToModify=Nie ma przepływu pracy można modyfikować modułu został uaktywniony.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tworzenie zlecenia klienta automatycznie po handlowego wniosek jest podpisany
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tworzenie faktury klienta automatycznie po handlowego wniosek jest podpisany
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Tworzenie faktury klienta automatycznie po zatwierdzeniu umowy
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Tworzenie faktury klienta automatycznie po zamówienie klienta jest zamknięty
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasyfikowania związany propozycję źródłowego zapowiadane gdy zamówienie klienta jest ustawiony na płatne
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasyfikowania związane Źródło (-a), gdy klienta do faktury klienta naliczana jest ustawiony wypłacane
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasyfikowania związany zamówienie klienta źródłowego (s) do grubodzioby, gdy faktura klient jest weryfikowany
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index eed90c5f694..61fcef4da9e 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -1,17 +1,72 @@
 # Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para o arquivo de exportação
+ACCOUNTING_EXPORT_DATE=Formato de data para arquivo de exportação
+ACCOUNTING_EXPORT_PIECE=Exportar o número de peça?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportação com conta global?
+ACCOUNTING_EXPORT_LABEL=Exportar o rótulo?
+ACCOUNTING_EXPORT_AMOUNT=Exportar o montante?
 Accounting=Contabilidade
 Globalparameters=Parametros globais
 Menuaccount=Contas contábeis
 ConfigAccountingExpert=Configuração do módulo especialista em contabilidade
 Journaux=Jornais
 JournalFinancial=Jornais financeiros
+OptionsDeactivatedForThisExportModel=Para este modelo de exportação, as opções são desativadas
 Selectmodelcsv=Escolha um modelo de exportação
+Modelcsv_CEGID=Exportação em direção CEGID Especialista
+Back=Retorno
+Definechartofaccounts=Definir um gráfico de contas
+Selectchartofaccounts=Selecionar um gráfico de contas
+Addanaccount=Adicionar uma conta contábil
+AccountAccounting=Conta contábil
+TradeMargin=Margem de comercialização
+ByCustomerInvoice=Pelos clientes faturas
+UpdateAccount=Modificação de uma conta contábil
+UpdateMvts=A modificação de um movimento
+WriteBookKeeping=Registo das contas em contabilidade geral
+AccountBalanceByMonth=Saldo da conta por mês
+CAHTF=Total de HT compra fornecedor
+EndProcessing=A fim de processamento
 SelectedLines=Linhas selecionadas
-ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços
+ACCOUNTING_SEPARATORCSV=Separador de coluna no arquivo de exportação
+AccountLengthDesc=Função que permite simular um comprimento de conta contábil, substituindo espaços pela figura zero. Esta função só toca a tela, ele não modifica as contas contábeis registrados no Dolibarr. Para a exportação, esta função é necessário para ser compatível com determinado software.
+ACCOUNTING_LENGTH_GACCOUNT=Comprimento das contas gerais
+ACCOUNTING_LENGTH_AACCOUNT=Comprimento do terceiro contas do partido
+ACCOUNTING_SELL_JOURNAL=Vender jornal
+ACCOUNTING_PURCHASE_JOURNAL=Compra jornal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Jornal Diversos
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Relatório de despesas jornal
+ACCOUNTING_SOCIAL_JOURNAL=Jornal social
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta de transferência
+ACCOUNTING_ACCOUNT_SUSPENSE=Conta de espera
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Contabilização conta por padrão para produtos comprados (se não for definido na folha de produto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Contabilização conta por padrão para os produtos vendidos (se não for definido na folha de produto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Contabilização conta por padrão para os serviços comprados (se não for definido na folha de serviço)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contabilização conta por padrão para os serviços vendidos (se não for definido na folha de serviço)
 Docref=Referência
 Code_tiers=Cliente/Fornecedor
+Labelcompte=Conta rótulo
+Codejournal=Jornal
+DelBookKeeping=Excluir os registros da contabilidade geral
+BankJournal=Banco jornal
+DescBankJournal=Jornal Banco incluindo todos os tipos de pagamentos que não sejam de caixa
+CashJournal=Dinheiro jornal
+DescCashJournal=Livro caixa, incluindo o tipo de dinheiro de pagamento
+CashPayment=Pagamento em dinheiro
 NewAccountingMvt=Nova movimentação
+NumMvts=Número de movimento
+ListeMvts=Lista do movimento
+ErrorDebitCredit=Débito e Crédito não pode ter um valor, ao mesmo tempo
+ReportThirdParty=Liste conta terceiros
+DescThirdPartyReport=Consulte aqui a lista dos clientes de terceiros e os fornecedores e as suas contas contábeis
+ListAccounts=Lista das contas contábeis
+Pcgsubtype=Sob classe de conta
+DescVentilCustomer=Consulte aqui a contabilização repartição anual dos seus clientes faturas
+TotalVente=HT volume de negócios total
+TotalMarge=Margem de vendas totais
+DescVentilDoneCustomer=Consultar aqui a lista das linhas de clientes faturas e sua conta de contabilidade
+ChangeAccount=Alterar a conta contábil para linhas selecionadas pela conta:
+DescVentilSupplier=Consulte aqui a contabilização repartição anual das suas faturas de fornecedores
+DescVentilDoneSupplier=Consulte aqui a lista das linhas de faturas de fornecedores e sua conta de contabilidade
+ValidateHistory=Validar automáticamente
+ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index e54cb96a5ec..f7c8e214993 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -3,6 +3,11 @@ Foundation=Empresa/Instituição
 VersionProgram=Versão do programa
 VersionLastInstall=Versão da instalação inicial
 VersionLastUpgrade=Versão da última atualização
+FileCheck=Integridade de arquivos
+FilesMissing=Arquivos ausentes
+FilesUpdated=Arquivos atualizados
+FileCheckDolibarr=Verificar a integridade dos arquivos Dolibarr
+XmlNotFound=Arquivo XML de Integridade Dolibarr não encontrado
 SessionId=ID da sessão
 SessionSaveHandler=Manipulador para salvar sessões.
 SessionSavePath=Localização da sessão guardada
@@ -102,7 +107,6 @@ MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos me
 MenuForUsers=menu para os usuarios
 LangFile=Arquivo .lang
 SystemInfo=Informações de Sistema
-SystemTools=Ferramentas do Sistema
 SystemToolsArea=Área de ferramentas do sistema
 SystemToolsAreaDesc=Esta área oferece diferentes funções da administração. Use o menu para escolher a Funcionalidade que procura.
 PurgeAreaDesc=Esta página permite eliminar todos os arquivos criados ou guardados pelo ERP (Arquivos temporários ou todos os arquivos da pasta <b>%s</b>). O uso desta função não é necessária. Proporciona-se para os Usuários que albergam o ERP não servidor que oferece as permissões de eliminação de arquivos salvaguardados pela servidor Web.
@@ -149,6 +153,7 @@ ModulesJobDesc=Os módulos mpresariais permitem uma pré-configuração simplifi
 ModulesMarketPlaceDesc=Voce pode encontrar mais modulos para download em sites externos na internet
 ModulesMarketPlaces=Mais módulos
 DoliStoreDesc=DoliStore, Pagina oficial para modulos  externos do Dolibarr ERP/CRM.
+DoliPartnersDesc=Lista com algumas empresas que podem fornecer / desenvolver  módulos ou funcionalidades on-demand (Nota: qualquer empresa Open Source knowning linguagem PHP pode lhe fornecer desenvolvimento específico)
 WebSiteDesc=Você pode pesquisar para encontrar mais módulos em Provedores de sites
 BoxesAvailable=Caixas disponíveis
 BoxesActivated=Caixas ativadas
@@ -158,11 +163,12 @@ SourceFile=Arquivo origem
 AutomaticIfJavascriptDisabled=Automático se Javascript está desativado
 AvailableOnlyIfJavascriptNotDisabled=Disponível somente se Javascript esta ativado
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript e Ajax estão ativados
+UsedOnlyWithTypeOption=Usado por alguns opção agenda única
 Passwords=Senhas
 DoNotStoreClearPassword=Nao salve senhas faceis no banco de dados mas salvar senhas criptografadas(Ativacao recomendada)
 MainDbPasswordFileConfEncrypted=Encriptar a senha da base em arquivo conf.php(Ativacao Recomendada)
-InstrucToEncodePass=Para ter a senha codificada na conf.php </ b> file <b>, substitua a linha <br> <b> $ dolibarr_main_db_pass = "..." </ b> <br> por <br> <b> $ dolibarr_main_db_pass = "encriptadas:% s" </ b>
-InstrucToClearPass=Para ter a senha codificada na conf.php </ b> file <b>, substitua a linha <br> <b> $ dolibarr_main_db_pass = "..." </ b> <br> por <br> <b> $ dolibarr_main_db_pass = "encriptadas:% s" </ b>
+InstrucToEncodePass=Para ter a senha codificada no arquivo <b>conf.php,</b> substitua a linha <br> <b>$Dolibarr_main_db_pass="...";</b> <br> por <br> <b>$ Dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Para ter senha descodificado (claro) para o arquivo <b>conf.php,</b> substituir a linha <br> <b>$Dolibarr_main_db_pass="crypted: ...";</b> <br> por <br> <b>$Dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Proteção e encriptação dos pdf gerados(Ativado não recomendado, quebra geração pdf massa)
 ProtectAndEncryptPdfFilesDesc=A proteção de um documento pdf deixa o documento livre para leitura e para impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia resultam impossível.
 Feature=Caracteristica
@@ -209,17 +215,19 @@ MenuHandlers=Configuradores menu
 MenuAdmin=Editor menu
 DoNotUseInProduction=Não utilizar em produção
 ThisIsProcessToFollow=Está aqui o procedimento a seguir:
+ThisIsAlternativeProcessToFollow=Esta é uma configuração alternativa para o processo:
 FindPackageFromWebSite=Encontre um pacote que oferece recurso desejado (por exemplo, no site oficial % s).
-DownloadPackageFromWebSite=Baixar pacote %s
-UnpackPackageInDolibarrRoot=Descompactar o pacote na pasta dedicada aos módulos externos: <b>%s</b>
+DownloadPackageFromWebSite=Pacote de download (por exemplo, de oficial web site %s).
+UnpackPackageInDolibarrRoot=Descompacte arquivo de pacote para o diretório de servidor Dolibarr dedicado a módulos <b>externos:%s</b>
 SetupIsReadyForUse=A Instalação está finalizada e o ERP está liberada para usar com o novo componente
 NotExistsDirect=O diretório alternativo para o root não foi definido
 InfDirAlt=Desde a versão 3, é possível definir um diretorio root alternativo. Esta funcoa permitepermite que você armazene, no mesmo lugar, plug-ins e templates personalizados <br> apenas crie um diretório na raiz do Dolibarr. (Por exemplo: custom) <br>
 InfDirExample=<br> então declará-lo no arquivo conf.php <br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These linhas estão comentadas com "#", descomentar apenas remover o caractere.
-YouCanSubmitFile=Selecione o módulo
+YouCanSubmitFile=Para esta etapa, você pode enviar pacote usando esta ferramenta: Selecione arquivo de módulo
 CurrentVersion=Versão atual do ERP
 CallUpdatePage=Chamar a página de atualização da estrutura e dados da base de dados %s.
 LastStableVersion=Ultima Versão estável
+UpdateServerOffline=Atualização de servidor off-line
 GenericMaskCodes=Pode introduzir qualquer máscara numérica. Nesta máscara, pode utilizar as seguintes etiquetas:<br><b>{000000} </b> corresponde a um número que se incrementa em cada um de %s. Introduza tantos zeros como longitude que deseje mostrar. O contador completarse-á a partir de zeros pela esquerda com o fim de ter tantos zeros como a máscara. <br> <b> {000000+000}</ b> Igual que o anterior, com uma compensação correspondente ao número da direita do sinal + aplica-se a partir do primeiro %s. <br> <b> {000000@x}</b> igual que o anterior, mas o contador restabelece-se a zero quando se chega a x meses (x entre 1 e 12). Se esta opção se utiliza e x é de 2 ou superior, então a seq�ência {yy}{mm} ou {yyyy}{mm} também é necessário. <br> <b> {dd} </b> dias (01 a 31). <br><b> {mm}</b> mês (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{e}</b> ano em 2, 4 ou 1 figura.<br>
 GenericMaskCodes2=<b>{cccc}</b> o codigo do cliente de n caracteres<br><b>{cccc000}</b> o codigo do cliente de n caracteres e seguido do contador dedicado para o cliente. Este contador dedicado ao cliente e reiniciado no mesmo tempo que o contador global.<br><b>{tttt}</b> O codigo do terceiro tipo de n caracteres (ver dicionario terceiros tipos ).<br>
 GenericMaskCodes3=qualquer outro caracter0 na máscara se fica sem alterações. <br>Não é permitido espaços <br>
@@ -285,6 +293,8 @@ ExtrafieldSelect =Selecionar lista
 ExtrafieldSelectList =Selecione da tabela
 ExtrafieldCheckBox=Caixa de seleção
 ExtrafieldRadio=Botão de opção
+ExtrafieldCheckBoxFromList=Caixa de seleção da tabela
+ExtrafieldLink=Link para um objeto
 ExtrafieldParamHelpselect=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor1  2, valor2 < 3, value3 ... A fim de ter a lista dependendo outro:  1, valor1 | parent_list_code: parent_key  2, valor2 | parent_list_code: parent_key
 ExtrafieldParamHelpcheckbox=Lista de parâmetros tem que ser como chave, valor <br><br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por exemplo:  1, valor 2, valor2 1 3, value3  ...
@@ -350,20 +360,28 @@ Module330Desc=Administração de Favoritos
 Module400Name=Projetos/Oportunidades/Contatos
 Module400Desc=Gerenciamento de Projetos, oportunidades ou contatos. Você pode associar qualquer elemento (invoice, ordem, propostas, intervenções, etc...) para um projeto e ter uma visão transversal da visualização de projeto.
 Module410Desc=Interface com calendário Webcalendar
-Module500Desc=Gestão de despesas especiais, como impostos, contribuição social, dividendos e salários
+Module500Name=Despesas especiais
 Module510Desc=Gestão de funcionários salários e pagamentos
+Module520Name=Empréstimo
+Module520Desc=Gestão dos empréstimos
 Module600Desc=Enviar notificação via EMail para terceiros sobre algums eventos do Dolibarr ( configurado para cada terceiro)
 Module700Desc=Administração de Bolsas
 Module1200Desc=Interface com o sistema de seguimento de incidências Mantis
 Module1400Name=Contabilidade
 Module1400Desc=Gestão de Contabilidade (partes duplas)
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1520Name=Geração de Documentos
+Module1780Name=Tags / Categorias
+Module1780Desc=Criar tags / categoria (produtos, clientes, fornecedores, contatos ou membros)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permitir editar alguma área de texto usando um editor avançado
+Module2200Name=Preços dinâmicos
+Module2200Desc=Habilitar o uso de expressões matemáticas para os preços
+Module2300Desc=Gerenciamento de tarefas agendadas
 Module2400Desc=Administração da agenda e das ações
 Module2500Name=Administração Eletrônica de Documentos
-Module2600Name=Webservices
-Module2600Desc=Ativar o servidor de serviços web Dolibarr
+Module2600Name=API de serviços (Web Services SOAP)
+Module2600Desc=Permitir que os serviços da API servidor SOAP Dolibarr fornecendo
+Module2610Name=API de serviços (Web services REST)
 Module2650Name=WebServices (cliente)
 Module2700Name=Sobrescrito
 Module2700Desc=Usar o serviço on-line Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (que se encontra com os seus e-mails). Precisa de um acesso à Internet
@@ -374,11 +392,13 @@ Module5000Name=Multi-Empresa
 Module5000Desc=Permite-lhe gerenciar várias empresas
 Module6000Desc=Gestão de fluxo de trabalho
 Module20000Name=Sair da configuração de pedidos
+Module39000Name=Lote do produto
 Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox
 Module50100Desc=Caixa registradora
 Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal
 Module50400Name=Contabilidade (avançada)
 Module50400Desc=Gestão de Contabilidade (partes duplas)
+Module54000Desc=Impressão direta (sem abrir os documentos) usando a interface Cups IPP (Impressora deve ser visível a partir do servidor, e CUPS deve ser instaladas no servidor).
 Module55000Name=Abrir Enquete
 Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz ...)
 Module59000Name=Margems
@@ -391,35 +411,38 @@ Permission14=Confirmar faturas
 Permission15=Enviar faturas por correio
 Permission16=Emitir pagamentos de faturas
 Permission19=Eliminar faturas
-Permission41=Consultar projetos
 Permission42=Criar/Modificar projetos
 Permission44=Eliminar projetos
-Permission91=Consultar Impostos e ICMS
-Permission92=Criar/Modificar Impostos e ICMS
-Permission93=Eliminar Impostos e ICMS
+Permission75=Tipos de configuração de adesão
+Permission91=Leia impostos e IVA social ou fiscal
+Permission92=Criar / modificar os impostos e IVA social ou fiscal
+Permission93=Excluir impostos e IVA social ou fiscal
 Permission101=Consultar Expedições
 Permission102=Criar/Modificar Expedições
 Permission104=Confirmar Expedições
 Permission106=Envios de exportação
 Permission109=Eliminar Expedições
 Permission112=Criar/Modificar quantidade/eliminar registros bancários
+Permission113=Instalação de contas financeiras (criar, gerenciar as categorias)
 Permission115=Exportar transações e extratos
 Permission116=Captar transferências entre contas
 Permission117=Gerenciar envio de cheques
-Permission141=Leia projetos (também privado não estou em contato para)
-Permission142=Criar / modificar projetos (também privado não estou em contato para)
-Permission144=Excluir projetos (também privado não estou em contato para)
 Permission146=Consultar Prestadores
 Permission151=Consultar Débitos Diretos
 Permission152=Configurar Débitos Diretos
 Permission153=Consultar Débitos Diretos
 Permission154=Crédito / recusar ordens permanentes recibos
 Permission161=Leia contratos / assinaturas
+Permission162=Criar / modificar contratos / assinaturas
+Permission163=Ativar um serviço / assinatura de um contrato
+Permission164=Desativar um serviço / assinatura de um contrato
+Permission165=Excluir contratos / assinaturas
 Permission171=Leia viagens e despesas (próprios e de seus subordinados)
 Permission172=Criar/Modificar viagens e gastos
 Permission173=Remover viagens e gastos
 Permission174=Leia todas as viagens e despesas
 Permission178=Exportar viagens e gastos
+Permission185=Ordenar ou cancelar pedidos a fornecedores
 Permission194=Consultar Linhas da Lagura de Banda
 Permission205=Gerenciar Ligações
 Permission213=Ativar Linha
@@ -446,6 +469,7 @@ Permission281=Consultar contatos
 Permission282=Criar/Modificar contatos
 Permission283=Eliminar contatos
 Permission286=Exportar os contatos
+Permission312=Atribuir serviço / subscrição para contrair
 Permission341=Ler suas próprias permissões
 Permission342=Criar ou modificar informações do próprio usuário
 Permission343=Modificar sua senha
@@ -462,6 +486,9 @@ Permission510=Leia Salários
 Permission512=Criar / modificar salários
 Permission514=Excluir salários
 Permission517=Salários de exportação
+Permission520=Leia Empréstimos
+Permission522=Criar / modificar empréstimos
+Permission524=Excluir empréstimos
 Permission532=Criar ou modificar serviços
 Permission534=Excluir serviços
 Permission536=Visualizar ou gerenciar serviços ocultos
@@ -469,6 +496,11 @@ Permission538=Exportar serviços
 Permission701=Criar/Modificar Bolsas
 Permission702=Eliminar Bolsas
 Permission703=Excluir doações
+Permission771=Leia relatórios de despesas (próprios e de seus subordinados)
+Permission772=Criar / modificar relatórios de despesas
+Permission773=Excluir relatórios de despesas
+Permission774=Leia todos os relatórios de despesas (mesmo para o utilizadores Não subordinados)
+Permission775=Aprovar os relatórios de despesas
 Permission1001=Consultar estoques
 Permission1002=Criar / modificar armazéns
 Permission1003=Excluir Armazéns
@@ -478,6 +510,7 @@ Permission1101=Consultar ordens de envio
 Permission1102=criar/modificar ordens de envio
 Permission1104=Confirmar ordem de envio
 Permission1109=Eliminar ordem de envio
+Permission1190=Aprovar (segunda) de aprovação dos pedidos a fornecedores
 Permission1231=Consultar faturas de Fornecedores
 Permission1232=Criar faturas de Fornecedores
 Permission1233=Confirmar faturas de Fornecedores
@@ -488,6 +521,10 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes
 Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados)
 Permission1321=Exportar faturas a clientes, atributos e cobranças
 Permission1421=Exportar faturas de clientes e atributos
+Permission23001=Leia trabalho Programado
+Permission23002=Criar / atualização agendada trabalho
+Permission23003=Excluir trabalho agendado
+Permission23004=Executar trabalho agendado
 Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta
 Permission2402=Criar/Modificar/Eliminar ações (eventos ou tarefas) vinculadas na sua conta
 Permission2403=Consultar ações (acontecimientos ou tarefas) de outros
@@ -506,12 +543,13 @@ Permission55001=Leia urnas
 Permission55002=Criar / modificar urnas
 Permission59001=Leia margens comerciais
 Permission59002=Definir margens comerciais
+Permission59003=Leia cada margem do usuário
 DictionaryCompanyType=Tipo de clientes
 DictionaryCompanyJuridicalType=Tipos jurídicos de thirdparties
 DictionaryProspectLevel=Nível potencial Prospect
 DictionaryCanton=Estado / cantões
 DictionaryCivility=Título Civilidade
-DictionarySocialContributions=Contribuições Sociais tipos
+DictionarySocialContributions=Tipos de encargos sociais e fiscais
 DictionaryVAT=Taxas de VAT ou imposto sobre vendas de moeda
 DictionaryRevenueStamp=Quantidade de selos fiscais
 DictionaryPaymentConditions=As condições de pagamento
@@ -526,6 +564,9 @@ DictionarySource=Origem das propostas / ordens
 DictionaryAccountancyplan=Plano de contas
 DictionaryAccountancysystem=Modelos para o plano de contas
 DictionaryEMailTemplates=Modelos de E-mails
+DictionaryUnits=Unidades
+DictionaryProspectStatus=Status de Prospecção
+DictionaryHolidayTypes=Tipo de folhas
 SetupSaved=configuração guardada
 BackToDictionaryList=Voltar para a lista de dicionários
 VATReceivedOnly=Impostos especiais não faturaveis
@@ -551,8 +592,12 @@ LocalTax2IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fisc
 LocalTax2IsNotUsedDescES=Por padrão, o IRPF proposta é 0. Fim da regra.
 LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos.
 LocalTax2IsNotUsedExampleES=Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos.
+CalcLocaltax=Relatórios sobre os impostos locais
+CalcLocaltax1=Vendas - Compras
 CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra
+CalcLocaltax2=Compras
 CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras
+CalcLocaltax3=De vendas
 CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas
 NbOfDays=N� de Dias
 AlwaysActive=Sempre Ativo
@@ -586,13 +631,15 @@ DefaultMaxSizeList=Longuitude máxima de listados por default
 DefaultLanguage=Idioma por default a utilizar (código idioma)
 EnableMultilangInterface=Ativar interface Multi Idioma
 EnableShowLogo=Mostrar logotipo no menu à esquerda
+EnableHtml5=Ativar Html5 (Desenvolvimento - Apenas disponível no modelo Eldy)
 SystemSuccessfulyUpdated=a sua sitema está atualizado
 CompanyTown=Município
+CompanyObject=Objeto da empresa
 Logo=Logotipo
 DoNotSuggestPaymentMode=Não sugerenciar
 NoActiveBankAccountDefined=Nenhuma conta bancaria ativa definida
 BankModuleNotActive=O módulo de contas bancarias não se encontra ativado
-ShowBugTrackLink=Mostrar link "Senhalar um bug"
+ShowBugTrackLink=Mostrar link "<strong>%s</strong>"
 DelayBeforeWarning=Prazo antes de alerta
 DelaysBeforeWarning=Prazos antes de alerta
 DelaysOfToleranceBeforeWarning=Prazos de tolerância antes de alerta
@@ -649,17 +696,21 @@ MAIN_MAX_DECIMALS_UNIT=Casas decimais máximas para os preços unitários
 MAIN_MAX_DECIMALS_TOT=Casas decimais máximas para os preços totais
 MAIN_MAX_DECIMALS_SHOWN=Casas decimais máximas para os valores mostrados em janela (Colocar <b>...</b> depois do máximo quer ver <b>...</b> quando o número se trunque à mostrar em janela)
 MAIN_DISABLE_PDF_COMPRESSION=Utilizar a compressão PDF para os Arquivos PDF gerados
-MAIN_ROUNDING_RULE_TOT=Tamanho da faixa de arredondamento (para os países raros em que o arredondamento é feito em outra coisa do que base 10)
+MAIN_ROUNDING_RULE_TOT=Passo do intervalo de arredondamento (para os países onde o arredondamento é feito em outra coisa do que a base 10. Por exemplo, colocar 0,05 se o arredondamento é feito por etapas 0,05)
 UnitPriceOfProduct=Preço líquido unitário de um produto
 TotalPriceAfterRounding=Preço total (imposto net / cuba / manhã) após arredondamento
 ParameterActiveForNextInputOnly=parâmetro efetivo somente a partir das próximas sessões
 NoEventOrNoAuditSetup=não são registrado eventos de segurança. Esto pode ser normal sim a auditoría não ha sido habilitado na página "configuração->segurança->auditoría".
 NoEventFoundWithCriteria=não são encontrado eventos de segurança para tais criterios de pesquisa.
 BackupDesc=Para realizar uma Cópia de segurança completa de Dolibarr, voçê deve:
+BackupDesc2=Salvar o conteúdo do diretório de documentos <b>(%s)</b> que contém todos os arquivos carregados e gerados (você pode fazer um zip por exemplo).
+BackupDesc3=Salvar o conteúdo de seu banco de dados <b>(%s)</b> em um arquivo de despejo. Para isso, você pode usar o seguinte assistente.
 BackupDescX=O Arquivo gerado deverá localizar-se em um lugar seguro.
 BackupDescY=O arquivo gerado devevrá ser colocado em local seguro.
 BackupPHPWarning=Backup não pode ser garantida com este método. Prefere uma anterior
 RestoreDesc=Para restaurar uma Cópia de segurança de Dolibarr, voçê deve:
+RestoreDesc2=Restaurar arquivo (arquivo zip por exemplo) do diretório de documentos para extrair árvore de arquivos no diretório de documentos de uma nova instalação ou em Dolibarr esta corrente documentos directoy <b>(% s).</b>
+RestoreDesc3=Restaurar os dados, a partir de um arquivo de despejo de backup, na base de dados da nova instalação Dolibarr ou no banco de dados desta instalação atual <b>(%s).</b> Atenção, uma vez que a restauração for concluída, você deve usar um login / senha, que existia quando o backup foi feito, se conectar novamente. Para restaurar um banco de dados de backup para esta instalação atual, você pode seguir este assistente.
 RestoreMySQL=importar do MySQL
 ForcedToByAModule=Esta regra é forçado a por um módulo ativado
 PreviousDumpFiles=Arquivos de despejo de backup de banco de dados disponível
@@ -681,6 +732,8 @@ MAIN_PROXY_HOST=Nome / Endereço do servidor proxy
 MAIN_PROXY_PORT=Porto de servidor proxy
 MAIN_PROXY_USER=Entre para usar o servidor proxy
 DefineHereComplementaryAttributes=Defina aqui todos os atributos, não já disponíveis por padrão, e que pretende ser apoiada por.
+ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas de encomenda)
+ExtraFieldsSupplierInvoicesLines=Atributos complementares (linhas da fatura)
 ExtraFieldsThirdParties=Atributos complementares (clientes)
 ExtraFieldsContacts=Atributos complementares (contato / endereço)
 ExtraFieldsCustomerOrders=Atributos complementares (ordens)
@@ -691,12 +744,13 @@ AlphaNumOnlyLowerCharsAndNoSpace=apenas alfanumérico e minúsculas, sem espaço
 SendingMailSetup=Configuração de envios por e-mail
 SendmailOptionNotComplete=Atenção, em alguns sistemas Linux, para enviar e-mail de seu e-mail, sendmail instalação execução must contém opção-ba (mail.force_extra_parameters parâmetros no seu arquivo php.ini). Se alguns destinatários não receber e-mails, tentar editar este parâmetro PHP com mail.force_extra_parameters =-ba).
 PathToDocuments=Rotas de acesso a documentos
+SendmailOptionMayHurtBuggedMTA=Recurso para enviar mails usando o método de "correio PHP direto" irá gerar uma mensagem de email que pode não ser corretamente analisado por alguns servidores de entrada de email. O resultado é que alguns e-mails não podem ser lidos por pessoas hospedadas por essas plataformas grampeado. É o caso para alguns provedores de Internet (Ex: Laranja na França). Este não é um problema em Dolibarr nem em PHP, mas para receber servidor de correio. No entanto, pode adicionar a opção MAIN_FIX_FOR_BUGGED_MTA a 1 na configuração - outra para modificar Dolibarr para evitar isso. No entanto, você pode enfrentar problema com outros servidores que respeitem estritamente o padrão SMTP. A outra solução (recomendado) é usar o método de "biblioteca soquete SMTP" que não tem desvantagens.
 TranslationSetup=Configuração de  tradução
 TranslationDesc=Escolha da língua visível na tela pode ser modificado:  * A nível mundial a partir do menu strong Home - Setup - Exibição* Para o usuário apenas de guia  de exibição do usuário de cartão de usuário (clique sobre o login no topo da tela).
 TotalNumberOfActivatedModules=Número total de módulos de recursos ativados:
 YouMustEnableOneModule=Você deve, pelo menos, permitir que um módulo
 ClassNotFoundIntoPathWarning=A classe não foi encontrado em caminho PHP
-OnlyFollowingModulesAreOpenedToExternalUsers=Note-se, apenas seguintes módulos são abertos a usuários externos (o que quer que sejam permissão desses usuários):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note-se, os módulos seguintes são abertos a usuários externos (o que quer que são permissão desses usuários):
 SuhosinSessionEncrypt=Armazenamento de sessão criptografada pelo Suhosin
 ConditionIsCurrently=Condição é atualmente
 YouUseBestDriver=Você usa o driverque é o melhor driver disponível atualmente.
@@ -728,6 +782,7 @@ AccountCodeManager=Módulo de geração dos códigos contabíls (clientes/Fornec
 ModuleCompanyCodeAquarium=Devolve um código contabíl composto de %s seguido do código Fornecedor de provedor para o código contabíl de provedor, e %s seguido do código Fornecedor de cliente para o código contabíl de cliente.
 ModuleCompanyCodePanicum=Devolve um código contabíl vazio.
 ModuleCompanyCodeDigitaria=Devolve um código contabíl composto seguindo o código de Fornecedor. o código está formado por caracter0 ' C ' em primeiroa posição seguido dos 5 primeiroos caracteres do código Fornecedor.
+NotificationsDesc=E-mails notificações este recurso permite que você envie e-mail automático silenciosamente, para alguns eventos Dolibarr. Alvos de notificações podem ser definidos: <br> * Por terceiros contatos (clientes ou fornecedores), um contato de tempo. <br> * Ou definindo endereços de e-mail alvo globais na página de configuração do módulo.
 ModelModules=Modelos de documentos
 DocumentModelOdt=Gere documentos a partir de modelos OpenDocuments (. ODT ou. Arquivos ODS para OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Marca d'água sobre o projeto de documento
@@ -776,16 +831,21 @@ AddShippingDateAbility=possibilidade de determinar uma data de entregas
 AddDeliveryAddressAbility=possibilidade de selecionar uma endereço de envio
 UseOptionLineIfNoQuantity=uma linha de produto/serviço que tem uma quantidade nula se considera como uma Opção
 WatermarkOnDraftProposal=Marca d'água em projetos de propostas comerciais (nenhum se estiver vazio)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta
+FreeLegalTextOnAskPriceSupplier=Texto livre sobre os pedidos de preços de fornecedores
 OrdersSetup=configuração do módulo pedidos
 OrdersModelModule=Modelos de documentos de pedidos
 HideTreadedOrders=Esconder as ordens tratados ou cancelados na lista
 WatermarkOnDraftOrders=Marca d'água em projetos de ordem (nenhum se estiver vazio)
+ShippableOrderIconInList=Adicionar um ícone na lista de pedidos que indicam se a ordem é shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Informar conta bancária de destino da ordem
 ClickToDialSetup=configuração do módulo Click To Dial
 ClickToDialUrlDesc=Url de chamada fazendo click ao ícone telefone. <br>a 'url completa chamada será: URL?login
 Bookmark4uSetup=configuração do módulo Bookmark4u
 InterventionsSetup=configuração do módulo Intervenções
 FreeLegalTextOnInterventions=Texto livre em documentos de intervenção
 WatermarkOnDraftInterventionCards=Marca d'água em documentos de cartão de intervenção (nenhum se estiver vazio)
+ContractsSetup=Contratos / instalação de módulo de Assinaturas
 ContractsNumberingModules=Contratos numeração módulos
 TemplatePDFContracts=Modelos de documentos Contratos
 FreeLegalTextOnContracts=Texto livre em contratos
@@ -856,6 +916,8 @@ LDAPFieldZip=Código Postal
 LDAPFieldZipExample=Exemplo : postalcode
 LDAPFieldTown=Município
 LDAPFieldDescriptionExample=Exemplo : description
+LDAPFieldNotePublic=Nota Pública
+LDAPFieldNotePublicExample=Exemplo: publicnote
 LDAPFieldGroupMembersExample=Exemplo: uniqueMember
 LDAPFieldBirthdate=data de nascimento
 LDAPFieldSidExample=Exemplo : objectsid
@@ -884,6 +946,7 @@ FilesOfTypeCompressed=Arquivos do tipo são comprimidas pelo servidor HTTP
 FilesOfTypeNotCompressed=Arquivos do tipo não são compactados pelo servidor HTTP
 CacheByServer=Cache por servidor
 CompressionOfResources=A compressão das respostas HTTP
+TestNotPossibleWithCurrentBrowsers=Tal detecção automática não é possível com os navegadores atuais
 ProductSetup=configuração do módulo produtos
 ServiceSetup=Configuração do módulo Serviços
 ProductServiceSetup=Configuração de Produtos e Serviços módulos
@@ -897,6 +960,7 @@ UseSearchToSelectProduct=Use um formulário de pesquisa para escolher um produto
 UseEcoTaxeAbility=Asumir ecotaxa (DEEE)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por default para os produtos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por default para os Fornecedores
+UseUnits=Unidades de apoio
 ProductCodeChecker=Módulo para geração de código do produto e verificação (produto ou serviço)
 ProductOtherConf=A configuração do produto / serviço
 SyslogOutput=Saída do log
@@ -917,15 +981,20 @@ BarcodeDescUPC=Códigos de barra tipo UPC
 BarcodeDescISBN=Códigos de barra tipo ISBN
 BarcodeDescC39=Códigos de barra tipo C39
 BarcodeDescC128=Códigos de barra tipo C128
+BarcodeDescDATAMATRIX=Código de barras do tipo Datamatrix
+BarcodeDescQRCODE=Código de barras do tipo QR code
 BarCodeNumberManager=Gerente de auto definir números de código de barras
 WithdrawalsSetup=configuração do módulo Débitos Diretos
 ExternalRSSSetup=configuração das importações do fluxos RSS
 NewRSS=Sindicação de um Novo fluxos RSS
 MailingEMailError=Voltar E-mail (Erros-to) para e-mails com erros
+MailingDelay=Segundos de espera antes do envio da mensagem seguinte
 NotificationSetup=Configuração do módulo de notificações por e-mail
+FixedEmailTarget=Alvo fixo e-mail
 SendingsSetup=configuração do módulos envios
 SendingsNumberingModules=Expedição de numeração de  módulos
 NoNeedForDeliveryReceipts=na maioria dos casos, as entregas utilizam como nota de entregas ao cliente (lista de produtos a enviar), se recebem e assinam por o cliente. Por o tanto, a hoja de entregas de produtos é uma característica duplicada e rara vez é ativada.
+FreeLegalTextOnShippings=Texto livre sobre transferências
 DeliveryOrderModel=Modelo de ordem de envio
 DeliveriesOrderAbility=Fretes pagos por o cliente
 AdvancedEditor=Formatação avançada
@@ -938,6 +1007,7 @@ OSCommerceTestOk=a login à servidor '%s' sobre a base '%s' por o Usuário '%s'
 OSCommerceTestKo1=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' não se pode efetuar.
 OSCommerceTestKo2=a login à servidor '%s' por o Usuário '%s' ha falhado.
 StockSetup=Configuração do módulo Armazém / Warehouse
+IfYouUsePointOfSaleCheckModule=Se você usar um módulo Ponto de Venda (POS módulo fornecido por padrão ou outro módulo externo), esta configuração pode ser ignorado pelo seu modulo ponto de Venda. A maioria modulo ponto de Vendas são projetados para criar imediatamente uma fatura e diminuir estoque por padrão tudo o que são opções aqui. Então, se você precisa ou não ter uma diminuição de ações quando registrar uma venda a partir do seu ponto de venda, verifique também a configuração do seu módulo POS.
 Menu=Seleção dos menus
 MenuHandler=Gerente de menus
 HideUnauthorizedMenu=Esconder menus não autorizadas (cinza)
@@ -979,9 +1049,12 @@ AGENDA_DEFAULT_FILTER_STATUS=Use automaticamente este estado no filtro das busca
 AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado
 ClickToDialDesc=Este módulo permite agregar um ícone depois do número de telefone de contatos Dolibarr. um clic neste ícone, Chama a um servidor com uma URL que se indica a continuação. Esto pode ser usado para Chamar à sistema call center de Dolibarr que pode Chamar à número de telefone em um sistema SIP, por Exemplo.
 CashDeskSetup=configuração do módulo de Caixa registradora
+CashDeskThirdPartyForSell=Terceiro padrão para uso em vendas
 CashDeskBankAccountForSell=conta de efetivo que se utilizará para as vendas
 CashDeskBankAccountForCheque=Padrão conta para usar a receber pagamentos por cheque
 CashDeskBankAccountForCB=Padrão conta para usar a receber pagamentos por cartões de crédito
+CashDeskDoNotDecreaseStock=Desativar diminuição de ações quando uma venda é feita a partir de ponto de venda (se "não", diminuição de ações é feito para cada vendem feito a partir de POS, o que for opção definida no módulo de estoque).
+CashDeskIdWareHouse=Forçar e restringir armazém a usar para redução de ações
 BookmarkSetup=Configuração do Módulo de Favoritos
 BookmarkDesc=Este módulo lhe permite Gerenciar os links e acessos diretos. também permite Adicionar qualquer página de Dolibarr o link web ao menu de acesso rápido da esquerda.
 NbOfBoomarkToShow=Número máximo de marcadores que se mostrará ao menu
@@ -989,6 +1062,12 @@ WebServicesSetup=Configuração do módulo Webservices
 WebServicesDesc=Ao habilitar este módulo, Dolibarr se tornar um servidor web service para fornecer serviços web diversos.
 WSDLCanBeDownloadedHere=Arquivos descritores WSDL dos serviços prestados pode ser baixado aqui
 EndPointIs=Clientes SOAP devem enviar seus pedidos para o terminal Dolibarr Disponível em URL
+ApiSetup=Instalação de módulo de API
+ApiDesc=Ao ativar este módulo, Dolibarr se tornar um servidor REST para fornecer serviços de web diversos.
+ApiProductionMode=Ative o modo de produção
+ApiEndPointIs=Você pode acessar a API na url
+ApiExporerIs=Você pode explorar a API na url
+OnlyActiveElementsAreExposed=Somente elementos de módulos habilitados são expostos
 BankSetupModule=Configuração do módulo Banco
 FreeLegalTextOnChequeReceipts=Texto livre em recibos de verificação
 BankOrderShow=Ordem de apresentação das contas bancárias para os países usando o "número do banco detalhada"
@@ -999,6 +1078,7 @@ SuppliersSetup=Configuração Módulo Fornecedor
 SuppliersCommandModel=Modelo completo de ordem fornecedor (logo. ..)
 SuppliersInvoiceModel=Modelo completo da fatura do fornecedor (logo. ..)
 SuppliersInvoiceNumberingModel=Faturas de fornecedores de numeração modelos
+IfSetToYesDontForgetPermission=Se definido como sim, não se esqueça de fornecer permissões a grupos ou usuários autorizados para a segunda aprovação
 GeoIPMaxmindSetup=Configuração do módulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo que contém a tradução Maxmind ip país. Exemplos:  / Usr / local / share / GeoIP / GeoIP.dat / Usr / share / GeoIP / GeoIP.dat
 NoteOnPathLocation=Note-se que o seu ip para o arquivo de dados do país devem estar dentro de um diretório do seu PHP pode ler (Verifique se o seu PHP open_basedir configuração e as permissões do sistema de arquivos).
@@ -1017,8 +1097,22 @@ FiscalYear=Ano fiscal
 FiscalYearCard=Ficha ano fiscal
 DeleteFiscalYear=Remover ano fiscal
 ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ?
+Opened=Aberto
 AlwaysEditable=Sempre pode ser editado
+MAIN_APPLICATION_TITLE=Forçar nome visível da aplicação (aviso: definir o seu próprio nome aqui pode quebrar recurso de login preenchimento automático ao usar aplicativos móveis DoliDroid)
 NbMajMin=Número mínimo de caracteres maiúsculos
 NbNumMin=Número mínimo de caracteres numéricos
 NbSpeMin=Número mínimo de caracteres especiais
+SortOrder=Ordem de classificação
 TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores
+IncludePath=Incluir caminho (definido na variável %s)
+YouMayFindNotificationsFeaturesIntoModuleNotification=Você pode encontrar opções para notificações por email por habilitar e configurar o módulo "Notificação".
+ListOfNotificationsPerContact=Lista de notificações por contato*
+ListOfFixedNotifications=Lista de notificações fixas
+GoOntoContactCardToAddMore=Vá na guia "Notificações" de um contato thirdparty para adicionar ou remover notificações para contatos / endereços
+Threshold=Limite
+BackupDumpWizard=Assistente para construir arquivo de despejo de backup do banco de dados
+SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
+SomethingMakeInstallFromWebNotPossible2=Por esta razão, o processo de atualização descrito aqui é apenas manual de passos que um usuário privilegiado pode fazer.
+HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre elas
+PressF5AfterChangingThis=Pressione F5 no teclado depois de mudar este valor para tê-lo eficaz
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index a1a02cb7e67..994c57e365a 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -36,7 +36,9 @@ InvoiceValidatedInDolibarr=Fatura %s validada
 InvoiceValidatedInDolibarrFromPos=Fatura %s validada no POS
 InvoiceBackToDraftInDolibarr=Fatura %s volta ao estado de rascunho
 OrderValidatedInDolibarr=Pedido %s validado
+OrderDeliveredInDolibarr=Ordem %s classificadas entregues
 OrderCanceledInDolibarr=Pedido %s cancelado
+OrderBilledInDolibarr=Ordem %s classificadas faturado
 OrderApprovedInDolibarr=Pedido %s aprovado
 OrderRefusedInDolibarr=Pedido %s recusado
 OrderBackToDraftInDolibarr=Pedido %s volta ao estado de rascunho
@@ -45,7 +47,9 @@ OrderSentByEMail=Pedido do cliente %s enviado por e-mail
 InvoiceSentByEMail=Fatura do cliente %s enviada por e-mail
 SupplierOrderSentByEMail=Pedido do fornecedor %s enviado por e-mail
 SupplierInvoiceSentByEMail=Fatura do fornecedor %s enviada por e-mail
+ShippingSentByEMail=Embarque %s enviada por e-mail
 ShippingValidated=Envio %s validado
+InterventionSentByEMail=Intervenção %s enviada por e-mail
 NewCompanyToDolibarr=Fornecedor criado
 DateActionPlannedStart=Data de início do planejamento
 DateActionPlannedEnd=Data final do planejamento
@@ -53,6 +57,7 @@ DateActionDoneStart=Data real de início
 DateActionDoneEnd=Data real de fim
 DateActionEnd=Data de término
 AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros para filtrar o resultado:
+AgendaUrlOptions2=<b>login =%s</b> ​​para restringir a saída para ações criadas por ou atribuídos para o <b>usuário %s.</b>
 AgendaUrlOptions3=<b>logina=%s</b> para restringir açoes de propriedade do usuario <b>%s</b>.
 AgendaUrlOptions4=<b>Usuário=%s</b> permitir apenas resultados para atividades atribuídas ao usuário <b>%s</b>.
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir a saida de açoes associadas ao projeto <b>PROJECT_ID</b>.
@@ -69,3 +74,5 @@ WorkingTimeRange=Intervalo de tempo trabalhado
 WorkingDaysRange=Intervalo de dias trabalhado
 AddEvent=Criar evento
 MyAvailability=Minha disponibilidade
+ActionType=Tipo de Evento
+DateActionBegin=Iniciar a data do evento
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index eb99b0d2d95..1a548f0ed3c 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -21,6 +21,10 @@ CurrentBalance=Saldo atual
 ShowAllTimeBalance=Mostrar Balanço Desde do Inicio
 AllTime=Do inicio
 RIB=Conta Bancaria
+IbanValid=IBAN é válido
+IbanNotValid=IBAN não é válido
+SwiftValid=BIC / SWIFT é válido
+SwiftNotValid=BIC / SWIFT não é válido
 AccountStatement=Extrato da Conta
 AccountStatementShort=Extrato
 AccountStatements=Extratos das Contas
@@ -59,11 +63,12 @@ ListTransactions=Lista Transações
 ListTransactionsByCategory=Lista Transações/Categoria
 TransactionsToConciliate=Registros a Conciliar
 IncludeClosedAccount=Incluir Contas Fechadas
-OnlyOpenedAccount=Somente Contas Abertas
+OnlyOpenedAccount=Apenas contas abertas
 AccountToCredit=Conta de Crédito
 AccountToDebit=Conta de Débito
 DisableConciliation=Desativar a função de Conciliação para esta Conta
 ConciliationDisabled=Função de Conciliação Desativada
+StatusAccountOpened=Aberto
 EditBankRecord=Editar Registo
 AddBankRecord=Adicionar Registo
 AddBankRecordLong=Realizar um registo manual fora de uma fatura
@@ -72,7 +77,6 @@ CustomerInvoicePayment=Pagamento de Cliente
 CustomerInvoicePaymentBack=Pagamento do cliente de volta
 SupplierInvoicePayment=Pagamento a Fornecedor
 WithdrawalPayment=Reembolso
-SocialContributionPayment=Pagamento Carga Social
 FinancialAccountJournal=Diário de Tesouraria da Conta
 BankTransfer=Transferencia Bancaria
 BankTransfers=Transferências Bancarias
@@ -104,6 +108,7 @@ AllAccounts=Todas as Contas bancarias/de Caixa
 BackToAccount=Voltar e a Conta
 FutureTransaction=Transação futura. Impossivel conciliar.
 SelectChequeTransactionAndGenerate=Selecionar/filtrar cheques a se incluir no recibo de deposito e clickar no "Criar"
+InputReceiptNumber=Escolha o extrato bancário relacionadas com a conciliação. Use um valor numérico classificável: AAAAMM ou AAAAMMDD
 EventualyAddCategory=Posivelmente especificar a categoria para se clasificar os registros
 ToConciliate=A se conciliar ?
 ThenCheckLinesAndConciliate=Verificar as linhas presentes no relatorio do banco e clickar
@@ -113,3 +118,5 @@ AllRIB=Todos BAN
 NoBANRecord=Nao tem registro BAN
 DeleteARib=Apagar registro BAN
 ConfirmDeleteRib=Voce tem certeza que quer apagar este registro BAN ?
+StartDate=Data de início
+EndDate=Data final
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index e9e3fe97c2b..efb21a05a68 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -68,6 +68,9 @@ PaymentsReports=Relatórios de Pagamentos
 PaymentsAlreadyDone=Pagamentos Efetuados
 PaymentsBackAlreadyDone=Reembolsos já efetuados
 PaymentRule=Regra de pagamento
+PaymentTerm=Termo de pagamento
+PaymentConditions=Termos de pagamento
+PaymentConditionsShort=Termos de pagamento
 PaymentAmount=Valor a Pagar
 ValidatePayment=Validar Pagamento
 HelpPaymentHigherThanReminderToPay=Atenção, o valor de uma fatura ou mais faturas e maior do que o que resta a pagar.<br>Editar a sua entrada ou confirme e pense em criar uma nota de credito para o excesso recebido por cada fatura paga alem do valor da mesma.
@@ -158,7 +161,6 @@ NumberOfBills=Nº de Faturas
 NumberOfBillsByMonth=Nº de faturas por mês
 AmountOfBills=Valor das Faturas
 AmountOfBillsByMonthHT=Quantidade de faturas por mês (sem ICMS)
-ShowSocialContribution=Mostrar contribução social
 ShowBill=Ver Fatura
 ShowInvoice=Ver Fatura
 ShowInvoiceReplace=Ver fatura retificativa
@@ -225,7 +227,6 @@ BillAddress=Endereço de Faturamento
 HelpEscompte=Um <b>Desconto</b> é um desconto acordado sobre uma fatura dada, a um cliente que realizou o seu pagamento muito antes do vencimiento.
 HelpAbandonBadCustomer=Este valor foi esquecido (cliente classificado como devedor) e considera-se como uma perda excepcional.
 HelpAbandonOther=Este valor foi abandonado já que se tratava de um erro de faturação (mal introdução de dados, fatura sustituida por outra).
-IdSocialContribution=Id Gasto Social
 PaymentId=Id Pagamento
 InvoiceId=Id Fatura
 InvoiceRef=Ref. Fatura
@@ -248,8 +249,11 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual
 ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
 RelatedBill=Fatura Anexo
 RelatedBills=Faturas Anexos
+RelatedCustomerInvoices=Faturas de clientes relacionadas
+RelatedSupplierInvoices=Faturas de fornecedores relacionados
 LatestRelatedBill=Últimas fatura correspondente
 WarningBillExist=Atenção, um ou mais fatura já existem
+MergingPDFTool=Mesclando ferramenta PDF
 PaymentConditionShort30D=30 Dias
 PaymentCondition30D=Pagamento a 30 Dias
 PaymentConditionShort30DENDMONTH=30 Dias Fim do Mês
@@ -310,6 +314,7 @@ DisabledBecausePayments=Não é possível uma vez já que existem alguns pagamen
 CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento já que há pelo menos uma fatura classificada como pago
 ExpectedToPay=Esperando pagamento
 PayedByThisPayment=Pago
+ClosePaidInvoicesAutomatically=Classificar "Pago" todo o padrão, situação ou faturas de substituição inteiramente pago.
 ClosePaidCreditNotesAutomatically=Classificar "pagou" todas as notas de crédito totalmente pago de volta.
 AllCompletelyPayedInvoiceWillBeClosed=Todos fatura que permanecer sem pagar será automaticamente fechada ao status de "Paid".
 ToMakePaymentBack=pagar tudo
@@ -329,11 +334,15 @@ TypeContact_invoice_supplier_external_BILLING=Contato da Fatura de Fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Contato de envio do fornecedor
 TypeContact_invoice_supplier_external_SERVICE=Contato de servico do fornecedor
 InvoiceFirstSituationAsk=Primeira situação da fatura
+InvoiceFirstSituationDesc=A <b>situação faturas</b> são amarradas às situações relacionadas com uma progressão, por exemplo, a progressão de uma construção. Cada situação é amarrada a uma fatura.
 InvoiceSituation=Situação da fatura
 InvoiceSituationAsk=Fatura acompanhando a situação
 InvoiceSituationDesc=Criar uma nova situação na sequência de um um já existente
+SituationAmount=Situação montante da fatura (líquida)
+SituationDeduction=Situação subtração
 CreateNextSituationInvoice=Criar proxima situação
+NotLastInCycle=Esta fatura não é a última no ciclo e não deve ser modificado.
 DisabledBecauseNotLastInCycle=A próxima situação já existe.
 CantBeLessThanMinPercent=O progresso não pode ser menor do que o seu valor na situação anterior.
-NoSituations=Não há situações abertas
+NoSituations=Não há situações em aberto
 InvoiceSituationLast=Fatura final e geral
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 5d8843ce523..7c0c6439841 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -13,7 +13,7 @@ BoxLastValidatedCustomerOrders=Últimos pedidos de clientes validados
 BoxLastActions=Últimas ações
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contatos/endereços
-BoxCurrentAccounts=Abrir saldo das contas
+BoxCurrentAccounts=Abrir Equilíbrio de contas
 BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes
 BoxTotalUnpaidSuppliersBills=Total de faturas pendentes de fornecedores
 BoxTitleLastRssInfos=As %s últimas Infos de %s
@@ -35,7 +35,7 @@ BoxTitleLastModifiedMembers=Últimos %s Membros
 BoxTitleLastFicheInter=As últimas % s intervenções modificadas
 BoxTitleOldestUnpaidCustomerBills=As %s faturas mais antigas de clientes pendente de cobrança
 BoxTitleOldestUnpaidSupplierBills=As %s faturas mais antigas de fornecedores pendente de pagamento
-BoxTitleCurrentAccounts=Abrir saldo das contas
+BoxTitleCurrentAccounts=Abrir saldos de contas
 BoxTitleTotalUnpaidCustomerBills=Faturas de Clientes Pendentes de Cobrança
 BoxTitleTotalUnpaidSuppliersBills=Faturas de Fornecedores Pendentes de Pagamento
 BoxTitleLastModifiedContacts=Últimos  %s contatos/endereços
@@ -74,3 +74,4 @@ BoxProductDistribution=Produtos / Serviços e distribuição
 BoxProductDistributionFor=Distribuição de para
 ForCustomersInvoices=Faturas de Clientes
 ForCustomersOrders=Ordem de clientes
+LastXMonthRolling=O último mês de rolamento %s
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 241cec78db8..f14bc256479 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -1,16 +1,77 @@
 # Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag / Categoria
+Rubriques=Tags / Categorias
+categories=tags / categorias
+TheCategorie=A tag / categoria
+NoCategoryYet=Nenhuma tag / categoria deste tipo criado
 In=Em
+CategoriesArea=Área Tags / Categorias
+SuppliersCategoriesArea=Área tags / categorias de Fornecedores
+CustomersCategoriesArea=Área tags / categorias de Clientes
+ContactsCategoriesArea=Área tags / categorias de Contatos
+MainCats=Principais tags / categorias
+CatList=Lista de tags / categorias
+AllCats=Todas as tags / categorias
+ViewCat=Ver tag / categoria
+NewCat=Adicionar tag / categoria
+NewCategory=Nova tag / categoria
+ModifCat=Modificar tag / categoria
+CatCreated=Tag / categoria criada
+CreateCat=Criar tag / categoria
+CreateThisCat=Criar esta tag / categoria
 NoSubCat=Esta categoria não contém Nenhuma subcategoria.
+FoundCatsForName=Tags / categorias encontradas para o nome:
+FoundSubCatsIn=Subcategorias encontradas no tag / categoria
+ErrSameCatSelected=Você selecionou a mesma tag / categoria várias vezes
+ErrForgotCat=Você esqueceu de escolher o tag / categoria
 ErrForgotField=Esqueceu de atribuir um campo
 ErrCatAlreadyExists=Este nome esta sendo utilizado
+AddProductToCat=Adicionar este produto a um tag / categoria?
+ImpossibleAddCat=Impossível adicionar a tag / categoria
+ImpossibleAssociateCategory=Impossível associar o tag / categoria
+ObjectAlreadyLinkedToCategory=Elemento já está ligada a esta tag / categoria.
+CategorySuccessfullyCreated=Esta tag / categoria %s foi adicionado com sucesso.
+ProductIsInCategories=Produto / serviço está ligada à seguintes tags / categorias
+MemberIsInCategories=Esse membro está vinculado a seguintes membros tags / categorias
+ContactIsInCategories=Este contato é ligado à sequência de contatos tags / categorias
+ProductHasNoCategory=Este produto / serviço não está em nenhuma tags / categorias
+SupplierHasNoCategory=Este fornecedor não está em nenhum tags / categorias
+MemberHasNoCategory=Este membro não está em nenhum tags / categorias
+ContactHasNoCategory=Este contato não está em nenhum tags / categorias
+ClassifyInCategory=Adicionar para tag / categoria
+NotCategorized=Sem tag / categoria
 ContentsVisibleByAll=O Conteúdo Será Visivel por Todos?
 ContentsVisibleByAllShort=Conteúdo visivel por todos
 ContentsNotVisibleByAllShort=Conteúdo não visivel por todos
+DeleteCategory=Excluir tag / categoria
+ConfirmDeleteCategory=Tem certeza de que deseja excluir esta tag / categoria?
+RemoveFromCategory=Remover o link com tag / categoria
+RemoveFromCategoryConfirm=Tem certeza de que deseja desvincular a operação do tag / categoria?
+NoCategoriesDefined=Nenhuma tag / categoria definida
+SuppliersCategoryShort=Fornecedores tag / categoria
+CustomersCategoryShort=Clientes tag / categoria
+ProductsCategoryShort=Produtos tag / categoria
+MembersCategoryShort=Membros tag / categoria
+SuppliersCategoriesShort=Fornecedores tags / categorias
+CustomersCategoriesShort=Clientes tags / categorias
+ProductsCategoriesShort=Produtos tags / categorias
+MembersCategoriesShort=Tag / categorias de Membros
+ContactCategoriesShort=Contatos tags / categorias
 ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto.
 ThisCategoryHasNoSupplier=Esta categoria não contém a nenhum fornecedor.
 ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente.
 ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro.
 ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato.
+CategId=ID Tag / categoria
+CatSupList=Lista de fornecedores tags / categorias
+CatProdList=Lista de produtos tags / categorias
+CatMemberList=Lista de membros tags / categorias
+CatContactList=Lista de contatos tags / categorias
+CatSupLinks=Ligações entre fornecedores e tags / categorias
+CatMemberLinks=Ligações entre os membros e tags / categorias
+DeleteFromCat=Remover de tags / categoria
 ExtraFieldsCategories=atributos complementares
+CategoriesSetup=Configuração Tags / categorias
 CategorieRecursivHelp=Se ativado, o produto também será ligada a categoria original quando adicionando em uma subcategoria
 AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
+ShowCategory=Mostrar tag / categoria
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index 98fe235628e..b07a4443788 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -48,6 +48,7 @@ LastProspectContactInProcess=Contato em Curso
 LastProspectContactDone=Clientes Potenciais Contactados
 DateActionPlanned=Data Planificação
 ActionAskedBy=Ação Questionada por
+ActionAffectedTo=Evento atribuído a
 ActionDoneBy=Ação Realizada por
 ActionUserAsk=Registrada por
 ErrorStatusCantBeZeroIfStarted=Se o campo '<b>Ficha de Realização</b>' tiver dados a ação está em curso, por isso o campo 'Estado' não pode ser 0%%.
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 3f5b2428e93..dfe2558d495 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -71,6 +71,7 @@ ProfId3RU=Id prof. 3 (CGC)
 ProfId4RU=Id prof. 4 (Livre)
 VATIntra=Cadastro Nacional Pessoa Juridica - CNPJ
 ProspectCustomer=Cliente em potencial/Cliente
+Prospect=Cliente em potencial
 CompanyHasRelativeDiscount=Este cliente tem um Desconto por default de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente não tem Descontos relativos por default
 CompanyHasAbsoluteDiscount=Este cliente tem <b>%s %s</b> Descontos fixos disponíveis
@@ -179,5 +180,10 @@ OutstandingBill=Max. permitido para uma nota aberta
 OutstandingBillReached=Chegou ao max permitido para nostas abertas
 MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador seq�êncial sem ruptura e sem Voltar a 0.
 ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
-SearchThirdparty=Procurar cliente/fornecedor
+SearchThirdparty=Pesquisar terceiros
 SearchContact=Procurar contato
+MergeOriginThirdparty=Duplicar terceiros (terceiros que deseja excluir)
+MergeThirdparties=Mesclar terceiros
+ConfirmMergeThirdparties=Tem certeza de que deseja mesclar esse terceiro para o atual? Todos os objetos vinculados (notas fiscais, ordens, ...) será movido para o terceiro atual, assim você será capaz de excluir o duplicado.
+ThirdpartiesMergeSuccess=Terceiros foram mesclados
+ErrorThirdpartiesMerge=Houve um erro ao excluir os terceiros. Por favor, verifique o log. As alterações foram revertidas.
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 064c999d7fd..60c0f0ff0e8 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -16,6 +16,7 @@ BillsForSuppliers=Faturas de Fornecedores
 Income=Depositos
 PaymentsNotLinkedToInvoice=pagamentos vinculados a Nenhuma fatura, por o que nenhum Fornecedor
 PaymentsNotLinkedToUser=pagamentos não vinculados a um usuário
+AccountingResult=Resultado contábil
 Piece=Contabilidade Doc.
 AmountHTVATRealPaid=líquido pago
 VATToPay=ICMS a Pagar
@@ -37,7 +38,6 @@ ToGet=Para restituir
 MenuSpecialExpenses=Despesas especiais
 PaymentCustomerInvoice=Pagamento de fatura do cliente
 PaymentSupplierInvoice=Pagamento de fatura do fornecedor
-PaymentSocialContribution=pagamento gasto social
 PaymentVat=Pagamento ICMS
 PaymentSalary=Pagamento de salário
 DateStartPeriod=Período de início e data
@@ -51,7 +51,6 @@ LT1PaymentES=RE pagamento
 LT1PaymentsES=RE pagamentos
 VATPayment=Pagamento ICMS
 VATPayments=Pagamentos ICMS
-SocialContributionsPayments=Pagamento de contribuições sociais
 ShowVatPayment=Ver Pagamentos ICMS
 TotalVATReceived=Total do ICMS Recebido
 AccountNumber=Nº de conta
@@ -62,8 +61,6 @@ AccountancyExport=exportação Contabilidade
 ErrorWrongAccountancyCodeForCompany=Código contabilidade incorreto para %s
 LastCheckReceiptShort=Ultimos %s cheques recebidos
 NbOfCheques=N� de Cheques
-ConfirmPaySocialContribution=? Tem certeza que quer classificar esta gasto social como paga?
-ConfirmDeleteSocialContribution=? Tem certeza que quer eliminar esta gasto social?
 CalcModeVATDebt=<b>Modo% S VAT compromisso da contabilidade% s.</b>
 CalcModeVATEngagement=<b>Modo% SVAT sobre os rendimentos e as despesas% s.</b>
 CalcModeDebt=Modo <b>% s declarações de dívidas% s </ b> diz <b> Compromisso da contabilidade </ b>.
@@ -131,10 +128,7 @@ CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Métod
 CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequado aplicar mesma regra de cálculo e obter mesmo resultado esperado pelo seu fornecedor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de <b>contabilidade de caixa</b> não é relevante. Este relatório está disponível somente quando utilizar o modo de <b>contabilidade engajamento</b> (ver configuração do módulo de contabilidade).
 AccountancyJournal=Codigo do jornal fiscal
-ACCOUNTING_VAT_ACCOUNT=Codigo contavel padrao para credito VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Codigo contavel padrao para pagamento do VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Codigo contavel padrao para clientes
 ACCOUNTING_ACCOUNT_SUPPLIER=Codigo contavel padrao para fornecedores
-CloneTax=Clonar contribuição social
-ConfirmCloneTax=Confirmar clonação da contribuição social
 CloneTaxForNextMonth=Clonar para o proximo mes
diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang
index e345252161d..2a176ef5269 100644
--- a/htdocs/langs/pt_BR/contracts.lang
+++ b/htdocs/langs/pt_BR/contracts.lang
@@ -13,6 +13,7 @@ ServiceStatusLate=Em Serviço, Expirado
 ServiceStatusClosed=Encerrado
 ServicesLegend=Legenda para os Serviços
 Contracts=Contratos
+ContractsAndLine=Contratos e linha de contratos
 NoContracts=Sem Contratos
 MenuInactiveServices=Serviços Inativos
 MenuRunningServices=Serviços Ativos
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 2c7721204b6..e660f6fa32b 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -1,9 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 About =Sobre
 CronAboutPage =Pagina sobre Cron
-Permission23101 =Ler tarefa agendada
-Permission23102 =Criar/atualizar tarefa agendada
-Permission23103 =Apagar tarefa agendada
+Permission23101 =Leia trabalho Programado
+Permission23102 =Criar / atualização de tarefa agendada
+Permission23103 =Excluir trabalho agendado
+Permission23104 =Executar trabalho agendado
 CronSetup=Configuração do gerenciamento de trabalho agendado
 URLToLaunchCronJobs=URL para checar e iniciar os cron se necessario
 OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho
@@ -17,14 +18,21 @@ CronListInactive=Lista de trabalhos nao ativos
 CronDateLastRun=Ultimo acionamento
 CronLastOutput=Saida do ultimo acionamento
 CronLastResult=Codigo do ultimo resultado
+CronList=As tarefas agendadas
+CronDelete=Excluir trabalhos agendados
+CronConfirmDelete=Tem certeza de que deseja apagar estes trabalhos agendados?
+CronExecute=Iniciar trabalhos agendadas
+CronConfirmExecute=Tem certeza de que deseja executar essas tarefas programadas agora?
+CronInfo=Módulo de tarefas agendadas permitem executar trabalho que foram planejadas
+CronWaitingJobs=Esperando empregos
 CronTask=Trabalho
 CronNone=Nenhum
 CronDtStart=Data inicio
 CronDtEnd=Data fim
 CronDtNextLaunch=Proxima execuçao
 CronDtLastLaunch=Ultima execuçao
-CronFrequency=Frequencia
-CronClass=Clase
+CronFrequency=Freqüência
+CronClass=Classe
 CronMethod=Metodo
 CronModule=Modulo
 CronAction=Açao
@@ -36,8 +44,8 @@ CronNbRun=Nr. execuçao
 CronEach=Cada
 JobFinished=Trabalho iniciado e terminado
 CronAdd=Adicionar trabalho
-CronHourStart=Hora e data do inicio do trabalho
-CronEvery=E execute cada tarefa
+CronHourStart=Iniciar a hora e data de emprego
+CronEvery=Executar cada trabalho
 CronObject=Instancia/Objeto a se criar
 CronArgs=Parametros
 CronSaveSucess=Salvo corretamente
@@ -55,9 +63,11 @@ CronObjectHelp=O nome do objeto a ser carregado. Por exemplo para buscar método
 CronMethodHelp=O método de objeto para o lançamento. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do método é <i>fecth</i>
 CronArgsHelp=Os argumentos do método. Por exemplo para buscar método do objeto Product do Dolibarr /htdocs/produto/class/product.class.php, o valor de paramtetros pode ser <i>0, ProductRef</i>
 CronCommandHelp=A linha de comando do sistema a se executar.
+CronCreateJob=Criar novo trabalho agendado
 CronInfoPage=Informaçao
-CronType=Tipo tarefa
+CronType=Tipo de emprego
 CronType_method=Chamar metodo da classe Dolibarr
 CronType_command=Comando Shell
 CronCannotLoadClass=Nao e possivel carregar a classe %s ou o objeto %s
 UseMenuModuleToolsToAddCronJobs=Vá ao menu "Principal - Módulo de ferramentas - Lista de trabalhos" para ver e editar a programação dos trabalhos.
+TaskDisabled=trabalho desativado
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index a4d3db1317d..db8c55b3504 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -6,6 +6,8 @@ Donor=Dador
 Donors=Dadores
 AddDonation=Criar uma doação
 NewDonation=Nova Doação
+DeleteADonation=Excluir uma doação
+ConfirmDeleteADonation=Tem certeza de que deseja excluir esta doação?
 ShowDonation=Mostrar doaçaõ
 DonationsPaid=Doações pagas
 DonationsReceived=Doações Recebidas
@@ -14,6 +16,8 @@ DonationsNumber=Número de Doações
 DonationsArea=Área de Doações
 DonationStatusPaid=Doaçaõ recebida
 DonationStatusPromiseValidatedShort=Validada
+DonationTitle=Recibo de doação
+DonationDatePayment=Data de pagamento
 DonationReceipt=Recibo doaçaõ
 DonationsModels=Modelo de documento de recepção de Doação
 LastModifiedDonations=As ultimas %s doações modificadaas
@@ -24,3 +28,4 @@ MinimumAmount=O montante mínimo é de %s
 DONATION_ART200=Mostrar o artigo 200 do CGI se você está preocupado
 DONATION_ART238=Mostrar o artigo 238 do CGI se você está preocupado
 DONATION_ART885=Mostrar o artigo 885 do CGI se você está preocupado
+DonationPayment=Pagamento doação
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index fc051f05a77..12eec79723a 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -18,6 +18,7 @@ ErrorFromToAccountsMustDiffers=a conta origem e destino devem ser diferentes.
 ErrorBadThirdPartyName=Nome de Fornecedor incorreto
 ErrorProdIdIsMandatory=Obrigatório
 ErrorBadCustomerCodeSyntax=a sintaxis do código cliente é incorreta
+ErrorBadBarCodeSyntax=Bad sintaxe para código de barras. Pode ser que você definir um tipo de código de barras mal ou você definida uma máscara de código de barras para a numeração que não coincide com o valor verificado.
 ErrorBarCodeRequired=Código de barras necessário
 ErrorBarCodeAlreadyUsed=Código de barras já utilizado
 ErrorUrlNotValid=O Endereço do Site está incorreta
@@ -64,6 +65,7 @@ ErrorRecordIsUsedCantDelete=Não é possível excluir registro. Ele já é usado
 ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
 ErrorContactEMail=Ocorreu um erro técnico. Por favor, contate o administrador no seguinte e-mail <b>%s</b> e forneça o seguinte código de erro <b>%s</b> em sua mensagem. Ou, se possível, adicione uma foto da tela - print screen.
 ErrorWrongValueForField=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não corresponde <b>regra% s)</b>
+ErrorFieldValueNotIn=Valor errado para o número do campo <b>%s</b> (valor <b>'%s'</b> não é um valor disponível no campo<b>%s</b> da <b>tabela% s =%s)</b>
 ErrorFieldRefNotIn=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não é <b>um% s</b> ref existente)
 ErrorsOnXLines=Erros no registro de <b>origem% s</b> (s)
 ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo "% s"
@@ -119,16 +121,33 @@ ErrorCantDeletePaymentReconciliated=Não posso deletar o pagamento que gerou uma
 ErrorCantDeletePaymentSharedWithPayedInvoice=Não e possivel cancelar o pagamento condiviso para pelo menos uma fatura com estado Pago
 ErrorPriceExpression1=Não é possível atribuir a constante %s'
 ErrorPriceExpression2=Não é possível redefinir a função built-in '%s'
+ErrorPriceExpression3=variavel não definida '%s' na definição de função
 ErrorPriceExpression4=Caracter Ilegal '%s'
 ErrorPriceExpression5=Inesperado '%s'
 ErrorPriceExpression6=Número errado de argumentos (%s dado, %s esperado)
 ErrorPriceExpression8=Operador Inesperado '%s'
 ErrorPriceExpression9=Ocorreu um erro inesperado
+ErrorPriceExpression10=Iperator '%s' não tem operando
+ErrorPriceExpression11=Esperando '%s'
 ErrorPriceExpression14=Divisão por zero
+ErrorPriceExpression17=Variável não definida '%s'
 ErrorPriceExpression19=Expressão não encontrada
 ErrorPriceExpression20=Expressão vazia
+ErrorPriceExpression21=Resultado vazio '%s'
+ErrorPriceExpression22=Resultado negativo '%s'
+ErrorPriceExpressionInternal=Erro interno '%s'
+ErrorPriceExpressionUnknown=Erro desconhecido '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Origem e de destino de armazéns devem ser diferentes
-ErrorTryToMakeMoveOnProductRequiringBatchData=Erro, tentando fazer um movimento de estoque, sem lote / informação de série, em um produto que requer lote / informação de série.
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas as recepções gravadas primeiro devem ser verificada (aprovado) antes de serem autorizados a fazer esta ação
+ErrorGlobalVariableUpdater0=Pedido HTTP falhou com o erro '%s'
+ErrorGlobalVariableUpdater1=Formato JSON inválido '%s'
+ErrorGlobalVariableUpdater2=Faltando parâmetro '%s'
+ErrorGlobalVariableUpdater3=Os dados solicitados não foram encontrados no resultado
+ErrorGlobalVariableUpdater4=Cliente SOAP falhou com o erro '%s'
+ErrorGlobalVariableUpdater5=Nenhuma variável global selecionado
+ErrorFieldMustBeANumeric=O campo <b>%s</b> deve ser um valor numérico
+ErrorFieldMustBeAnInteger=O campo <b>%s</b> deve ser um inteiro
+ErrorMandatoryParametersNotProvided=Parâmetro (s) de preenchimento obrigatório não fornecidas
 WarningMandatorySetupNotComplete=Parâmetros de configuração obrigatórios ainda não estão definidos
 WarningSafeModeOnCheckExecDir=Atenção, a opção PHP <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
 WarningAllowUrlFopenMustBeOn=o parâmetro <b>allow_url_fopen</b> deve ser especificado a <b>on</b> ao Arquivo <b>php.ini</b> para discolocar deste módulo completamente ativo. deve modificar este Arquivo manualmente
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index 5286aa27371..fd0f6ae6a84 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -1,23 +1,54 @@
 # Dolibarr language file - Source file is en_US - holiday
+Holidays=Folhas
+CPTitreMenu=Folhas
 MenuReportMonth=Relatorio mensal
+NotActiveModCP=Você deve permitir módulo de folhas para visualizar esta página.
+NoCPforUser=Você não tem qualquer dia disponível.
+AddCP=Faça um pedido de licença
+Employe=Empregado
 DateDebCP=Data inicio
 DateFinCP=Data fim
 DateCreateCP=Data criacão
 ToReviewCP=Aguardando aprovação
+ApprovedCP=Aprovado
+CancelCP=Cancelado
 RefuseCP=Negado
 ValidatorCP=Aprovador
+ListeCP=Lista de folhas
 ReviewedByCP=Sera revisado por
+SendRequestCP=Criar pedido de licença
+UpdateAllCP=Atualize as folhas
 ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial.
 ErrorSQLCreateCP=Ocorreu um erro no SQL durante a criação:
+ErrorIDFicheCP=Ocorreu um erro, o pedido de licença não existe.
 ReturnCP=Retorne à página anterior
+ErrorUserViewCP=Você não está autorizado a ler este pedido de licença.
+InfosCP=Informações do pedido de licença
 InfosWorkflowCP=Fluxo de Trabalho de Informação
 RequestByCP=Requisitado por
+TitreRequestCP=Deixar pedido
+NbUseDaysCP=Número de dias de férias consumida
 DeleteCP=Eliminar
 ActionValidCP=Confirmar
 ActionRefuseCP=Não autorizar
+TitleDeleteCP=Excluir o pedido de licença
+ConfirmDeleteCP=Confirme a eliminação do pedido de licença?
+ErrorCantDeleteCP=Erro você não tem o direito de excluir este pedido de licença.
+CantCreateCP=Você não tem o direito de fazer pedidos de licença.
+InvalidValidatorCP=Você deve escolher um aprovador ao seu pedido de licença.
+CantUpdate=Você não pode atualizar este pedido de licença.
 NoDateDebut=Você deve selecionar uma data inicial.
 NoDateFin=Você deve selecionar uma data final.
+ErrorDureeCP=O seu pedido de licença não contém dia de trabalho.
+TitleValidCP=Aprovar o pedido de licença
+ConfirmValidCP=Tem certeza de que deseja aprovar o pedido de licença?
+TitleToValidCP=Enviar pedido de licença
+ConfirmToValidCP=Tem certeza de que deseja enviar a solicitação de licença?
+TitleRefuseCP=Recusar o pedido de licença
+ConfirmRefuseCP=Você está certo de que quer recusar o pedido de licença?
 NoMotifRefuseCP=Você deve selecionar uma razão para não autorizar a requisição.
+TitleCancelCP=Cancelar o pedido de licença
+ConfirmCancelCP=Tem certeza de que deseja cancelar o pedido de licença?
 DetailRefusCP=Motivo da recusa
 DateRefusCP=Data da recusa
 DateCancelCP=Data do cancelamento
@@ -27,17 +58,31 @@ MotifCP=Razão
 UserCP=Usuário
 ErrorAddEventToUserCP=Ocorreu um erro ao adicionar a licença excepcional.
 AddEventToUserOkCP=A adição da licença excepcional tenha sido concluída.
+LogCP=Log de atualizações de dias de férias disponíveis
 ActionByCP=Interpretada por
 PrevSoldeCP=Balanço anterior
 NewSoldeCP=Novo Balanco
+alreadyCPexist=Um pedido de licença já foi feito sobre este período.
 UserName=Apelidos
+LastDayOfHoliday=Último dia de férias
 HolidaysMonthlyUpdate=A atualização mensal
 ManualUpdate=Atualização manual
+HolidaysCancelation=Deixar pedido de cancelamento
+ConfCP=Configuração do módulo de pedido de licença
 DescOptionCP=Descrição da opção
 ValueOptionCP=Valor
+GroupToValidateCP=Grupo com a capacidade de aprovar os pedidos de licença
 ConfirmConfigCP=Validar a configuração
+LastUpdateCP=Última atualização automática de alocação de folhas
 UpdateConfCPOK=Atualizado com sucesso.
 ErrorUpdateConfCP=Ocorreu um erro durante a atualização, por favor, tente novamente.
+DelayForSubmitCP=Prazo de fazer pedidos de licença
+nbUserCP=Número de usuários suportados nas folhas de módulo
+nbHolidayDeductedCP=Número de dias de férias a ser deduzido por dia de férias tomadas
+nbHolidayEveryMonthCP=Número de dias de férias adicionados a cada mês
+Module27130Name=Gestão de pedidos de licença
+Module27130Desc=Gestão de pedidos de licença
+TitleOptionMainCP=Definições principais do pedido de licença
 ValidEventCP=Confirmar
 UpdateEventCP=Eventos de atualização
 NameEventCP=Nome do evento
@@ -56,3 +101,12 @@ UpdateEventOptionCP=Modificar
 ErrorMailNotSend=Ocorreu um erro durante o envio de e-mail:
 NoCPforMonth=Não deixe este mês.
 nbJours=Número de dias
+TitleAdminCP=Configuração das folhas
+HolidaysToValidate=Validar as solicitações de licença
+HolidaysToValidateBody=Abaixo está um pedido de licença para validar
+HolidaysValidated=Pedidos de licença validados
+HolidaysValidatedBody=O seu pedido de licença para %s para %s foi validado.
+HolidaysRefused=Pedido negado
+HolidaysRefusedBody=O seu pedido de licença para %s para %s foi negado pelo seguinte motivo:
+HolidaysCanceledBody=O seu pedido de licença para %s para %s foi cancelada.
+Permission20003=Excluir pedidos de licença
diff --git a/htdocs/langs/pt_BR/incoterm.lang b/htdocs/langs/pt_BR/incoterm.lang
new file mode 100644
index 00000000000..65047fa2de0
--- /dev/null
+++ b/htdocs/langs/pt_BR/incoterm.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - incoterm
+Module62000Desc=Adicione recursos para gerenciar Incoterm
+IncotermLabel=Incotermos
+IncotermSetup=Configurações do modulo Incoterm
+IncotermFunctionDesc=Ativar recursos Incoterm (Terceiros, Propostas, Ordems de clientes, Faturas de clientes, Envios, Ordems de fornecedores)
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index 2e2532dea8c..e41876a3285 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -11,7 +11,12 @@ ConfFileReload=Recarregar todas as informaçoes do arquivo de configuraçao.
 PHPSupportSessions=Esta PHP suporta sessões.
 PHPSupportPOSTGETOk=Esta PHP suporta variáveis GET e POST.
 PHPSupportPOSTGETKo=É possível configurar o PHP não suporta variáveis POST e / ou GET. Verifique se o seu parâmetro <b>variables_order</b> em php.ini.
+PHPSupportGD=Este suporte PHP GD gráfica funções.
+PHPSupportUTF8=Este suporte PHP UTF8 funções.
+PHPMemoryOK=Seu PHP max sessão memória está definido <b>para %s.</b> Isto deve ser suficiente.
 PHPMemoryTooLow=Seu PHP max sessão memória está definido <b>para %s</b> bytes. Isto deve ser muito baixo. Alterar o seu <b>php.inem memory_limit</b> para definir parâmetro para pelo <b>menos %s</b> bytes.
+ErrorPHPDoesNotSupportSessions=Sua instalação não suporta PHP sessões. Esta característica é necessária para tornar Dolibarr trabalho. Verifique a sua configuração do PHP.
+ErrorPHPDoesNotSupportGD=Sua instalação PHP não suporta gráficos função GD. Não gráfico estarão disponíveis.
 ErrorPHPDoesNotSupportUTF8=Sua instalação PHP não suporta UTF8 funções. Dolibarr pode não funcionar corretamente. Resolva este antes de instalar Dolibarr.
 ErrorDirDoesNotExists=Diretório %s não existe.
 ErrorGoBackAndCorrectParameters=Ir para trás e corrigir errado parâmetros.
@@ -30,50 +35,74 @@ License=A usar licença
 ConfigurationFile=Arquivo de configuração
 WebPagesDirectory=Directoria onde armazenar as páginas web
 DocumentsDirectory=Directoria onde armazenar documentos enviados e/ou gerados
+URLRoot=URL de raiz
 ForceHttps=Forcar conexoes seguras (https)
 CheckToForceHttps=Escolha esta opcao para forcar conexoes seguras (https).<br>Isto requere que o servidor web esta configurado para uso com certificado SSL.
 DolibarrDatabase=Base de dados Dolibarr
+DatabaseChoice=Escolha de base de dados
+ServerPortDescription=Database server port. Mantenha vazio se desconhecido.
 DatabasePrefix=Prefixo tabela banco de dados
 AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo
 PasswordAgain=Introduza a password uma segunda vez
 AdminPassword=Password para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo
 CreateDatabase=Criar uma base de dados
 DatabaseSuperUserAccess=Base de dados - Acesso Superuser
+CheckToCreateDatabase=Verifique se caixa de dados não existe e deve ser criado. <br> Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página.
+CheckToCreateUser=Caixa de login, se não existe e deve ser criado. <br> Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página.
 Experimental=(experimental, não operacional)
+Deprecated=(Obsoleto)
+DatabaseRootLoginDescription=Login do usuário permissão para criar novas bases de dados ou de novos usuários, inútil se o seu banco de dados e seu banco de dados já existe login (como quando você está hospedado por um provedor de hospedagem da web).
 KeepEmptyIfNoPassword=Deixar em branco se o usuário não tiver password
 SaveConfigurationFile=Gravar configuração
 ConfigurationSaving=A gravar...
 ServerConnection=Conexão ao servidor
+DatabaseConnection=Conexão à base de dados
 DatabaseCreation=Database criação
 UserCreation=Usuário criação
 CreateDatabaseObjects=Criação dos objetos na base de dados...
+ReferenceDataLoading=Dados de base a carregar...
 TablesAndPrimaryKeysCreation=Tabelas e chaves primárias criação
+OtherKeysCreation=Chaves estrangeiras e índices criação
+FunctionsCreation=Funções criação
 AdminAccountCreation=A criar login do Administradore
 PleaseTypePassword=Por favor escreva uma password, passwords vazias não são permitidas !
 PleaseTypeALogin=Por favor escreva um login !
 PasswordsMismatch=As passwords diferem, tente novamente sff !
 SystemIsInstalled=Instalação completa.
 SystemIsUpgraded=Dolibarr foi atualizado com êxito.
+YouNeedToPersonalizeSetup=Agora necessita de configurar o Dolibarr por forma a corresponder às suas necessidades (aspecto, funcionalidades, ...). Para tal clique no seguinte link:
 AdminLoginCreatedSuccessfuly=Login de Administrador criado com sucesso.
 GoToDolibarr=Vai para Dolibarr
 GoToSetupArea=Prosseguir para a área de configuração
 MigrationNotFinished=A versao do banco de dados nao e competamente atualizada, voce tera que aviar o processo de atualizacao novamente.
 GoToUpgradePage=Vai para a pagina de atualizaçao novamente
+WithNoSlashAtTheEnd=Sem a barra "/" no final
 DirectoryRecommendation=É recomendado que você ponha esta directry das páginas da web diretório.
 AdminLoginAlreadyExists=Dolibarr conta administrador <b>' %s'</b> já existe.
 WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a instalação ou atualização estiver completa, você deve remover o <b>diretório</b> de <b>instalação ou renomeá-lo para install.lock a fim de evitar o seu uso malicioso.</b>
 ThisPHPDoesNotSupportTypeBase=PHP Este sistema não suporta qualquer tipo de interface para acesso de dados %s
 DatabaseMigration=Estrutura migração de dados
+ProcessMigrateScript=Script transformação
+ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ...
 FreshInstall=Fresh instalar
+FreshInstallDesc=Utilize este modo, se esta for a primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleto, mas se você deseja atualizar sua versão, selecione "Atualizar" modo.
 UpgradeDesc=Use este modo se você tiver substituído Dolibarr antigos arquivos com arquivos de uma versão mais recente. Isto irá atualizar o seu banco de dados e dados.
 InstallNotAllowed=Instalação não permitidas pela <b>conf.php</b> permissões
 YouMustCreateWithPermission=Você deve criar o arquivo %s e definir permissões escrever sobre ele para instalar o servidor web durante o processo.
 CorrectProblemAndReloadPage=Corrija o problema e pressione a tecla F5 para recarregar página.
+AlreadyDone=Já migrou
 DatabaseVersion=Database versão
 YouMustCreateItAndAllowServerToWrite=Você deve criar este diretório e para permitir que o servidor da web para escrever nela.
 CharsetChoice=Conjunto de caracteres escolha
+DBSortingCollation=Caracteres triagem fim
+CharacterSetDatabase=Conjunto de caracteres para o banco de dados
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de <b>dados %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
+YouAskLoginCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados <b>login %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
+OrphelinsPaymentsDetectedByMethod=Orphelins pagamento detectado pelo método %s
+RemoveItManuallyAndPressF5ToContinue=Removê-lo manualmente e pressione F5 para continuar.
 KeepDefaultValuesDeb=Voce esta usando o assistente de configuração do Dolibarr do pacote Linux (Ubuntu, Debian, Fedora...), portanto os valores propostos aqui estao ja optimizados. O unico parametro a se completar e a senha do administrador de banco de dados. Mude outros parametros somente se voce sabe o que esta fazendo.
 KeepDefaultValuesProxmox=Voçê esta usando o asistente de configuração do Dolibarr da Proxmox aplicação virtual, portanto os valores propostos aqui estão ja otimizados. Mude-os somente se voçê sabe o que esta fazendo.
+IfLoginDoesNotExistsCheckCreateUser=Se login não existe ainda, você deve verificar a opção "Criar usuário"
 InstallChoiceRecommanded=Versao recomendada para instalação <b>%s</b> da sua versao corrente <b>%s</b>
 InstallChoiceSuggested=<b>Escolha sugerida pelo sistema de installação</b>
 MigrateIsDoneStepByStep=A versão (%s) alvo tem uma lacuna de varias versões, portanto o asistente de instalação retornara com a sugestão seguinte apos terminado esta instalação.
@@ -89,6 +118,8 @@ MigrationShippingDelivery2=Atualizar armazenamento de espediçao 2
 LastStepDesc=<strong>Ultimo passo</strong>: Defina aqui o usuario e a senha que voce planeja usar para conectar-se ao software. Nao perca estas credenciais, pois sao da conta que administra todas as outras contas.
 ActivateModule=Ativar modulo %s
 ShowEditTechnicalParameters=Clique aqui para mostrar/editar parametros avançados (modo avançado)
+WarningUpgrade=Aviso:\nVocê realizou já um backup do banco de dados ?\nIsto é altamente recomendado: por exemplo, devido a alguns bugs em sistemas de bancos de dados (exemplo da versão 5.5.40 do mySql), alguns dados ou tabelas podem ser perdidos durante este processo, por isso é altamente recomendado ter um backup completo de seu banco de dados antes de iniciar a migração.\n\nClique em OK para iniciar o processo de migração...
+ErrorDatabaseVersionForbiddenForMigration=Sua versão de banco de dados é %s. Ele tem uma perda de dados tomada de bug crítico se você fizer mudanças na estrutura de seu banco de dados, como é exigido pelo processo de migração. Por sua razão, a migração não será permitida até que você atualize seu banco de dados para uma versão fixa superior (lista de versão grampeado conhecido: %s)
 MigrationFixData=Correção para dados não normalizados
 MigrationProposal=Migração de dados de propostas comerciais
 MigrationInvoice=Migração de dados para os clientes "faturas
@@ -118,5 +149,6 @@ MigrationProjectUserResp=Dados da migração do campo fk_user_resp de llx_projet
 MigrationProjectTaskTime=Atualizar tempo gasto em sgundos
 MigrationActioncommElement=Atualizar dados nas ações
 MigrationPaymentMode=Migração de dados para o modo de pagamento
+MigrationEvents=Migração de eventos para adicionar proprietário evento na tabela de atribuição
 ShowNotAvailableOptions=Mostrar as opções não disponíveis
 HideNotAvailableOptions=Esconder as opção não disponível
diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang
index 391a68486cd..abefcec4639 100644
--- a/htdocs/langs/pt_BR/interventions.lang
+++ b/htdocs/langs/pt_BR/interventions.lang
@@ -13,6 +13,7 @@ InterventionClassifyUnBilled=Classificar "à faturar"
 StatusInterInvoiced=Faturado
 RelatedInterventions=Intervençoes relativas
 ShowIntervention=Mostrar intervençao
+SendInterventionRef=Apresentação de intervenção %s
 SendInterventionByMail=Enviar por E-mail intervenção
 InterventionCreatedInDolibarr=Intervenção %s criada
 InterventionValidatedInDolibarr=Intervenção %s validada
@@ -28,3 +29,4 @@ ArcticNumRefModelError=Ativação Impossível
 PacificNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn onde yy é o ano, mm. O mês e nnnn um contador seq�êncial sem ruptura e sem ficar a 0
 PacificNumRefModelError=Uma fatura que começa por # $$syymm existe na base e é incompativel com esta numeração. Eliminia  ou renomea-la para ativar este módulo.
 PrintProductsOnFichinter=Imprimi produtos na ficha de intervento
+PrintProductsOnFichinterDetails=intervenções gerados a partir de ordens
diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang
index c724d9a49d9..4ebb88a86c9 100644
--- a/htdocs/langs/pt_BR/languages.lang
+++ b/htdocs/langs/pt_BR/languages.lang
@@ -10,11 +10,13 @@ Language_de_DE=Alemao
 Language_de_AT=Alemao (Austria)
 Language_de_CH=Alemão (Suíça)
 Language_en_AU=Ingles (Australia)
+Language_en_CA=Ingles (Canada)
 Language_en_GB=Ingles (Renho Unido)
 Language_en_IN=Ingles (India)
 Language_en_NZ=Ingles (Nova Zelandia)
 Language_en_SA=Ingles (Arabia Saudita)
 Language_en_US=Ingles (Estados Unidos)
+Language_es_CO=Espanhol (Colômbia)
 Language_es_MX=Espanhol (Mexico)
 Language_et_EE=Estone
 Language_fa_IR=Persio
@@ -27,6 +29,7 @@ Language_he_IL=Ebreo
 Language_hu_HU=Ungeres
 Language_is_IS=Islandes
 Language_ja_JP=Japones
+Language_ka_GE=Georgiano
 Language_nb_NO=Norveges (Bokmal)
 Language_nl_NL=Holandês (Holanda)
 Language_pl_PL=Polones
diff --git a/htdocs/langs/pt_BR/loan.lang b/htdocs/langs/pt_BR/loan.lang
new file mode 100644
index 00000000000..21d18c46f17
--- /dev/null
+++ b/htdocs/langs/pt_BR/loan.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Emprestimo
+Loans=Emprestimos
+NewLoan=Novo emprestimo
+ShowLoan=Mostrar emprestimo
+PaymentLoan=Pagamento do emprestimo
+ShowLoanPayment=Mostrar pagamento do emprestimo
+Interest=Juro
+Nbterms=Numero de termos
+LoanPayment=Pagamento de empréstimo
+ConfirmDeleteLoan=Confirme a exclusão deste empréstimo
+LoanPaid=Empréstimo pago
+ErrorLoanCapital=Montante do empréstimo tem de ser numérico e maior que zero.
+ErrorLoanLength=Prazo do empréstimo tem de ser numérico e maior que zero.
+ErrorLoanInterest=Juros anual tem de ser numérico e maior que zero.
+PurchaseFinanceInfo=Compra e Financiamento Informação
+SalePriceOfAsset=Preço de venda de ativos
+PercentageDown=Percentagem de Down
+LengthOfMortgage=Duração do Mortgage
+AnnualInterestRate=Taxa de juros anual
+ExplainCalculations=Explique Cálculos
+ShowMeCalculationsAndAmortization=Mostre-me os cálculos e amortização
+MortgagePaymentInformation=Informação do pagamento de hipoteca
+DownPayment=Pagamento Inicial
+AmountFinanced=Valor Financiado
+AmortizationMonthlyPaymentOverYears=Amortização de pagamento mensal: <b>%s%</b>de  %s ao longo dos anos
+Totalsforyear=Os totais de ano
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 69d44f38411..53eb4cab598 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -33,7 +33,7 @@ CheckRead=Ler recebidor
 YourMailUnsubcribeOK=O e-mail <b>%s</b> foi removido com sucesso da lista
 MailtoEMail=Hyper-link ao e-mail
 ActivateCheckRead=Permitir uso do atalho "Desenscrever"
-ActivateCheckReadKey=Chave principal para criptar URL de uso para funções "Ler destinatario" e "Desenscrever"
+ActivateCheckReadKey=Chave usada para criptografar URL usado para "confirmação de leitura" e recurso "Unsubcribe"
 EMailSentToNRecipients=E-mail enviado para %s destinatarios.
 XTargetsAdded=<b>%s </b> destinatários adicionados à lista de destino
 EachInvoiceWillBeAttachedToEmail=Documento usando o modelo de fatura padrão que será criado e anexado a cada e-mail.
@@ -78,3 +78,5 @@ ListOfNotificationsDone=Listar todas as notificações de e-mail enviadas
 MailSendSetupIs=Configuração do envio de e-mails foi configurado a '%s'. Este modo não pode ser usado para envios de massa de e-mails.
 MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - EMails%s para mudar o parametro <strong>'%s'</strong> para usar o modo '%s'. Neste modo voçê pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de EMails.
 MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s.
+YouCanAlsoUseSupervisorKeyword=Você também pode adicionar a palavra-chave <strong>__SUPERVISOREMAIL__</strong> ter e-mail que está sendo enviado ao supervisor do usuário (só funciona se um email é definido para este supervisor)
+NbOfTargetedContacts=Número atual de e-mails de contatos direcionados
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 2c65942015a..3cdc90d671b 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -36,12 +36,13 @@ ErrorServiceUnavailableTryLater=Serviço não disponível atualmente. Volte a ex
 ErrorConfigParameterNotDefined=O parâmetro <b>%s</b> não está definido ao arquivo de configuração Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário <b>%s</b> na base de dados do Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o país '%s'.
-ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definido para o pais '%s'.
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
 SelectDate=Selecionar uma data
 SeeAlso=Ver tambem %s
 SeeHere=veja aqui
 BackgroundColorByDefault=Cor do fundo padrão
+FileNotUploaded=O arquivo nao foi carregado
+FileUploaded=O arquivo foi carregado com sucesso
 FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
 NbOfEntries=Nr. de entradas
 GoToWikiHelpPage=Ler ajuda online ( necesita de acosso a internet)
@@ -116,6 +117,8 @@ Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
 Connection=Login
 Now=Agora
+HourStart=Comece hora
+DateAndHour=Data e hora
 DateStart=Data Inicio
 DateEnd=Data Fim
 DateModification=Data Modificação
@@ -130,6 +133,8 @@ DateOperationShort=Data Op.
 DateLimit=Data Límite
 DateRequest=Data Consulta
 DateProcess=Data Processo
+DateApprove=Data de aprovação
+DateApprove2=Data de aprovação (segunda aprovação)
 DurationDay=Día
 Day=Día
 days=Dias
@@ -145,7 +150,7 @@ UnitPriceHT=Preço Base
 UnitPriceTTC=Preço Unit. Total
 PriceU=Preço Unit.
 PriceUHT=Preço Unit.
-PriceUTTC=Preço Unit. Total
+AskPriceSupplierUHT=UP net solicitada
 AmountInvoice=Valor Fatura
 AmountPayment=Valor Pagamento
 AmountHTShort=Valor (neto)
@@ -196,7 +201,13 @@ RemoveFilter=Eliminar filtro
 GeneratedOn=Gerado a %s
 Available=Disponivel
 NotYetAvailable=Ainda não disponível
+Categories=Tags / categorias
+Category=Tag / categoria
 to=para
+ApprovedBy=Aprovado por
+ApprovedBy2=Aprovado pelo (segunda aprovação)
+Approved=Aprovado
+Refused=Recusado
 ByUsers=Por usuário
 CurrentLogin=Login atual
 FebruaryMin=Fev
@@ -226,6 +237,7 @@ NbOfThirdParties=Numero de Fornecedores
 NbOfObjects=Numero de Objetos
 NbOfReferers=Numero de Referencias
 Referers=Referindo-se objetos
+Uncheck=Desmarque
 Entities=Entidadees
 CustomerPreview=Historico Cliente
 SupplierPreview=Historico Fornecedor
@@ -288,6 +300,7 @@ BySalesRepresentative=Por vendedor representante
 LinkedToSpecificUsers=Conectado com um contato particular do usuario
 DeleteAFile=Apagar arquivo
 ConfirmDeleteAFile=Voce tem certeza que quer apagar este arquivo
+SystemTools=Ferramentas do sistema
 ModulesSystemTools=Ferramentas de modulos
 NoPhotoYet=Sem fotos disponiveis no momento
 HomeDashboard=Resumo de inicio
@@ -305,5 +318,13 @@ XMoreLines=%s linha(s) escondidas
 PublicUrl=URL pública
 AddBox=Adicionar caixa
 SelectElementAndClickRefresh=Selecionar um elemento e clickar atualizar
+PrintFile=Imprimir arquivo %s
+GoIntoSetupToChangeLogo=Vá para casa - Configuração - Empresa de mudar logotipo ou ir para casa - Setup - Display para esconder.
+Deny=Negar
+Denied=Negado
+ListOfTemplates=Lista de modelos
+Genderman=Homem
+Genderwoman=Mulher
 Saturday=Sabado
 SaturdayMin=Sab
+SelectMailModel=Escolha um modelo de e-mail
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index 6b81e85596e..36bd3668beb 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -15,6 +15,9 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro  já está vinculado a u
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu.
 ThisIsContentOfYourCard=Este é os detalhes do seu cartão
 CardContent=Conteúdo da sua ficha de membro
+SetLinkToThirdParty=Link para um fornecedor Dolibarr
+MembersListUpToDate=Lista dos Membros válidos ao día de adesão
+MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão
 MembersListResiliated=Lista dos Membros cancelados
 MenuMembersUpToDate=Membros ao día
 MenuMembersNotUpToDate=Membros não ao día
@@ -69,6 +72,7 @@ BlankSubscriptionFormDesc=Dolibarr pode fornecer uma URL pública para permitir
 EnablePublicSubscriptionForm=Habilite a forma pública auto-assinatura
 ExportDataset_member_1=Membros e Filiações
 LastSubscriptionsModified=Assinaturas Últimas modificadas
+Date=Data
 MemberNotOrNoMoreExpectedToSubscribe=não submetida a cotação
 AddSubscription=Criar subscripção
 MemberModifiedInDolibarr=membro modificado em Dolibarr
@@ -100,6 +104,7 @@ MembersByTownDesc=Esta tela mostrará estatísticas sobre usuários por cidade.
 MembersStatisticsDesc=Escolha as estatísticas que você quer ler ...
 MenuMembersStats=Estatísticas
 LastMemberDate=Data do membro
+Nature=Tipo de produto
 Public=Informações são públicas
 NewMemberbyWeb=Novo membro adicionado. Aguardando aprovação
 NewMemberForm=Formulário para novo membro
@@ -110,7 +115,6 @@ MEMBER_NEWFORM_PAYONLINE=Ir na página de pagamento online integrado
 DOLIBARRFOUNDATION_PAYMENT_FORM=Para fazer o seu pagamento de assinatura usando uma transferência bancária, consulte a página <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Para pagar utilizando um cartão de crédito ou Paypal, clique no botão na parte inferior desta página. <br>
 ByProperties=Por características
 MembersStatisticsByProperties=Membros estatísticas por características
-MembersByNature=Membros, por natureza,
 VATToUseForSubscriptions=Taxa de VAT para utilizar as assinaturas
 NoVatOnSubscription=Não TVA para assinaturas
 MEMBER_PAYONLINE_SENDEMAIL=E-mail para avisar quando Dolibarr receber uma confirmação de um pagamento validados para subscrição
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index d816efbdacd..bed5a9472f3 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -5,27 +5,42 @@ OrderLine=Linha de Comando
 OrderToProcess=Pedido a se processar
 CustomerOrder=Pedido de Cliente
 CustomersOrders=Pedidos de clientes
-OrdersToValid=Pedidos de Clientes a Confirmar
-OrdersToBill=Pedidos de Clientes Entregues
-OrdersInProcess=Pedidos de Clientes em Processo
-OrdersToProcess=Pedidos de Clientes à processar
-SuppliersOrdersToProcess=Pedidos de fornecedor a se processar
+CustomersOrdersRunning=Pedidos dos clientes atuais
+CustomersOrdersAndOrdersLines=Pedidos de clientes e linhas de pedidos
+OrdersToValid=Pedidos de clientes para validar
+OrdersToBill=Pedidos dos clientes entregue
+OrdersInProcess=Pedidos de clientes em processo
+OrdersToProcess=Pedidos de clientes para processar
+SuppliersOrdersToProcess=Fornecedor ordens para processar
 StatusOrderSentShort=Em processo
 StatusOrderSent=Envio em processo
 StatusOrderOnProcessShort=Pedido
 StatusOrderToBillShort=Entregue
 StatusOrderToBill2Short=A se faturar
 StatusOrderOnProcess=Pedido - Aguardando Recebimento
+StatusOrderOnProcessWithValidation=Ordenada - recepção Standby ou validação
 StatusOrderToBill=A Faturar
 StatusOrderToBill2=A Faturar
 ShippingExist=Existe envio
+ProductQtyInDraft=Quantidade do produto em projetos de ordens
+ProductQtyInDraftOrWaitingApproved=Quantidade do produto em projecto ou ordens aprovadas, ainda não ordenou
 DraftOrWaitingApproved=Rascunho aprovado mas ainda não controlado
 MenuOrdersToBill=Pedidos por Faturar
+MenuOrdersToBill2=Ordens faturáveis
 SearchACustomerOrder=Procure um pedido do cliente
+SearchASupplierOrder=Pesquisar uma ordem de fornecedor
+ApproveOrder=Aprovar pedidos
+Approve2Order=Aprovar pedido (segundo nível)
 UnvalidateOrder=Desaprovar pedido
 AddOrder=Criar ordem
 AddToDraftOrders=Adicionar a projeto de pedido
+OrdersOpened=Pedidos para processar
+NoOpenedOrders=Sem pedidos em aberto
+NoOtherOpenedOrders=Não há outros pedidos em aberto
 NoDraftOrders=Não há projetos de pedidos
+LastOrders=Pedidos de clientes Última %s
+LastCustomerOrders=Pedidos de clientes Última %s
+LastSupplierOrders=Pedidos a fornecedores Última %s
 LastClosedOrders=Os últimos %s Pedidos
 AmountOfOrdersByMonthHT=Numero de pedidos por mes (sem impostos)
 ConfirmCloseOrder=Tem certeza de que deseja fechar este pedido? Quando um pedido é fechado, ele só pode ser cobrado.
@@ -38,6 +53,8 @@ ConfirmMakeOrder=Tem certeza que quer confirmar este pedido em data de<b>%s</b>
 GenerateBill=Faturar
 ClassifyShipped=Clasificar entregue
 ClassifyBilled=Classificar "Faturado"
+RelatedCustomerOrders=Pedidos de clientes relacionadas
+RelatedSupplierOrders=Pedidos a fornecedores relacionadas
 ActionsOnOrder=Ações sobre o pedido
 NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e por tanto expedidos neste pedido
 UseCustomerContactAsOrderRecipientIfExist=Utilizar endereço do contato do cliente de seguimento cliente se está definido em vez do Fornecedor como destinatário dos pedidos
@@ -45,6 +62,7 @@ UserWithApproveOrderGrant=Usuários autorizados a aprovar os pedidos.
 CloneOrder=Copiar o Pedido
 ConfirmCloneOrder=Tem certeza de que deseja clonar este<b>%s</b> ?
 DispatchSupplierOrder=Receber pedido de fornecedor %s
+FirstApprovalAlreadyDone=A primeira aprovação já feito
 TypeContact_commande_internal_SALESREPFOLL=Responsável do seguimento do pedido do cliente
 TypeContact_commande_internal_SHIPPING=Representante seguindo o envio
 TypeContact_commande_external_BILLING=Contato fatura cliente
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index f946e4512e3..0a578f6dea5 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -10,6 +10,7 @@ Notify_FICHINTER_VALIDATE=Intervenção validada
 Notify_FICHINTER_SENTBYMAIL=Intervenção enviada por e-mail
 Notify_BILL_VALIDATE=Fatura cliente validada
 Notify_BILL_UNVALIDATE=Fatura cliente invalidada
+Notify_ORDER_SUPPLIER_VALIDATE=Ordem fornecedor registrado
 Notify_ORDER_SUPPLIER_APPROVE=Pedido fornecedor aprovado
 Notify_ORDER_SUPPLIER_REFUSE=Pedido fornecedor recusado
 Notify_ORDER_VALIDATE=Pedido cliente validado
@@ -40,8 +41,10 @@ Notify_PROJECT_CREATE=criação de projeto
 Notify_TASK_CREATE=Tarefa criada
 Notify_TASK_MODIFY=Tarefa alterada
 Notify_TASK_DELETE=Tarefa excluída
+SeeModuleSetup=Veja configuração do módulo %s
 TotalSizeOfAttachedFiles=Tamanho Total dos Arquivos/Documentos Anexos
 LinkedObject=Arquivo Anexo
+NbOfActiveNotifications=Número de notificações (nb de e-mails de destinatários)
 PredefinedMailTest=Esse e um teste de envio.⏎\nAs duas linhas estao separadas por retono de linha.⏎\n⏎\n__SIGNATURE__
 PredefinedMailTestHtml=Esse e um email de <b>teste</b> (a palavra test deve ser em bold).<br>As duas linhas estao separadas por retorno de linha.<br><br>__SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
@@ -100,6 +103,7 @@ EMailTextInterventionValidated=A intervenção %s foi validada
 EMailTextInvoiceValidated=A fatura %s foi validada.
 EMailTextProposalValidated=A proposta %s foi validada.
 EMailTextOrderValidated=O pedido %s foi validado.
+EMailTextOrderValidatedBy=A ordem %s foi gravada por %s.
 ImportedWithSet=Data importacao
 DolibarrNotification=Notificação automatica
 ResizeDesc=Insira a nova largura <b>OU</b> o novo peso. A proporção sera mantida durante a transformacao...
@@ -123,6 +127,8 @@ NewKeyWillBe=Sua nova chave de acesso do software sera
 ClickHereToGoTo=Clickar aqui para ir a %s
 YouMustClickToChange=Voce tem que clickar no seguinte atalho para validar a sua troca de senha
 ForgetIfNothing=Se voce nao pediu esta mudanca, simplismente esquece deste email. Suas credenciais estao seguras.
+IfAmountHigherThan=Se a quantia mais elevada do que <strong>%s</strong>
+SourcesRepository=Repositório de fontes
 AddCalendarEntry=Adicionar entrada ao calendário
 ContractValidatedInDolibarr=Contrato %s validado
 ContractCanceledInDolibarr=Contrato %s cancelado
diff --git a/htdocs/langs/pt_BR/printing.lang b/htdocs/langs/pt_BR/printing.lang
index 7df33364e64..58cf136dff3 100644
--- a/htdocs/langs/pt_BR/printing.lang
+++ b/htdocs/langs/pt_BR/printing.lang
@@ -1,12 +1,11 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Impressão Direta
-Module112000Desc=Habilitar Sistema de Impressão Direta
+Module64000Name=Impressão Direta
+Module64000Desc=Habilitar Sistema de Impressão Direta
 PrintingSetup=Configuração do Sistema de Impressão Direta
 PrintingDesc=Este módulo adiciona um botão Imprimir para enviar documentos diretamente para uma impressora (sem abrir documento em um aplicativo) com vários módulos.
 ModuleDriverSetup=Configuração do modulo driver
 PrintingDriverDesc=Configuração de variáveis para o driver de impressão.
 ListDrivers=Lista de drivers
-PrintTestDesc=Lista de Impressoras.
 FileWasSentToPrinter=Arquivo %s enviado para impressora
 NoActivePrintingModuleFound=Sem módulo ativo para impressão de documentos
 PleaseSelectaDriverfromList=Por favor, selecione um driver da lista.
@@ -19,10 +18,8 @@ PrintingDriverDescprintgcp=Configuração das variáveis para o driver de impres
 PrintTestDescprintgcp=Lista de Impressoras para Google Cloud Print.
 PRINTGCP_LOGIN=Login de conta GOOGLE
 PRINTGCP_PASSWORD=Senha de conta GOOGLE
-STATE_UNKNOWN=Desconhecido
 STATE_DORMANT=Off-line por um bom tempo
 TYPE_HP=HP Impressora
-GCP_Name=Nome
 GCP_displayName=Nome De Exibição
 GCP_Id=ID da impressora
 GCP_OwnerName=Nome do proprietário
@@ -35,25 +32,16 @@ PrintingDriverDescprintipp=Configuração das variáveis para o driver de impres
 PrintTestDescprintipp=Lista de Impressoras para driver PrintIPP.
 PRINTIPP_ENABLED=Mostrar ícone "Impressão direta" em listas de documentos
 PRINTIPP_HOST=Servidor de impressão
-PRINTIPP_PORT=Porta
-PRINTIPP_PASSWORD=Senha
 NoPrinterFound=Nenhuma impressora encontrada (verifique a configuração do CUPS)
 NoDefaultPrinterDefined=Nenhuma impressora padrão definida
 DefaultPrinter=Impressora padrão
-Printer=Impressora
-CupsServer=Servidor CUPS
 IPP_Name=\nNome da impressora
 IPP_State=Estado da impressora
 IPP_State_reason=Estado razão
 IPP_State_reason1=Estado razão1
-IPP_Color=Cor
-IPP_Device=Dispositivo
 IPP_Media=Mídia da impressora
 IPP_Supported=Tipo de mídia
 STATE_IPP_stopped=Parou
-STATE_IPP_paused=Pausada
 STATE_IPP_toner-low-report=Toner Baixo
-STATE_IPP_none=Nenhum
 MEDIA_IPP_stationery=artigos de papelaria
 MEDIA_IPP_thermal=Térmico
-IPP_COLOR_print-black=Impressora BW
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 26ed02b1907..5fe41cd166d 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -1,8 +1,19 @@
 # Dolibarr language file - Source file is en_US - productbatch
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-Batch=Lot/Serial
-batch_number=Lot/Serial number
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
+ManageLotSerial=Use lote / número de série
+ProductStatusOnBatch=Sim (lote / série necessário)
+ProductStatusNotOnBatch=Não (lote / série não utilizado)
+Batch=Lote / Serial
+atleast1batchfield=Compra prazo de validade ou data de venda ou Lote / Número de série
+batch_number=Lote / Número de série
+BatchNumberShort=Lote / Serial
+l_eatby=Compra-por data
+l_sellby=Data de venda
+DetailBatchNumber=Detalhes Lote / Serial
+DetailBatchFormat=Lote / Serial: %s - Compra-por: %s - Venda por: %s (Qtde: %d)
+printBatch=Lote / Serial: %s
+printEatby=Compra-por: %s
+printSellby=Venda-por: %s
+printQty=Qtde: %d
+AddDispatchBatchLine=Adicione uma linha para Shelf Life expedição
+WhenProductBatchModuleOnOptionAreForced=Quando o módulo Lote / Serial estiver ligado, aumentar / diminuir modo estoque é forçado a última opção e não pode ser editado. Outras opções podem ser definidas como você quer.
+ProductDoesNotUseBatchSerial=Este produto não utiliza Lote / número de série
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 2fa64f205ad..751244fa369 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -8,10 +8,12 @@ MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de b
 ProductAccountancyBuyCode=Codigo contabilidade (compras)
 ProductAccountancySellCode=Codigo contabilidade (vendas)
 ProductsAndServicesOnSell=Produtos e Serviços para venda ou para compra
+ProductsAndServicesNotOnSell=Produtos e Serviços Não estáo à venda
 ProductsOnSell=Produto para venda ou para compra
-ProductsNotOnSell=Produto fora de venda e de compra
+ProductsNotOnSell=Produto não está à venda e não está para compra
 ProductsOnSellAndOnBuy=Produtos para venda e compra
 ServicesOnSell=Serviços para venda ou para compra
+ServicesNotOnSell=Serviços Não está à venda
 ServicesOnSellAndOnBuy=Serviços para venda e compra
 LastRecorded=últimos Produtos/Serviços em Venda Registados
 LastRecordedProductsAndServices=Os %s últimos Produtos/Perviços Registados
@@ -32,15 +34,18 @@ SellingPriceHT=Preço de venda (sem taxas)
 SellingPriceTTC=Preço de venda (incl. taxas)
 CurrentPrice=Preço atual
 NewPrice=Novo Preço
-MinPrice=Preço mínimo de venda
-MinPriceHT=Minimo preço de venda (líquido de imposto)
-MinPriceTTC=Minimo preço de venda (inc. taxa)
+MinPrice=Min. preço de venda
+MinPriceHT=Min. preço de venda (líquido de impostos)
+MinPriceTTC=Min. preço de venda (inc. impostos)
 CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
 ContractStatusClosed=Encerrado
-ContractStatusToRun=Para començar
+ContractStatusRunning=Contínuo
+ContractStatusOnHold=Em espera
+ContractStatusToRun=Faça em curso
+ContractNotRunning=Este contrato não está em curso
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
-ErrorPriceCantBeLowerThanMinPrice=Erro Preço nao pode ser menor do preço minimo.
+ErrorPriceCantBeLowerThanMinPrice=Erro, o preço não pode ser inferior ao preço mínimo.
 AddToMyBills=Adicionar às minhas faturas
 AddToOtherBills=Adicionar a Outras faturas
 AllWays=Rota para encontrar o sua produto ao estoque
@@ -49,14 +54,14 @@ NoteNotVisibleOnBill=Nota (Não é visivel as faturas, orçamentos, etc.)
 MultiPricesAbility=Vários  preços por produto / serviço
 MultiPricesNumPrices=Numero de preços
 MultiPriceLevelsName=Categoria de preços
-AssociatedProductsAbility=Activar a função do pacote virtual
+AssociatedProductsAbility=Ative o recurso pacote
 AssociatedProducts=Pacote produto
-AssociatedProductsNumber=Numero de produtos compondo este pacote virtual do produto
+AssociatedProductsNumber=Número de produtos a compor este produto pacote
 ParentProductsNumber=Numero de pacotes pais do produto
-IfZeroItIsNotAVirtualProduct=Se 0, este produto não e um pacote virtual do produto
-IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não e usado em nenhum pacote virtual do produto
+IfZeroItIsNotAVirtualProduct=Se for 0, este produto não é um produto pacote
+IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não é usado por qualquer produto do pacote
 CategoryFilter=Filtro por categoria
-ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/servisio (quantidade afetada)
+ProductAssociationList=Lista dos produtos / serviços que são componente deste produto / pacote virtual
 ProductParentList=Lista de pacote produtos/serviços com este produto como componente
 ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso
 ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
@@ -85,15 +90,24 @@ CloneProduct=Clonar produto ou serviço
 ConfirmCloneProduct=Voce tem certeza que deseja clonar o produto ou servico <b>%s</b> ?
 CloneContentProduct=Clonar todas as principais informações de um produto/serviço
 ClonePricesProduct=Clonar principais informações e preços
-CloneCompositionProduct=Clonar produto/serviço empacotado
 ProductIsUsed=Este produto é usado
 NewRefForClone=Ref. do novo produto/serviço
-CustomerPrices=Preços de clientes
-SuppliersPrices=Preços de fornecedores
-SuppliersPricesOfProductsOrServices=Preços (de produtos ou serviços) Fornecedores
+CustomerPrices=Os preços dos clientes
+SuppliersPrices=Fornecedor preços
+SuppliersPricesOfProductsOrServices=Fornecedor de preços (produtos ou serviços)
 CustomCode=Codigo NCM
 CountryOrigin=Pais de origem
 HiddenIntoCombo=Escondido nas listas de seleções
+ShortLabel=Etiqueta curta
+set=conjunto
+se=conjunto
+second=segundo
+hour=hora
+day=dia
+kilogram=quilograma
+gram=grama
+meter=medidor
+liter=litro
 ProductCodeModel=Modelo de ref. de produto
 ServiceCodeModel=Modelo de ref. de serviço
 AddThisProductCard=Criar ficha produto
@@ -115,7 +129,7 @@ UnitPmp=Unidades VWAP
 CostPmpHT=Total unidades VWAP
 ProductUsedForBuild=Automaticamente consumidos pela produção
 ProductBuilded=Produção completada
-ProductsOrServiceMultiPrice=Preços Clientes (de produtos ou serviços, multi-preços)
+ProductsOrServiceMultiPrice=Preços de Clientes (de produtos ou serviços, multi-preços)
 ProductSellByQuarterHT=Total de produtos vendidos no trimestre
 ServiceSellByQuarterHT=Total de servicos vendidos no trimestre
 Quarter1=1° Trimestre
@@ -138,14 +152,22 @@ ResetBarcodeForAllRecords=Definir o valor de código de barras para todos os reg
 PriceByCustomer=Preço diferente para cada cliente
 PriceCatalogue=Preço único por produto / serviço
 PricingRule=Regras para os preços dos clientes
-AddCustomerPrice=Adicione preço por parte dos clientes
+AddCustomerPrice=Adicione preço por cliente
 ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
 PriceByCustomerLog=Preço por cliente
-MinimumPriceLimit=Preço minimo nao pode ser inferior a %s
+MinimumPriceLimit=Preço mínimo não pode ser inferior, em seguida %s
 MinimumRecommendedPrice=Preço minimo recomendado e: %s
 PriceExpressionEditor=Editor de expressão Preço
 PriceExpressionSelected=Expressão de preço Selecionado
 PriceExpressionEditorHelp1="Preço = 2 + 2" ou "2 + 2" para fixação do preço. use; para separar expressões
-PriceExpressionEditorHelp2=Você pode acessar ExtraFields com variáveis como\n<b>#options_myextrafieldkey#</b>
+PriceExpressionEditorHelp5=Valores globais disponíveis:
 PriceMode=Modo de Preço
-PriceNumeric=Número
+DefaultPrice=Preço padrão
+ComposedProduct=Sub-produto
+MinSupplierPrice=Preço mínimo fornecedor
+DynamicPriceConfiguration=Configuração de preço dinâmico
+GlobalVariables=As variáveis ​​globais
+GlobalVariableUpdaters=Updaters variáveis ​​globais
+GlobalVariableUpdaterType1=Dados WebService
+LastUpdated=Ultima atualização
+PropalMergePdfProductChooseFile=Selecione os arquivos PDF
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index e16645e7107..0218e5cdf20 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -1,11 +1,14 @@
 # Dolibarr language file - Source file is en_US - projects
 ProjectId=Id do projeto
+ProjectStatus=Status Projeto
 SharedProject=A todos
 PrivateProject=Contatos do projeto
 MyProjectsDesc=Exibe apenas os projetos que você for um contato (independente do tipo).
 ProjectsPublicDesc=Exibe todos os projetos que você esta autorizado a ver.
+ProjectsPublicTaskDesc=Essa visão apresenta todos os projetos e tarefas que estão autorizados a ler.
 ProjectsDesc=Exibi todos os projetos (sua permissão de usuário lhe permite ver todos).
 MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um contato (seja qual for o tipo).
+OnlyOpenedProject=Só os projetos abertos são visíveis (projetos em fase de projeto ou o estado fechado não são visíveis).
 TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler.
 TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo).
 AddProject=Criar projeto
@@ -17,13 +20,16 @@ OfficerProject=Responsável do Projeto
 LastProjects=Os %s últimos Projetos
 ShowProject=Adicionar Projeto
 NoProject=Nenhum Projeto Definido
-NbOpenTasks=No Tarefas Abertas
+NbOpenTasks=Nb de tarefas abertas
 NbOfProjects=No de Projetos
 TimeSpent=Tempo Dedicado
+TimeSpentByYou=Tempo gasto por você
+TimeSpentByUser=Tempo gasto por usuário
 TimesSpent=Tempo gasto
 RefTask=Ref. Tarefa
 TaskTimeSpent=O tempo gasto nas tarefas
 TaskTimeUser=Usuário
+TasksOnOpenedProject=Tarefas em projetos abertos
 NewTimeSpent=Novo Tempo Dedicado
 MyTimeSpent=O Meu Tempo Dedicado
 MyTasks=As minhas Tarefas
@@ -35,6 +41,9 @@ ProgressDeclared=o progresso declarado
 ProgressCalculated=calculado do progresso
 ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto
 ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedor Associados ao Projeto
+ListExpenseReportsAssociatedProject=Lista de relatórios de despesas associadas ao projeto
+ListDonationsAssociatedProject=Lista de doações associados ao projeto
+ListTaskTimeUserProject=Lista de tempo consumido nas tarefas de projecto
 ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana
 ActivityOnProjectThisMonth=Atividade ao Projeto este Mês
 ActivityOnProjectThisYear=Atividade ao Projeto este Ano
@@ -52,6 +61,7 @@ YouAreNotContactOfProject=Você não é um contato deste projeto privado
 ConfirmDeleteATimeSpent=Tem certeza de que deseja excluir este tempo?
 DoNotShowMyTasksOnly=Ver tambem tarefas não associadas comigo
 ShowMyTasksOnly=Ver so minhas tarefas
+TaskRessourceLinks=Recursos
 NoTasks=Não há tarefas para este projeto
 LinkedToAnotherCompany=Ligado a outros terceiros
 TaskIsNotAffectedToYou=Tarefas não associadas a voce
@@ -64,6 +74,7 @@ CloneContacts=Copiar contatos
 CloneNotes=Copiar notas
 CloneProjectFiles=Copiar arquivos do projetos
 CloneTaskFiles=Copia(s) do(s) arquivo(s) do projeto(s) finalizado
+CloneMoveDate=Atualizar projeto / tarefas com lançamento a partir de agora?
 ConfirmCloneProject=Tem certeza que deseja copiar este projeto?
 ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de início do projeto
 TaskCreatedInDolibarr=Tarefa %s criada
@@ -78,8 +89,18 @@ AddElement=Link para componente
 UnlinkElement=Desligar elemento
 DocumentModelBaleine=Modelo de relatório de um projeto completo (logo. ..)
 PlannedWorkload=carga horária planejada
+PlannedWorkloadShort=Carga de trabalho
+WorkloadOccupation=Partilhar Carga de trabalho
 ProjectReferers=Fazendo referência a objetos
 SearchAProject=Buscar um projeto
 ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado
 ProjectDraft=Rascunhos de projetos
-FirstAddRessourceToAllocateTime=Associar recurso para alocar tempo
+FirstAddRessourceToAllocateTime=Associar um recurso para alocar tempo
+InputPerDay=Entrada por dia
+InputPerWeek=Entrada por semana
+InputPerAction=Entrada por ação
+TimeAlreadyRecorded=Tempo já passado gravado para esta tarefa / dia e usuário %s
+ProjectsWithThisUserAsContact=Projetos com este usuário como contato
+TasksWithThisUserAsContact=As tarefas atribuídas a esse usuário
+ResourceNotAssignedToProject=Não atribuído ao projeto
+ResourceNotAssignedToTask=Não é atribuída a tarefa
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 760efce5296..0638d8dad40 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - propal
+ProposalsOpened=Propostas comerciais abertas
 ProposalCard=Cartao de proposta
 AddProp=Criar proposta
 ConfirmDeleteProp=Tem certeza que quer eliminar este orçamento?
@@ -8,19 +9,25 @@ LastClosedProposals=Os últimos Orçamentos Encerrados
 LastModifiedProposals=As últimas %s propostas modificadas
 LastProposals=últimos Orçamentos
 AmountOfProposalsByMonthHT=Valor por Mês (sem ICMS)
+PropalsOpened=Aberto
 PropalsNotBilled=Não Faturados
 PropalStatusSigned=Assinado (A Faturar)
 PropalStatusNotSigned=Sem Assinar (Encerrado)
 PropalStatusBilled=Faturado
+PropalStatusOpenedShort=Aberto
 PropalStatusClosedShort=Encerrado
 PropalStatusBilledShort=Faturado
 PropalsToClose=Orçamentos a Fechar
 PropalsToBill=Orçamentos Assinados a Faturar
 ActionsOnPropal=Ações sobre o Orçamento
+NoOpenedPropals=Não há propostas comerciais abertas
+NoOtherOpenedPropals=Não há outras propostas comerciais abertas
 ErrorCantOpenDir=Impossível Abrir a Pasta
 DatePropal=Data da Proposta
 CloseAs=Fechado como
 BuildBill=Criar Fatura
+AddToDraftProposals=Adicionar a projeto de proposta
+NoDraftProposals=Não há projetos de propostas
 CreateEmptyPropal=Criar orçamento a partir da Lista de produtos predefinidos
 DefaultProposalDurationValidity=Prazo de validez por default (em dias)
 UseCustomerContactAsPropalRecipientIfExist=Utilizar endereço contato de seguimento de cliente definido em vez do endereço do Fornecedor como destinatário dos Orçamentos
@@ -39,3 +46,4 @@ TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta
 DefaultModelPropalCreate=Criaçao modelo padrao
 DefaultModelPropalToBill=Modelo padrao no fechamento da proposta comercial ( a se faturar)
 DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao faturada)
+ProposalCustomerSignature=Aceite por escrito, carimbo da empresa, data e assinatura
diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang
index 04f737983b5..4ad87183104 100644
--- a/htdocs/langs/pt_BR/salaries.lang
+++ b/htdocs/langs/pt_BR/salaries.lang
@@ -6,3 +6,6 @@ SalaryPayment=Pagamento de salário
 SalariesPayments=Pagamentos de salários
 THM=Preço medio por hora
 TJM=Preço medio por diaria
+CurrentSalary=Salário atual
+THMDescription=Este valor pode ser usado para calcular o custo do tempo consumido em um projeto inserido por usuários se o módulo de projetos é utilizado
+TJMDescription=Este valor é atualmente apenas como informação e não é utilizado para o cálculo
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index a1e3c7bb152..66125fb7eb0 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -1,9 +1,14 @@
 # Dolibarr language file - Source file is en_US - sendings
 RefSending=Ref. Envio
+AllSendings=Todos os embarques
+ShowSending=Mostrar Envio
 SendingsArea=Área Envios
 LastSendings=Os %s últimos Envios
+SendingCard=Cartão de embarque
 QtyReceived=Quant. Recibida
+KeepToShip=Permaneça para enviar
 StatusSendingValidated=Validado (produtos a enviar o enviados)
+SendingSheet=Folha de embarque
 Carriers=Transportadoras
 Carrier=Transportadora
 CarriersArea=Área Transportadoras
@@ -14,15 +19,22 @@ ConfirmCancelSending=Tem certeza que quer anular esta expedição?
 DocumentModelMerou=Modelo A5 Merou
 WarningNoQtyLeftToSend=Atenção, nenhum produto à espera de ser enviado.
 StatsOnShipmentsOnlyValidated=Estatisticas referentes os envios , mas somente validados. Data usada e data da validacao do envio ( a data planejada da entrega nao e sempre conhecida).
-DateDeliveryPlanned=Data de entrega planejada
+DateDeliveryPlanned=Data prevista para o fornecimento
 DateReceived=Data de entrega recebida
 SendShippingByEMail=Envio enviado por e-mail
 SendShippingRef=Submeter para envio %s
 ActionsOnShipping=Eventos no envio
 LinkToTrackYourPackage=Atalho para rastreamento do pacote
 ShipmentCreationIsDoneFromOrder=No momento a criaçao de um novo envio e feito da ficha de pedido.
+RelatedShippings=Embarques relacionados
 ShipmentLine=Linha de envio
 CarrierList=Lista de transportadoras
+SendingRunning=Produto a partir de pedidos de clientes encomendados
+SuppliersReceiptRunning=Produto de pedidos a fornecedores ordenados
+ProductQtyInCustomersOrdersRunning=Quantidade do produto em aberto ordens clientes
+ProductQtyInSuppliersOrdersRunning=Quantidade do produto em ordens abertas fornecedores
+ProductQtyInShipmentAlreadySent=Quantidade do produto da ordem do cliente abriu já foi enviado
+ProductQtyInSuppliersShipmentAlreadyRecevied=Quantidade do produto a partir da ordem fornecedor abriu já recebeu
 SendingMethodCATCH=Remoção pelo cliente
 SendingMethodTRANS=Transportadora
 SendingMethodCOLSUI=Acompanhamento
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index b75f00caf22..b6f29941aba 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Armazens
 NewWarehouse=Novo Armazém ou Zona de Armazenagem
 WarehouseEdit=modificar armazém
 MenuNewWarehouse=Novo Armazém
-WarehouseOpened=Armazém Aberto
+WarehouseOpened=Armazém aberta
 WarehouseClosed=Armazém Encerrado
 WarehouseSource=Armazém Origem
 WarehouseSourceNotDefined=Sem armazém definido,
@@ -15,6 +15,7 @@ CancelSending=Cancelar Envio
 DeleteSending=Eliminar Envio
 Stock=Estoque
 Stocks=Estoques
+StocksByLotSerial=Estoque por lot / serial
 ErrorWarehouseRefRequired=Nome de referência do armazenamento é necessária
 ErrorWarehouseLabelRequired=A etiqueta do armazenamento é obrigatória
 CorrectStock=Corrigir Estoque
@@ -31,6 +32,9 @@ StockTooLow=Estoque insuficiente
 StockLowerThanLimit=Da ação inferior limite de alerta
 EnhancedValueOfWarehouses=Valor de estoques
 UserWarehouseAutoCreate=Criar existencias automaticamente na criação de um usuário
+IndependantSubProductStock=Estoque de produtos e estoque subproduto são independentes
+QtyDispatchedShort=Qtde despachou
+QtyToDispatchShort=Qtde de expedição
 OrderDispatch=Recepção de estoques
 RuleForStockManagementDecrease=Regra de Administração de decrementos de estoque
 RuleForStockManagementIncrease=Regra de Administração de incrementos de estoque
@@ -57,6 +61,7 @@ IdWarehouse=Id. armazenamento
 DescWareHouse=Descrição do armazenamento
 LieuWareHouse=Localização do armazenamento
 WarehousesAndProducts=Armazenamento de produtos
+WarehousesAndProductsBatchDetail=Armazéns e produtos (com detalhe por lote / série)
 AverageUnitPricePMPShort=Preço médio de entrada
 AverageUnitPricePMP=Preço médio de entrada
 SellPriceMin=Venda Preço unitário
@@ -70,11 +75,11 @@ SelectWarehouseForStockDecrease=Escolha arquivo para usar a redução estoque
 SelectWarehouseForStockIncrease=Escolha arquivo para usar no aumento de estoque
 NoStockAction=Nenhuma estoque
 LastWaitingSupplierOrders=Encomendas à espera de recepções
-DesiredStock=Estoque desejado
+DesiredStock=Estoque mínimo desejado
+DesiredMaxStock=Estoque máximo desejado
 StockToBuy=Para encomendar
 Replenishment=Reabastecimento
 ReplenishmentOrders=Pedidos de reposição
-VirtualDiffersFromPhysical=De acordo com a aumentar / diminuir opções de ações, estoque físico e virtual de estoque (ordens físicas + correntes) poderão diferir
 UseVirtualStockByDefault=Use estoque virtuais por padrão, em vez de estoque físico, para o recurso de reposição
 UseVirtualStock=Use estoque virtuais
 UsePhysicalStock=Use estoque físico
@@ -86,7 +91,8 @@ SelectProductWithNotNullQty=Selecione pelo menos um produto com um qty não nulo
 WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque
 WarehouseForStockIncrease=O arquivos serão utilizados para aumento de
 ForThisWarehouse=Para este armazenamento
-ReplenishmentStatusDesc=Esta lista de todos os produtos com um estoque menor do que o estoque desejado (ou inferior ao valor de alerta se checkbox "alerta só" está marcada), e sugerir-lhe para criar ordens de fornecedor para preencher a diferença.
+ReplenishmentStatusDesc=Esta é uma lista de todos os produtos com um estoque menor do que o estoque desejado (ou inferior ao valor de alerta se checkbox "alerta apenas" estiver marcada), e sugerir-lhe para criar ordens de fornecedor para preencher a diferença.
+ReplenishmentOrdersDesc=Esta é uma lista de todas as ordens de fornecedor abertos, incluindo os produtos pré-definidos. Apenas abriu pedidos com produtos pré-definidos, de modo ordens que podem afetar os estoques, são visíveis aqui.
 Replenishments=Reconstituições
 NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
 NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
@@ -94,11 +100,17 @@ MassMovement=Movimento de massas
 MassStockMovement=Movimento de estoque em massa
 SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém de origem e um armazém de destino e clique em "% s". Uma vez feito isso para todos os movimentos necessários, clique em "% s".
 RecordMovement=Gravar a transferência
+ReceivingForSameOrder=Recibos para este fim
 StockMovementRecorded=Movimentos de estoque gravados
 RuleForStockAvailability=Regras sobre os requisitos de ações
-StockMustBeEnoughForInvoice=Banco de nível deve ser o suficiente para adicionar o produto / serviço em fatura
-StockMustBeEnoughForOrder=Banco de nível deve ser o suficiente para adicionar o produto / serviço em ordem
-StockMustBeEnoughForShipment=Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte
+StockMustBeEnoughForInvoice=Nível de estoque deve ser suficiente para adicionar o produto / serviço para faturar
+StockMustBeEnoughForOrder=Nível de estoque deve ser suficiente para adicionar o produto / serviço por encomenda
+StockMustBeEnoughForShipment=Nível de estoque deve ser suficiente para adicionar o produto / serviço para embarque
 MovementLabel=Rótulo de Movimento
+InventoryCode=Código de movimento ou de inventário
+IsInPackage=Contido em pacote
 ShowWarehouse=Mostrar armazém
-MovementCorrectStock=Correção da conteúdo para o produto %s
+MovementCorrectStock=Da correção para o produto %s
+MovementTransferStock=Da transferência de produto %s em um outro armazém
+InventoryCodeShort=Inv. / Mov. código
+NoPendingReceptionOnSupplierOrder=Sem recepção pendente devido a abrir ordem fornecedor
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index 7df119d9f45..e30dbf4ab04 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -12,7 +12,7 @@ ExportDataset_fournisseur_1=Faturas de Fornecedores e Linhas de Fatura
 ExportDataset_fournisseur_2=Faturas Fornecedores e Pagamentos
 ExportDataset_fournisseur_3=Ordems de fornecedor e linhas de ordem
 ConfirmApproveThisOrder=Tem certeza que quer aprovar este pedido?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Negar esta ordem
 ConfirmDenyingThisOrder=Tem certeza que quer negar este pedido?
 ConfirmCancelThisOrder=Tem certeza que quer cancelar este pedido?
 AddCustomerInvoice=Criar Fatura para o Cliente
@@ -21,3 +21,6 @@ NoneOrBatchFileNeverRan=Nenhum lote ou <b>%s</b> não foi executado recentemente
 SentToSuppliers=Enviado para fornecedores
 ListOfSupplierOrders=Lista de pedidos do fornecedor
 MenuOrdersSupplierToBill=Pedidos a se faturar do foprnecedor
+NbDaysToDelivery=Atraso de entrega em dias
+DescNbDaysToDelivery=O maior atraso de entregar os produtos a partir deste fim
+UseDoubleApproval=Use a aprovação de casal (a segunda aprovação pode ser feito por qualquer usuário com a permissão dedicado)
diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang
index 6909727bff7..767b1265747 100644
--- a/htdocs/langs/pt_BR/trips.lang
+++ b/htdocs/langs/pt_BR/trips.lang
@@ -1,13 +1,62 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-ListOfTrips=List of expense report
-NewTrip=New expense report
+ExpenseReports=Os relatórios de despesas
+Trip=Relatório de despesas
+Trips=Os relatórios de despesas
+TripsAndExpenses=Relatórios de despesas
+TripsAndExpensesStatistics=Estatísticas de relatórios de despesas
+TripCard=Despesa de cartão de relatório
+AddTrip=Criar relatório de despesas
+ListOfTrips=Lista de relatórios de despesas
 Kilometers=Kilometros
 FeesKilometersOrAmout=Quantidade de Kilometros
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
+DeleteTrip=Excluir relatório de despesas
+ConfirmDeleteTrip=Tem certeza de que deseja excluir este relatório de despesas?
+ListToApprove=Esperando aprovação
+ExpensesArea=Área de relatórios de despesas
+SearchATripAndExpense=Pesquisar um relatório de despesas
 ClassifyRefunded=Classificar 'Rembolsado'
+ExpenseReportWaitingForApproval=Um novo relatório de despesas foi apresentada para aprovação
+ExpenseReportWaitingForApprovalMessage=Um novo relatório de despesas foi apresentado e está aguardando aprovação.\n - Usuário: %s \n - Período: %s \n Clique aqui para autenticar: %s
+TripId=Id relatório de despesas
+AnyOtherInThisListCanValidate=Pessoa para informar para validação.
+TripSociete=Informações da empresa
+TripSalarie=Informações do usuário
+TripNDF=Informações relatório de despesas
+PDFStandardExpenseReports=Template padrão para gerar um documento PDF para relatório de despesa
+ExpenseReportLine=Linha de relatório de despesas
+TF_TRANSPORTATION=Transporte
+TF_TRAIN=Trem
+TF_BUS=Onibus
+TF_PEAGE=Pedágio
+TF_ESSENCE=Combustivel
+ErrorDoubleDeclaration=Você declarou outro relatório de despesas em um intervalo de datas semelhante.
+AucuneNDF=Não há relatórios de despesas encontrados para este critério
+AucuneLigne=Não há relatório de despesas declaradas ainda
+AddLine=Adicionar linha
+Date_DEBUT=Data de início
+Date_FIN=Data final do período
+ModePaiement=Modo de pagamento
+VALIDATOR=Usuário responsável pela aprovação
+AUTHOR=Gravada por
+AUTHORPAIEMENT=Pago por
+REFUSEUR=Negado pelo
+CANCEL_USER=Excluída por
+MOTIF_REFUS=Razão
+MOTIF_CANCEL=Razão
+DATE_REFUS=Negar data
+DATE_SAVE=Validado em
+DATE_VALIDE=Validado em
+DATE_CANCEL=Data de cancelamento
+SendToValid=Enviado em aprovação
+ValidateAndSubmit=Validar e submeter à aprovação
+NOT_VALIDATOR=Você não tem permissão para aprovar este relatório de despesas
+NOT_AUTHOR=Você não é o autor deste relatório de despesas. Operação cancelada.
+RefuseTrip=Negar um relatório de despesas
+ConfirmRefuseTrip=Tem certeza de que deseja negar este relatório de despesas?
+ConfirmValideTrip=Tem certeza de que deseja aprovar este relatório de despesas?
+ConfirmPaidTrip=Tem certeza de que deseja alterar o status do relatório de despesas para "Pago"?
+ConfirmCancelTrip=Tem certeza de que deseja cancelar este relatório de despesas?
+BrouillonnerTrip=Voltar relatório de despesas para o status de "Rascunho"
+ConfirmBrouillonnerTrip=Tem certeza de que deseja mover este relatório de despesas para o status de "Rascunho"?
+ConfirmSaveTrip=Tem certeza de que deseja validar esse relatório de despesas?
+NoTripsToExportCSV=Nenhum relatório de despesas para exportar para este período.
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index d5ed0fe9de1..f07e623c06f 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -29,11 +29,13 @@ ConfirmEnableGroup=Você tem certeza que quer reativar o grupo <b>%s</b> ?
 ConfirmReinitPassword=Você tem certeza que quer gerar uma nova senha para o usuário <b>%s</b> ?
 ConfirmSendNewPassword=Você tem certeza que quer enviar uma nova senha para o usuário <b>%s</b> ?
 NewUser=Novo usuário
+CreateUser=Criar usuário
 SearchAGroup=Buscar um grupo
 SearchAUser=Buscar um usuário
 LoginNotDefined=O usuário não está definido
 NameNotDefined=O nome não está definido
 ListOfUsers=Lista de usuário
+SuperAdministrator=Super Administrador
 SuperAdministratorDesc=Administrador geral
 AdministratorDesc=Entidade do administrador
 DefaultRights=Permissões por Padrao
@@ -47,6 +49,7 @@ RemoveFromGroup=Remover do grupo
 PasswordChangedAndSentTo=Senha alterada e enviada a <b>%s</b>.
 PasswordChangeRequestSent=Solicitação para alterar a senha para <b>%s</b> enviada a <b>%s</b>.
 MenuUsersAndGroups=Usuários e Grupos
+MenuMyUserCard=Meu cartão de usuario
 LastUsersCreated=Os %s últimos usuários criados
 ShowGroup=Visualizar grupo
 ShowUser=Visualizar usuário
@@ -68,6 +71,7 @@ CreateDolibarrThirdParty=Criar um fornecedor
 LoginAccountDisable=A conta está desativada, indique um Novo login para a ativar.
 LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
 LoginAccountDisableInLdap=A conta está desativada ao domínio
+GuiLanguage=Idioma do Interface
 ExportDataset_user_1=Usuários e Atributos
 DomainUser=Usuário de Domínio
 CreateInternalUserDesc=Este formulario permite criar um usuario interno a sua compania/fundação. Para criar um usuario externo (cliente, fornecedor, ...), use o botão 'Criar usuario Dolibarr' da ficha de contatos dos terceiro..
@@ -75,6 +79,7 @@ InternalExternalDesc=Um usuário <b>interno</b> é um usuário que pertence à s
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário.
 UserWillBeInternalUser=Usuario criado sera um usuario interno (porque nao esta conectado a um particular terceiro)
 UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conectado a um particular terceiro)
+IdPhoneCaller=ID chamador (telefone)
 UserLogged=Usuário %s Conectado
 UserLogoff=Usuario %s desconectou
 NewUserCreated=Usuário %s  Criado
@@ -83,9 +88,12 @@ EventUserModified=Usuário %s Modificado
 UserDisabled=Usuário %s Desativado
 UserEnabled=Usuário %s Ativado
 UserDeleted=Usuário %s Eliminado
+GroupModified=Grupo %s Alterado
+GroupDeleted=Grupo %s Eliminado
 ConfirmCreateContact=Tem certeza que quer criar uma conta para este contato?
 ConfirmCreateLogin=Tem certeza de que deseja criar uma conta para este membro?
 ConfirmCreateThirdParty=Tem certeza que quer criar um Fornecedor para este membro?
+LoginToCreate=Login a Criar
 NameToCreate=Nome do Fornecedor a Criar
 YourRole=Suas funções
 YourQuotaOfUsersIsReached=Sua cota de usuarios ativos atingida !
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index ef40826cfdf..4ade1c448d5 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -6,6 +6,7 @@ StandingOrderToProcess=A Processar
 WithdrawedBills=Faturas de Levantamentos
 RequestStandingOrderToTreat=Pedido de processamento das ordems abertas
 RequestStandingOrderTreated=Pedido para ordems abertas processado
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar o status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas.
 CustomersStandingOrders=Débitos Diretos de Clientes
 CustomerStandingOrder=Débito Direto de Cliente
 NbOfInvoiceToWithdraw=Nb. da fatura para  realizar pedido
@@ -50,8 +51,10 @@ NotifyCredit=Revogação de crédito
 NumeroNationalEmetter=Nacional Número Transmissor
 BankToReceiveWithdraw=Conta bancária para receber saques
 CreditDate=A crédito
+WithdrawalFileNotCapable=Não foi possível gerar arquivos recibo retirada para o seu país %s (O seu país não é suportado)
 ShowWithdraw=Mostrar Retire
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se fatura não tem pelo menos um pagamento retirada ainda processado, não vai ser definido como pago para permitir a gestão de remoção prévia.
+DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem permanente. Uma vez feito isso, vá ao menu Banco-> Retirada para gerenciar a ordem permanente. Quando a ordem de pé é fechada, o pagamento da fatura será gravado automaticamente, e fatura fechada se restante a pagar é nulo.
 WithdrawalFile=Arquivo Retirada
 SetToStatusSent=Defina o status "arquivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isto também se aplica aos pagamentos de faturas e classificá-los como "Paid"
diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang
index a815cc3188a..55c711cad68 100644
--- a/htdocs/langs/pt_BR/workflow.lang
+++ b/htdocs/langs/pt_BR/workflow.lang
@@ -1,11 +1,7 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configuração do módulo de Fluxo de Trabalho
-WorkflowDesc=Este módulo é concebido para modificar o comportamento de ações automáticas para aplicação. Por padrão, o fluxo de trabalho é aberto (você faz as coisas na ordem que você quiser). Você pode ativar as ações automáticas que você tem interesse.
-ThereIsNoWorkflowToModify=Não há fluxo de trabalho que você pode modificar para o módulo que você ativou.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar uma ordem do cliente automaticamente, após uma proposta comercial é assinada
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente após um proposta comercial é assinado
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente depois de um contrato de é validado
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar uma fatura de cliente automaticamente após um pedido do cliente está fechado
+WorkflowDesc=Este módulo é concebido para modificar o comportamento das ações automáticas para aplicação. Por padrão, o fluxo de trabalho está aberto (você pode fazer as coisas na ordem que você quiser). Você pode ativar as ações automáticas que você está interessado.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente uma ordem de cliente depois de uma proposta comercial é assinado
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar proposta fonte ligada ao bico quando a ordem do cliente é definido como pago
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique os pedido do cliente vinculado as fonte(s) das faturas quando a fatura do cliente ainda não foi paga
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique os pedidos do cliente vinculado as fonte(s) das faturas quando a fatura do cliente  for paga.
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 05a0f457b36..54e66fb7b1d 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Contabilista
 Globalparameters=Parâmetros Globais
@@ -13,9 +20,9 @@ ConfigAccountingExpert=A configuração do módulo especialista em contabilidade
 Journaux=Diarios
 JournalFinancial=Diarios financeiros
 Exports=Exportados
-Export=Export
+Export=Exportar
 Modelcsv=Modelo de exportação
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=Para este modelo de esportação, as opções estão desativadas
 Selectmodelcsv=Selecione um modelo de exportação
 Modelcsv_normal=Exportação classica
 Modelcsv_CEGID=Exportação em direção Especialista CEGID 
@@ -68,7 +75,7 @@ Lineofinvoice=Linha de fatura
 VentilatedinAccount=Limpo com succeso na conta de contabilidade
 NotVentilatedinAccount=Por limpar na conta de contabilidade
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Separador de coluna no ficheiro a exportar
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a ser mostrado por página (máxima recomendada: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a classificação das páginas repartição "Tem que repartir" pelos elementos mais recentes
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Comprimento de conta de terceiros
 
 ACCOUNTING_SELL_JOURNAL=Diário de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
-ACCOUNTING_BANK_JOURNAL=diário de bancos
-ACCOUNTING_CASH_JOURNAL=diário de caixa
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário de diversos
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Diário social
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta de transferencia 
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index cb8efe3ac9a..3404bc1b717 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu para os Utilizadores
 LangFile=Ficheiro .lang
 System=Sistema
 SystemInfo=Info Sistema
-SystemTools=Utilidades do Sistema
 SystemToolsArea=Área de utilidades do sistema
 SystemToolsAreaDesc=Esta área oferece diferentes funções de administração. Use o menu para escolher a Funcionalidade e pesquisa.
 Purge=Limpar
@@ -232,8 +231,8 @@ Security=Segurança
 Passwords=Palavras-Passe
 DoNotStoreClearPassword=Não guardar a palavra-passe sem codificar na base de dados
 MainDbPasswordFileConfEncrypted=Encriptar a palavra-passe da base de dados no ficheiro conf.php
-InstrucToEncodePass=Para ter uma senha codificada no arquivo <b>conf.php</b>, substitua a linha <br> <b>
-InstrucToClearPass=Para ter a chave descodificada (transparente) para o <b>conf.php</b> arquivo, substitua a linha <br> <b>dolibarr_main_db_pass $
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protecção e encriptação dos pdf gerados
 ProtectAndEncryptPdfFilesDesc=A protecção de um documento pdf deixa o documento livre para leitura e impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia são impossíveis.
 Feature=Característica
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Procedimento a seguir:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Passo %s
 FindPackageFromWebSite=Encontre um pacote que fornece a funcionalidade desejada (por exemplo, %s site oficial).
-DownloadPackageFromWebSite=Transfira o pacote %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=A Instalação está finalizada e o ERP/CRM está disponivel com o novo componente.
 NotExistsDirect=A diretoria raiz alternativa não está definida.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Seleccione o módulo:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Versão actual do ERP/CRM
 CallUpdatePage=Chamar a página de actualização da estrutura da base de dados %s.
 LastStableVersion=Última Versão estável
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Biblioteca usada para gerar PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Atualizar link
@@ -430,8 +429,8 @@ Module20Name=Orçamentos
 Module20Desc=Gestão de Orçamentos/Propostas comerciais
 Module22Name=E-Mailings
 Module22Desc=Administração e envío de E-Mails massivos
-Module23Name= Energia
-Module23Desc= Acompanhamento do consumo de energia
+Module23Name=Energia
+Module23Desc=Acompanhamento do consumo de energia
 Module25Name=Pedidos de clientes
 Module25Desc=Gestão de pedidos de clientes
 Module30Name=Facturas e Recibos
@@ -492,8 +491,8 @@ Module400Name=Projetos/Oportunidades/Chefias
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Interface com calendario Webcalendar
-Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salários
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notificações
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Bolsas
 Module700Desc=Gestão de Bolsas
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Gestão da agenda e das acções
 Module2500Name=Gestão Electrónica de Documentos
 Module2500Desc=Permite administrar uma base de documentos
-Module2600Name=WebServices
-Module2600Desc=O servidor de serviços web ERP/CRM está Disponível
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Criar/Modificar produtos/serviços
 Permission34=Eliminar produtos/serviços
 Permission36=Exportar produtos/serviços
 Permission38=Exportar Produtos
-Permission41=Consultar projectos
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Criar/Modificar projectos
 Permission44=Eliminar projectos
 Permission61=Consultar Intervenções
@@ -599,10 +600,10 @@ Permission86=Enviar pedidos de clientes
 Permission87=Fechar pedidos de clientes
 Permission88=Anular pedidos de clientes
 Permission89=Eliminar pedidos de clientes
-Permission91=Consultar Impostos e IVA
-Permission92=Criar/Modificar Impostos e IVA
-Permission93=Eliminar Impostos e IVA
-Permission94=Exportar Impostos Sociais
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Consultar balanços e resultados
 Permission101=Consultar envios
 Permission102=Criar/modificar envios
@@ -620,9 +621,9 @@ Permission121=Consultar empresas
 Permission122=Criar/Modificar empresas
 Permission125=Eliminar empresas
 Permission126=Exportar as empresas
-Permission141=Leia as tarefas
-Permission142=Criar / modificar funções
-Permission144=Exclusão de tarefas
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Consultar Fornecedores
 Permission147=Consultar Estados
 Permission151=Consultar Débitos Directos
@@ -800,7 +801,7 @@ DictionaryCountry=Países
 DictionaryCurrency=Moedas
 DictionaryCivility=Civility title
 DictionaryActions=Tipo de eventos da agenda
-DictionarySocialContributions=Tipos de contribuições sociais
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Condições de Pagamento
@@ -817,6 +818,9 @@ DictionarySource=Origem das propostas/ordens
 DictionaryAccountancyplan=Gráfico de contas
 DictionaryAccountancysystem=Modelos para o gráfíco de contas
 DictionaryEMailTemplates=Modelos de Mensagens
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Configuração guardada
 BackToModuleList=Voltar à lista de módulos
 BackToDictionaryList=Voltar à lista de dicionários
@@ -936,13 +940,14 @@ CompanyZip=Código Postal
 CompanyTown=Concelho
 CompanyCountry=País
 CompanyCurrency=Moeda principal
+CompanyObject=Object of the company
 Logo=Logótipo
 DoNotShow=Não mostrar
 DoNotSuggestPaymentMode=Não sugerir
 NoActiveBankAccountDefined=Nenhuma conta bancaria activa definida
 OwnerOfBankAccount=Titular da conta %s
 BankModuleNotActive=O módulo de contas bancarias não se encontra activado
-ShowBugTrackLink=Mostrar link "detetar um bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Mostrar painel de informação na página principal
 Alerts=Alertas
 Delays=Prazos
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Decimais máximos para os preços unitários
 MAIN_MAX_DECIMALS_TOT=Decimais máximos para os preços totais
 MAIN_MAX_DECIMALS_SHOWN=Decimais máximos para os valores mostrados na janela (Por <b>...</b> depois do valor máximo em <b>...</b> quando o número seja truncado, mostrar na janela)
 MAIN_DISABLE_PDF_COMPRESSION=Utilizar a compressão PDF para os Ficheiros gerados
-MAIN_ROUNDING_RULE_TOT= Comprimento do arredondamento (são raros os países onde o intervalo de arredondamento é feito em mais do que base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Preço unitário líquido de um produto
 TotalPriceAfterRounding=Preço total (líquido / / IVA incl fiscal) após arredondamento
 ParameterActiveForNextInputOnly=Parâmetro efectivo somente a partir das próximas sessões
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total de módulos de funcionalidades ativos: <b>%s
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho PHP
 YesInSummer=Sim no verão
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=A condição está atualmente %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Nº de produtos max em listas (0
 ConfirmDeleteProductLineAbility=Confirma a eliminação de uma linha de produtos nos formularios.
 ModifyProductDescAbility=Personalização das descrições dos produtos nos formularios
 ViewProductDescInFormAbility=Visualização das descrições dos produtos nos formularios
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualização de produtos descrições no idioma de terceiros
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Assumir ecotaxa (DEEE)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defeito para os produtos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por defeito para os Terceiros
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Configuração de Produtos/Serviços
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Códigos de barras tipo UPC
 BarcodeDescISBN=Códigos de barras tipo ISBN
 BarcodeDescC39=Códigos de barras tipo C39
 BarcodeDescC128=Códigos de barras tipo C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Tem a certeza que quer eliminar a entrada de menu <b>%s</b> ?
 DeleteLine=Apagar a linha
 ConfirmDeleteLine=Tem a certeza que quer eliminar esta linha?
 ##### Tax #####
-TaxSetup=Configuração do Módulo Impostos, Cargas Sociais e Dividendos
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Opção de carga de IVA
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices módulo configuração
 WebServicesDesc=Ao permitir a este módulo, ERP/CRM tornar-se um serviço de servidor web para fornecer diversos serviços da web.
 WSDLCanBeDownloadedHere=WSDL descritor de arquivo desde serviços pode ser fazer o download aqui
 EndPointIs=Clientes SOAP devem enviar os seus pedidos à Dolibarr final disponível no URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Banco módulo de configuração
 FreeLegalTextOnChequeReceipts=Texto livre em recibos dos cheques
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projeto de instalação do módulo
 ProjectsModelModule=Modelo de projeto de documento de relatório
 TasksNumberingModules=Módulo de numeração das tarefas
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Configuração GED
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Abrir ano fiscal
 CloseFiscalYear=Fechar ano fiscal
 DeleteFiscalYear=Apagar ano fiscal
 ConfirmDeleteFiscalYear=Tem a certeza de que deseja apagar este ano fiscal?
-Opened=Aberto
+Opened=Open
 Closed=Fechado
 AlwaysEditable=Pode ser sempre editado
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 3c906efba05..46b349cd554 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Encomenda %s aprovada
 OrderRefusedInDolibarr=Encomenda %s recusada
 OrderBackToDraftInDolibarr=Encomenda %s voltou ao estado de rascunho
-OrderCanceledInDolibarr=Encomenda %s cancelada
 ProposalSentByEMail=Proposta a cliente %s enviada por e-mail
 OrderSentByEMail=Encomenda de cliente %s enviada por email
 InvoiceSentByEMail=Factura de cliente %s enviada por e-mail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 83cf407b1e6..812cee8ceab 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Conciliar
 Conciliation=Conciliação
 ConciliationForAccount=Conciliações nesta Conta
 IncludeClosedAccount=Incluir Contas fechadas
-OnlyOpenedAccount=Somente Contas abertas
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Conta de crédito
 AccountToDebit=Conta de débito
 DisableConciliation=Desactivar a função de Conciliação para esta Conta
 ConciliationDisabled=Função de Conciliação desactivada
-StatusAccountOpened=Aberta
+StatusAccountOpened=Open
 StatusAccountClosed=Fechada
 AccountIdShort=Número
 EditBankRecord=Editar registo
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Pagamento de cliente
 CustomerInvoicePaymentBack=Devolução pagamento de cliente
 SupplierInvoicePayment=Pagamento a fornecedor
 WithdrawalPayment=Pagamento de retirada
-SocialContributionPayment=Pagamento carga social
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Diário de tesouraria da Conta
 BankTransfer=Transferência bancária
 BankTransfers=Transferencias bancarias
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index b7a851ff0b0..21c11edd693 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nº de facturas
 NumberOfBillsByMonth=Nb de facturas por mês
 AmountOfBills=Montante das facturas
 AmountOfBillsByMonthHT=Quantidade de facturas por mês (líquidos de impostos)
-ShowSocialContribution=Mostrar contribuição social
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Ver factura
 ShowInvoice=Ver factura
 ShowInvoiceReplace=Ver factura rectificativa
@@ -270,7 +270,7 @@ BillAddress=Morada de facturação
 HelpEscompte=Um <b>Desconto</b> é um desconto acordado sobre uma factura dada, a um cliente que realizou o seu pagamento muito antes do vencimento.
 HelpAbandonBadCustomer=Este Montante é deixado (cliente julgado como devedor) e se considera como uma perda excepcional.
 HelpAbandonOther=Este Montante é deixado,já que se tratava de um erro de facturação (má introdução de dados, factura substituída por outra).
-IdSocialContribution=Contribuição Social id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Pagamento id
 InvoiceId=Id factura
 InvoiceRef=Ref. factura
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Última fatura relacionada
 WarningBillExist=Aviso, já existe uma ou mais faturas
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Pronto Pagamento
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=Esta situação é final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Fatura geral e final
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 28d7fd11458..888b477767b 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Últimos contractos
 BoxLastContacts=Últimos contatos, endereços
 BoxLastMembers=Últimos membros
 BoxFicheInter=Últimas intervenções
-BoxCurrentAccounts=Balanço de abertura das contas
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Volume de negocio
 BoxTotalUnpaidCustomerBills=Total das faturas de clientes em débito
 BoxTotalUnpaidSuppliersBills=Total das faturas dos fornecedores em crédito
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Volume de negocio realizado
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 9fb4a949c6f..5446d59f3fd 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=Foi adicionado com êxito.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Nenhuma
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Conteúdo não visível por todos
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Cat. Clientes/Potenciais
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 3d3c2c4ecf5..ab339498b39 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Contacto de Terceiro
 StatusContactValidated=Estado do Contacto
 Company=Empresa
 CompanyName=Razão social
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Empresas
 CountryIsInEEC=País da Comunidade Económica Europeia
 ThirdPartyName=Nome de terceiros
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador sequêncial sem ruptura e sem Voltar a 0.
 LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento.
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
-SearchThirdparty=Procurar terceiro
+SearchThirdparty=Search third party
 SearchContact=Procurar contacto
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index c43f8cdc695..8958606da5a 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -56,23 +56,23 @@ VATCollected=IVA Recuperado
 ToPay=A Pagar
 ToGet=Para Voltar
 SpecialExpensesArea=Área para todos os pagamentos especiais
-TaxAndDividendsArea=Área Impostos, gastos sociais e dividendos
-SocialContribution=Gasto social
-SocialContributions=Gastos sociais
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Despesas Especiais
 MenuTaxAndDividends=Impostos e Dividas
 MenuSalaries=Salários
-MenuSocialContributions=Gastos sociais
-MenuNewSocialContribution=Novo gasto
-NewSocialContribution=Novo gasto social
-ContributionsToPay=Gastos por pagar
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Área Contabilidade/Tesouraria
 AccountancySetup=Configuração Contabilidade
 NewPayment=Novo Pagamento
 Payments=Pagamentos
 PaymentCustomerInvoice=Cobrança factura a cliente
 PaymentSupplierInvoice=Pagamento factura de fornecedor
-PaymentSocialContribution=Pagamento gasto social
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Pagamento IVA
 PaymentSalary=Pagamento de Salário
 ListPayment=Lista de pagamentos
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Pagamento IVA
 VATPayments=Pagamentos IVA
-SocialContributionsPayments=Contribuições de pagamentos Social
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Ver Pagamentos IVA
 TotalToPay=Total a Pagar
 TotalVATReceived=Total do IVA Recebido
@@ -116,11 +116,11 @@ NewCheckDepositOn=Criar Novo deposito na conta: %s
 NoWaitingChecks=Não existe cheque em espera para depositar.
 DateChequeReceived=Data introdução de dados de recepção cheque
 NbOfCheques=Nº de Cheques
-PaySocialContribution=Pagar uma gasto social
-ConfirmPaySocialContribution=Está seguro de querer classificar este gasto social como pago?
-DeleteSocialContribution=Eliminar gasto social
-ConfirmDeleteSocialContribution=Está seguro de querer eliminar este gasto social?
-ExportDataset_tax_1=gastos sociais e pagamentos
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clonar uma contribuição social
-ConfirmCloneTax=Confirme a clonagem de uma contribuição social
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Cloná-la para o mês seguinte
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index bcac2727da0..16181345f92 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -4,10 +4,10 @@ About = Acerca de
 CronAbout = Sobre Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Criar/Alterar tarefa agendada
-Permission23103 = Eliminar tarefa agendada
-Permission23104 = Executar tarefa agendada
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Configuração da gestão de tarefas agendadas
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Resultado da última execução
 CronLastResult=Last result code
 CronListOfCronJobs=Lista de tarefas agendadas
 CronCommand=Comando
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Tarefa
@@ -39,8 +39,8 @@ CronDtStart=Data de Início
 CronDtEnd=Data Fim
 CronDtNextLaunch=Próximo execução
 CronDtLastLaunch=Última execução
-CronFrequency=Frequência
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Método
 CronModule=Módulo
 CronAction=Ação
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Terafa lançada e concluída
 #Page card
 CronAdd= Adicionar tarefas
-CronHourStart= Date e hora de início da tarefa
-CronEvery= And execute task each
-CronObject= Instância/Objeto para criar
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instância/Objeto para criar
 CronArgs=Parâmetros
 CronSaveSucess=Guardado com sucesso
 CronNote=Comentário
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informação
 # Common
-CronType=Tipo de tarefa
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Aceda a "Home - Ferramentas dos Módulos" para visualizar e editar as tarefas agendadas.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index 2527487d249..466583a2062 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Procurar por Objecto
 ECMSectionOfDocuments=Pastas de Documentos
 ECMTypeManual=Manual
 ECMTypeAuto=Automático
-ECMDocsBySocialContributions=Documentos associados a contribuições sociais
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documentos associados a terceiros
 ECMDocsByProposals=Documentos associcados a orçamentos
 ECMDocsByOrders=Documentos associados a pedidos
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 1915d8200c9..7f7a91e56aa 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 63bb32c1033..c71919e336e 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -3,7 +3,7 @@ HRM=RH
 Holidays=Licenças
 CPTitreMenu=Licenças
 MenuReportMonth=Comunicado mensal
-MenuAddCP=Efetue um pedido de licença
+MenuAddCP=New leave request
 NotActiveModCP=Deve ativar o módulo de Licenças para ver esta página.
 NotConfigModCP=Deve configurar o módulo de Licenças para ver esta página. Para o efetuar, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> clique aqui </ a>.
 NoCPforUser=Não tem nenhum dia disponivel.
@@ -71,7 +71,7 @@ MotifCP=Motivo
 UserCP=Utilizador
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=Veja registo de requisições
+MenuLogCP=View change logs
 LogCP=Registo de actualizações de dias disponíveis  
 ActionByCP=Realizado por
 UserUpdateCP=Para o utilizador
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Grupo habilitado para aprovar requisições
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Ultima atualização de alocação de requisições 
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Olá
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/pt_PT/incoterm.lang b/htdocs/langs/pt_PT/incoterm.lang
index 2396d2acb0e..19360700799 100644
--- a/htdocs/langs/pt_PT/incoterm.lang
+++ b/htdocs/langs/pt_PT/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
-IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetupTitle1=Função
+IncotermSetupTitle2=Estado
+IncotermSetup=Configuração do módulo Incoterm
+IncotermFunctionDesc=Ativar função Incoterm (Terceiros, Proposta, Encomenda de Cliente, Fatura de Cliente, Expedição, Encomenda do Fornecedor)
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index e281ee14d50..c4f738e560f 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Servidor da Base de Dados - Acesso de Administrador
 CheckToCreateDatabase=Marque a caixa se a base de dados não existir e se deverá ser criada. <br> Neste caso, deve preencher o nome/senha para a conta de administrador, no fim desta página.
 CheckToCreateUser=Marque a caixa se o administrador da base de dados não existir e se deverá ser criado. <br> Neste caso, deve escolher o seu nome/senha e preencher também os dados da conta de administrador no fim desta página. Se esta caixa estiver desmarcada, o administrador da base de dados e a sua senha já deverão existir.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Início de sessão do utilizador autorizado para criar as novas bases de dados ou novos utilizadores, obrigatório se a sua base de dados ou o administrador já existirem.
 KeepEmptyIfNoPassword=Deixar em branco se o utilizador não tiver uma senha (evitar isto)
 SaveConfigurationFile=Guardar valores
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index 67f384c4152..bc88b4c167b 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Árabe
 Language_ar_SA=Árabe
+Language_bn_BD=Bengali
 Language_bg_BG=Búlgaro
 Language_bs_BA=Bósnio
 Language_ca_ES=Catalão
@@ -21,9 +22,10 @@ Language_en_SA=Inglês (Arábia Saudita)
 Language_en_US=Inglês (Estados Unidos)
 Language_en_ZA=Inglês (África do Sul)
 Language_es_ES=Espanhol
-Language_es_DO=Espanhol (República Dominicana)
 Language_es_AR=Espanhol (Argentina)
 Language_es_CL=Espanhol (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Espanhol (República Dominicana)
 Language_es_HN=Espanhol (Honduras)
 Language_es_MX=Espanhol (México)
 Language_es_PY=Espanhol (Paraguai)
@@ -45,7 +47,10 @@ Language_id_ID=Indonésio
 Language_is_IS=Islandês
 Language_it_IT=Italiano
 Language_ja_JP=Japonês
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Coreano
+Language_lo_LA=Lao
 Language_lt_LT=Lituano
 Language_lv_LV=Letão
 Language_mk_MK=Macedónio
@@ -64,6 +69,7 @@ Language_sv_SV=Sueco
 Language_sv_SE=Sueco
 Language_sq_AL=Albanês
 Language_sk_SK=Eslovaco
+Language_sw_SW=Kiswahili
 Language_th_TH=Tailandês
 Language_uk_UA=Ucraniano
 Language_uz_UZ=Uzbeque
diff --git a/htdocs/langs/pt_PT/loan.lang b/htdocs/langs/pt_PT/loan.lang
new file mode 100644
index 00000000000..af9c1f4f84f
--- /dev/null
+++ b/htdocs/langs/pt_PT/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Empréstimo
+Loans=Empréstimos
+NewLoan=Novo Empréstimo
+ShowLoan=Mostrar Empréstimo
+PaymentLoan=Pagamento do Empréstimo
+ShowLoanPayment=Mostrar Pagamento do Empréstimo
+Capital=Capital
+Insurance=Seguro
+Interest=Juros
+Nbterms=Número de termos
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Pagamento do Empréstimo
+ConfirmDeleteLoan=Confirme a eliminação deste empréstimo
+LoanDeleted=Empréstimo Apagado Com Sucesso
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Empréstimo Liquidado
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Compra e Informação Financeira
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Duração da Hipoteca
+AnnualInterestRate=Taxa de Juros Anual
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Mostrar-me os cálculos e a amortização
+MortgagePaymentInformation=Informação do Pagamento da Hipoteca
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Montante Financiado
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totais para o ano
+MonthlyPayment=Pagamento Mensal
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuração do módulo de empréstimo
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 48a6a9a29e3..22957d35c85 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Recibo de Leitura
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Permitir usar o link "Cancelar Subscrição"
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-mail enviado para %s destinatários.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Endereço de cancelamento de subscrição
 TagSignature=Signature sending user
 TagMailtoEmail=E-mail do destinatário
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notificações
 NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index eedee0c086f..973cbf5de07 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Encontraram-se alguns erros. Modificaçõe
 ErrorConfigParameterNotDefined=O parâmetro <b>%s</b> não está definido ao fichero de configuração Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossivel encontrar o utilizador <b>%s</b> na base de dados do Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o país '%s'.
-ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país &quot;%s&quot;.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
 SetDate=Definir data
 SelectDate=Seleccionar uma data
@@ -301,8 +301,8 @@ UnitPriceHT=Preço Base (base)
 UnitPriceTTC=Preço Unitário
 PriceU=P.U.
 PriceUHT=P.U. (base)
-AskPriceSupplierUHT=P.U. HT Solicitado
-PriceUTTC=P.U.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Montante
 AmountInvoice=Montante da Fatura
 AmountPayment=Montante do Pagamento
@@ -339,6 +339,7 @@ IncludedVAT=IVA incluído
 HT=Sem IVA
 TTC=IVA incluido
 VAT=IVA
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Taxa IVA
@@ -413,6 +414,8 @@ Qty=Quant.
 ChangedBy=Modificado por
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalcular
 ResultOk=Éxito
 ResultKo=Erro
@@ -421,7 +424,7 @@ Reportings=Relatórios
 Draft=Rascunho
 Drafts=Rascunhos
 Validated=Validado
-Opened=Aberto
+Opened=Open
 New=Novo
 Discount=Desconto
 Unknown=Desconhecido
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Associado ao contacto de um utilizador
 DeleteAFile=Apagar um Ficheiro
 ConfirmDeleteAFile=Tem a certeza que querer eliminar este ficheiro?
 NoResults=Sem resultados
+SystemTools=System tools
 ModulesSystemTools=Módulos de ferramentas
 Test=Teste
 Element=Elemento
@@ -703,6 +707,9 @@ ShowTransaction=Mostrar transação
 GoIntoSetupToChangeLogo=Vá Início - Configurar - Empresa para alterar o logótipo ou vá a Início - Configurar - Exibir para ocultar.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
@@ -732,3 +739,4 @@ ShortThursday=Qui
 ShortFriday=Sex
 ShortSaturday=Sab
 ShortSunday=Dom
+SelectMailModel=Select email template
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index b30a848fa5a..89a1e009bff 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -199,7 +199,8 @@ Entreprises=Empresas
 DOLIBARRFOUNDATION_PAYMENT_FORM=Para fazer o seu pagamento de inscrição através de transferência bancária, consulte a página <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Para pagar com cartão de crédito ou Paypal, clique no botão na parte inferior desta página. <br>
 ByProperties=por categorias
 MembersStatisticsByProperties=Estatísticas do utilizador por categorias
-MembersByNature=Membros, por categoria
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas
 NoVatOnSubscription=Sem TVA para assinaturas
 MEMBER_PAYONLINE_SENDEMAIL=Enviar e-mail para avisar quando Dolibarr receber uma confirmação de pagamento validados por assinatura
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 07e2d6604ef..c819853f082 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Pedido a Fornecedor
 SuppliersOrders=Pedidos a Fornecedores
 SuppliersOrdersRunning=Pedidos a Fornecedores em Curso
 CustomerOrder=Pedido do Cliente
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Pedidos de Clientes em Curso
-CustomersOrdersAndOrdersLines=Pedidos de Clientes e Linhas de Pedido
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Ordens do Fornecedor para processar
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Anulado
 StatusOrderDraftShort=Rascunho
 StatusOrderValidatedShort=Validado
@@ -75,8 +75,9 @@ AddToMyOrders=Adicionar os meus Pedidos
 AddToOtherOrders=Adicionar a outros pedidos
 AddToDraftOrders=Add to draft order
 ShowOrder=Mostrar Pedido
-NoOpenedOrders=Nenhum pedido em aberto
-NoOtherOpenedOrders=Nenhum outro pedido aberto
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Outros Pedidos
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 7f4744141e2..78d54b4908f 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validação Ficha Intervenção
 Notify_FICHINTER_SENTBYMAIL=Intervenções enviadas por correio
 Notify_BILL_VALIDATE=Validação factura
 Notify_BILL_UNVALIDATE=Fatura do cliente não validada
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Fornecedor fim aprovado
 Notify_ORDER_SUPPLIER_REFUSE=Fornecedor fim recusado
 Notify_ORDER_VALIDATE=Pedido do cliente validado
@@ -203,6 +204,7 @@ ClickHereToGoTo=Clique aqui para ir para %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Adicionar entrada ao calendario
diff --git a/htdocs/langs/pt_PT/printing.lang b/htdocs/langs/pt_PT/printing.lang
index f0cd2a40292..a0a00beb068 100644
--- a/htdocs/langs/pt_PT/printing.lang
+++ b/htdocs/langs/pt_PT/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Configurar o Sistema de Impressão Direta
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
+ModuleDriverSetup=Controlador do Módulo de Configuração
+PrintingDriverDesc=Variáveis da configuração para o controlador de impressão.
+ListDrivers=Lista de Controladores
+PrintTestDesc=Lista de Impressoras.
+FileWasSentToPrinter=O ficheiro %s foi enviado para a inpressora
+NoActivePrintingModuleFound=Nenhum módulo ativo para imprimir o documento
+PleaseSelectaDriverfromList=Por favor, selecione um controlador da lista.
 SetupDriver=Driver setup
-TestDriver=Test
-TargetedPrinter=Targeted printer
+TestDriver=Testar
+TargetedPrinter=Impressora alvo
 UserConf=Setup per user
-PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
+PRINTGCP=Impressão na Nuvem da Google
+PrintGCPDesc=Este controlador permite-lhe enviar documentos diretamente para uma impressora com a Impressão na Nuvem da Google.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
-STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
-STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
+PrintTestDescprintgcp=Lista de Impressoras para a Impressão na Nuvem da Google
+PRINTGCP_LOGIN=Início de Sessão da Conta da Google
+PRINTGCP_PASSWORD=Senha da Conta da Google
+STATE_ONLINE=Ligado à rede
+STATE_UNKNOWN=Desconhecido
+STATE_OFFLINE=Desligado da rede
+STATE_DORMANT=Desligado da rede à já algum tempo
 TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
-TYPE_DOCS=DOCS
-TYPE_DRIVE=Google Drive
+TYPE_HP=Impressora da HP
+TYPE_DOCS=DOCUMENTOS
+TYPE_DRIVE=Drive da Google
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
-TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
+TYPE_IOS_CHROME_SNAPSHOT=iOS
+GCP_Name=Nome
+GCP_displayName=Exibir Nome
+GCP_Id=Id. da Impressora
+GCP_OwnerName=Nome do Fabricante
+GCP_State=Estado da Impressora
 GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
+GCP_Type=Tipo de Impressora
+PRINTIPP=Controlador PrintIPP
 PrintIPPSetup=Setup of Direct Print module
 PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
 PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
 PrintTestDescprintipp=List of Printers for driver PrintIPP.
 PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
+PRINTIPP_HOST=Servidor de Impressão
+PRINTIPP_PORT=Porta
+PRINTIPP_USER=Iniciar Sessão
+PRINTIPP_PASSWORD=Senha
+NoPrinterFound=Não foram encontradas impressoras (verifique a sua configuração CUPS)
+NoDefaultPrinterDefined=Não foi definida nenhuma impressora predefinda
+DefaultPrinter=Impressora Predefinida
+Printer=Impressora
+CupsServer=Servidor CUPS
 IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+IPP_Name=Nome da Impressora
+IPP_State=Estado da Impressora
+IPP_State_reason=Razão do Estado
+IPP_State_reason1=Razão do Estado 1
 IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
+IPP_Color=Cor
+IPP_Device=Dispositivo
 IPP_Media=Printer media
 IPP_Supported=Type of media
-STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
-STATE_IPP_none=None
+STATE_IPP_idle=Inativa
+STATE_IPP_stopped=Parada
+STATE_IPP_paused=Pausada
+STATE_IPP_toner-low-report=Pouco Toner
+STATE_IPP_none=Nenhum
 MEDIA_IPP_stationery=Stationery
-MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+MEDIA_IPP_thermal=Termal
+IPP_COLOR_print-black=Impressora BW
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 913d8cddb47..f506c37959d 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -22,16 +22,16 @@ ProductAccountancySellCode=Contabilidade (código vender)
 ProductOrService=Produto ou Serviço
 ProductsAndServices=Produtos e Serviços
 ProductsOrServices=Produtos ou Serviços
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesOnSell=Produtos e Serviços para compra ou venda
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Estatísticas Produtos e Serviços
 ProductsStatistics=Estatísticas Produtos
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
+ProductsOnSellAndOnBuy=Produtos para compra e venda
+ServicesOnSell=Serviços para compra ou venda
+ServicesNotOnSell=Services not for sale
+ServicesOnSellAndOnBuy=Serviços para compra e venda
 InternalRef=Referencia Interna
 LastRecorded=Ultimos Produtos/Serviços em Venda Registados
 LastRecordedProductsAndServices=Os %s Ultimos Produtos/Perviços Registados
@@ -44,7 +44,7 @@ CardProduct1=Ficha do Serviço
 CardContract=Ficha do Contrato
 Warehouse=Armazem
 Warehouses=Armazens
-WarehouseOpened=Armazem aberto
+WarehouseOpened=Warehouse open
 WarehouseClosed=Armazem fechado
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Preço de venda (inc. IVA)
 PublicPrice=Preço público
 CurrentPrice=Preço actual
 NewPrice=Novo preço
-MinPrice=Mínima. preço de venda
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=O preço de venda não pode ser inferior ao mínimo permitido para este produto ( %s sem impostos)
 ContractStatus=Estado de contrato
 ContractStatusClosed=Fechado
-ContractStatusRunning=Em Serviço
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Expirado
-ContractStatusOnHold=Fora de serviço
-ContractStatusToRun=To get running
-ContractNotRunning=Este contrato não está em serviço
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Um produto com a referencia %s já existe.
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorrecto
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Fornecedores
 SupplierRef=Ref. fornecedor
 ShowProduct=Mostrar produto
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Sim o serviço é de Duração limitada :
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Nº de preços
 MultiPriceLevelsName=Categoría de preços
-AssociatedProductsAbility=Activate the virtual package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsAbility=Activate the package feature
+AssociatedProducts=Pacote do produto
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associar
 Translation=Tradução
 KeywordFilter=Filtro por Chave
@@ -131,7 +131,7 @@ ProductToAddSearch=Procurar produtos a Adicionar
 AddDel=Adicionar/Retirar
 Quantity=Quantidade
 NoMatchFound=Não foram encontrados resultados
-ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/serviço (quantidade afectada)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Um dos produtos seleccionados é pai do produto em curso
 DeleteProduct=Eliminar um produto/serviço
@@ -153,13 +153,13 @@ Restock=Recolocar
 ProductSpecial=Especial
 QtyMin=Qtd mínima
 PriceQty=Preço para a quantidade
-PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMin=Preço para esta qt. mín. (s/ o desconto)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+DiscountQtyMin=Desconto predefinido para a qt.
 NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
 NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. Fornecedor definida para este produto
 RecordedProducts=Produtos em venda
-RecordedServices=Services recorded
+RecordedServices=Serviços registados
 RecordedProductsAndServices=Produtos/Serviços para Venda
 PredefinedProductsToSell=Predefined products to sell
 PredefinedServicesToSell=Predefined services to sell
@@ -179,25 +179,50 @@ CloneProduct=Copie produto ou serviço
 ConfirmCloneProduct=Tem certeza de que pretende copiar produto ou <b>serviço %s?</b>
 CloneContentProduct=Copie todas as principais informações do produto / serviço
 ClonePricesProduct=Copie principais informações e preços
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto / serviço
-CustomerPrices=preços de Clientes
-SuppliersPrices=preços dos fornecedores
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Código alfandega
 CountryOrigin=País de origem
 HiddenIntoCombo=Escondido em listas de seleção
 Nature=Natureza
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
-AddThisProductCard=Create product card
+AddThisProductCard=Criar cartão do produto
 HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
-AddThisServiceCard=Create service card
+AddThisServiceCard=Criar cartão do serviço
 HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
 CurrentProductPrice=Preço atual
 AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
+AlwaysUseFixedPrice=Utilizar o preço fixo
 PriceByQuantity=Different prices by quantity
 PriceByQuantityRange=Quantity range
 ProductsDashboard=Resumo Produtos/Serviços
@@ -212,9 +237,9 @@ QtyNeed=Quant.
 UnitPmp=Net unit VWAP
 CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
-ProductBuilded=Production completed
+ProductBuilded=Produção concluída
 ProductsMultiPrice=Produto multi-preço
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1º Trimestre
@@ -236,11 +261,11 @@ BarCodeDataForThirdparty=Informações de código de barras do terceiro %s:
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Preço único por produto/serviço
-PricingRule=Rules for customer prices
-AddCustomerPrice=Adicionar preço por clientes
+PricingRule=Regras para os preços de cliente
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Preço por registo de cliente
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -250,20 +275,24 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
+PriceNumeric=Número
+DefaultPrice=Preço Predefinido
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
-GlobalVariables=Global variables
+GlobalVariables=Variáveis globais
 GlobalVariableUpdaters=Global variable updaters
-GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterType0=Dados JSON
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=WebService data
 GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
 GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
+UpdateInterval=Intervalo de atualização (minutos)
+LastUpdated=Última atualização
+CorrectlyUpdated=Corretamente atualizado
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index c138fd4739f..185e07b83f8 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Esta visualização apresenta todos os projetos que está aut
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Esta visualização apresenta todos os projetos (as suas permissões de utilizador concedem-lhe a permissão para ver tudo).
 MyTasksDesc=Esta visualização está limitada aos projetos ou tarefas em que é um contacto para (seja qual for o tipo).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
 TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Área de Projetos
 NewProject=Novo Projeto
 AddProject=Criar Projeto
@@ -29,7 +30,7 @@ ProjectsList=Lista de Projetos
 ShowProject=Mostrar Projeto
 SetProject=Definir Projeto
 NoProject=Nenhum projeto definido ou possuído
-NbOpenTasks=Nr. de Tarefas Abertas
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nr. de Projetos
 TimeSpent=Tempo Dispendido
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Tempo despendido nas tarefas
 TaskTimeUser=Utilizador
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Tarefas nos projetos abertos
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Carga de trabalho não definida
 NewTimeSpent=Novo Tempo Dispendido
 MyTimeSpent=Meu Tempo Dispendido
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista de eventos associados ao projeto
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
 ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
 ActivityOnProjectThisYear=Actividade do Projecto neste Ano
@@ -95,7 +98,7 @@ DeleteATimeSpent=Excluir o tempo gasto
 ConfirmDeleteATimeSpent=Tem certeza que quer eliminar este tempo dispensado?
 DoNotShowMyTasksOnly=Ver também as tarefas não me atribuidas
 ShowMyTasksOnly=Ver só as tarefas que me foram atribuídas
-TaskRessourceLinks=Recursos
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
 NoTasks=Não existem tarefas para este projeto
 LinkedToAnotherCompany=Vinculado a Terceiros
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Procurar um projeto
 ProjectMustBeValidatedFirst=Primeiro deve validar o projeto
 ProjectDraft=Esboço de projetos
-FirstAddRessourceToAllocateTime=Associar um recuirso para alocar a hora
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index 91f6dd61fb0..64af2d09317 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -4,7 +4,7 @@ Proposal=Orçamento
 ProposalShort=Proposta
 ProposalsDraft=Orçamentos Rascunho
 ProposalDraft=Orçamento Rascunho
-ProposalsOpened=Orçamentos Abertos
+ProposalsOpened=Open commercial proposals
 Prop=Orçamentos
 CommercialProposal=Orçamento
 CommercialProposals=Orçamentos
@@ -16,7 +16,7 @@ Prospect=Cliente Potencial
 ProspectList=Lista de Clientes Potenciais
 DeleteProp=Eliminar Orçamento
 ValidateProp=Confirmar Orçamento
-AddProp=Criar Orçamento
+AddProp=Create proposal
 ConfirmDeleteProp=Está seguro de querer eliminar este orçamento?
 ConfirmValidateProp=Está seguro de querer Confirmar este orçamento?
 LastPropals=Os %s Ultimos Orçamentos
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Montante por Mês (sem IVA)
 NbOfProposals=Número Orçamentos
 ShowPropal=Ver Orçamento
 PropalsDraft=Rascunho
-PropalsOpened=Abertos
+PropalsOpened=Open
 PropalsNotBilled=Não Facturados
 PropalStatusDraft=Rascunho (a Confirmar)
 PropalStatusValidated=Validado (Orçamento Aberto)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Sem Assinar (Fechado)
 PropalStatusBilled=Facturado
 PropalStatusDraftShort=Rascunho
 PropalStatusValidatedShort=Validado
-PropalStatusOpenedShort=Aberto
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Fechado
 PropalStatusSignedShort=Assinado
 PropalStatusNotSignedShort=Sem Assinar
@@ -51,12 +51,10 @@ PropalsToClose=Orçamento a Fechar
 PropalsToBill=Orçamentos Assinados a Facturar
 ListOfProposals=Lista de Orçamentos
 ActionsOnPropal=Acções sobre o Orçamento
-NoOpenedPropals=Sem Orçamentos Abertos
-NoOtherOpenedPropals=Nenhum outro orçamento aberto
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Ref. Orçamento
 SendPropalByMail=Enviar Orçamento por E-mail
-FileNotUploaded=Não foi Carregado o Ficheiro
-FileUploaded=O Ficheiro foi carregado correctamente
 AssociatedDocuments=Documentos Associados ao Orçamento :
 ErrorCantOpenDir=Impossivel Abrir a Pasta
 DatePropal=Data da proposta
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Orçamento %s Inexistente
 Estimate=Orçamento:
 EstimateShort=Orç.
 OtherPropals=Outros Orçamentos
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=Criar orçamento por Cópia de um existente
 CreateEmptyPropal=Criar orçamento desde a Lista de produtos predefinidos
 DefaultProposalDurationValidity=Prazo de validade por defeito (em días)
@@ -100,3 +98,4 @@ DocModelJauneDescription=Modelo de Orçamento Jaune
 DefaultModelPropalCreate=Criação do modelo padrão
 DefaultModelPropalToBill=Modelo padrão ao fechar uma proposta de negócio (a facturar)
 DefaultModelPropalClosed=Modelo padrão ao fechar uma proposta de negócio (não faturada)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 9c699574cc0..c2223ca09ec 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Mostrar pagamento de salário
 THM=Preço médio da hora
 TJM=Preço médio diário
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 3ea181e8313..9f55de4a9e2 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Modelo Simples
 DocumentModelMerou=Mérou modelo A5
 WarningNoQtyLeftToSend=Atenção, não existe qualquer produto à espera de ser enviado.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Data de entrega planeada
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Data da entrega recebida
 SendShippingByEMail=Efectuar envio por e-mail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 6225f7517c2..cb8b8ca69b7 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Armazéns
 NewWarehouse=Novo Armazem ou Zona de Armazenagem
 WarehouseEdit=Modificar armazém
 MenuNewWarehouse=Novo Armazem
-WarehouseOpened=Armazem Aberto
+WarehouseOpened=Warehouse open
 WarehouseClosed=Armazem Fechado
 WarehouseSource=Armazem Origem
 WarehouseSourceNotDefined=Sem armazém definido
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Escolha depósito a ser usado para diminuição
 SelectWarehouseForStockIncrease=Escolha depósito a ser usado para aumentar stock
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Stock desejado
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Só Alertas
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=Para este armazém
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 6daa756f054..badff41b1b0 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Enviado para os fornecedores
 ListOfSupplierOrders=Lista das encomendas do fornecedor
 MenuOrdersSupplierToBill=Encomendas do fornecedor para faturar
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=O maior atraso é exibido entre a lista do produto da encomenda
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
index 79f39545625..f38129b2c80 100644
--- a/htdocs/langs/pt_PT/trips.lang
+++ b/htdocs/langs/pt_PT/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Relatório de Despesas
 TripsAndExpensesStatistics=Estatísticas dos Relatórios de Despesas
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=Lista de relatório de despesas
+ListOfTrips=List of expense reports
 ListOfFees=Lista de Taxas
 NewTrip=Novo relatório de despesas
 CompanyVisited=Empresa/Instituição Visitada
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Informação da Empresa
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Autocarro
 TF_CAR=Carro
 TF_PEAGE=Portagem
 TF_ESSENCE=Combustível
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Táxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=Lista de relatórios de despesas
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Adicione uma linha
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Nota
 Project=Projeto
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Aprovado por
 AUTHOR=Registado por
-AUTHORPAIEMENT=Pago por
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Negado por
-CANCEL_USER=Cancelado por
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Motivo
 MOTIF_CANCEL=Motivo
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Data de pagamento
 
 TO_PAID=Pagar
 BROUILLONNER=Reabrir
-SendToValid=Enviar para aprovação
+SendToValid=Sent on approval
 ModifyInfoGen=Editar
 ValidateAndSubmit=Validar e submeter para aprovação 
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancelar um relatório de despesas
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validar relatório de despesas
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index cc64abc3155..f0e8d589044 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Apagar Grupo
 PasswordChangedAndSentTo=Palavra-passe alterada e enviada para <b>%s</b>.
 PasswordChangeRequestSent=Pedido para alterar a palavra-passe para <b>%s</b> enviada para <b>%s</b>.
 MenuUsersAndGroups=Utilizadores e Grupos
+MenuMyUserCard=My user card
 LastGroupsCreated=Os %s últimos grupos criados
 LastUsersCreated=Os %s últimos utilizadores criados
 ShowGroup=Mostrar Grupo
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 618fa876467..3f242c7e71e 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=arquivo retirado
 SetToStatusSent=Definir o estado como "arquivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isso também irá criar pagamentos em facturas e classificá-los para pagar
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Pagamento de %s ordem permanente pelo banco
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index e3e82fc3596..b5e838766f8 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Configuração do módulo de Workflow
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Não há fluxo de trabalho você pode modificar para o módulo que você tenha ativado.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar um pedido do cliente automaticamente, após uma proposta comercial ser assinada
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente, após uma proposta comercial ser assinada
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente depois de um contrato ser validado
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente após um pedido do cliente estar fechado
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a fonte ligada como prposta a cobrança quando a ordem do cliente for definida como paga
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada como cobrado quando a ordem(s) do cliente for definida como paga
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada a ordem(s) de clientes quando a fatura de cliente for validada
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index fa60ab7a5b4..1e3f9c0c53e 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Contabilitate
 Globalparameters=Parametri globali
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Lungimea conturilor de terţi
 
 ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
-ACCOUNTING_BANK_JOURNAL=Jurnal bancă
-ACCOUNTING_CASH_JOURNAL=Jurnal casă
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal Diverse
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Jurnal Asigurări Sociale
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cont transfer
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index ded1fc6c1c4..83979bf971c 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Meniu pentru utilizatori
 LangFile=Fişiere. Lang
 System=Sistem
 SystemInfo=Informaţii Sistem
-SystemTools=Instrumente Sistem
 SystemToolsArea=Instrumente Sistem
 SystemToolsAreaDesc=Această zonă oferă funcţionalităţi de administrare. Folositi meniul pentru a alege funcţionalitatea pe care o căutaţi.
 Purge=Curăţenie
@@ -232,8 +231,8 @@ Security=Securitate
 Passwords=Parolele
 DoNotStoreClearPassword=Nu stoca parole în mod clar în baza de date
 MainDbPasswordFileConfEncrypted=Baza de date parola criptat în conf.php
-InstrucToEncodePass=Pentru a avea parola codate în <b>conf.php</b> dosar, înlocuiţi linie <br> <b>dolibarr_main_db_pass $ ="..."</b> <br> de <br> <b>dolibarr_main_db_pass $ = "criptat: %s"</b>
-InstrucToClearPass=Pentru a avea parola decodificate (clare) în <b>conf.php</b> dosar, înlocuiţi linie <br> <b>dolibarr_main_db_pass $ = "criptat :..."</b> <br> de <br> <b>dolibarr_main_db_pass $ = "%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protecţie a generat pdf (nu recommandd, pauzele de masă PDF Generation)
 ProtectAndEncryptPdfFilesDesc=De protecţie a unui document PDF păstrează disponibil pentru a citi şi de a imprima cu orice browser PDF. Cu toate acestea, editarea şi copierea nu este posibil acum. Reţineţi că utilizarea acestei funcţii face construirea unui globale cumulate pdf nu de lucru (cum ar fi facturile unpaid).
 Feature=Funcţionalitate
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Acesta este procesul de configurare pentru a:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Pasul %s
 FindPackageFromWebSite=Găsiţi un pachet care ofera facilitate dorit (de exemplu, pe site-ul web %s).
-DownloadPackageFromWebSite=Descărcaţi pachetul %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Instalarea este terminat şi Dolibarr este gata pentru a fi utilizate cu această nouă componentă.
 NotExistsDirect=Nu este  definit directorroot  alternativ.<br>
 InfDirAlt=Începând cu versiunea 3, este posibil să se definească un director radacina alternativ.Director rădăcină vă permite să stocați, în același loc, plug-in-uri și template-uri personalizate. <br> Doar creaţi un director de la rădăcină Dolibarr (de exemplu: custom). <br>
 InfDirExample=<br> Apoi, declaraţi l  fișierul în conf.php <br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br * Aceste linii sunt comentate cu "#", pentru a decomenta doar elimina caracterul.
-YouCanSubmitFile=Selectaţi modulul:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr versiunea curentă
 CallUpdatePage=Du-te la pagina care se actualizează datele şi structura bazei de date %s.
 LastStableVersion=Ultima versiune stabilă
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Lista de parametri a venit de la tabelul <br>Sintaxa:
 ExtrafieldParamHelpchkbxlst=Lista de parametri a venit de la tabelul <br>Sintaxa: able_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br> filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă <br> dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)<br><br>În scopul de avea lista depinzând de alta  :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Librairie utilizată la construirea PDF ului
 WarningUsingFPDF=Atenție: <b>conf.php</b> contine Directiva <b>dolibarr_pdf_force_fpdf = 1.</b> Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF. <br> Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , atunci comentariu sau elimina linia <b>$ dolibarr_pdf_force_fpdf = 1,</b> și se adaugă în schimb <b>$ dolibarr_lib_TCPDF_PATH = &#39;path_to_TCPDF_dir&#39;</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Introduceți un număr de telefon pentru a afișa un link de test ClickToDial  Url pentru utilizatorul<strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Oferte
 Module20Desc=Managementul Ofertelor Comerciale
 Module22Name=Emailing
 Module22Desc=Managementul trimiterilor de emailuri în masă
-Module23Name= Energie
-Module23Desc= Monitorizarea consumului de energie
+Module23Name=Energie
+Module23Desc=Monitorizarea consumului de energie
 Module25Name=Comenzi clienţi
 Module25Desc=Managementul Comenzilor Clienţi
 Module30Name=Facturi
@@ -492,8 +491,8 @@ Module400Name=Proiecte / Oportunitati  / Prospecți
 Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comandă, ofertă, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
-Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
-Module500Desc=Managementul cheltuielilor speciale cum ar fi taxele , contribuţiile sociale, dividendele si salariile
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salarii
 Module510Desc=Managementul salariilor angajatilor si a plaţiilor
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notificări
 Module600Desc=Trimite notificări prin email la unele evenimente de afaceri Dolibarr la contactele terților (configurare definită pe fiecare terţ)
 Module700Name=Donatii
 Module700Desc=MAnagementul Donaţiilor
-Module770Name=Raport Cheltuieli
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Acţiuni / activităţi de ordine de zi şi de gestionare a
 Module2500Name=Electronic Content Management
 Module2500Desc=Salvaţi şi partaja documente
-Module2600Name=Servicii web
-Module2600Desc=Activarea serviciilor Dolibarr serverul web
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=Servicii web  (client)
 Module2650Desc=Activați Servicii web a clientului Dolibarr  (Poate fi folosit pentru a da date / cererile de servere externe. Doar Comenzi Furnizor sunt acceptate  pentru moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Creare / Modificare produse / servicii
 Permission34=Ştergere produse / servicii
 Permission36=Exportul de produse / servicii
 Permission38=Exportul de produse
-Permission41=Citiţi cu proiecte şi sarcini
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Creare / Modificare de proiecte, pentru a edita sarcinile mele de proiecte
 Permission44=Ştergere proiecte
 Permission61=Citeşte intervenţii
@@ -599,10 +600,10 @@ Permission86=Trimite ordinelor clienţilor
 Permission87=Inchide ordinelor clienţilor
 Permission88=Anulare ordinelor clienţilor
 Permission89=Ştergere ordinelor clienţilor
-Permission91=Citiţi contribuţiile sociale şi de TVA
-Permission92=Creare / Modificare a contribuţiilor sociale şi a TVA-ului
-Permission93=Ştergere a contribuţiilor sociale şi a TVA-ului
-Permission94=Export contribuţiilor sociale
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Citeşte rapoarte
 Permission101=Citeşte sendings
 Permission102=Creare / Modificare Livrare
@@ -620,9 +621,9 @@ Permission121=Citiţi cu terţe părţi legate de utilizator
 Permission122=Creare / Modificare terţe părţi legate de utilizator
 Permission125=Ştergere terţe părţi legate de utilizator
 Permission126=Export terţi
-Permission141=Citiţi sarcini
-Permission142=Crearea / modificarea sarcinilor
-Permission144=Ştergeţi sarcini
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Citiţi cu furnizorii
 Permission147=Citeşte stats
 Permission151=Citiţi cu ordine de plată
@@ -800,7 +801,7 @@ DictionaryCountry=Ţări
 DictionaryCurrency=Monede
 DictionaryCivility=Mod adresare
 DictionaryActions=Tip evenimente agenda
-DictionarySocialContributions=Tipuri Contribuţii sociale
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Cote TVA sau Cote Taxe Vanzări
 DictionaryRevenueStamp=Valoarea timbrelor fiscale
 DictionaryPaymentConditions=Conditiile de plata
@@ -817,6 +818,9 @@ DictionarySource=Originea ofertei  / comenzi
 DictionaryAccountancyplan=Plan de conturi
 DictionaryAccountancysystem=Model pentru plan de conturi
 DictionaryEMailTemplates=Șabloane e-mailuri 
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup salvate
 BackToModuleList=Inapoi la lista de module
 BackToDictionaryList=Inapoi la lista de dicţionare
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Oraş
 CompanyCountry=Ţară
 CompanyCurrency=Deviza principală
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Nu mai afişa
 DoNotSuggestPaymentMode=Nu sugerează
 NoActiveBankAccountDefined=Niciun cont bancar activ definit
 OwnerOfBankAccount=Titular de cont bancar %s
 BankModuleNotActive=Conturi bancare de module nu a permis
-ShowBugTrackLink=Arata link-ul "Raportaţi o eroare"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "de lucru" la pagina de start
 Alerts=Alerte
 Delays=Întârzierile
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Zecimale max pentru preturi unitare
 MAIN_MAX_DECIMALS_TOT=Zecimale max pentru preturi totale
 MAIN_MAX_DECIMALS_SHOWN=Zecimale max pentru  preţurile afişate pe ecran (Adăugaţi <b>...</b> după acest număr, dacă doriţi să vezi <b>...</b> când numărul este trunchiat atunci când sunt afişate pe ecran)
 MAIN_DISABLE_PDF_COMPRESSION=Utilizaţi PDF generate de compresie pentru fişiere PDF.
-MAIN_ROUNDING_RULE_TOT= Dimensiune de rotunjire gama (pentru ţările rare în care rotunjirea se face pe altceva decât baza 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=preţul unitar net al unui produs
 TotalPriceAfterRounding=Pret total (net / TVA / inclusiv fiscale) după rotunjirea
 ParameterActiveForNextInputOnly=Parametru de eficient pentru următoarea intrare numai
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Numărul total al modulelor funcţionale activate:
 YouMustEnableOneModule=Trebuie activat cel puţin 1 modul
 ClassNotFoundIntoPathWarning=Clasa %s negăsită în calea PHP
 YesInSummer=Da în vară
-OnlyFollowingModulesAreOpenedToExternalUsers=Notă, doar următoarele module sunt deschise pentru utilizatorii externi (indiferent dacă sunt permisiuni de utilizatori):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Stocarea sesiune criptată prin Suhosin
 ConditionIsCurrently=Condiția este momentan %s
 YouUseBestDriver=Utilizaţi driverul %s care este cel mai bun driver disponibil acum.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=Max
 ConfirmDeleteProductLineAbility=Confirmarea de îndepărtare a produce o linie în forme
 ModifyProductDescAbility=Personalizare de descrieri produse în forme
 ViewProductDescInFormAbility=Vizualizare descrierile de produs, în forme (de altfel ca popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Vizualizarea de descrieri de produse în limba thirdparty
 UseSearchToSelectProductTooltip=De asemenea, dacă aveți un număr mare produse (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
 UseSearchToSelectProduct=Folositi un formular de căutare pentru a alege un produs (mai degrabă decât o listă derulantă).
 UseEcoTaxeAbility=Suport Eco-Taxe (DEEE)
 SetDefaultBarcodeTypeProducts=Implicit tip de cod de bare de a utiliza pentru produse
 SetDefaultBarcodeTypeThirdParties=Implicit tip de cod de bare de a utiliza pentru terţi
+UseUnits=Support units
 ProductCodeChecker= Modul pentru generare de cod de produs și verificare (produs sau serviciu)
 ProductOtherConf= Configurare Produse / Servicii
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Coduri de bare de tip UPC
 BarcodeDescISBN=Coduri de bare de tip ISBN
 BarcodeDescC39=Coduri de bare de tip C39
 BarcodeDescC128=Coduri de bare de tip C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
 BarCodeNumberManager=Manager pentru autodefinire numere coduri bare
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Sunteţi sigur că doriţi să ştergeţi meniul de <b>intrare
 DeleteLine=Ştergere rând
 ConfirmDeleteLine=Sunteţi sigur că doriţi să ştergeţi această linie?
 ##### Tax #####
-TaxSetup=Impozite, contribuţii sociale şi dividende de modul de configurare
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Opţiunea de exigibilit de TVA
 OptionVATDefault=Bazată pe incasări
 OptionVATDebitOption=Bazată pe debit
@@ -1552,6 +1561,15 @@ WebServicesSetup=WebServices modul de configurare
 WebServicesDesc=Prin activarea acestui modul, Dolibarr devenit un serviciu de web server pentru a oferi diverse servicii web.
 WSDLCanBeDownloadedHere=WSDL Descriptorul de fişier cu condiţia serviceses pot fi download aici
 EndPointIs=SOAP clienţii trebuie să trimită cererile lor la Dolibarr final disponibile la Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Banca modul de configurare
 FreeLegalTextOnChequeReceipts=Free text pe cec încasări
@@ -1581,6 +1599,7 @@ ProjectsSetup=Proiect modul de configurare
 ProjectsModelModule=Proiectul de raport document model
 TasksNumberingModules=Model de numerotaţie al taskurilor
 TaskModelModule=Modele  de document de rapoarte taskuri
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Arborescenţa automată este disponibilă
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Deschide an fiscal
 CloseFiscalYear=Închide an fiscal
 DeleteFiscalYear=Şterge an fiscal
 ConfirmDeleteFiscalYear=Sigur  doriţi să ştergeţi acest an fiscal  ?
-Opened=Deschis
+Opened=Open
 Closed=Închis
 AlwaysEditable=Permite a fi editat mereu
 MAIN_APPLICATION_TITLE=Forțează numele vizibil al aplicare (avertisment: setarea propriul nume aici poate duce la eliminarea facilitaţii de conectare automată atunci când se utilizează aplicația mobilă DoliDroid)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 5e8e04e5de9..4b2adc8063d 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Comanda %s aprobată
 OrderRefusedInDolibarr=Comanda %s refuzată
 OrderBackToDraftInDolibarr=Comanda %s revenită de statutul schiţă
-OrderCanceledInDolibarr=Comanda  %s anulată
 ProposalSentByEMail=Oferta comercială %s  trimisă prin e-mail
 OrderSentByEMail=Comanda client %s trimisă prin e-mail
 InvoiceSentByEMail=Factura client %s trimisă prin e-mail
@@ -96,3 +95,5 @@ AddEvent=Creare eveniment
 MyAvailability=Disponibilitatea mea
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 70f13d3bc35..d61a8c13be6 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Deconteaza
 Conciliation=Conciliere
 ConciliationForAccount=Deconteaza acest cont
 IncludeClosedAccount=Includeţi conturile închise
-OnlyOpenedAccount=Numai conturile deschise
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Cont de credit
 AccountToDebit=Cont de debit
 DisableConciliation=Dezactivaţi reconcilierea pentru acest cont
 ConciliationDisabled=Reconciliere dezactivată
-StatusAccountOpened=Deschis
+StatusAccountOpened=Open
 StatusAccountClosed=Închis
 AccountIdShort=Cod
 EditBankRecord=Editare înregistrare
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Plată Client
 CustomerInvoicePaymentBack=Return Plată client
 SupplierInvoicePayment=Plată Furnizor
 WithdrawalPayment=Retragerea de plată
-SocialContributionPayment=Plată contribuţie socială
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Jurnal Cont Financiar
 BankTransfer=Virament bancar
 BankTransfers=Viramente 
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index f642ec13a7b..4961f09ab01 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nr  facturi
 NumberOfBillsByMonth=Nr facturi pe luni
 AmountOfBills=Valoare facturi
 AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără tva)
-ShowSocialContribution=Afisează  contribuţiile sociale
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Afisează  factura
 ShowInvoice=Afisează  factura
 ShowInvoiceReplace=Afisează  factura de înlocuire
@@ -270,7 +270,7 @@ BillAddress=Adresa de facturare
 HelpEscompte=Această reducere este un discount acordat clientului pentru că plata  a fost făcută înainte de termen.
 HelpAbandonBadCustomer=Această sumă a fost abandonată (client ae declarat  client de rău platnic) şi este considerat ca fiind o pierdere excepţională.
 HelpAbandonOther=Această sumă a fost abandonată, deoarece a fost o eroare (client greșit sau factura înlocuită cu alta, de exemplu)
-IdSocialContribution=ID Contribuţie Socială
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID Plată
 InvoiceId=ID Factură
 InvoiceRef=Ref. Factură
@@ -294,10 +294,11 @@ TotalOfTwoDiscountMustEqualsOriginal=Valoarea totală a celor două noi reduceri
 ConfirmRemoveDiscount=Sigur doriţi să eliminaţi acest discount?
 RelatedBill=Factură asociată
 RelatedBills=Facturi asociate
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
+RelatedCustomerInvoices=Facturi client asociate
+RelatedSupplierInvoices=Facturi asociate Furnizor
 LatestRelatedBill=Ultima Factură asociată
 WarningBillExist=Avertisment, una sau mai multe facturi există deja
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Imediat
@@ -429,5 +430,5 @@ NotLastInCycle=Aceasta factura ce nu se afla in ultimul ciclu si nu poate fi mod
 DisabledBecauseNotLastInCycle=URmatoarea situatie deja exista
 DisabledBecauseFinal=Aceasta situatie este finala
 CantBeLessThanMinPercent=Progresul nu poate fi mai mic decat valoarea lui in precedenta situatie
-NoSituations=Nicio situatie deschisa
+NoSituations=No open situations
 InvoiceSituationLast=Factura finala si generala
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index 14f69356c72..9443c560081 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Ultimele contracte
 BoxLastContacts=Ultimele contacte / adrese
 BoxLastMembers=Ultimii membri
 BoxFicheInter=Ultimele intervenţii
-BoxCurrentAccounts=Solduri conturi deschise
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Cifra de afaceri Vânzări 
 BoxTotalUnpaidCustomerBills=Total facturi clienţi neîncasate
 BoxTotalUnpaidSuppliersBills=Total facturi  furnizori neplătite
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Ultimii  %s membri
 BoxTitleLastFicheInter=Ultimele %s intervenţii modificate
 BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s  facturi clienţi neîncasate
 BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s  facturi furnizori neplătite
-BoxTitleCurrentAccounts=Solduri conturi deschise 
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Cifra de afaceri vânzări 
 BoxTitleTotalUnpaidCustomerBills=Facturi clienţi neîncasate
 BoxTitleTotalUnpaidSuppliersBills=Facturi furnizori neplătite
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 799c5ab66a1..b1b2dd96cbe 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b> %s</b> a fost adaugat cu succes.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Niciunul
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Această categorie  există deja cu această referinţă
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Conţinutul nu va fi vizibil pentru toţi
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Categorii  Clienţi / Prospecte
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 93c5f0623d7..814a3677371 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Contact Terţ
 StatusContactValidated=Status Contact
 Company=Societate
 CompanyName=Nume  societate
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Societăţi
 CountryIsInEEC=Ţara este în interiorul Comunităţii Economice Europene
 ThirdPartyName=Nume Terţ
@@ -410,5 +411,10 @@ OutstandingBillReached=Max. atins pentru facturi in suspensie
 MonkeyNumRefModelDesc=Retrimite numărulcu formatul %syymm-nnnn pentru codul de client și %syymm-nnnn pentru codul de furnizor unde YY este anul, mm  este luna și nnnn este o secvență continuă și fără să revină la 0.
 LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi modificat în orice moment.
 ManagingDirectors=Nume Manager(i) nume (CEO, director, preşedinte...)
-SearchThirdparty=Caută terţ
+SearchThirdparty=Search third party
 SearchContact=Caută contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 71204246fb0..d095dbc84f8 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -56,23 +56,23 @@ VATCollected=TVA colectat
 ToPay=De plată
 ToGet=De rambursat
 SpecialExpensesArea=Plăţi speciale
-TaxAndDividendsArea=Taxe, Contribuţii Sociale şi Dividende
-SocialContribution=Contribuţie socială
-SocialContributions=Contribuţii sociale
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Cheltuieli speciale
 MenuTaxAndDividends=Impozite şi dividende
 MenuSalaries=Salarii
-MenuSocialContributions=Contribuţii sociale
-MenuNewSocialContribution=Contribuţie nouă
-NewSocialContribution=Contribuţie socială nouă
-ContributionsToPay=Contribuţii de plată
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Contabilitate / Trezorerie
 AccountancySetup=Setări Contabilitate
 NewPayment=Plată nouă
 Payments=Plăţi
 PaymentCustomerInvoice=Plată factură client
 PaymentSupplierInvoice=Plată factură  furnizor
-PaymentSocialContribution=Plată  contribuţie socială
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Plată TVA
 PaymentSalary=Plata salariu
 ListPayment=Listă plăţi
@@ -91,7 +91,7 @@ LT1PaymentES=RE Plată
 LT1PaymentsES=RE Plăţi
 VATPayment=Plată TVA
 VATPayments=Plăţi TVA
-SocialContributionsPayments=Plăţi contribuţii sociale
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Arata plata TVA
 TotalToPay=Total de plată
 TotalVATReceived=Total TVA primit
@@ -116,11 +116,11 @@ NewCheckDepositOn=New verifica depozit în contul: %s
 NoWaitingChecks=Niciun cec de depus.
 DateChequeReceived=Data primire Cec
 NbOfCheques=Nr cecuri
-PaySocialContribution=Plătesc o contribuţie socială
-ConfirmPaySocialContribution=Sunteţi sigur că doriţi pentru a clasifica această contribuţie socială ca platite?
-DeleteSocialContribution=Ştergeţi o contribuţie socială
-ConfirmDeleteSocialContribution=Sunteţi sigur că doriţi să ştergeţi această contribuţie socială?
-ExportDataset_tax_1=Contribuţii sociale, cât şi plăţile
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mod <b>%s TVA pe baza contabilității de angajament %s</b>.
 CalcModeVATEngagement=Mod <b>%s TVA pe baza venituri-cheltuieli%s.</b>
 CalcModeDebt=Mod <b>%sCreanțe-Datorii%s</b> zisă <b> contabilitatea de angajamente</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pe
 TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul <b>contabilitate de casă</b> nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul  <b>contabilitate de angajament</b> (a se vedea configurarea modulului de contabilitate).
 CalculationMode=Mod calcul
 AccountancyJournal=Jurnal cod contabilitate
-ACCOUNTING_VAT_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Colectată
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Platită
 ACCOUNTING_ACCOUNT_CUSTOMER=Cont Contabilitate Predefinit pentru terţi Clienţi
 ACCOUNTING_ACCOUNT_SUPPLIER=Cont Contabilitate Predefinit pentru terţi Furnizori
-CloneTax=Clonaţi o contribuţie socială
-ConfirmCloneTax=Confirmaţi Clona  contribuţie sociale
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clonaţi-o pentru luna următoare
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index dc3786315b3..d2134728a35 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -4,10 +4,10 @@ About = Despre
 CronAbout = Despre Cron
 CronAboutPage = Despre pagina cron
 # Right
-Permission23101 = Citeste sarcină programată
-Permission23102 = Creare/Modificare sarcină programată
-Permission23103 = Ştergeţi o sarcină programată
-Permission23104 = Execută sarcină programată
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Setare Managementul joburilor programate
 URLToLaunchCronJobs=URL-ul pentru a verifica și a lansa joburi cron, dacă este necesar
@@ -26,11 +26,11 @@ CronLastOutput=Ieşirea ultimei rulări
 CronLastResult=Codul ultimului rezultat
 CronListOfCronJobs=Lista joburilor programate
 CronCommand=Comandă
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Dată începere
 CronDtEnd=Data de final
 CronDtNextLaunch=Urmatoarea execuţie
 CronDtLastLaunch=Ultima execuţie
-CronFrequency=Frecvenţa
-CronClass=Clasa
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metoda
 CronModule=Modulul
 CronAction=Acţiunea
@@ -55,9 +55,9 @@ CronEach=Fiecare
 JobFinished=Job lansat şi terminat
 #Page card
 CronAdd= Adaugă joburi
-CronHourStart= Data şi Ora de start a sarcinii
-CronEvery= Şi execută sarcina la fiecare
-CronObject= Instanţă/Obiect de creat
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instanţă/Obiect de creat
 CronArgs=Parametri
 CronSaveSucess=Salvare realizată
 CronNote=Comenteaza
@@ -76,13 +76,14 @@ CronMethodHelp=Metoda obiectului de încărcat. <BR> De exemplu să aducă metod
 CronArgsHelp=Argumentele metodei . <BR> De exemplu să aducă metoda  obiect ului Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea parametrilor pot fi este  <i>0, ProductRef</i>
 CronCommandHelp=Linia de comandă de sistem pentru a executa.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informatie
 # Common
-CronType=Tip sarcină
+CronType=Job type
 CronType_method=Apel metodă a Clasei Dolibarr
 CronType_command=Comandă shell
 CronMenu=Cron
 CronCannotLoadClass=Nu pot încărca clasa %s sau  obiectul %s
 UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Instrumentele modulelor - Lista de job-uri'' pentru a vedea și edita job-urile programate.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index 49c4ce3bb8e..4285360baba 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Caută după obiect
 ECMSectionOfDocuments=Directoare  documente
 ECMTypeManual=Manual
 ECMTypeAuto=Automat
-ECMDocsBySocialContributions=Documente legate de contribuţiile sociale
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documente legate de terţi
 ECMDocsByProposals=Documente legate de oferte
 ECMDocsByOrders=Documente legate de comenzi  clienţi
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index f1d575dc612..096c6458ee5 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
@@ -190,3 +191,4 @@ WarningNotRelevant=Operaţiuni irelevante pentru acest dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcţionalitate dezactivată atunci când configurarea de afișare este optimizată pentru nevăzători sau de browsere text .
 WarningPaymentDateLowerThanInvoiceDate=Data plăţii(%s) este mai veche decât data facturii (%s) pentru factura %s
 WarningTooManyDataPleaseUseMoreFilters=Prea multe date. Folosiţi mai multe filtre
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index 1e22f40b9b8..52db0965fe5 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Concedii
 CPTitreMenu=Concedii
 MenuReportMonth=Situaţia lunară
-MenuAddCP=Crează o cerere de concediu
+MenuAddCP=New leave request
 NotActiveModCP=Trebuie să activaţi modulul de concedii pentru a vedea această pagină.
 NotConfigModCP=Trebuie să configuraţi modulul Concedii pentru a vedea această pagină.Pentru aceasta , <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> clic aici </ a>.
 NoCPforUser=Nu mai aveţi nici o zi disponibilă
@@ -71,7 +71,7 @@ MotifCP=Motiv
 UserCP=Utilizator
 ErrorAddEventToUserCP=O eroare a survenit in timpul adaugarii de concediu exceptional.
 AddEventToUserOkCP=Adaugarea de concediu exceptional a fost efectuat
-MenuLogCP=Vezi logurile cererilor de concedii
+MenuLogCP=View change logs
 LogCP=Loguri al actualizărilor zilelor de concediu
 ActionByCP=Realizat de
 UserUpdateCP=Pentru utilizatorul
@@ -93,6 +93,7 @@ ValueOptionCP=Valoare
 GroupToValidateCP=Grup cu drepturi de  aprobare a concediilor
 ConfirmConfigCP=Validare configuraţie
 LastUpdateCP=Ultima actualizare automată a concediilor
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Actualizare realizată.
 ErrorUpdateConfCP=O eroare a apărut în timpul actualizării,  încercaţi din nou.
 AddCPforUsers=Adaugaţi soldul concediului alocat utilizatorului la <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clic aici</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=O eroare a intervenit la trimiterea mailului :
 NoCPforMonth=Niciun concediu această lună.
 nbJours=Număr zile
 TitleAdminCP=Configurarea modulului concedii
+NoticePeriod=Notice period
 #Messages
 Hello=Salut
 HolidaysToValidate=Validează cereri concedii
@@ -139,10 +141,11 @@ HolidaysRefused=Cerere respinsă
 HolidaysRefusedBody=Cererea dvs pentru concediu  pentru %s la %s a fost respinsă pentru următoul motiv:
 HolidaysCanceled=Cereri Concedii anulate
 HolidaysCanceledBody=Cererea dvs pentru concediu  pentru %s la %s a fost anulată.
-Permission20000=Citeşte cererile de plecare proprii
-Permission20001=Crează/modifică cererile tale de concediu
-Permission20002=Creaează/modifică toate cererile de concediu 
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Şterge cererile de concediu
-Permission20004=Configurare zile disponibile
-Permission20005=Revezi logurile ale cererilor de concedii modificate
-Permission20006=Citeşte raport concedii lunare
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/ro_RO/incoterm.lang b/htdocs/langs/ro_RO/incoterm.lang
index 2396d2acb0e..2a6053ff160 100644
--- a/htdocs/langs/ro_RO/incoterm.lang
+++ b/htdocs/langs/ro_RO/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
+IncotermLabel=Incoterm
+IncotermSetupTitle1=Functionalitate
 IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetup=Configurare  modul Incoterm
+IncotermFunctionDesc=Activare Functionalitati INcoterm ( Terti, Oferte, Comenzi, Facturi, Livrari )
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index c4a8956bc4d..8e089320a94 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Serverul de baze de date - superuser de acces
 CheckToCreateDatabase=Verificaţi dacă în cutia în cazul în care baza de date nu există şi trebuie să fie creat. <br> În acest caz, trebuie să completaţi datele de conectare / parola pentru contul de superuser, la partea de jos a acestei pagini.
 CheckToCreateUser=Verificaţi dacă în cutia în cazul în care proprietarul bazei de date nu există şi trebuie să fie creat. <br> În acest caz, trebuie să alegeţi de conectare şi parola şi umple, de asemenea, conectare / parola pentru contul de superuser, la partea de jos a acestei pagini. Dacă această casetă este debifată bază de date, proprietarul şi parolele sale trebuie să există.
 Experimental=(Experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login utilizatorului posibilitatea de a crea baze de date noi sau de noi utilizatori, inutil în cazul în care baza de date si login-ul bazei de date există deja (ca atunci cand sunt găzduite de către un furnizor de web hosting).
 KeepEmptyIfNoPassword=Lasă un gol în cazul în care utilizatorul nu are nici o parola (a evita acest lucru)
 SaveConfigurationFile=Salvaţi valorile
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index 483e5b1caa3..c22da0fac0e 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabă
 Language_ar_SA=Arabă (Arabia Saudită)
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgară
 Language_bs_BA=Bosniac
 Language_ca_ES=Catalană
@@ -21,9 +22,10 @@ Language_en_SA=Engleză (Arabia Saudită)
 Language_en_US=Engleză (Statele Unite)
 Language_en_ZA=Engleză (Africa de Sud)
 Language_es_ES=Spaniolă
-Language_es_DO=Spaniolă (Republica Dominicană)
 Language_es_AR=Spaniolă (Argentina)
 Language_es_CL=Spaniolă (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spaniolă (Republica Dominicană)
 Language_es_HN=Spaniolă (Honduras)
 Language_es_MX=Spaniolă (Mexic)
 Language_es_PY=Spaniolă (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indoneziană
 Language_is_IS=Islandeză
 Language_it_IT=Italiană
 Language_ja_JP=Japoneză
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Coreeană
+Language_lo_LA=Lao
 Language_lt_LT=Lituanian
 Language_lv_LV=Letonă
 Language_mk_MK=Macedonean
@@ -64,6 +69,7 @@ Language_sv_SV=Suedeză
 Language_sv_SE=Suedeză
 Language_sq_AL=Albaneză
 Language_sk_SK=Slovacă
+Language_sw_SW=Kiswahili
 Language_th_TH=Tailandez
 Language_uk_UA=Ucrainean
 Language_uz_UZ=Uzbecă
diff --git a/htdocs/langs/ro_RO/loan.lang b/htdocs/langs/ro_RO/loan.lang
new file mode 100644
index 00000000000..979bd2a0d7b
--- /dev/null
+++ b/htdocs/langs/ro_RO/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Asigurari
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 81a2cb43ea9..1d0ab1c5b7f 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Confirmarea de primire
 YourMailUnsubcribeOK=Emailul  <b>%s</b>  este dezabonat din mailing list
 MailtoEMail=Hyper link către email
 ActivateCheckRead=Permite utiliyarea linkului  "Dezabonare"
-ActivateCheckReadKey=Utilizaţi cheia pentru a cripta URL-ul folosit pentru funcţiunile "Confirmare de citire" și "Dezabonare"
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail trimis la %s destinatari.
 XTargetsAdded=<b>%s</b> destinatari adăugaţi în lista target
 EachInvoiceWillBeAttachedToEmail=Un document folosind modelul implicit al documentului va fi creat și atașat la fiecare e-mail.
@@ -128,6 +128,7 @@ TagCheckMail=Urmăreşte deschiderea emailului
 TagUnsubscribe=Link Dezabonare
 TagSignature=Semnătura utilizator expeditor
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Anunturi
 NoNotificationsWillBeSent=Nu notificări prin email sunt planificate pentru acest eveniment şi a companiei
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 66c56e78592..893d93e18aa 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Câteva erori găsite . Vom reveni asupra
 ErrorConfigParameterNotDefined=Parametrul <b> %s</b> nu este definit în  fişierul de configurare  Dolibarr<b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Utilizatorul<b>%s</b>  negăsit  în baza de date Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Eroare,  nici o cota de TVA definită pentru  ţara '% s'.
-ErrorNoSocialContributionForSellerCountry=Eroare, nici un  tip de contribuții sociale definite pentru țara '% s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Eroare,  salvarea fişierului eşuată.
 SetDate=setează data
 SelectDate=selectează data
@@ -301,8 +301,8 @@ UnitPriceHT=Preț unitar (net)
 UnitPriceTTC=Preț unitar
 PriceU=UP
 PriceUHT=UP (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Valoare
 AmountInvoice=Valoare Factură
 AmountPayment=Valoare de plată
@@ -339,6 +339,7 @@ IncludedVAT=Inclusiv TVA
 HT=Net fără tva
 TTC=Inc. taxe
 VAT=TVA
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Taxa TVA
@@ -413,6 +414,8 @@ Qty=Cant
 ChangedBy=Modificat de
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculează
 ResultOk=Succes
 ResultKo=Eşec
@@ -421,7 +424,7 @@ Reportings=Rapoarte
 Draft=Schiţă
 Drafts=Schiţe
 Validated=Validat
-Opened=Deschis
+Opened=Open
 New=Nou
 Discount=Discount
 Unknown=Necunoscut
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Link către un contact utilizator particular
 DeleteAFile=Şterge  fişier
 ConfirmDeleteAFile=Sigur  doriţi să ştergeţi fişierul
 NoResults=Niciun Rezultat
+SystemTools=System tools
 ModulesSystemTools=Module Instrumente
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Luni
 Tuesday=Marţi
@@ -732,3 +739,4 @@ ShortThursday=J
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
+SelectMailModel=Select email template
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 88e34a08e29..44cc821bcab 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -199,7 +199,8 @@ Entreprises=Societăţi
 DOLIBARRFOUNDATION_PAYMENT_FORM=Pentru a face plata cotizaţiei folosind un transfer bancar, a se vedea pagina <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Pentru a plăti cu un card de credit sau Paypal, faceţi clic pe butonul de la partea de jos a acestei pagini. <br>
 ByProperties=După caracteristici
 MembersStatisticsByProperties=Statistici Membri după caracteristici
-MembersByNature=Membri după personalitate juridică
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Rata TVA utilizată pentru înscrieri
 NoVatOnSubscription=Fără TVA la adeziuni
 MEMBER_PAYONLINE_SENDEMAIL=Email de avertizare atunci când Dolibarr primeşte o confirmare a unei plăți validate pentru înscriere
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 240dec059fb..ba1031d0f54 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Comandă Furnizor
 SuppliersOrders=Comenzi Furnizori
 SuppliersOrdersRunning=Comenzi Furnizori în curs
 CustomerOrder=Comandă client
-CustomersOrders=Comenzi clienți
-CustomersOrdersRunning=Comenzi Clienţi în curs
-CustomersOrdersAndOrdersLines=Comenzi Clienţi şi linii comenzi
-OrdersToValid=Comenzi clienţi de validat
-OrdersToBill=Comenzi Clienţi livrate
-OrdersInProcess=Comenzi Clienţi în desfăşurare
-OrdersToProcess=Comenzi Clienţi de procesat
-SuppliersOrdersToProcess=Comenzi Furnizori de tratat
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Anulata
 StatusOrderDraftShort=Schiţă
 StatusOrderValidatedShort=Validat
@@ -75,8 +75,9 @@ AddToMyOrders=Adaugă la comenzile mele
 AddToOtherOrders=Adauga la alte comenzi
 AddToDraftOrders=Adaugă la comanda schiţă
 ShowOrder=Afişează comanda
-NoOpenedOrders=Nu sunt comenzi deschise
-NoOtherOpenedOrders=Nu sunt alte comenzi deschise
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Nicio comandă  schiţă
 OtherOrders=Alte comenzi
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index a3b3b6ed3a0..aa80c7cecca 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate intervenţie
 Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin mail
 Notify_BILL_VALIDATE=Factura client validată
 Notify_BILL_UNVALIDATE=Factura client nevalidată
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Furnizor pentru a aprobat
 Notify_ORDER_SUPPLIER_REFUSE=Furnizor pentru a refuzat
 Notify_ORDER_VALIDATE=Comandă client validată
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click aici pentru a merge la %s
 YouMustClickToChange=Trebuie însă mai întâi să faceți clic pe link-ul următor pentru a valida această schimbare a parolei
 ForgetIfNothing=Dacă nu ați solicitat această schimbare, ignoraţi acest e-mail. Datele dvs.  sunt păstrate în condiții de siguranță.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Adăugaţi în calendar intrare %s
diff --git a/htdocs/langs/ro_RO/printing.lang b/htdocs/langs/ro_RO/printing.lang
index 92a4f5353fd..87f8c0cfe0a 100644
--- a/htdocs/langs/ro_RO/printing.lang
+++ b/htdocs/langs/ro_RO/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Imprimare directa
-Module112000Desc=Activeaza Sistemul  Imprimare directa\n\n 
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Configurarea Sistemuluii Imprimare directă
 PrintingDesc=Acest modul adauga un buton de imprimare pentru a trimite documentele direct la o imprimantă ( fara deschiderea documentului in aplicatie) cu diferite module.
 ModuleDriverSetup=Configurare Modul Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Parolă
 NoPrinterFound=Nu există imprimante (verificați setarea CUPS)
-FileWasSentToPrinter=Fișierul %s a fost trimis la imprimantă
 NoDefaultPrinterDefined=Nicio imprimantă implicită definită
 DefaultPrinter=Imprimantă implicită
 Printer=Imprimanta
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index 88d825c214a..f7f2aa42beb 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -10,13 +10,13 @@ batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
 l_eatby=Data expirare
 l_sellby=Data vânzare
-DetailBatchNumber=Detalii Lot / Serie
-DetailBatchFormat=Lot/Serie: %s - Mananca de: %s - Vindem de: %s (Cant : %d)
-printBatch=Lot: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Expiră : %s
 printSellby=Vanzare: %s
 printQty=Cant: %d
 AddDispatchBatchLine=Adauga o linie pentru Perioada de valabilitate expediere
 BatchDefaultNumber=Nedefinit
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=Acest produs nu foloseste numarul de lot / serie
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 9a4d95bef7f..1a537c9d173 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produs sau serviciu
 ProductsAndServices=Produse si Servicii
 ProductsOrServices=Produse sau servicii
 ProductsAndServicesOnSell=Produse si Servicii supuse vânzării sau cumpărării
-ProductsAndServicesNotOnSell=Produse si Servicii neoferite
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Statistici Produse si Servicii
 ProductsStatistics=Statistici Produse
-ProductsOnSell=Produs supus vânzării sau cumpărării
-ProductsNotOnSell=Produs nesupus vânzării sau cumpărării
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Produse supuse vânzării sau cumpărării
 ServicesOnSell=Servicii supuse vânzării sau cumpărării
-ServicesNotOnSell=Servicii  neoferite prestarii
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Servicii supuse vânzării sau cumpărării
 InternalRef=Referinţă internă
 LastRecorded=Ultimele produse / servicii disponibile înregistrate
@@ -44,7 +44,7 @@ CardProduct1=Fişă  Serviciul
 CardContract=Fişă  Contract
 Warehouse=Depozit
 Warehouses=Depozite
-WarehouseOpened=Depozit deschis
+WarehouseOpened=Warehouse open
 WarehouseClosed=Depozit închis
 Stock=Stoc
 Stocks=Stocuri
@@ -71,21 +71,21 @@ SellingPriceTTC=Preţul de vânzare (incl. taxe)
 PublicPrice=Preţ Public
 CurrentPrice=Preţ curent
 NewPrice=Preţ nou
-MinPrice=Preţ min.  vânzare
-MinPriceHT=Preţ minim vânzare (fără tva)
-MinPriceTTC=Preţ minim vânzare (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără tva). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important.
 ContractStatus=Status Contract
 ContractStatusClosed=Închis
-ContractStatusRunning=În service
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expirat
-ContractStatusOnHold=Fără service
-ContractStatusToRun=De pus în funcţiune
-ContractNotRunning=Acest contract nu este în execuţie
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Un produs cu referinţa %s există deja.
 ErrorProductBadRefOrLabel=Valoare greșită pentru referință sau eticheta.
 ErrorProductClone=A apărut o problemă în timp ce sw încerca clonarea produsului sau a serviciului.
-ErrorPriceCantBeLowerThanMinPrice=Eroare Preţul nu poate fi mai mic decât Preţul Minim
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Furnizori
 SupplierRef=Ref. produs furnizor
 ShowProduct=Afişează  produs
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Dacă produsul este un serviciu cu durată limitată:
 MultiPricesAbility=Câteva nivele ale preţurilor produs/serviciu
 MultiPricesNumPrices=Numărul de preţ
 MultiPriceLevelsName=Categorii Preţ
-AssociatedProductsAbility=Activează  funcţia pachete  virtuale
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Pachet produs
-AssociatedProductsNumber=Număr produse  ce compun acest pachet  produse virtual
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Numărul  pachetelor produselor  părinte
-IfZeroItIsNotAVirtualProduct=Dacă 0, acest produs nu este un pachet produs virtual
-IfZeroItIsNotUsedByVirtualProduct=Dacă 0, acest produs nu este folosit de niciun pachet produs virtual
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Compus ca produs virtual
 Translation=Traduceri
 KeywordFilter=Filtru de cuvinte cheie
@@ -131,7 +131,7 @@ ProductToAddSearch=Cauta produse de adăugat
 AddDel=Adăugare / Retrage
 Quantity=Cantitate
 NoMatchFound=Niciun rezultat găsit
-ProductAssociationList=Lista de legate de produse / servicii: nume de produse / servicii (cantitatea afectate)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Lista de pachete produse / servicii cu acest produs, ca o componentă
 ErrorAssociationIsFatherOfThis=Un produs este selectat de părinte cu curent produs
 DeleteProduct=A şterge un produs / serviciu
@@ -179,16 +179,41 @@ CloneProduct=Clone produs sau un serviciu
 ConfirmCloneProduct=Sigur doriţi să clonaţi produsul sau serviciul <b>%s</b> ?
 CloneContentProduct=Clone toate principalele informatii de produs / serviciu
 ClonePricesProduct=Clone principalele informatii si preturi
-CloneCompositionProduct=Clonează  pachet produs/serviciu
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Acest produs este utilizat
 NewRefForClone=Ref. de produs / serviciu nou
-CustomerPrices=Preţuri Clienţii
-SuppliersPrices=Preţuri Furnizori
-SuppliersPricesOfProductsOrServices=Preţuri Furnizori ( al produselor şi serviciilor)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Codul vamal
 CountryOrigin=Ţara de origine
 HiddenIntoCombo=Ascuns în liste selectaţi
 Nature=Natura
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Model ref Produs
 ServiceCodeModel=Model ref Serviciu 
 AddThisProductCard=Crează Fişă produs
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Autoconsum de producție
 ProductBuilded=Producţie completată
 ProductsMultiPrice=Produse preţ multiplu
-ProductsOrServiceMultiPrice=Preţuri Clienti ( al produselor şi serviciilor, multi-preţ)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Cifra de afaceri trimestrială a produselor VWAP
 ServiceSellByQuarterHT=Cifra de afaceri trimestrială servicii VWAP
 Quarter1=Trimestru 1.
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Defineşte valoare coduri de bare pentru toate înregi
 PriceByCustomer=Preţuri diferite pentru fiecare client
 PriceCatalogue=Preţ unic pe produs/serviciu
 PricingRule=Reguli pentru preţuri clienţi
-AddCustomerPrice=Adaugă Preţ pe client
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientuli
 PriceByCustomerLog=Log Preţ pe client
-MinimumPriceLimit=Preţul minim nu poate fi mai mic decat %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Preţul minim recomandat este: %s
 PriceExpressionEditor=Editor expresie preț
 PriceExpressionSelected=Expresie preț selectatată
@@ -254,7 +279,7 @@ PriceNumeric=Număr
 DefaultPrice=Preț Implicit
 ComposedProductIncDecStock=Mărește/micșorează stoc pe schimbări sintetice
 ComposedProduct=Sub-produs
-MinSupplierPrice=Preț Minim furnizor
+MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
 GlobalVariables=Global variables
 GlobalVariableUpdaters=Global variable updaters
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 72059112942..a00610d7969 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi per
 ProjectsPublicTaskDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
 ProjectsDesc=Această vedere prezintă toate proiectele  (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
 MyTasksDesc=Această vedere  este limitată la proiecte sau sarcini  pentru care sunteţi contact(indiferent de tip).
-OnlyOpenedProject=Numai proiectele deschise sunt vizibile (proiecte cu statutul draft sau închise nu sunt vizibile).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
 TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Proiecte
 NewProject=Proiect nou
 AddProject=Creare proiect
@@ -29,7 +30,7 @@ ProjectsList=Lista  proiecte
 ShowProject=Afişează proiect
 SetProject=Setare proiect
 NoProject=Niciun proiect definit sau responsabil
-NbOpenTasks=Nr  taskuri deschise
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nr proiecte
 TimeSpent=Timp comsumat
 TimeSpentByYou=Timpul consumat  da tine
@@ -41,7 +42,7 @@ TaskTimeSpent=Timp consumat pe task
 TaskTimeUser=Utilizator
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Sarcini la proiectele deschise
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Volumul de muncă nu este definit
 NewTimeSpent=Timp nou consumat
 MyTimeSpent=Timpul meu consumat
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Lista intervenţii  asociate  la  proiectului
 ListExpenseReportsAssociatedProject=Lista rapoartelor cheltuieli  asociate proiectului
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista evenimentelor  asociate la proiectului
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână
 ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună
 ActivityOnProjectThisYear=Activitatea de pe proiect în acest an
@@ -95,7 +98,7 @@ DeleteATimeSpent=Ştergeţi timpul  consumat
 ConfirmDeleteATimeSpent=Ssigur doriţi să ştergeţi acest timp consumat?
 DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie
 ShowMyTasksOnly=Vezi numai taskurile atribuite mie
-TaskRessourceLinks=Resurse
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
 NoTasks=Nr sarcini pentru acest proiect
 LinkedToAnotherCompany=Legat de terţe părţi, alta
@@ -139,8 +142,15 @@ ProjectReferers=Obiecte asociate
 SearchAProject=Cauta proiect
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
 ProjectDraft=Proiecte schiţă
-FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Intrare pe zi
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Timpul consumat deja înregistrat pentru această sarcină / zi și utilizator %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index e0bbcc76543..d8da0755011 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -4,7 +4,7 @@ Proposal=Ofertă  Comercială
 ProposalShort=Ofertă 
 ProposalsDraft=Oferte Comerciale schiţă
 ProposalDraft=Ofertă  Comercială Schiţă
-ProposalsOpened=Oferte comerciale deschise
+ProposalsOpened=Open commercial proposals
 Prop=Oferte Comerciale
 CommercialProposal=Ofertă Comercială
 CommercialProposals=Oferte  Comerciale
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Valoarea pe luni (netă)
 NbOfProposals=Număr oferte comerciale
 ShowPropal=Afişează oferta
 PropalsDraft=Schiţe
-PropalsOpened=Deschise
+PropalsOpened=Open
 PropalsNotBilled=Închise nefacturate
 PropalStatusDraft=Schiţă (de validat)
 PropalStatusValidated=Validată (oferta e deschisă)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nesemnată (inchisă)
 PropalStatusBilled=Facturată
 PropalStatusDraftShort=Schiţă
 PropalStatusValidatedShort=Validată
-PropalStatusOpenedShort=Deschisă
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Închisă
 PropalStatusSignedShort=Semnată
 PropalStatusNotSignedShort=Nesemnată
@@ -51,8 +51,8 @@ PropalsToClose=Oferte Comerciale de închis
 PropalsToBill=Oferte Comerciale semnate de facturat
 ListOfProposals=Lista  ofertelor comerciale
 ActionsOnPropal=Evenimente pe ofertă
-NoOpenedPropals=Nu sunt oferte comerciale deschise
-NoOtherOpenedPropals=Nu există alte oferte comerciale deschise
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Ref. Ofertă comercială
 SendPropalByMail=Trimite oferta comercială pe mail
 AssociatedDocuments=Documente asociate la ofertă:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Model ofertă Jaune
 DefaultModelPropalCreate=Crează model implicit
 DefaultModelPropalToBill=Model implicit la închiderea unei oferte comerciale (de facturat)
 DefaultModelPropalClosed=Model implicit la închiderea unei oferte comerciale (nefacturat)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 232688c5b4d..6239df53839 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Arata plata salariu
 THM=Pret mediu pe ora
 TJM=Pret mediu zilnic
 CurrentSalary=Salariu curent
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 94d4d7d5fe2..f1e0094ffbc 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Model simplu
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Atenţie,  nu sunt produse care aşteaptă să fie expediate.
 StatsOnShipmentsOnlyValidated=Statisticil ectuate privind numai livrările validate. Data folosită este data validării livrării (data de livrare planificată nu este întotdeauna cunoscută).
-DateDeliveryPlanned=Data de livrare planificată
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Data de livrare reală
 SendShippingByEMail=Trimite dispoziţia de livrare prin e-mail
 SendShippingRef=Transmitere livrare %s
@@ -67,7 +67,7 @@ SendingRunning=Produs din comenzile clientului comandate
 SuppliersReceiptRunning=Produs din comenzile furnizorului comandate
 ProductQtyInCustomersOrdersRunning=Cantitate produs in comenzile clientilor deschise
 ProductQtyInSuppliersOrdersRunning=Cantitate produs in comenzile furnizorilor deschise
-ProductQtyInShipmentAlreadySent=Cantitate produs din comenzile clientilor deschise deja trimise
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Cantitate produs din comenzile furnizorilor deschise deja primite
 
 # Sending methods
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 67ca7b27112..00be24c7917 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Depozite
 NewWarehouse=Depozit / Stoc  Nou 
 WarehouseEdit=Modifică depozit
 MenuNewWarehouse=Depozit nou
-WarehouseOpened=Depozit deschis
+WarehouseOpened=Warehouse open
 WarehouseClosed=Depozit închis
 WarehouseSource=Depozit Sursa
 WarehouseSourceNotDefined=Niciun depozit definit,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Alege depozitul  pentru scăderea stocului
 SelectWarehouseForStockIncrease=Alege depozitul  pentru creşterea stocului
 NoStockAction=Nicio actiune pe stoc
 LastWaitingSupplierOrders=Comenzi nereceptionate
-DesiredStock=Stoc dorit
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=De  comandat
 Replenishment=Reaprovizionare
 ReplenishmentOrders=Comenzi reaprovizionare
-VirtualDiffersFromPhysical=Potrivit  opțiunilor  decreştere/ descreştere , stocul fizic și stocul virtual (fizic + Comenzicurente) pot diferi
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Utilizați stoc virtual implicit, în loc de stoc fizic, pentru facilitatea de reaprovizionare
 UseVirtualStock=Utilizeaza Stoc Virtual 
 UsePhysicalStock=Utilizeaza Stoc Fizic
-CurentSelectionMode=Mod selectie curent
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Stoc Virtual 
 CurentlyUsingPhysicalStock=Stoc  Fizic
 RuleForStockReplenishment=Reguli pentru reaprovizionarea stocului
@@ -112,8 +113,8 @@ AlertOnly= Numai Alerte
 WarehouseForStockDecrease=Depozitul <b>%s</b> va fi utilizat pentru scăderea stocului
 WarehouseForStockIncrease=Depozitul <b>%s</b> va fi utilizat pentru creşterea stocului
 ForThisWarehouse=Pentru acest depozit
-ReplenishmentStatusDesc=Aceasta este lista cu toate produsele având stocul mai mic decât stocul dorit (sau valoarea de alertă dacă  casuţa "doar alertă " este bifată) și sugerăm să vă creaţi comenzi furnizor pentru a completa diferența.
-ReplenishmentOrdersDesc=Aceasta este lista tuturor comenzilor furnizori deschise, inclusiv produse predefinite.  Doar comenzile deschise cu produse predefinite, astfel încât pot afecta stocurile, sunt vizibile aici.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Reaprovizionări
 NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată  (< %s)
 NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Înregistrare transfer
 ReceivingForSameOrder=Recepţii pentru această comandă
 StockMovementRecorded=Mişcări stoc înregistrate
 RuleForStockAvailability=Reguli pentru cereri stoc
-StockMustBeEnoughForInvoice=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în factură
-StockMustBeEnoughForOrder=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în comandă
-StockMustBeEnoughForShipment= Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în livrare
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Eticheta transferului
 InventoryCode=Codul de inventar sau transfer
 IsInPackage=Continute in pachet
 ShowWarehouse=Arată depozit
-MovementCorrectStock=Corectie continut stoc pentru produsul %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Transfer stoc al produsului %s in alt depozit
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 9919d03b06e..8ce7f1b01c6 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Trimite la furnizori
 ListOfSupplierOrders=Lista comenzi furnizori
 MenuOrdersSupplierToBill=Comenzi Furnizor de facturat
 NbDaysToDelivery= Intârziere Livrare in zile
-DescNbDaysToDelivery=Cea mai mare intarziere este afisata in lista produsului comandat
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index 77fbdf3700b..d51fac5fa8d 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Rapoarte Cheltuieli
 TripsAndExpensesStatistics=Statistici Rapoarte Cheltuieli
 TripCard=Fisa Raport Cheltuieli
 AddTrip=Creare Raport Cheltuieli
-ListOfTrips=Listă  rapoarte de cheltuieli
+ListOfTrips=List of expense reports
 ListOfFees=Lista note cheltuieli
 NewTrip= Raport de cheltuieli nou
 CompanyVisited=Societatea / Instituţia vizitată
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Persoana de informare pentru validare.
 TripSociete=Informații   companie
 TripSalarie=Informații Utilizator 
 TripNDF=Informations expense report
-DeleteLine=Ștergeo linie a raportului de cheltuieli
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Sunteţi sigur că doriţi să ştergeţi această linie?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Line raport de cheltuieli
@@ -40,11 +40,10 @@ TF_BUS=Autobuz
 TF_CAR=Mașină
 TF_PEAGE=Taxă
 TF_ESSENCE=Combustibil
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=Ați declarat un alt raport de cheltuieli într-un interval de timp similar.
-ListTripsAndExpenses=Listă rapoarte de cheltuieli
 AucuneNDF=Nu există rapoarte de cheltuieli pentru acest criteriu
 AucuneLigne=Nu există încă nici un raport de cheltuieli declarate 
 AddLine=Adaugao linie
@@ -56,12 +55,12 @@ ModePaiement=Mod plata
 Note=Notă
 Project=Proiect
 
-VALIDATOR=Utilizatorul de informat pentru aprobare
+VALIDATOR=User responsible for approval
 VALIDOR=Aprobat de
 AUTHOR=Înregistrat de
-AUTHORPAIEMENT=Platit de
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Respins de
-CANCEL_USER=Anulat de
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Motiv
 MOTIF_CANCEL=Motiv
@@ -69,16 +68,15 @@ MOTIF_CANCEL=Motiv
 DATE_REFUS=Dată respingere
 DATE_SAVE=Dată validare
 DATE_VALIDE=Dată validare
-DateApprove=Data Aprobare
 DATE_CANCEL=Data anulare
 DATE_PAIEMENT=Data Plata 
 
-Deny=Respinge
 TO_PAID=Plăteşte
 BROUILLONNER=Redeschide
-SendToValid=Trimis la aprobare
+SendToValid=Sent on approval
 ModifyInfoGen=Editare
 ValidateAndSubmit=Validareaza și trimite pentru aprobare
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Nu aveti permisiunea să aprobati acest raport de cheltuieli
 NOT_AUTHOR=Tu nu esti autorul acestui raport de cheltuieli. Operatiune anulata.
@@ -95,11 +93,10 @@ ConfirmPaidTrip=Sunteţi sigur că doriţi sa clasati acest raport de cheltuieli
 CancelTrip=Anulează un raport de cheltuieli
 ConfirmCancelTrip=Sunteți sigur că doriți să anulați acest raport cheltuieli?
 
-BrouillonnerTrip=Muta Inapoi raportul de cheltuieli la statutul de "Draft" 
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Valideaza raport de cheltuieli
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-
 NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 011eae0c15d..0fe828e604e 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Înlăturaţi din grup
 PasswordChangedAndSentTo=Parola schimbat şi a trimis <b>la %s.</b>
 PasswordChangeRequestSent=Cerere pentru a schimba parola <b>pentru %s %s</b> la trimis.
 MenuUsersAndGroups=Utilizatorii & Grupuri
+MenuMyUserCard=My user card
 LastGroupsCreated=Ultima %s creat grupuri
 LastUsersCreated=Ultima %s utilizatorii creat
 ShowGroup=Arata grup
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 28dd4d7d3c9..4156c8f2cb6 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Fişier Retragere
 SetToStatusSent=Setează statusul "Fişier Trimis"
 ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor  fi clasificate ca "Plătit"
 StatisticsByLineStatus=Statistici după starea  liniilor
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Plata %s comandă în picioare de către bancă
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index 4dc8c56927b..dea2b1598f5 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Configurare Modul Flux de Lucru
-WorkflowDesc=Acest modul vă permite modificarea comportamentului acțiunilor automate în aplicaţie. În mod implicit, fluxul de lucru este deschis (puteţi face ce doriţi în ordinea dorită). Puteți activa acțiunile automate de care sunteti interesat
-ThereIsNoWorkflowToModify=Nu există nici un flux de lucru  modificabil pentru modulele  activate.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează o comandă client automat, după ce o ofertă comercială este semnată
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o ofertă comercială este semnată
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crează o factură client automat, după ce un contract este validat
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o comandă client este închisă
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasează propunere comercială legată ca facturată când comanda client este setată ca plătită
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasează comenzi(le) client sursă legate ca facturate, atunci când factura clientului este setată ca plătită
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasează comenzi(le) client sursă legate ca facturate, atunci când factura clientului este validată
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index c908cea5084..4a31097ce20 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=Кодировка UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Бухгалтерия
 Globalparameters=Глобальные параметры
@@ -25,8 +32,8 @@ Back=Назад
 Definechartofaccounts=Define a chart of accounts
 Selectchartofaccounts=Select a chart of accounts
 Validate=Подтвердить
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
+Addanaccount=Добавить бухгалтерский счёт
+AccountAccounting=Бухгалтерский счёт
 Ventilation=Breakdown
 ToDispatch=На отправку
 Dispatched=Отправленный
@@ -37,15 +44,15 @@ TradeMargin=Торговая наценка
 Reports=Отчёты
 ByCustomerInvoice=По счетам клиентов
 ByMonth=По месяцам
-NewAccount=New accounting account
+NewAccount=Новый бухгалтерский счёт
 Update=Обновить
 List=Список
 Create=Создать
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+WriteBookKeeping=Записать счета в главную книгу
 Bookkeeping=Главная книга
-AccountBalanceByMonth=Account balance by month
+AccountBalanceByMonth=Баланс счёта по месяцам
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -53,11 +60,11 @@ AccountingVentilationCustomer=Breakdown accounting customer
 Line=Строка
 
 CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
+InvoiceLines=Строки счёта для обсуждения
 InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account
 
-Ventilate=Ventilate
+Ventilate=Обсудить
 VentilationAuto=Automatic breakdown
 
 Processing=Обрабатывается
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж
 ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
-ACCOUNTING_BANK_JOURNAL=Банковский журнал
-ACCOUNTING_CASH_JOURNAL=Журнал наличных средств
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Журнал "Разное"
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Социальный журнал
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 5e15e4c1f46..5f4d831f57d 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Меню для пользователей
 LangFile=.lang файл
 System=Система
 SystemInfo=Информация о системе
-SystemTools=Системные настройки
 SystemToolsArea=Раздел системных настроек
 SystemToolsAreaDesc=Этот раздел предоставляет административные функции. Используйте меню для выбора необходимой функции.
 Purge=Очистить
@@ -232,8 +231,8 @@ Security=Безопасность
 Passwords=Пароли
 DoNotStoreClearPassword=Не хранить пароли в чистом виде в базе данных - хранить зашифрованные значения (Рекомендуем)
 MainDbPasswordFileConfEncrypted=Зашифровать пароль к базе в conf.php (Рекомендуется)
-InstrucToEncodePass=Чтобы поместить зашифрованный пароль в <b>conf.php</b> файл, замените строку <br><b>$dolibarr_main_db_pass ="..."</b><br>на<br><b>$dolibarr_main_db_pass"=crypted:%s"</b>
-InstrucToClearPass=Чтобы поместить декодированный пароль (прозрачный) в <b>conf.php</b> файл, замените строку <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>на<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Защита генерируемых PDF файлов (НЕ РЕКОМЕНДУЕТСЯ при массовом создании PDF)
 ProtectAndEncryptPdfFilesDesc=Защита PDF документа оставляет его доступным для чтения и печати PDF любым браузером. Вместе с тем, редактирование и копирование запрещается. Заметим, что, использование этой опции делает создание глобального аккумулированного PDF перестает работать (как, неоплаченные счета-фактуры).
 Feature=Особенность
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Это установка для обработки:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Шаг %s
 FindPackageFromWebSite=Найти пакет, который обеспечивает функции вы хотите (например, на официальном веб-сайте %s).
-DownloadPackageFromWebSite=Загрузить пакет %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Установка закончена, и Dolibarr готов к использованию с этого нового компонента.
 NotExistsDirect=Альтернативная root директория не определена.<br>
 InfDirAlt=Начиная с версии 3 стало возможным определение альтернативной root директории. Это позволяет вам хранить в одном и том же месте плагины и пользовательские шаблоны.<br>Просто создайте директорию в root директории Dolibarr (например, custom).<br>
 InfDirExample=<br>затем объявите в файле conf.php<br>$dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='path/of/dolibarr/htdocs/custom'<br>*Эти строки закомментированы с помощью символа "#". Чтобы раскомментировать - просто удалите этот служебный символ.
-YouCanSubmitFile=Выберите модуль:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Текущая версия Dolibarr
 CallUpdatePage=Перейдите на страницу, которая обновляет структуру базы данных и данные %s.
 LastStableVersion=Последняя стабильная версия
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Библиотека, использованная для генерации PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Введите номер телефона для ссылки с целью тестирования ClickToDial  пользователя <strong>%s</strong>
 RefreshPhoneLink=Обновить ссылку
@@ -430,8 +429,8 @@ Module20Name=Предложения
 Module20Desc=Коммерческие предложения управления
 Module22Name=E-рассылок
 Module22Desc=E-рассылок управления
-Module23Name= Энергия
-Module23Desc= Мониторинг потребления энергии
+Module23Name=Энергия
+Module23Desc=Мониторинг потребления энергии
 Module25Name=Приказы клиентов
 Module25Desc=Клиент заказов управления
 Module30Name=Счета-фактуры
@@ -492,8 +491,8 @@ Module400Name=Проекты/Возможности/Покупка
 Module400Desc=Управление проектами, возможностями или потенциальными клиентами. Вы можете назначить какой-либо элемент (счет, заказ, предложение, посредничество, ...) к проекту и получить вид  в представлении проекта.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграции
-Module500Name=Специальные расходы (налоги, социальные выплаты, дивиденды)
-Module500Desc=Управление специальными расходами, такими как налоги, социальные выплаты, дивиденды и зарплаты
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Зарплаты
 Module510Desc=Управление зарплатами сотрудников и платежами
 Module520Name=Ссуда
@@ -502,7 +501,7 @@ Module600Name=Уведомления
 Module600Desc=Отправлять уведомления контактам контрагентов по электронной почте о некоторых бизнес-событиях системы Dolibarr (настройка задана для каждого контрагента)
 Module700Name=Пожертвования
 Module700Desc=Пожертвования управления
-Module770Name=Отчёт о затратах
+Module770Name=Expense reports
 Module770Desc=Управление и утверждение отчётов о затратах (на транспорт, еду)
 Module1120Name=Коммерческое предложение поставщика
 Module1120Desc=Запросить у поставщика коммерческое предложение и цены
@@ -524,8 +523,10 @@ Module2400Name=Повестка дня
 Module2400Desc=Деятельность / задачи и программы управления
 Module2500Name=Электронное управление
 Module2500Desc=Сохранение и обмен документами
-Module2600Name=WebServices
-Module2600Desc=Включить сервер услуг Dolibarr Сети
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=модуль WebServices  (для клиента)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Создать / изменить продукцию / услуги
 Permission34=Исключить продукты / услуги
 Permission36=Экспорт товаров / услуг
 Permission38=Экспорт продукции
-Permission41=Читать проектов и задач
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Создать / изменить проекты, редактировать задачи, для моих проектов
 Permission44=Удаление проектов
 Permission61=Читать мероприятий
@@ -599,10 +600,10 @@ Permission86=Отправить заказов клиентов
 Permission87=Закрыть заказов клиентов
 Permission88=Отмена заказов клиентов
 Permission89=Удалить заказов клиентов
-Permission91=Читать социальных отчислений и налога на добавленную стоимость
-Permission92=Создать / изменить социальных отчислений и налога на добавленную стоимость
-Permission93=Удалить социального взноса и налога на добавленную стоимость
-Permission94=Экспорт социальных взносов
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Читать сообщения
 Permission101=Читать отправок
 Permission102=Создать / изменить отправок
@@ -620,9 +621,9 @@ Permission121=Читать третьей стороны, связанных с
 Permission122=Создать / изменить третьих сторон, связанных с пользователем
 Permission125=Удалить третьей стороны, связанных с пользователем
 Permission126=Экспорт третьей стороны
-Permission141=Читайте задач
-Permission142=Создать / изменить задач
-Permission144=Удалить задач
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Читать провайдеров
 Permission147=Читайте статистику
 Permission151=Прочитайте Регламент
@@ -800,7 +801,7 @@ DictionaryCountry=Страны
 DictionaryCurrency=Валюты
 DictionaryCivility=Вежливое обращение
 DictionaryActions=Тип событий по повестке дня
-DictionarySocialContributions=Типы социальных выплат
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Значения НДС или налога с продаж
 DictionaryRevenueStamp=Количество акцизных марок
 DictionaryPaymentConditions=Условия оплаты
@@ -817,6 +818,9 @@ DictionarySource=Происхождение Коммерческих предл
 DictionaryAccountancyplan=План счетов
 DictionaryAccountancysystem=Модели для диаграммы счетов
 DictionaryEMailTemplates=Шаблоны электронных писем
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Настройки сохранены
 BackToModuleList=Вернуться к списку модулей
 BackToDictionaryList=Назад к списку словарей
@@ -936,13 +940,14 @@ CompanyZip=Индекс
 CompanyTown=Город
 CompanyCountry=Страна
 CompanyCurrency=Основная валюта
+CompanyObject=Object of the company
 Logo=Логотип
 DoNotShow=Не показывать
 DoNotSuggestPaymentMode=Не рекомендуем
 NoActiveBankAccountDefined=Не определен активный банковский счет
 OwnerOfBankAccount=Владелец банковского счета %s
 BankModuleNotActive=Модуль Банковских счетов не активирован
-ShowBugTrackLink=Показать ссылку "Сообщить об ошибке"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Показать "Инструменты" на главной странице
 Alerts=Предупреждения
 Delays=Задержки
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Макс десятичных цен за единицу
 MAIN_MAX_DECIMALS_TOT=Макс десятичных общей цены
 MAIN_MAX_DECIMALS_SHOWN=Макс десятичных цен отображается на экране (Добавить <b>...</b> После этого, если вы хотите посмотреть <b>...</b> когда число усекается когда отображаются на экране)
 MAIN_DISABLE_PDF_COMPRESSION=Использовать сжатие PDF для порожденных PDF файлов.
-MAIN_ROUNDING_RULE_TOT= Размер округления диапазона (для тех стран, где округление происходит что-то другое, чем по основанию 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Чистая цена единицы продукта
 TotalPriceAfterRounding=Общая стоимость (нетто / НДС / включая налоги) после округления
 ParameterActiveForNextInputOnly=Параметр эффективным для следующего ввода только
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Полное количество активиро
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
 ClassNotFoundIntoPathWarning=Класс %s не найден по PHP пути
 YesInSummer=Да летом
-OnlyFollowingModulesAreOpenedToExternalUsers=Примечание. Следующие модули открыты для внешних пользователей (Какими бы ни были права доступа для этих пользователей)  
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Хранилище сессий шифровано системой SUHOSIN
 ConditionIsCurrently=Текущее состояние %s
 YouUseBestDriver=Вы используете драйвер %s, который на текущий момент является самым подходящим
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=М
 ConfirmDeleteProductLineAbility=Подтверждение удаления линия производит в форме
 ModifyProductDescAbility=Персонализация описаний производится в форме
 ViewProductDescInFormAbility=Визуализация продукта описания в форме (иначе как всплывающие подсказки)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Визуализация продуктов описания в сторонних язык
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Использовать форму поиска для выбора продукта (вместо выпадающего списка).
 UseEcoTaxeAbility=Поддержка Эко-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Стандартный вид штрих-кода, используемого для продуктов
 SetDefaultBarcodeTypeThirdParties=Стандартный вид штрих-кода, используемого для третьих сторон
+UseUnits=Support units
 ProductCodeChecker= Модуль для генерации кода продукта и проверки (Товар или Услуга)
 ProductOtherConf= Конфигурация Товаров / Услуг
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Штрих-код типа СКП
 BarcodeDescISBN=Штрих-код типа ISBN
 BarcodeDescC39=Штрих-код типа C39
 BarcodeDescC128=Штрих-код типа C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Путь для запуска к утилите генерации штри-кодов (используется для некоторых типов штрих-кодов). Должна быть совместима с командой "genbarcode".<br>Например, /usr/local/bin/genbarcode
 BarcodeInternalEngine=Внутренние средства управления
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Вы уверены, что хотите удалить мен
 DeleteLine=Удалить строки
 ConfirmDeleteLine=Вы уверены, что хотите удалить эту строку?
 ##### Tax #####
-TaxSetup=Налоги, социальные взносы и дивиденды модуль настройки
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Вариант d'exigibilit де TVA
 OptionVATDefault=Кассовый
 OptionVATDebitOption=Принцип начисления
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices модуль настройки
 WebServicesDesc=Позволяя этого модуля, Dolibarr стать веб-службы сервера представить разные веб-службы.
 WSDLCanBeDownloadedHere=WSDL дескриптор файла предоставляемых serviceses можно скачать здесь
 EndPointIs=SOAP клиенты должны направить свои заявки с точки Dolibarr доступна по адресу
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Банк модуль настройки
 FreeLegalTextOnChequeReceipts=Свободный текст на чеке расписки
@@ -1581,6 +1599,7 @@ ProjectsSetup=Проект модуля установки
 ProjectsModelModule=доклад документ проекта модели
 TasksNumberingModules=Модуль нумерации Задач
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Автоматическое дерево папок и документов
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Открыть финансовый год
 CloseFiscalYear=Закрыть финансовый год
 DeleteFiscalYear=Удалить финансовый год
 ConfirmDeleteFiscalYear=Вы точно хотите удалить этот финансовый год?
-Opened=Открыты
+Opened=Open
 Closed=Закрыты
 AlwaysEditable=Всегда может быть отредактировано
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Установка внешних мод
 SomethingMakeInstallFromWebNotPossible2=По этой причине, описанный здесь процесс апрейгда  - это только шаги, которые может выполнить пользователь с соответствующими правами доступа.
 InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл <strong>%s</strong>, чтобы использовать эту функцию.
 ConfFileMuseContainCustom=Установка внешнего модуля из приложения сохраняет файлы модуля в папке <strong>%s</strong>. Для использования этой папке в системе  Dolibarr вы должны настроить  <strong>conf/conf.php</strong>  с использованием этой функции<br>-<strong>$dolibarr_main_url_root_alt</strong> со значением <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> со значением <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index 907b0e05c15..f6352d70233 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -47,18 +47,17 @@ PropalValidatedInDolibarr=Предложение проверены
 InvoiceValidatedInDolibarr=Счет проверены
 InvoiceValidatedInDolibarrFromPos=Счёт %s подтверждён с платёжного терминала
 InvoiceBackToDraftInDolibarr=Счет %s вернуться к проекту статус
-InvoiceDeleteDolibarr=Счет-фактура %s удалена
+InvoiceDeleteDolibarr=Счёт %s удален
 OrderValidatedInDolibarr=Заказ %s проверен
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Заказ %s  доставлен
 OrderCanceledInDolibarr=Заказ %s отменен
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Заказ %s готов к выставлению счёта
 OrderApprovedInDolibarr=Заказ %s утвержден
 OrderRefusedInDolibarr=Заказ %s  отклонён
 OrderBackToDraftInDolibarr=Заказ %s возращен в статус черновик
-OrderCanceledInDolibarr=Заказ %s отменен
 ProposalSentByEMail=Коммерческое предложение %s отправлены по электронной почте
 OrderSentByEMail=Заказ покупателя %s отправлен по электронной почте
-InvoiceSentByEMail=Счет-фактура клиента %s отправлен по электронной почте
+InvoiceSentByEMail=Счёт клиента %s отправлен по электронной почте
 SupplierOrderSentByEMail=Поставщик порядке %s отправлены по электронной почте
 SupplierInvoiceSentByEMail=Поставщиком счета %s отправлены по электронной почте
 ShippingSentByEMail=Посылка %s отправлена с помощью EMail
@@ -94,5 +93,7 @@ WorkingTimeRange=Диапазон рабочего времени
 WorkingDaysRange=Диапазон рабочих дней
 AddEvent=Создать событие
 MyAvailability=Моя доступность
-ActionType=Event type
-DateActionBegin=Start event date
+ActionType=Тип события
+DateActionBegin=Дата начала события
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index d5cb3876768..743f810f1ac 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Согласительной
 Conciliation=Согласительная
 ConciliationForAccount=Согласительную этот счет
 IncludeClosedAccount=Включите закрытые счета
-OnlyOpenedAccount=Только открыли счета
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Счета к кредитам
 AccountToDebit=Счет дебетовать
 DisableConciliation=Отключите функцию примирения для этой учетной записи
 ConciliationDisabled=Согласительный функция отключена
-StatusAccountOpened=Открыты
+StatusAccountOpened=Open
 StatusAccountClosed=Закрытые
 AccountIdShort=Количество
 EditBankRecord=Изменить запись
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Заказчиком оплаты
 CustomerInvoicePaymentBack=Банк для платежей клиента
 SupplierInvoicePayment=Поставщик оплаты
 WithdrawalPayment=Снятие оплаты
-SocialContributionPayment=Социальный вклад оплаты
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Финансовые счета журнале
 BankTransfer=Банковский перевод
 BankTransfers=Банковские переводы
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 5b8e7625201..1f5a827cd77 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -12,30 +12,30 @@ BillsLate=Просроченные платежи
 BillsStatistics=Статистика счетов клиентов
 BillsStatisticsSuppliers=Статистика счетов поставщиков
 DisabledBecauseNotErasable=Неактивны, потому что не могут быть стерты
-InvoiceStandard=Стандартный счет-фактура
-InvoiceStandardAsk=Стандартный счет-фактура
+InvoiceStandard=Стандартный счёт
+InvoiceStandardAsk=Стандартный счёт
 InvoiceStandardDesc=Такой вид счёта является общим.
 InvoiceDeposit=Счета-фактура на взнос
 InvoiceDepositAsk=Счета-фактура на взнос
 InvoiceDepositDesc=Этот вид счета-фактуры оформляется при получении взноса.
 InvoiceProForma=Формальный счёт
-InvoiceProFormaAsk=Формальный счет-фактура
-InvoiceProFormaDesc=<b>Формальный счет-фактура</b> является образом подлинного счета-фактуры, но не имеет бухгалтерской учетной стоимости.
+InvoiceProFormaAsk=Формальный счёт
+InvoiceProFormaDesc=<b>Формальный счёт</b> является образом оригинального счёта, но не имеет бухгалтерской учетной записи.
 InvoiceReplacement=Замена счета-фактуры
 InvoiceReplacementAsk=Замена счета-фактуры на другой
 InvoiceReplacementDesc=<b>Замена счёта</b>  используется для отмены и замены всего счёта, когда оплата по нему ещё не получена. \n<br><br> Примечание: только неоплаченные счета могут быть заменены. Если счёт, который вы заменяете, ещё не закрыт, он будет автоматически закрыт и помечен "потерянный".  
 InvoiceAvoir=Кредитовое авизо
 InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры
-InvoiceAvoirDesc=<b>Кредитовое авизо</b> - это 'обратный' счет-фактура, который используется для решения проблемы, когда выставлен счета-фактуры в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или не наоборот - не оплатил счет-фактуру полностью, поскольку он вернулся некоторые продукты, например).
+InvoiceAvoirDesc=<b>Кредитовое авизо</b> - это 'обратный' счёт, который используется для решения проблемы, когда выставлен счёт в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или  наоборот - не оплатил счёт полностью, поскольку он вернул некоторые товары).
 invoiceAvoirWithLines=Создать кредитное авизо со строками из оригинального счёта
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithPaymentRestAmount=Кредитное авизо с неоплаченным остатком оригинального счёта
+invoiceAvoirLineWithPaymentRestAmount=Кредитное авизо на остаток для оплаты
 ReplaceInvoice=Заменить счет-фактуру %s
-ReplacementInvoice=Заменяющий счет-фактура
+ReplacementInvoice=Заменяющий счёт
 ReplacedByInvoice=Заменен счетом-фактурой %s
 ReplacementByInvoice=Заменен счетом-фактурой
-CorrectInvoice=Правильный счет-фактура %s
-CorrectionInvoice=Корректирующий счет-фактура
+CorrectInvoice=Правильный счёт %s
+CorrectionInvoice=Корректирующий счёт
 UsedByInvoice=Использован для оплаты счета-фактуры %s
 ConsumedBy=Использован
 NotConsumed=Не использован
@@ -44,15 +44,15 @@ NoInvoiceToCorrect=Нет счетов-фактур для корректиро
 InvoiceHasAvoir=Исправлен одним или несколькими счетами-фактурами
 CardBill=Карточка счета-фактуры
 PredefinedInvoices=Предопределенные Счета-фактуры
-Invoice=Счет-фактура
+Invoice=Счёт
 Invoices=Счета-фактуры
 InvoiceLine=Строка счета-фактуры
-InvoiceCustomer=Счет-фактура Покупателю
-CustomerInvoice=Счет-фактура Покупателю
+InvoiceCustomer=Счёт клиента
+CustomerInvoice=Счёт клиента
 CustomersInvoices=Счета-фактуры Покупателей
-SupplierInvoice=Счет-фактура Поставщика
+SupplierInvoice=Счёт поставщика
 SuppliersInvoices=Счета-фактуры Поставщиков
-SupplierBill=Счет-фактура Поставщика
+SupplierBill=Счёт поставщика
 SupplierBills=счета-фактуры Поставщиков
 Payment=Платеж
 PaymentBack=Возврат платежа
@@ -81,7 +81,7 @@ PaymentAmount=Сумма платежа
 ValidatePayment=Подтвердть платёж
 PaymentHigherThanReminderToPay=Платеж больше, чем в напоминании об оплате
 HelpPaymentHigherThanReminderToPay=Внимание, сумма оплаты по одному или нескольким документам выше остатка к оплате. <br> Измените вашу запись, или подтвердите и подумать о создании кредитового авизо на превышения, полученные за каждый переплаченный счет-фактуру.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Внимание, сумма к оплате одной или нескольких счетов выше, чем остаток платежа. <br> Отредактируйте запись, в противном случае подтвердите.
 ClassifyPaid=Классифицировать как 'Оплачен'
 ClassifyPaidPartially=Классифицировать как 'Оплачен частично'
 ClassifyCanceled=Классифицировать как 'Аннулирован'
@@ -128,7 +128,7 @@ PaymentStatusToValidShort=На подтверждении
 ErrorVATIntraNotConfigured=Номер плательщика НДС еще не установлен
 ErrorNoPaiementModeConfigured=Режим оплаты по умолчанию не установлен. Перейдите в настройку модуля Счетов-фактур  для исправления данной ситуации.
 ErrorCreateBankAccount=Создайт банковский счет, а затем перейдите к панели настройки модуля Счетов-фактур для установки способов оплаты
-ErrorBillNotFound=Счет-фактура %s не существует
+ErrorBillNotFound=Счёт %s не существует
 ErrorInvoiceAlreadyReplaced=Ошибка при попытке подтвеждения счета-фактуры, заменяющего счет-фактуру %s. Этот счет-фактура уже был заменен счетом-фактурой %s.
 ErrorDiscountAlreadyUsed=Ошибка, скидка уже используется
 ErrorInvoiceAvoirMustBeNegative=Ошибка, корректирующий счет-фактура должен иметь отрицательную сумму
@@ -137,7 +137,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Ошибка, невозможн
 BillFrom=Продавец
 BillTo=Покупатель
 ActionsOnBill=Действия со счетом-фактурой
-NewBill=Новый счет-фактура
+NewBill=Новый счёт
 LastBills=Последние %s счетов-фактур
 LastCustomersBills=Последние %s счетов-фактур Покупателям
 LastSuppliersBills=Последние %s счетов-фактур Поставщиков
@@ -170,7 +170,7 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Используйте этот вы
 ConfirmClassifyAbandonReasonOther=Другой
 ConfirmClassifyAbandonReasonOtherDesc=Этот выбор будет использоваться во всех других случаях. Например, потому, что вы планируете создать заменяющий счет-фактуру.
 ConfirmCustomerPayment=Вы подтверждаете ввод этого платежа на <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
+ConfirmSupplierPayment=Вы подтверждаете этот ввод платежа для  <b>%s</b> %s?
 ConfirmValidatePayment=Вы уверены, что хотите подтвердить этот платеж? Изменить однажды подтвержденный платеж невозможно.
 ValidateBill=Подтвердить счет-фактуру
 UnvalidateBill=Unvalidate счет
@@ -178,7 +178,7 @@ NumberOfBills=Кол-во счетов-фактур
 NumberOfBillsByMonth=Кол-во счетов-фактур по месяцам
 AmountOfBills=Сумма счетов-фактур
 AmountOfBillsByMonthHT=Сумма счетов-фактур за месяц (за вычетом налога)
-ShowSocialContribution=Показать социальный взнос
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Показать счет-фактуру
 ShowInvoice=Показать счет-фактуру
 ShowInvoiceReplace=Показать заменяющий счет-фактуру
@@ -270,7 +270,7 @@ BillAddress=Адрес выставления
 HelpEscompte=Эта скидка предоставлена Покупателю за досрочный платеж.
 HelpAbandonBadCustomer=От этой суммы отказался Покупатель (считается плохим клиентом) и она считается чрезвычайной потерей.
 HelpAbandonOther=От этой суммы отказались из-за ошибки (например, неправильный клиент или счет-фактура был заменен на другой)
-IdSocialContribution=Код Социальных взносов
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Код платежа
 InvoiceId=Код счета-фактуры
 InvoiceRef=Ref. счета-фактуры
@@ -292,12 +292,13 @@ ConfirmSplitDiscount=Вы уверены, что хотите разделить
 TypeAmountOfEachNewDiscount=Введите сумму каждой из двух частей:
 TotalOfTwoDiscountMustEqualsOriginal=Сумма двух новых скидок должна быть равна размеру первоначальной скидки.
 ConfirmRemoveDiscount=Вы уверены, что хотите удалить эту скидку?
-RelatedBill=Связанный счет-фактура
+RelatedBill=Связанный счёт
 RelatedBills=Связанные счета-фактуры
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
-LatestRelatedBill=Latest related invoice
+RelatedCustomerInvoices=Связанные счета клиента
+RelatedSupplierInvoices=Связанные счета поставщика
+LatestRelatedBill=Последний связанный счёт
 WarningBillExist=Предупреждение! Счёт (или счета) уже существуют
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Немедленно
@@ -400,9 +401,9 @@ ToMakePaymentBack=Возврат платежа
 ListOfYourUnpaidInvoices=Список неоплаченных счетов
 NoteListOfYourUnpaidInvoices=Примечание: Этот список содержит счета только тех контрагентов, которые связаны с нами, как представители по сбыту.
 RevenueStamp=Штамп о уплате налогов
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=Эта опция доступна только при создании счёта на вкладке "клиент" из раздела Контрагенты
 PDFCrabeDescription=Шаблон Счета-фактуры Crabe. Полный шаблон (вспомогательные опции НДС, скидки, условия платежей, логотип и т.д. ..)
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Функция возвращает номер в формате %syymm-nnnn  для стандартных счетов и %syymm-nnnn для кредитных авизо, где yy год,  mm месяц и nnnn является непрерывной последовательностью и не возвращает 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 TerreNumRefModelError=Документ, начинающийся с $syymm, уже существует и не совместим с этой моделью последовательности. Удалите или переименуйте его, чтобы активировать этот модуль.
 ##### Types de contacts #####
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Финальный и основной счёт
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index 4b407c6b042..c37f09eaaa0 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Последние договоры
 BoxLastContacts=Последние контакты / адреса
 BoxLastMembers=Последнее участники
 BoxFicheInter=Последние мероприятия
-BoxCurrentAccounts=Открытые остатки на счетах
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Оборот по продажам
 BoxTotalUnpaidCustomerBills=Общая сумма неоплаченных счетов-фактур покупателям
 BoxTotalUnpaidSuppliersBills=Общая сумма неоплаченных счетов-фактур поставщиков
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Последние %s  участников
 BoxTitleLastFicheInter=%s последних измененных мероприятий
 BoxTitleOldestUnpaidCustomerBills=%s самых старых неоплаченных счетов клиентов
 BoxTitleOldestUnpaidSupplierBills=%s самых старых неоплаченных счетов поставщиков
-BoxTitleCurrentAccounts=Открытые остатки на счетах
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Оборот по продажам
 BoxTitleTotalUnpaidCustomerBills=Неоплаченные счета клиента
 BoxTitleTotalUnpaidSuppliersBills=Не оплаченные счета  поставщица
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 8da468cf547..16b7becd98f 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-NoCategoryYet=No tag/category of this type created
+Rubrique=Тег/Категория
+Rubriques=Теги/Категории
+categories=теги/категории
+TheCategorie=Тег/категория
+NoCategoryYet=Нет созданных тегов/категорий данного типа
 In=В
 AddIn=Добавить в
 modify=изменить
 Classify=Добавить
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
+CategoriesArea=Раздел тегов/категорий 
+ProductsCategoriesArea=Раздел тегов/категорий  товаров/услуг
+SuppliersCategoriesArea=Раздел тегов/категорий  поставщиков
+CustomersCategoriesArea=Раздел тегов/категорий клиентов
+ThirdPartyCategoriesArea=Раздел тегов/категорий контрагентов
+MembersCategoriesArea=Раздел тегов/категорий участников
+ContactsCategoriesArea=Раздел тегов/категорий контактов
+MainCats=Основные теги/категории
 SubCats=Подкатегории
 CatStatistics=Статистика
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CatList=Список тегов/категорий
+AllCats=Все теги/категории
+ViewCat=Просмотр тега/категории
+NewCat=Добавить тег/категорию
+NewCategory=Новый тег/категория
+ModifCat=Изменить тег/категорию
+CatCreated=Тег/категория созданы
+CreateCat=Создать тег/категорию
+CreateThisCat=Создать этот (эту) тег/категорию
 ValidateFields=Проверить поля
 NoSubCat=Нет подкатегории.
 SubCatOf=Подкатегория
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
+FoundCats=Найденные теги/категории
+FoundCatsForName=Теги/категории для этого имени:
+FoundSubCatsIn=Подкатегории найдены в теге/категории
+ErrSameCatSelected=Вы выбрали тот же самый тег/категорию несколько раз
+ErrForgotCat=Вы забыли выбрать тег/категорию
 ErrForgotField=Вы забыли заполнить поля
 ErrCatAlreadyExists=Это имя уже используется
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
+AddProductToCat=Добавать к этому товару тег/категорию?
+ImpossibleAddCat=Невозможно добавить тег/категорию
+ImpossibleAssociateCategory=Невозможно присоединить тег/категорию к 
 WasAddedSuccessfully=<b>%s</b> успешно добавлена.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ObjectAlreadyLinkedToCategory=Элемент уже связан с этим тегом/категорией
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=У этого продукта/услуги  нет тегов/категорий
+SupplierHasNoCategory=Этот поставщик не принадлежнит ни к какому тегу/категории
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
+MemberHasNoCategory=У этого участника нет тегов/категорий
+ContactHasNoCategory=Это контакт не имеет тега или не принадлежит категории
+ClassifyInCategory=Add to tag/category
 NoneCategory=Нет
-NotCategorized=Without tag/category
+NotCategorized=Без тега/категории
 CategoryExistsAtSameLevel=Категория к таким кодом уже существует
 ReturnInProduct=Назад к карточке товара/услуги
 ReturnInSupplier=Назад к карточке поставщика
@@ -64,22 +64,22 @@ ReturnInCompany=Назад к карточке покупателя/потенц
 ContentsVisibleByAll=Содержимое будет доступно всем
 ContentsVisibleByAllShort=Содержимое доступно всем
 ContentsNotVisibleByAllShort=Содержание не доступно всем
-CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
+CategoriesTree=Дерево тегов/категорий
+DeleteCategory=Удалить тег/категорию
+ConfirmDeleteCategory=Вы точно хотите удалить этот тег/категорию?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
+NoCategoriesDefined=Не задан тег/категория
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Теги/категории поставщиков
+CustomersCategoriesShort=Теги/категории клиентов
 CustomersProspectsCategoriesShort=Категории Покупателей/Потенц. клиентов
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
+ProductsCategoriesShort=Теги/категории  товаров
+MembersCategoriesShort=Теги/категории участников
+ContactCategoriesShort=Теги/категории контактов
 ThisCategoryHasNoProduct=В этой категории нет товаров.
 ThisCategoryHasNoSupplier=В этой категории нет поставщиков.
 ThisCategoryHasNoCustomer=В этой категории нет покупателей.
@@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Эта категория не содержит ни о
 AssignedToCustomer=Установленное для покупателя
 AssignedToTheCustomer=Установленное для покупателя
 InternalCategory=Внутренняя категория
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
+CategoryContents=Содержание тега/категории
+CategId=ID тега/категории
+CatSupList=Список тегов/категорий поставщика
+CatCusList=Список тегов/категорий клиента/потенциального клиента
+CatProdList=Список тегов/категорий товаров
+CatMemberList=Список тегов/категорий участников
+CatContactList=List of contact tags/categories
+CatSupLinks=Связи между поставщиками и  тегами/категориями
+CatCusLinks=Связи между клиентами/потенц. клиентами  и  тегами/категориями
+CatProdLinks=Связи между продуктами/услугами  и  тегами/категориями
+CatMemberLinks=Связи между участниками  и  тегами/категориями
+DeleteFromCat=Удалить из тега/категории
 DeletePicture=Удалить изображение
 ConfirmDeletePicture=Подтверждаете удаление изображения?
 ExtraFieldsCategories=Дополнительные атрибуты
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
+CategoriesSetup=Настройка тегов/категорий
+CategorieRecursiv=Автоматическая ссылка на родительский тег/категорию
 CategorieRecursivHelp=Если активировать, то продукт будет связан с родительской категорией при добавлении в подкатегорию
 AddProductServiceIntoCategory=Добавить следующий товар/услугу
-ShowCategory=Show tag/category
+ShowCategory=Показать тег/категорию
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 31d81132f6a..c41724b7bfc 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Контакт контрагента
 StatusContactValidated=Статус контакта
 Company=Компания
 CompanyName=Название компании
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Компании
 CountryIsInEEC=Страна входит в состав Европейского экономического сообщества
 ThirdPartyName=Наименование контрагента
@@ -410,5 +411,10 @@ OutstandingBillReached=Достигнут максимум неуплаченн
 MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
 ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
-SearchThirdparty=Поиск контрагента
+SearchThirdparty=Search third party
 SearchContact=Поиск контакта
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 2b8adba6916..1633355bd30 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -3,7 +3,7 @@ Accountancy=Бухгалтерия
 AccountancyCard=Карточка бухгалтерии 
 Treasury=Казначейство
 MenuFinancial=Финансовые
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRules=Используйте <a href="%s">Настройку модуля Налоги</a> для изменения правил расчёта
 TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Вариант для бухгалтеров
 OptionModeTrue=Вариант "затраты-выпуск"
@@ -56,23 +56,23 @@ VATCollected=НДС собрали
 ToPay=Для оплаты
 ToGet=Чтобы вернуться
 SpecialExpensesArea=Раздел для всех специальных платежей
-TaxAndDividendsArea=Налог, социальные отчисления и дивиденды области
-SocialContribution=Социальный вклад
-SocialContributions=Социальные взносы
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Специальные расходы
 MenuTaxAndDividends=Налоги и дивиденды
 MenuSalaries=Зарплаты
-MenuSocialContributions=Социальные взносы
-MenuNewSocialContribution=Новый вклад
-NewSocialContribution=Новый социальный взнос
-ContributionsToPay=Взносы платить
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Бухгалтерия / Казначейство области
 AccountancySetup=Бухгалтерия установки
 NewPayment=Новые оплаты
 Payments=Платежи
 PaymentCustomerInvoice=Заказчиком оплаты счетов-фактур
 PaymentSupplierInvoice=Поставщик оплате счета-фактуры
-PaymentSocialContribution=Социальный вклад оплаты
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=НДС платеж
 PaymentSalary=Выплата зарплаты
 ListPayment=Список платежей
@@ -91,7 +91,7 @@ LT1PaymentES=Погашение
 LT1PaymentsES=Погашения
 VATPayment=Оплата НДС
 VATPayments=НДС Платежи
-SocialContributionsPayments=Социальные отчисления платежей
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Показать оплате НДС
 TotalToPay=Всего к оплате
 TotalVATReceived=Общая сумма НДС, полученные
@@ -116,28 +116,28 @@ NewCheckDepositOn=Новый депозит проверить на счету:
 NoWaitingChecks=Не дожидаясь проверок на хранение.
 DateChequeReceived=Чек при ввода даты
 NbOfCheques=Кол-во чеков
-PaySocialContribution=Оплатить социального взноса
-ConfirmPaySocialContribution=Вы уверены, что хотите классифицировать этот социальный вклад, как оплачивается?
-DeleteSocialContribution=Удалить социального взноса
-ConfirmDeleteSocialContribution=Вы уверены, что хотите удалить этот социальный взнос?
-ExportDataset_tax_1=Социальные взносы и платежи
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeLT1= Режим <b>%sRE на счетах клиентов - счетах поставщиков%s</b>
+CalcModeLT1Debt=Режим <b>%sRE на счетах клиентов%s</b>
+CalcModeLT1Rec= Режим <b>%sRE на счетах поставщиков%s</b>
+CalcModeLT2= Режим <b>%sIRPF на счетах клиентов - счетах поставщиков%s</b>
+CalcModeLT2Debt=Режим <b>%sIRPF  на счетах клиентов%s</b>
+CalcModeLT2Rec= Режим <b>%sIRPF на счетах поставщиков%s</b>
 AnnualSummaryDueDebtMode=Баланс доходов и расходов, годовые итоги
 AnnualSummaryInputOutputMode=Баланс доходов и расходов, годовые итоги
 AnnualByCompaniesDueDebtMode=Билан DES recettes и dpenses, dtail пар ярусов, в <b>режиме %sCrances-Dettes %s</b> DIT <b>comptabilit d'участия.</b>
 AnnualByCompaniesInputOutputMode=Билан DES recettes и dpenses, dtail пар ярусов, в <b>режиме %sRecettes-Dpenses %s</b> DIT <b>comptabilit де ящик.</b>
 SeeReportInInputOutputMode=См. LE <b>отношения %sRecettes-Dpenses %s</b> DIT <b>comptabilit де ящик</b> POUR UN CALCUL SUR LES paiements effectivement raliss
 SeeReportInDueDebtMode=См. LE <b>отношения %sCrances-Dettes %s</b> DIT <b>comptabilit d'участие</b> POUR UN CALCUL SUR LES factures Мизеса
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded= - Суммы даны с учётом всех налогов
 RulesResultDue=- Суммы указаны с НДС <br> - Она включает в себя неоплаченные счета, расходы и НДС ли они выплачиваются или нет. <br> - Он основан на одобрении даты счета-фактуры и НДС, и на сегодняшний день из-за расходов.
 RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
 RulesCADue=- Она включает в себя клиентов из-за счетов ли они выплачиваются или нет. <br> - Он основан на дату одобрения этих счетов-фактур. <br>
@@ -161,7 +161,7 @@ RulesVATInProducts=- Для материальных ценностей, она
 RulesVATDueServices=- Для услуг, отчет включает в себя счета-фактуры за счет, оплачиваемый или нет, исходя из даты выставления счета.
 RulesVATDueProducts=- Для материальных ценностей, она включает в себя НДС, счета-фактуры, на основе даты выставления счета.
 OptionVatInfoModuleComptabilite=Примечание: Для материальных ценностей, она должна использовать даты доставки будет более справедливым.
-PercentOfInvoice=%%/счет-фактура
+PercentOfInvoice=%%/счёт
 NotUsedForGoods=Не используется на товары
 ProposalStats=Статистика по предложениям
 OrderStats=Статистика по заказам
@@ -187,7 +187,7 @@ InvoiceLinesToDispatch=Строки счёта для отправки
 InvoiceDispatched=Отправленные счета
 AccountancyDashboard=Суммарная информация по бухгалтерии
 ByProductsAndServices=По продуктам и услугам
-RefExt=External ref
+RefExt=Внешняя ссылка
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
 LinkedOrder=Link to order
 ReCalculate=Пересчитать
@@ -197,11 +197,11 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is
 CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Режим вычислений
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+AccountancyJournal=Журнал бухгалтерских кодов
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Клонировать для следующего месяца
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index 9cef3657708..54adbe56cf6 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -4,10 +4,10 @@ About = О
 CronAbout = О Планировщике
 CronAboutPage = Страница о планировщике
 # Right
-Permission23101 = Открыть запланированную задачу
-Permission23102 = Создать/удалить запланированное задание
-Permission23103 = Удалить запланированное задание
-Permission23104 = Выполнить запланированное задание
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Настройки запланированных заданий
 URLToLaunchCronJobs=Ссылка для проверки и запуска заданий планировщика cron (если требуется)
@@ -26,21 +26,21 @@ CronLastOutput=Последний вывод команды
 CronLastResult=Последний код возврата команды
 CronListOfCronJobs=Список запланированных заданий
 CronCommand=Команда
-CronList=Scheduled job
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
-CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
-CronInfo=Scheduled job module allow to execute job that have been planned
-CronWaitingJobs=Waiting jobs
+CronList=Scheduled jobs
+CronDelete=Удалить запланированные задания
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronExecute=Запустить запланированные задания
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronInfo=Модуль запланированных задач позволяет выполнять запланированные задачи
+CronWaitingJobs=Ожидающие задачи
 CronTask=Задание
 CronNone=Никакой
 CronDtStart=Начальная дата
 CronDtEnd=Конечная дата
 CronDtNextLaunch=Следующий запуск
 CronDtLastLaunch=Последний запуск
-CronFrequency=Частота
-CronClass=Класс
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Метод
 CronModule=Модуль
 CronAction=Действие
@@ -55,9 +55,9 @@ CronEach=Каждый
 JobFinished=Задание запущено и завершено
 #Page card
 CronAdd= Добавить задание
-CronHourStart= Время и дата для запуска задачи
-CronEvery= И выполнять задачу каждые
-CronObject= Экземпляр / объект для создания
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Экземпляр / объект для создания
 CronArgs=Параметры
 CronSaveSucess=Сохранено успешно
 CronNote=Комментарий
@@ -75,14 +75,15 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Команда для выполнения
-CronCreateJob=Create new Scheduled Job
+CronCreateJob=Создать новое запланированное задание
+CronFrom=From
 # Info
 CronInfoPage=Информация
 # Common
-CronType=Тип задачи
+CronType=Job type
 CronType_method=Вызов метода из класса системы Dolibarr 
 CronType_command=Команда командной строки
 CronMenu=Планировщик
 CronCannotLoadClass=Невозможно загрузить класс %s или объект %s
 UseMenuModuleToolsToAddCronJobs=Используйте меню "Главная - Настройки модулей -Список заданий"  для просмотра и редактирования запланированных заданий. 
-TaskDisabled=Задача отключена
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 07ce2ffd803..40bc676044f 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Поиск по объекту
 ECMSectionOfDocuments=Директории документов
 ECMTypeManual=Ручной
 ECMTypeAuto=Автоматический
-ECMDocsBySocialContributions=Документы, связанные с отчислениями на социальные нужды
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Документы, связанные с третьими сторонами
 ECMDocsByProposals=Документы, связанные с предложениями
 ECMDocsByOrders=Документы, связанные с заказчиками заказов
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 161c887dc27..42a13ea584d 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=Ошибка SOAP-клиента '%s'
 ErrorGlobalVariableUpdater5=Не выбрана глобальная переменная
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Обязательные параметры не определены
@@ -190,3 +191,4 @@ WarningNotRelevant=Ненужная операция для этого набо
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Функция отключена, когда отображение оадптировано для слабовидящих или текстовых браузеров. 
 WarningPaymentDateLowerThanInvoiceDate=Дата платежа (%s)  меньше, чем дата  (%s)  счёта  %s.
 WarningTooManyDataPleaseUseMoreFilters=Слишком много данных. Пожалуйста, используйте дополнительные фильтры 
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 941e40ee0b4..69437528e49 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -3,7 +3,7 @@ HRM=Отдел кадров
 Holidays=Отпуска
 CPTitreMenu=Отпуска
 MenuReportMonth=Ежемесячная выписка
-MenuAddCP=Подать аявление на отпуск
+MenuAddCP=New leave request
 NotActiveModCP=Вы должны включить модуль "Отпуска" для просмотра этой страницы
 NotConfigModCP=Вы должны настроить модуль "Отпуска" для просмотра этой страницы. Для этого <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">нажмите здесь </ a>.
 NoCPforUser=У вас нет доступных дней отдыха.
@@ -71,7 +71,7 @@ MotifCP=Причина
 UserCP=Пользователь
 ErrorAddEventToUserCP=Возникла ошибка при добавлении исключительного отпуска.
 AddEventToUserOkCP=Добавление исключительного отпуска успешно завершено. 
-MenuLogCP=Посмотреть журнал заявлений на отпуск
+MenuLogCP=View change logs
 LogCP=Журнал обновлений доступных выходных дней
 ActionByCP=Выполнено 
 UserUpdateCP=Для пользователя
@@ -93,6 +93,7 @@ ValueOptionCP=Значение
 GroupToValidateCP=Группа с возможностями для утверждения заявлений на отпуск
 ConfirmConfigCP=Проверить конфигурацию
 LastUpdateCP=Последнее автоматическое обновление распределения отпусков
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Обновлено успешно
 ErrorUpdateConfCP=Во время обновления произошла ошибка. Пожалуйста, попробуйте еще раз.
 AddCPforUsers=Пожалуйста, задайте баланс распределения  отпусков пользователей. Для этого,  <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">нажмите сюда</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Произошла ошибка при отправке эле
 NoCPforMonth=Нет отпуска в этом месяце
 nbJours=Количество дней
 TitleAdminCP=Настройка модуля "Отпуска"
+NoticePeriod=Notice period
 #Messages
 Hello=Здравствуйте
 HolidaysToValidate=Подтверждение заявления на отпуск
@@ -139,10 +141,11 @@ HolidaysRefused=Заявление отклонено.
 HolidaysRefusedBody=Ваше заявление на отпуск с  %s по %s отклонено по следующей причине: 
 HolidaysCanceled=Отменённые заявления на отпуск
 HolidaysCanceledBody=Ваше заявление на отпуск с  %s по %s отменено. 
-Permission20000=Посмотреть мои заявления на отпуск
-Permission20001=Создать/изменить мои заявления на отпуск
-Permission20002=Создать/изменить заявления на отпуск для всех
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Удалить заявления на отпуск
-Permission20004=Настройка доступных дней отпуска для пользователей
-Permission20005=посмотреть журнал изменённых заявлений на отпуск
-Permission20006=Посмотреть отчёт  о отпусках по месяцам
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/ru_RU/incoterm.lang b/htdocs/langs/ru_RU/incoterm.lang
index 2396d2acb0e..f918c87d96d 100644
--- a/htdocs/langs/ru_RU/incoterm.lang
+++ b/htdocs/langs/ru_RU/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
-IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
+IncotermLabel=Обязанности по доставке товаров
+IncotermSetupTitle1=Функция
+IncotermSetupTitle2=Статус
+IncotermSetup=Настройка модуля "Обязанности по доставке товаров"
+IncotermFunctionDesc=Активировать функцию "Обязанности по доставке товаров" (для контрагентов,  коммерческих предложений, заказов и счетов клиентов, поставок, заказов поставщиков)
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 854a530bc0f..765aa5c870e 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Мы постарались сделать установку Dolibarr настолько простой, насколько это возможно. Просто следуйте инструкциям по установке, шаг за шагом.
-MiscellaneousChecks=Условия проверки
+MiscellaneousChecks=Проверка системных требований
 DolibarrWelcome=Добро пожаловать на Dolibarr
 ConfFileExists=Файл <b>конфигурации %s</b> существует.
 ConfFileDoesNotExists=Файл <b>конфигурации %s</b> не существует!
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=База данных - Superuser доступа
 CheckToCreateDatabase=Флажок, если база данных не существует, и должен быть создан. <br> В этом случае, вы должны заполнить логин и пароль для учетной записи суперпользователя в нижней части этой страницы.
 CheckToCreateUser=Флажок, если логин не существует и должна быть создана. <br> В этом случае, вы должны заполнить логин и пароль для учетной записи суперпользователя в нижней части этой страницы.
 Experimental=(экспериментальная, не действуют)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Войти на пользователя разрешается создавать новые базы данных и новых пользователей, бесполезны, если ваша база данных, и ваша база данных логин уже существует (например, когда вы Хостинг провайдер веб-хостинга).
 KeepEmptyIfNoPassword=Оставьте пустым, если пользователь не имеет пароля (избежать этого)
 SaveConfigurationFile=Сохранить значения
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index 726045b2701..1d55e1f69a6 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Арабский
 Language_ar_SA=Арабский
+Language_bn_BD=Bengali
 Language_bg_BG=Болгарский
 Language_bs_BA=Боснийский
 Language_ca_ES=Каталанский
@@ -21,9 +22,10 @@ Language_en_SA=Английский (Саудовская Аравия)
 Language_en_US=Английский (США)
 Language_en_ZA=Английский (Южная Африка)
 Language_es_ES=Испанский
-Language_es_DO=Испанский (Доминиканская Республика)
 Language_es_AR=Испанский (Аргентина)
 Language_es_CL=Испанский (Чили)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Испанский (Доминиканская Республика)
 Language_es_HN=Испанский (Гондурас)
 Language_es_MX=Испанский (Мексика)
 Language_es_PY=Испанский (Парагвай)
@@ -45,7 +47,10 @@ Language_id_ID=Индонезийский
 Language_is_IS=Исландский
 Language_it_IT=Итальянский
 Language_ja_JP=Японский
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Корейский
+Language_lo_LA=Lao
 Language_lt_LT=Литовский
 Language_lv_LV=Латышский
 Language_mk_MK=Македонский
@@ -64,6 +69,7 @@ Language_sv_SV=Шведский
 Language_sv_SE=Шведский
 Language_sq_AL=Албанский
 Language_sk_SK=Словацкий
+Language_sw_SW=Kiswahili
 Language_th_TH=Тайский
 Language_uk_UA=Украинский
 Language_uz_UZ=Узбекский
diff --git a/htdocs/langs/ru_RU/loan.lang b/htdocs/langs/ru_RU/loan.lang
new file mode 100644
index 00000000000..620db5f0ca6
--- /dev/null
+++ b/htdocs/langs/ru_RU/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Ссуда
+Loans=Ссуды
+NewLoan=Новая ссуда
+ShowLoan=Показать ссуду
+PaymentLoan=Оплата ссуды
+ShowLoanPayment=Просмотр оплаты ссуды
+Capital=Капитал
+Insurance=Страховка
+Interest=Доля капитала
+Nbterms=Количество условий
+LoanAccountancyCapitalCode=Бухгалтерский код капитала
+LoanAccountancyInsuranceCode=Бухгалтерский код страхования
+LoanAccountancyInterestCode=Бухгалтерский код доли в капитале
+LoanPayment=Оплата ссуды
+ConfirmDeleteLoan=Подтвердите удаление этой ссуды
+LoanDeleted=Ссуда успешно удалена
+ConfirmPayLoan=Подтвердите, что эта ссуда оплачена
+LoanPaid=Ссуда оплачена
+ErrorLoanCapital=Суммы ссуды должна быть числом больше нуля.
+ErrorLoanLength=Длина ссуды должна быть числом больше нуля.
+ErrorLoanInterest=Годовой процент должен быть числом больше нуля.
+# Calc
+LoanCalc=Калькулятор банковской ссуды
+PurchaseFinanceInfo=Информация о покупках и финансах
+SalePriceOfAsset=Цена продажи актива
+PercentageDown=Процент вниз
+LengthOfMortgage=Срок ссуды
+AnnualInterestRate=Годовой процент
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Авансовый платёж
+DownPaymentDesc=<b>Авансовый платеж</b> = цена дома, умноженного на процент,  разделенный на 100 (для 5% аванса будет  5/100 или 0.05),
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=Ежемесячная оплата вычислена, используя следующую формулу
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Годовой итог
+MonthlyPayment=Месячный платёж
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=Вы потратите %s на свой дом в  %s году
+# Admin
+ConfigLoan=Настройка модуля Ссуды
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Бухгалтерский код капитала по умолчанию
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Бухгалтерский код страхования по-умолчанию
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index d3aa823b20d..4f7933b37e3 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -77,15 +77,15 @@ CheckRead=Открыть получателя
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Ссылка на email
 ActivateCheckRead=Разрешить использовать ссылку "Отказаться от подписки"
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=Email отправлено %s получателям.
-XTargetsAdded=<b>%s</b> recipients added into target list
+XTargetsAdded=<b>%s</b> добавлено в список получателей
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
 MailTopicSendRemindUnpaidInvoices=Уведомление по счёту %s (%s)
 SendRemind=Отправить напоминание по Email
 RemindSent=%s напоминания(й) отправлено
 AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
-NoRemindSent=No EMail reminder sent
+NoRemindSent=Нет отправленного уведомления по электронной почте
 ResultOfMassSending=Result of mass EMail reminders sending
 
 # Libelle des modules de liste de destinataires mailing
@@ -127,14 +127,15 @@ YouCanUseCommaSeparatorForSeveralRecipients=Вы можете использов
 TagCheckMail=Отслеживать открытие писем
 TagUnsubscribe=Ссылка для отказа от подписки
 TagSignature=Подпись отправителя
-TagMailtoEmail=Recipient EMail
+TagMailtoEmail=EMail получателя
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Уведомления
 NoNotificationsWillBeSent=Нет электронной почте уведомления, планируется к этому мероприятию и компании
 ANotificationsWillBeSent=1 уведомление будет отправлено по электронной почте
 SomeNotificationsWillBeSent=%s уведомления будут отправлены по электронной почте
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active email notification targets
+AddNewNotification=Включить новое задание на уведомление по электронной почте
+ListOfActiveNotifications=Список всех заданий на уведомление по электронной почте
 ListOfNotificationsDone=Список всех уведомлений по электронной почте отправлено
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 2ee42a37e2e..c93051bb965 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Были обнаружены некото
 ErrorConfigParameterNotDefined=Параметр <b>%s</b> не определен внутри конфигурационного файла Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Не удалось найти пользователя <b>%s</b> в базе данных Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Ошибка, ставки НДС не установлены для страны '%s'.
-ErrorNoSocialContributionForSellerCountry=Ошибка, не определен тип социальных взносов для страны %s.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Ошибка, не удалось сохранить файл.
 SetDate=Установить дату
 SelectDate=Выбрать дату
@@ -301,8 +301,8 @@ UnitPriceHT=Цена за единицу (нетто)
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
-AskPriceSupplierUHT=Запрошена цена единицы за вычетом налогов
-PriceUTTC=Цена ед.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
 AmountPayment=Сумма платежа
@@ -339,6 +339,7 @@ IncludedVAT=Включает НДС
 HT=Без налога
 TTC=Вкл-я налог
 VAT=НДС
+VATs=Sales taxes
 LT1ES=Повторно
 LT2ES=IRPF
 VATRate=Ставка НДС
@@ -413,6 +414,8 @@ Qty=Кол-во
 ChangedBy=Изменен
 ApprovedBy=Утверждено
 ApprovedBy2=Утверждено (повторно)
+Approved=Утверждено
+Refused=Отклонено
 ReCalculate=Пересчитать
 ResultOk=Успешно
 ResultKo=Неудачно
@@ -421,7 +424,7 @@ Reportings=Отчеты
 Draft=Черновик
 Drafts=Черновики
 Validated=Подтверждено
-Opened=Открыто
+Opened=Open
 New=Новый
 Discount=Скидка
 Unknown=Неизвестно
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Связан с особым контактом польз
 DeleteAFile=Удалить файл
 ConfirmDeleteAFile=Вы уверены, что хотите удалить файл?
 NoResults=Нет результатов
+SystemTools=Системные инструменты
 ModulesSystemTools=Настройки модулей
 Test=Тест
 Element=Элемент
@@ -703,6 +707,9 @@ ShowTransaction=Показать транзакции
 GoIntoSetupToChangeLogo=Используйте Главная-Настройки-Компании для изменения логотипа или  Главная-Настройки-Отображение для того, чтобы его скрыть.
 Deny=Запретить
 Denied=Запрещено
+ListOfTemplates=Список шаблонов
+Genderman=Мужчина
+Genderwoman=Женщина
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
@@ -732,3 +739,4 @@ ShortThursday=Чт
 ShortFriday=Пт
 ShortSaturday=Сб
 ShortSunday=Вс
+SelectMailModel=Выбрать шаблон электронного письма
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 77d60e90402..07c997ae68f 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -199,7 +199,8 @@ Entreprises=Компании
 DOLIBARRFOUNDATION_PAYMENT_FORM=Чтобы сделать вашу подписку оплаты с помощью банковского перевода, см. стр. <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Для оплаты с помощью кредитной карты или Paypal, нажмите на кнопку в нижней части этой страницы. <br>
 ByProperties=По характеристикам
 MembersStatisticsByProperties=Стастистика участников по характеристикам
-MembersByNature=Участники по природе
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Значение НДС, для ипользования в подписках
 NoVatOnSubscription=Нет НДС для подписок
 MEMBER_PAYONLINE_SENDEMAIL=Адрес электронно почты, куда будут отправляться предупреждения, когда будет получено подтверждение о завершенном платеже за подписку
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 0bda675f6e4..835391df9af 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Для поставщиков
 SuppliersOrders=Поставщики заказ
 SuppliersOrdersRunning=Текущие поставщиков заказов
 CustomerOrder=Для клиентов
-CustomersOrders=Заказы клиентов
-CustomersOrdersRunning=Текущие клиентов заказы
-CustomersOrdersAndOrdersLines=Клиент приказов и распоряжений линий
-OrdersToValid=Заказы клиентов для подтверждения
-OrdersToBill=Доставленные заказы клиентов
-OrdersInProcess=Заказы клиентов в обработке
-OrdersToProcess=Заказы клиентов для обработки
-SuppliersOrdersToProcess=Поставщика заказов для обработки
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Отменен
 StatusOrderDraftShort=Черновик
 StatusOrderValidatedShort=Подтвержденные
@@ -75,8 +75,9 @@ AddToMyOrders=Добавить в мои заказы
 AddToOtherOrders=Добавить в других заказов
 AddToDraftOrders=Добавить проект заказа
 ShowOrder=Показать порядок
-NoOpenedOrders=Нет открыл заказов
-NoOtherOpenedOrders=Никакие другие открыли заказов
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Нет проектов заказов
 OtherOrders=Другие заказы
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 9d09fec50a1..fa80f2f6ba9 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Посредничество подтверждено
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Проверка векселя
 Notify_BILL_UNVALIDATE=Счёт клиента не подтверждён
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Поставщик утвердил порядок
 Notify_ORDER_SUPPLIER_REFUSE=Поставщик порядке отказалась
 Notify_ORDER_VALIDATE=Kundeordre validert
@@ -203,6 +204,7 @@ ClickHereToGoTo=Нажмите сюда, чтобы перейти к %s
 YouMustClickToChange=Однако, вы должны сначала нажать на ссылку для подтверждения изменения пароля
 ForgetIfNothing=Если вы не запрашивали эти изменения, забудьте про это электронное письмо.  Ваши данные в безопасности.
 IfAmountHigherThan=Если количество более чем <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Добавить запись в календаре %s
diff --git a/htdocs/langs/ru_RU/printing.lang b/htdocs/langs/ru_RU/printing.lang
index f0cd2a40292..3e30d2ac7b3 100644
--- a/htdocs/langs/ru_RU/printing.lang
+++ b/htdocs/langs/ru_RU/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
-TestDriver=Test
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
-STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
-STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Настройки системы прямой печати
+PrintingDesc=Этот модуль добавляет кнопку Печать для отправки документа напрямую на принтер (без открытия документа в приложении)
+ModuleDriverSetup=Настройка драйвера
+PrintingDriverDesc=Настройки драйвера принтера
+ListDrivers=Список драйверов
+PrintTestDesc=Список принтеров
+FileWasSentToPrinter=Файл %s отправлен на принтер
+NoActivePrintingModuleFound=Нет активного модуля для печати документа
+PleaseSelectaDriverfromList=Пожалуйста, выберите драйвер из списка
+SetupDriver=Настройка драйвера
+TestDriver=Проверить
+TargetedPrinter=Целевой принтер
+UserConf=Настройка для пользователя
+PRINTGCP=Сервис Google Cloud Print
+PrintGCPDesc=Этот драйвер позволяет отправлять документы на принтер с использованием сервиса Google Cloud Print
+PrintingDriverDescprintgcp=Настройки для драйвера сервиса Google Cloud Print
+PrintTestDescprintgcp=Список принтеров для сервиса Google Cloud Print
+PRINTGCP_LOGIN=Имя пользователя Google 
+PRINTGCP_PASSWORD=Пароль пользователя Google
+STATE_ONLINE=Онлайн
+STATE_UNKNOWN=Неизвестно
+STATE_OFFLINE=Оффлайн
+STATE_DORMANT=Вне зоны доступа долгое время
 TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
-TYPE_DOCS=DOCS
+TYPE_HP=Принтер HP
+TYPE_DOCS=Документы
 TYPE_DRIVE=Google Drive
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
-PrintIPPSetup=Setup of Direct Print module
+GCP_Name=Имя
+GCP_displayName=Отображаемое имя
+GCP_Id=ID принтера
+GCP_OwnerName=Имя владельца
+GCP_State=Состояние принтера
+GCP_connectionStatus=Статус
+GCP_Type=Тип принтера
+PRINTIPP=Драйвер PrintIPP
+PrintIPPSetup=Настройка модуля прямой печати
 PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
-PrintTestDescprintipp=List of Printers for driver PrintIPP.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
+PrintingDriverDescprintipp=Настраиваемые переменные  для печати с использованием драйвера PrintIPP.
+PrintTestDescprintipp=Список принтеров для драйвера PrintIPP
+PRINTIPP_ENABLED=Отображать иконку "Прямая печать" в документах
+PRINTIPP_HOST=Принт-сервер
+PRINTIPP_PORT=Порт
+PRINTIPP_USER=Логин
+PRINTIPP_PASSWORD=Пароль
+NoPrinterFound=Принтеры не найдены (проверьте настройки печати системы CUPS)
+NoDefaultPrinterDefined=Не указан принтер по умолчанию
+DefaultPrinter=Принтер по умолчанию
+Printer=Принтер
+CupsServer=CUPS сервер
+IPP_Uri=Ссылка на принтер
+IPP_Name=Имя принтера
+IPP_State=Состояние принтера
 IPP_State_reason=State reason
 IPP_State_reason1=State reason1
 IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
-STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
-STATE_IPP_none=None
-MEDIA_IPP_stationery=Stationery
-MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+IPP_Color=Цвет
+IPP_Device=Устройство
+IPP_Media=Носитель
+IPP_Supported=Тип носителя
+STATE_IPP_idle=В ждущем режиме
+STATE_IPP_stopped=Остоновлен
+STATE_IPP_paused=На паузе
+STATE_IPP_toner-low-report=Низкий уровень тонера
+STATE_IPP_none=Нет
+MEDIA_IPP_stationery=Почтовая бумага
+MEDIA_IPP_thermal=Термо-принтер
+IPP_COLOR_print-black=BW принтер
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 659de0c2a4c..8e9662340c8 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Кол-во:%d
 AddDispatchBatchLine=Добавить строку Срока годности
 BatchDefaultNumber=Не задана
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=Этот товар не использует номер партии/серийный номер
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 6e0115ffc99..c093e0dfb95 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Товар или Услуга
 ProductsAndServices=Товары и Услуги
 ProductsOrServices=Товары  или Услуги
 ProductsAndServicesOnSell=Товары и Услуги для покупки или продажи
-ProductsAndServicesNotOnSell=Товары или Услуги не для продажи
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Продукты и услуги статистика
 ProductsStatistics=Продукты статистика
-ProductsOnSell=Товар для покупки или продажи
-ProductsNotOnSell=Товар не для покупки и не для продажи
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Товар для продажи и покупки
 ServicesOnSell=Услуга для покупки или для продажи
-ServicesNotOnSell=Услуга не для продажи
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Услуга для продажи и покупки
 InternalRef=Внутренние ссылки
 LastRecorded=Последние продукты / услуги по продаже зарегистрировано
@@ -44,7 +44,7 @@ CardProduct1=Карточка услуги
 CardContract=Карточка контакта
 Warehouse=Склад
 Warehouses=Склады
-WarehouseOpened=Склад открыт
+WarehouseOpened=Warehouse open
 WarehouseClosed=Склад закрыт
 Stock=Склад
 Stocks=Склады
@@ -71,21 +71,21 @@ SellingPriceTTC=Продажная цена (вкл. налоги)
 PublicPrice=Официальные цены
 CurrentPrice=Текущая цена
 NewPrice=Новая цена
-MinPrice=Миним. продажная цена
-MinPriceHT=Минимальная цена продажи (net of tax)
-MinPriceTTC=Минимальная цена продажи (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
 ContractStatus=Статус контакта
 ContractStatusClosed=Закрытые
-ContractStatusRunning=В работе
+ContractStatusRunning=Ongoing
 ContractStatusExpired=истекли
-ContractStatusOnHold=Не в работе
-ContractStatusToRun=To get running
-ContractNotRunning=Этот контракт не в работе
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Продукции с учетом% уже существует.
 ErrorProductBadRefOrLabel=Неправильное значение для справки или этикетку.
 ErrorProductClone=Возникла проблема при попытке дублирования продукта или услуги
-ErrorPriceCantBeLowerThanMinPrice=Ошибка. Цена не может быть ниже минимальной цены. 
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Поставщики
 SupplierRef=Поставщик исх.
 ShowProduct=Показать товар
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Если продукт является услугой 
 MultiPricesAbility=Несколько уровней цен для товаров/услуг
 MultiPricesNumPrices=Кол-во цен
 MultiPriceLevelsName=Категории цен
-AssociatedProductsAbility=Включить режим виртуальной упаковки товара
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Упаковка товара
-AssociatedProductsNumber=Количество товаров в этой виртуальной упоковке
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=Если задан 0, то этот товар не виртуальная упаковка
-IfZeroItIsNotUsedByVirtualProduct=Если задан 0, то этот товар не будет использован ни в какой виртуальной упаковке
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Ассоциированные
 Translation=Перевод
 KeywordFilter=Фильтр ключевых слов
@@ -131,7 +131,7 @@ ProductToAddSearch=Поиск продукта для добавления
 AddDel=Добавить / Удалить
 Quantity=Кол-во
 NoMatchFound=Не найдено соответствия
-ProductAssociationList=Список продуктов / услуг: Наименование товара / услуги (количество пострадавших)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Один из выбранного продукта родителей с действующим продукта
 DeleteProduct=Удалить товар / услугу
@@ -179,16 +179,41 @@ CloneProduct=Клон продукт или услугу
 ConfirmCloneProduct=Вы уверены, что хотите клонировать продукт или <b>услуга %s?</b>
 CloneContentProduct=Клон все основные данные о продукции / услуг
 ClonePricesProduct=Клон основные данные и цены
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
-CustomerPrices=Клиенты цены
-SuppliersPrices=Поставщики цены
-SuppliersPricesOfProductsOrServices=Цены поставщика (за товары или услуги)
+CustomerPrices=Цены клиентов
+SuppliersPrices=Цены поставщиков
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Пользовательский код
 CountryOrigin=Страна происхождения
 HiddenIntoCombo=Скрытые в списках выбора
 Nature=Природа
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Ссылка на шаблон товара
 ServiceCodeModel=Ссылка на шаблон услуги
 AddThisProductCard=Создать карточку товара
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Производство завершено
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Цены клиенты (за товары, услуги, совместные цены)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=I квартал
@@ -237,7 +262,7 @@ ResetBarcodeForAllRecords=Задать значение штри х-кода л
 PriceByCustomer=Различная цена для каждого клиента
 PriceCatalogue=Уникальная цена для товара/услуги
 PricingRule=Правила для цен клиента
-AddCustomerPrice=Добавить цену клиента
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Установить такую же цену для дочерних клиентов
 PriceByCustomerLog=Цена по журналу клиента
 MinimumPriceLimit=Минимальная цена не может быть ниже %s
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=Следующий формат {"URL": "http:/
 UpdateInterval=Интервал обновления (в минутах)
 LastUpdated=Последнее обновление
 CorrectlyUpdated=Правильно обновлено
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 19094a381aa..d73af48f2f0 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Эта точка зрения представлены вс
 ProjectsPublicTaskDesc=Это представление всех проектов и задач, к которым у вас есть доступ.
 ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего).
 MyTasksDesc=Эта точка зрения ограничена на проекты или задачи, которые являются для контакта (что бы это тип).
-OnlyOpenedProject=Видны только открытые проекты (проекты на стадии черновика или закрытые проекты не видны)
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать.
 TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Проекты области
 NewProject=Новый проект
 AddProject=Создать проект
@@ -29,7 +30,7 @@ ProjectsList=Список проектов
 ShowProject=Показать проекта
 SetProject=Комплекс проектов
 NoProject=Нет проекта определена
-NbOpenTasks=Nb открытых задач
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb проектов
 TimeSpent=Время, затраченное
 TimeSpentByYou=Затраченное мной время
@@ -41,7 +42,7 @@ TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Задачи на открытых проектах
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Рабочая нагрузка не задана
 NewTimeSpent=Новое время
 MyTimeSpent=Мое время
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Список мероприятий, связан
 ListExpenseReportsAssociatedProject=Список отчётов о затратах, связанных с проектом
 ListDonationsAssociatedProject=Список пожертвований, связанных с проектом
 ListActionsAssociatedProject=Список мероприятий, связанных с проектом
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Деятельность по проекту на этой неделе
 ActivityOnProjectThisMonth=Деятельность по проектам в этом месяце
 ActivityOnProjectThisYear=Деятельность по проектам в этом году
@@ -95,7 +98,7 @@ DeleteATimeSpent=Удалить времени
 ConfirmDeleteATimeSpent=Вы уверены, что хотите удалить этот раз провели?
 DoNotShowMyTasksOnly=Также видеть  задачи, не назначенные мне
 ShowMyTasksOnly=Видеть только задачи, назначенные мне
-TaskRessourceLinks=Библиография
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне
 NoTasks=Нет задач, для этого проекта
 LinkedToAnotherCompany=Связь с другими третий участник
@@ -139,8 +142,15 @@ ProjectReferers=Ссылающиеся объекты
 SearchAProject=Поиск проекта
 ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён
 ProjectDraft=Черновики проектов
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Ввод по дням
 InputPerWeek=Ввод по неделе
 InputPerAction=Ввод по действиям
 TimeAlreadyRecorded=Время, потраченное на уже зафиксировано для этой задачи / дня и пользователя %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 74aa5773852..cd1b27f7f55 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -4,7 +4,7 @@ Proposal=Коммерческое предложение
 ProposalShort=Предложение
 ProposalsDraft=Проект коммерческого предложения
 ProposalDraft=Проект коммерческого предложения
-ProposalsOpened=Открытие коммерческих предложений
+ProposalsOpened=Open commercial proposals
 Prop=Коммерческие предложения
 CommercialProposal=Коммерческое предложение
 CommercialProposals=Коммерческие предложения
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Сумма в месяц (за вычетом нал
 NbOfProposals=Количество коммерческих предложений
 ShowPropal=Показать предложение
 PropalsDraft=Черновики
-PropalsOpened=Открыты
+PropalsOpened=Open
 PropalsNotBilled=Закрытые не будет взиматься
 PropalStatusDraft=Проект (должно быть подтверждено)
 PropalStatusValidated=Удостоверенная (предложение открыто)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Не подписал (закрытые)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Черновик
 PropalStatusValidatedShort=Подтвержденные
-PropalStatusOpenedShort=Открыты
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Закрытые
 PropalStatusSignedShort=Подпись
 PropalStatusNotSignedShort=Не подписано
@@ -51,8 +51,8 @@ PropalsToClose=Коммерческие предложения закрыть
 PropalsToBill=Подпись коммерческие предложения по законопроекту
 ListOfProposals=Список коммерческих предложений
 ActionsOnPropal=Меры по предложению
-NoOpenedPropals=Нет открыли коммерческие предложения
-NoOtherOpenedPropals=Никакие другие открыли коммерческие предложения
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Коммерческие предложения исх
 SendPropalByMail=Отправить коммерческое предложение по почте
 AssociatedDocuments=Документы, связанные с предложением:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Желтый предложение модель
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Шаблон по умолчанию, когда закрывается коммерческое предложение (для создания счёта)
 DefaultModelPropalClosed=Шаблон по умолчанию, когда закрывается коммерческое предложение (не оплаченное)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 8429f995703..2498fa011b4 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Показать выплату зарплаты
 THM=Средняя расценка почасовой оплаты
 TJM=Средняя расценка дневной оплаты
 CurrentSalary=Текущая зарплата
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 5266b0bc135..1d162255dbe 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -2,7 +2,7 @@
 RefSending=Ref. поставки
 Sending=Поставки
 Sendings=Поставки
-AllSendings=All Shipments
+AllSendings=Все поставки
 Shipment=Поставка
 Shipments=Поставки
 ShowSending=Показать Отправку
@@ -53,7 +53,7 @@ DocumentModelSimple=Простая модель документа
 DocumentModelMerou=Модель A5
 WarningNoQtyLeftToSend=Внимание, нет товаров ожидающих отправки.
 StatsOnShipmentsOnlyValidated=Статистика собирается только на утверждённые поставки. Используемая дата - дата утверждения поставки (планируемая дата доставки не всегда известна)
-DateDeliveryPlanned=Планируемая дата доставки
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Дата доставки получена
 SendShippingByEMail=Отправить поставкой по EMail
 SendShippingRef=Представление поставки %s
@@ -67,7 +67,7 @@ SendingRunning=Товар из уже заказанных клиентом
 SuppliersReceiptRunning=Товар из уже  заказанных поставщиком
 ProductQtyInCustomersOrdersRunning=Количество товара в открытых заказах клиента
 ProductQtyInSuppliersOrdersRunning=Количество товара в открытых заказах поставщика
-ProductQtyInShipmentAlreadySent=Количество товара из открытого заказа клиента уже отправлено. 
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Количество товара из открытого заказа поставщика уже получено. 
 
 # Sending methods
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 47b1c19b530..33273c12cfa 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Склады
 NewWarehouse=Новый склад / Фондовый области
 WarehouseEdit=Редактировать склад
 MenuNewWarehouse=Новый склад
-WarehouseOpened=Склад открыт
+WarehouseOpened=Warehouse open
 WarehouseClosed=Склад закрыт
 WarehouseSource=Источник склад
 WarehouseSourceNotDefined=Склад не определен,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Выберите хранилище, чтобы
 SelectWarehouseForStockIncrease=Выберите склад для использования в запас увеличения
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Заказы, ожидающие приёма
-DesiredStock=Желаемый запас
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=На заказ
 Replenishment=Пополнение
 ReplenishmentOrders=Заказ на пополнение
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Использовать виртуальный запас на складе вместо имеющего место быть, для функции наполнения
 UseVirtualStock=Использовать виртуальный склад
 UsePhysicalStock=Использовать физические запасы
-CurentSelectionMode=Текущий режим выделения
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Виртуальный запас
 CurentlyUsingPhysicalStock=Физический запас
 RuleForStockReplenishment=Правило для пополнения запасов
@@ -112,8 +113,8 @@ AlertOnly= Только предупреждения
 WarehouseForStockDecrease=Склад <b>%s</b> будет использован для уменьшения остатка
 WarehouseForStockIncrease=Склад <b>%s</b> будет использован для увеличения остатка
 ForThisWarehouse=Для этого склада
-ReplenishmentStatusDesc=Это список всех продуктов с остатками меньше лимита (или меньше чем значение для оповещения если отмечен чекбокс "только оповещение"), и рекомендуем вам сформировать заказ поставщикам чтобы восполнить разницу
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
 NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Получатели заказа
 StockMovementRecorded=Перемещения остатков записаны
 RuleForStockAvailability=Правила и требования к запасу на складе
-StockMustBeEnoughForInvoice=Достаточный запас товара/услуг на складе, чтобы  добавить в счёт
-StockMustBeEnoughForOrder=Достаточный запас товара/услуг на складе, чтобы  добавить в заказ
-StockMustBeEnoughForShipment= Достаточный запас товара/услуг на складе, чтобы  добавить в поставку
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Просмотр склада
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Перевозка товара %s на другой склад
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Исходный склад должен быть определен здесь, когда модуль "номер партии товара" включён. Он будет использоваться для отображения с номером партии/серийным номером товара для необходимой номера партии/ серийного номера с целью движения товаров. Если вы хотите отправить товары из разных складов, просто сделайте отправку за несколько шагов.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index 2e563da07c2..f2200b48868 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Отправлено поставщикам
 ListOfSupplierOrders=Список заказов поставщиков
 MenuOrdersSupplierToBill=Заказы поставщика для выписки счёта
 NbDaysToDelivery=Задержка доставки в днях
-DescNbDaysToDelivery=Самая большая задержка отображается среди списка товаров в заказе
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index a1708340798..6ac63ba6dfe 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Отчёты о затратах
 TripsAndExpensesStatistics=Статистика отчётов о затратах
 TripCard=Карточка отчётов о затратах
 AddTrip=Создать отчёт о затратах
-ListOfTrips=Список отчёта о затратах
+ListOfTrips=List of expense reports
 ListOfFees=Список сборов
 NewTrip=Новый отчёт о затртатах
 CompanyVisited=Посещенная организация
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Кого уведомлять для подтве
 TripSociete=Информация о компании
 TripSalarie=Информация о пользователе
 TripNDF=Информация о отчёте о затратах
-DeleteLine=Удалить строку из отчёта о затратах
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Вы точно хотите удалить эту строку?
 PDFStandardExpenseReports=Шаблон отчёта о затратах для создания документа в формате PDF
 ExpenseReportLine=Строка отчёта о затратах
@@ -40,11 +40,10 @@ TF_BUS=Автобус
 TF_CAR=Машина
 TF_PEAGE=Троллейбус
 TF_ESSENCE=Топливо
-TF_HOTEL=Хостел
+TF_HOTEL=Hotel
 TF_TAXI=Такси
 
 ErrorDoubleDeclaration=Вы должны задекларировать другой отчёт о затратах в этом временном диапазоне. 
-ListTripsAndExpenses=Список отчётов о затратах
 AucuneNDF=Нет отчётов о затратах по этому критерию
 AucuneLigne=Нет задекларированных отчётов о затратах
 AddLine=Добавить строку
@@ -56,12 +55,12 @@ ModePaiement=Режим оплаты
 Note=Примечание
 Project=Проект
 
-VALIDATOR=Уведомить пользователя о опробации
+VALIDATOR=User responsible for approval
 VALIDOR=Утверждено
 AUTHOR=Записано
-AUTHORPAIEMENT=Оплачено
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Отклонено
-CANCEL_USER=Отменено
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Причина
 MOTIF_CANCEL=Причина
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Дата платежа
 
 TO_PAID=Оплатить
 BROUILLONNER=Открыть заново
-SendToValid=Отправить запрос на утверждение
+SendToValid=Sent on approval
 ModifyInfoGen=Редактировать
 ValidateAndSubmit=Проверить и отправить запрос на утверждение
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Вы не можете утвердить этот отчёт о затратах
 NOT_AUTHOR=Вы не автор этого отчёта о затратах. Операция отменена.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Вы точно хотите изменит статус это
 CancelTrip=Отменить отчёт о затратах
 ConfirmCancelTrip=Вы точно хотите отменить отчёт о затратах?
 
-BrouillonnerTrip=Вернуть отчёту о затратах статус "Черновик"
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Вы точно хотите изменить статус этого отчёта о затратах на "Черновик"?
 
 SaveTrip=Проверить отчёт о завтратах
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 4df93b40a8c..526b2d62468 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Удалить из группы
 PasswordChangedAndSentTo=Пароль изменен и направил <b>в %s.</b>
 PasswordChangeRequestSent=Запрос на изменение пароля <b>для %s направлено %s.</b>
 MenuUsersAndGroups=Пользователи и Группы
+MenuMyUserCard=My user card
 LastGroupsCreated=Последнее %s созданы группы
 LastUsersCreated=Последнее %s пользователей создаются
 ShowGroup=Показать группы
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index d05d5fffd61..36a858add14 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Файл изъятия средств
 SetToStatusSent=Установить статус "Файл отправлен"
 ThisWillAlsoAddPaymentOnInvoice=Это также применит оплату по счетам и установит статус счетов на "Оплачен"
 StatisticsByLineStatus=Статистика статуса по строкам
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Оплата постоянных %s порядке банк
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index 97816ff6d9d..0d3aa393842 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Установка модуля Рабочих процессов
-WorkflowDesc=Этот модуль спроектирован для изменения поведения автоматических действий в приложении. По умолчанию, рабочий процесс открыт (вы можете делать вещи в том порядке, в каком желаете). Вы можете включить режим автоматических действий, в которых вы заинтересованы. 
-ThereIsNoWorkflowToModify=Существует не рабочий процесс можно изменить для модуля активации.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Создать заказ клиента автоматически после коммерческое предложение подписано
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Создать счет клиента автоматически после коммерческое предложение подписано
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Создать счет клиента автоматически после контракт проверяется
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Создать счет клиента автоматически после заказа клиента закрыт
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Классифицировать связанные коммерческие предложения оплаченными, когда заказ клиента обозначен, как оплаченный
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента оплачен. 
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента подтверждён.
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 623e2060f71..6108ff6b4ec 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Účtovníctvo
 Globalparameters=Globálne parametre
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 9e4b7a8aad7..a3f837e5482 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu pre užívateľov
 LangFile=súbor .lang
 System=Systém
 SystemInfo=Informácie o systéme
-SystemTools=Systémové nástroje
 SystemToolsArea=Systémové nástroje priestor
 SystemToolsAreaDesc=Táto oblasť poskytuje správu funkcií. V menu vyberte funkciu, ktorú hľadáte.
 Purge=Očistiť
@@ -232,8 +231,8 @@ Security=Zabezpečenie
 Passwords=Heslá
 DoNotStoreClearPassword=Do žiadny obchod jasná heslá v databáze, ale iba šifrované úložisko hodnota (Activated odporúčané)
 MainDbPasswordFileConfEncrypted=Databáza heslo zašifrované v conf.php (Activated odporúčané)
-InstrucToEncodePass=Ak chcete mať heslo zakódovaný do súboru <b>conf.php</b> nahradiť riadku <br> <b>$ Dolibarr_main_db_pass = &quot;...&quot;</b> <br> podľa <br> <b>$ Dolibarr_main_db_pass = &quot;šifrovaný: %s&quot;</b>
-InstrucToClearPass=Ak chcete mať heslo dekódované (číra) do <b>conf.php</b> súboru, nahradiť riadku <br> <b>$ Dolibarr_main_db_pass = &quot;šifrovaných: ...&quot;</b> <br> podľa <br> <b>$ Dolibarr_main_db_pass = &quot;%s&quot;</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Ochrana generovaných súborov PDF (aktivuje sa neodporúča, rozbije hromadné generovanie PDF)
 ProtectAndEncryptPdfFilesDesc=Ochrana dokumentu vo formáte PDF udržuje ju k dispozícii pre čítanie a tlač PDF s akýmkoľvek prehliadači. Avšak, editáciu a kopírovanie nie je už možné. Všimnite si, že používate túto funkciu, aby budovu globálne kumulovanú pdf nefunguje (ako nezaplatených faktúr).
 Feature=Rys
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=To je nastavený tak, aby proces:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Krok %s
 FindPackageFromWebSite=Nájsť balíčka, ktorý obsahuje funkciu, ktorú chcete (napr. na oficiálnych webových stránkach %s).
-DownloadPackageFromWebSite=Stiahnite si balíček %s.
-UnpackPackageInDolibarrRoot=Rozbaľte súbor balíka do adresára vyhradeného pre externé moduly: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Inštalácia je dokončená a Dolibarr je pripravený na použitie s touto nový komponent.
 NotExistsDirect=Alternatívne koreňový adresár nie je definovaná. <br>
 InfDirAlt=Od verzie 3 je možné definovať alternatívny koreň directory.This umožňuje ukladať, rovnaké miesto, plug-iny a vlastné šablóny. <br> Stačí vytvoriť adresár v koreňovom adresári Dolibarr (napr.: vlastné). <br>
 InfDirExample=<br> Potom vyhlásiť ju v súbore conf.php <br> $ Dolibarr_main_url_root_alt = 'http://myserver/custom &quot; <br> $ Dolibarr_main_document_root_alt = '/ cesta / of / Dolibarr / htdocs / vlastný &quot; <br> * Tieto riadky sú okomentované znakom &quot;#&quot;, odkomentovať odobrať iba charakter.
-YouCanSubmitFile=Vyberte modul:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr aktuálna verzia
 CallUpdatePage=Prejdite na stránku, ktorá aktualizuje databázovú štruktúru a údaje: %s.
 LastStableVersion=Posledná stabilná verzia
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Knižnica použiť na vytvorenie PDF
 WarningUsingFPDF=Upozornenie: Váš <b>conf.php</b> obsahuje direktívu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že môžete používať knižnicu FPDF pre generovanie PDF súborov. Táto knižnica je stará a nepodporuje mnoho funkcií (Unicode, obraz transparentnosť, azbuka, arabské a ázijské jazyky, ...), takže môže dôjsť k chybám pri generovaní PDF. <br> Ak chcete vyriešiť tento a majú plnú podporu generovanie PDF, stiahnite si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knižnice</a> , potom komentár alebo odstrániť riadok <b>$ dolibarr_pdf_force_fpdf = 1,</b> a namiesto neho doplniť <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Zadajte telefónne číslo pre volania ukázať odkaz na test ClickToDial URL pre <strong>%s</strong>
 RefreshPhoneLink=Obnoviť odkaz
@@ -430,8 +429,8 @@ Module20Name=Návrhy
 Module20Desc=Komerčné návrh riadenia
 Module22Name=Mass E-mailing
 Module22Desc=Mass E-mailing riadenie
-Module23Name= Energia
-Module23Desc= Sledovanie spotreby energií
+Module23Name=Energia
+Module23Desc=Sledovanie spotreby energií
 Module25Name=Zákazníckych objednávok
 Module25Desc=Zákazníka riadenie
 Module30Name=Faktúry
@@ -492,8 +491,8 @@ Module400Name=Projekty/Príležitosti/Vyhliadky
 Module400Desc=Riadenie projektov, príležitostí alebo vyhliadok. Môžete priradiť ľubovoľný prvok (faktúra, objednávka, návrh, intervencia, ...) k projektu a získať priečny pohľad z pohľadu projektu.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrácia
-Module500Name=Osobitné náklady (dane, sociálne príspevky, dividendy)
-Module500Desc=Správa špeciálnych výdavkov, ako sú dane, sociálny príspevok, dividendy a platy
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Upozornenie
 Module600Desc=Poslať e-mailové upozornenie na niektoré Dolibarr firemné udalosti kontaktom tretích strán (nastavenie definované zvlášť pre každú tretiu stranu)
 Module700Name=Dary
 Module700Desc=Darovanie riadenie
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Program rokovania
 Module2400Desc=Udalosti / úlohy a agendy vedenie
 Module2500Name=Elektronický Redakčný
 Module2500Desc=Uložiť a zdieľať dokumenty
-Module2600Name=WebServices
-Module2600Desc=Povoliť Dolibarr webových služieb servera
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Vytvoriť / upraviť produktov
 Permission34=Odstrániť produkty
 Permission36=Pozri / správa skryté produkty
 Permission38=Export produktov
-Permission41=Prečítajte projektov (spoločné projekty, projekt a ja som kontakt pre)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Vytvoriť / upraviť projektov (spoločné projekty, projekt a ja som kontakt pre)
 Permission44=Odstrániť projektov (spoločné projekty, projekt a ja som kontakt pre)
 Permission61=Prečítajte intervencie
@@ -599,10 +600,10 @@ Permission86=Poslať objednávky odberateľov
 Permission87=Zavrieť zákazníkov objednávky
 Permission88=Storno objednávky odberateľov
 Permission89=Odstrániť objednávky odberateľov
-Permission91=Prečítajte si príspevky na sociálne zabezpečenie a dane z pridanej hodnoty
-Permission92=Vytvoriť / upraviť príspevky na sociálne zabezpečenie a dane z pridanej hodnoty
-Permission93=Odstránenie sociálne príspevky a dane z pridanej hodnoty
-Permission94=Export príspevky na sociálne zabezpečenie
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Prečítajte si správy
 Permission101=Prečítajte si sendings
 Permission102=Vytvoriť / upraviť sendings
@@ -620,9 +621,9 @@ Permission121=Prečítajte tretej strany v súvislosti s užívateľmi
 Permission122=Vytvoriť / modifikovať tretie strany spojené s používateľmi
 Permission125=Odstránenie tretej strany v súvislosti s užívateľmi
 Permission126=Export tretej strany
-Permission141=Prečítajte projektov (aj súkromné ​​nie som kontakt pre)
-Permission142=Vytvoriť / upraviť projektov (aj súkromné ​​nie som kontakt pre)
-Permission144=Odstrániť projekty (aj súkromné ​​nie som kontakt pre)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Prečítajte si poskytovatelia
 Permission147=Prečítajte si štatistiky
 Permission151=Prečítajte si trvalé príkazy
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Nastavenie uložené
 BackToModuleList=Späť na zoznam modulov
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zips
 CompanyTown=Mesto
 CompanyCountry=Krajina
 CompanyCurrency=Hlavná mena
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Nezobrazovať
 DoNotSuggestPaymentMode=Nenaznačujú
 NoActiveBankAccountDefined=Žiadny aktívny bankový účet definovaný
 OwnerOfBankAccount=Majiteľ %s bankových účtov
 BankModuleNotActive=Účty v bankách modul nie je povolený,
-ShowBugTrackLink=Ukázať odkaz &quot;Nahlásiť chybu&quot;
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Ukázať &quot;ponk&quot; na domovskej stránke
 Alerts=Upozornenie
 Delays=Oneskorenie
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max desatinná pre jednotkových cien
 MAIN_MAX_DECIMALS_TOT=Max desatinné miesta pre celkovej ceny
 MAIN_MAX_DECIMALS_SHOWN=Max desatinná pre ceny zobrazené na obrazovke (Pridať <b>...</b> po tejto rady, ak chcete vidieť <b>...</b> keď je číslo skrátená pri zobrazení na obrazovke)
 MAIN_DISABLE_PDF_COMPRESSION=Použiť kompresiu PDF generovaných súborov PDF.
-MAIN_ROUNDING_RULE_TOT= Veľkosť zaokrúhlenie rozsahu (pre mála krajín, kde je vykonané zaokrúhlenie na niečo iné ako základ 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Čistá jednotková cena produktu
 TotalPriceAfterRounding=Celková cena (bez DPH / s DPH / s DPH) po zaokrúhlení
 ParameterActiveForNextInputOnly=Parameter efektívne pre ďalší vstup iba
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Celkový počet aktivovaných funkcií modulov: <b
 YouMustEnableOneModule=Musíte povoliť aspoň jeden modul
 ClassNotFoundIntoPathWarning=Trieda %s nenašli cestu do PHP
 YesInSummer=Áno v lete
-OnlyFollowingModulesAreOpenedToExternalUsers=Na vedomie, že iba nasledujúce moduly otvoril externým používateľom (nech sú povolenia týchto užívateľov):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Úložisko relácie šifrovaná Suhosin
 ConditionIsCurrently=Podmienkou je v súčasnej dobe %s
 YouUseBestDriver=Pomocou ovládača %s, že je najlepší vodič súčasnej dobe k dispozícii.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Maximálny počet výrobkov v kombá vyberte zoznamy
 ConfirmDeleteProductLineAbility=Potvrdenie pri odstraňovaní produktovej rady vo formulároch
 ModifyProductDescAbility=Personalizácia popisy produktov vo formách
 ViewProductDescInFormAbility=Vizualizácia popisy produktov vo formách (inak ako vyskakovacie bubline)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Vizualizácia Popisy výrobkov v thirdparty jazyku
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Použť vyhľadávací formulár pre výber produktu (namiesto rozbaľovacieho zoznamu).
 UseEcoTaxeAbility=Podpora Eco-taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Predvolený typ čiarového kódu použiť pre produkty
 SetDefaultBarcodeTypeThirdParties=Predvolený typ čiarového kódu použiť k tretím osobám
+UseUnits=Support units
 ProductCodeChecker= Modul pre generovanie kódu produktu a preskúšavanie (výrobku alebo služby)
 ProductOtherConf= Katalóg / Konfigurácia služby
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Čiarových kódov typu UPC
 BarcodeDescISBN=Čiarový kód typu ISBN
 BarcodeDescC39=Čiarový kód typu C39
 BarcodeDescC128=Čiarový kód typu C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Vnútorná motor
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Ste si istí, že chcete zmazať <b>%s</b> položka menu?
 DeleteLine=Odstránenie riadka
 ConfirmDeleteLine=Ste si istí, že chcete zmazať tento riadok?
 ##### Tax #####
-TaxSetup=Dane, sociálne príspevky a dividendy modul nastavenia
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=DPH z dôvodu
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices modul nastavenia
 WebServicesDesc=Tým, že tento modul, Dolibarr stal webový server služby poskytovať rôzne webové služby.
 WSDLCanBeDownloadedHere=WSDL deskriptor súbory poskytovaných služieb možno stiahnuť tu
 EndPointIs=SOAP klienti musia poslať svoje požiadavky na koncový bod Dolibarr k dispozícii na adrese
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bankové modul nastavenia
 FreeLegalTextOnChequeReceipts=Voľný text na kontroly príjmov
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekt modul nastavenia
 ProjectsModelModule=Projekt správy Vzor dokladu
 TasksNumberingModules=Úlohy číslovanie modul
 TaskModelModule=Úlohy správy Vzor dokladu
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatické strom zložiek a dokumentov
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 9504ee53600..19d777c7565 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Objednať %s schválený
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Objednať %s vrátiť do stavu návrhu
-OrderCanceledInDolibarr=Objednať %s zrušený
 ProposalSentByEMail=Komerčné návrh %s zaslaná e-mailom
 OrderSentByEMail=%s zákazníkov objednávka zaslaná e-mailom
 InvoiceSentByEMail=%s faktúre Zákazníka zaslaná e-mailom
@@ -96,3 +95,5 @@ AddEvent=Vytvoriť udalosť
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index cf7d597da0c..e4ff0b105d5 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Zmieriť
 Conciliation=Zmierenie
 ConciliationForAccount=Zmierte sa tento účet
 IncludeClosedAccount=Zahrnúť uzatvorených účtov
-OnlyOpenedAccount=Iba otvorené účty
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Účet na úver
 AccountToDebit=Účet na vrub
 DisableConciliation=Zakázať zmierenie funkciu pre tento účet
 ConciliationDisabled=Odsúhlasenie funkcia vypnutá
-StatusAccountOpened=Otvorené
+StatusAccountOpened=Open
 StatusAccountClosed=Zatvorené
 AccountIdShort=Číslo
 EditBankRecord=Upraviť záznam
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Klientská platba
 CustomerInvoicePaymentBack=Klientská platba späť
 SupplierInvoicePayment=Dodávateľ platba
 WithdrawalPayment=Odstúpenie platba
-SocialContributionPayment=Sociálny príspevok platba
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Finančný účet časopis
 BankTransfer=Bankový prevod
 BankTransfers=Bankové prevody
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 955cfee9f0f..1f8103e9d37 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb faktúr
 NumberOfBillsByMonth=Nb faktúr mesiace
 AmountOfBills=Výška faktúr
 AmountOfBillsByMonthHT=Výška faktúr mesačne (bez dane)
-ShowSocialContribution=Zobraziť sociálny príspevok
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Zobraziť faktúru
 ShowInvoice=Zobraziť faktúru
 ShowInvoiceReplace=Zobraziť výmene faktúru
@@ -270,7 +270,7 @@ BillAddress=Bill adresa
 HelpEscompte=Táto zľava je zľava poskytnutá zákazníkovi, pretože jej platba bola uskutočnená pred horizonte.
 HelpAbandonBadCustomer=Táto suma bola opustená (zákazník povedal, aby bol zlý zákazník) a je považovaný za výnimočný voľné.
 HelpAbandonOther=Táto suma bola opustená, pretože došlo k chybe (chybný zákazník alebo faktúra nahradený iný napríklad)
-IdSocialContribution=Sociálny príspevok id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Platba id
 InvoiceId=Faktúra id
 InvoiceRef=Faktúra čj.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Bezprostredný
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 7e585f6e168..5194e483b51 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Posledný zmluvy
 BoxLastContacts=Posledné kontakty / adresy
 BoxLastMembers=Najnovší členovia
 BoxFicheInter=Posledný intervencie
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Obrat
 BoxTotalUnpaidCustomerBills=Celkové nezaplatené faktúry zákazníka
 BoxTotalUnpaidSuppliersBills=Celkové nezaplatené faktúry dodávateľa
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Posledné %s upravený zásah
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Obrat
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 699d1137662..7591dfb3dbb 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> bolo úspešne pridané.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Nikto
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Táto kategória už existuje s týmto čj
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Obsah nie je vidieť všetci
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prospech. kategórie
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 12b261cf99a..938dd25fa6f 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Treťou stranou kontakt / adresa
 StatusContactValidated=Stav kontaktu / adresa
 Company=Spoločnosť
 CompanyName=Názov spoločnosti
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Firmy
 CountryIsInEEC=Krajina je v rámci Európskeho hospodárskeho spoločenstva
 ThirdPartyName=Tretia strana názov
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Späť numero vo formáte %syymm-nnnn pre zákazníka kódu a %syymm-NNNN s dodávateľmi kódu, kde yy je rok, MM je mesiac a nnnn je sekvencia bez prerušenia a bez návratu na 0.
 LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Vyhľadať tretiu stranu
+SearchThirdparty=Search third party
 SearchContact=Vyhľadať kontakt
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index fe039fc72ff..6cd77eb0a51 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Vybrané DPH
 ToPay=Zaplatiť
 ToGet=Ak chcete získať späť
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Daňové, sociálne príspevky a dividendy oblasti
-SocialContribution=Sociálny príspevok
-SocialContributions=Sociálne príspevky
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Dane a dividendy
 MenuSalaries=Salaries
-MenuSocialContributions=Sociálne príspevky
-MenuNewSocialContribution=Nový príspevok
-NewSocialContribution=Nový príspevok na sociálne zabezpečenie
-ContributionsToPay=Príspevky platiť
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Účtovníctvo / Treasury oblasť
 AccountancySetup=Účtovníctvo nastavenie
 NewPayment=Nový platobný
 Payments=Platby
 PaymentCustomerInvoice=Zákazník faktúru
 PaymentSupplierInvoice=Dodávateľ faktúru
-PaymentSocialContribution=Sociálny príspevok platba
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=DPH platba
 PaymentSalary=Salary payment
 ListPayment=Zoznam platieb
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Platba DPH
 VATPayments=Platby DPH
-SocialContributionsPayments=Sociálne príspevky platby
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zobraziť DPH platbu
 TotalToPay=Celkom k zaplateniu
 TotalVATReceived=Celkom bez DPH obdržal
@@ -116,11 +116,11 @@ NewCheckDepositOn=Vytvorte potvrdenie o vklade na účet: %s
 NoWaitingChecks=Žiadne kontroly čakanie na vklad.
 DateChequeReceived=Skontrolujte dátum príjmu
 NbOfCheques=Nb kontrol
-PaySocialContribution=Platiť sociálne príspevok
-ConfirmPaySocialContribution=Ste si istí, že chcete klasifikovať ako sociálny príspevok vypláca?
-DeleteSocialContribution=Odstránenie sociálny príspevok
-ConfirmDeleteSocialContribution=Ste si istí, že chcete zmazať tento príspevok na sociálne zabezpečenie?
-ExportDataset_tax_1=Sociálne príspevky a platby
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režim <b>%sVAT na záväzky accounting%s.</b>
 CalcModeVATEngagement=Režim <b>%sVAT z príjmov-expense%sS.</b>
 CalcModeDebt=Režim <b>%sClaims-Debt%sS</b> povedal <b>Záväzok účtovníctva.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=podľa dodávateľa zvoliť vhodnú metódu použiť
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití <b>hotovosti evidencia</b> režim nie je relevantná. Táto správa je k dispozícii len pri použití <b>zásnubný evidencia</b> režimu (pozri nastavenie účtovného modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 4217c1002b6..601e4ca72c3 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -4,10 +4,10 @@ About = O
 CronAbout = O Cron
 CronAboutPage = Cron o stránke
 # Right
-Permission23101 = Prečítajte si naplánovaná úloha
-Permission23102 = Vytvoriť / aktualizovať naplánovanú úlohu
-Permission23103 = Odstrániť naplánovaná úloha
-Permission23104 = Vykonať naplánované úlohy,
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Naplánované úlohy správy Nastavenie
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Posledný beh výstup
 CronLastResult=Posledný kód výsledku
 CronListOfCronJobs=Zoznam naplánovaných úloh
 CronCommand=Príkaz
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Práca
@@ -39,8 +39,8 @@ CronDtStart=Dátum začatia
 CronDtEnd=Dátum ukončenia
 CronDtNextLaunch=Ďalšie prevedenie
 CronDtLastLaunch=Posledná poprava
-CronFrequency=Frekvenčný
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metóda
 CronModule=Modul
 CronAction=Akcie
@@ -55,9 +55,9 @@ CronEach=Každý
 JobFinished=Práca zahájená a dokončená
 #Page card
 CronAdd= Pridať pracovných miest
-CronHourStart= Začnite hodinu a dátum úlohy
-CronEvery= A úloha vykonať každý
-CronObject= Inštancia / objekt vytvoriť
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Inštancia / objekt vytvoriť
 CronArgs=Parametre
 CronSaveSucess=Uložiť úspešne
 CronNote=Komentár
@@ -76,13 +76,14 @@ CronMethodHelp=Objekt spôsob štartu. <BR> Napr načítať metódy objektu výr
 CronArgsHelp=Metóda argumenty. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť <i>0, ProductRef</i>
 CronCommandHelp=Systém príkazového riadka spustiť.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informácie
 # Common
-CronType=Typ úlohy
+CronType=Job type
 CronType_method=Volanie metódy triedy Dolibarr
 CronType_command=Shell príkaz
 CronMenu=Cron
 CronCannotLoadClass=Nemožno načítať triedu alebo objekt %s %s
 UseMenuModuleToolsToAddCronJobs=Choďte do menu &quot;Home - Moduly náradie - Zoznam úloh&quot; vidieť a upravovať naplánované úlohy.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
index 5c0e414f92a..9254d683107 100644
--- a/htdocs/langs/sk_SK/ecm.lang
+++ b/htdocs/langs/sk_SK/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Hľadať podľa objektu
 ECMSectionOfDocuments=Adresára dokumentov
 ECMTypeManual=Manuál
 ECMTypeAuto=Automatický
-ECMDocsBySocialContributions=Dokumenty súvisiace odvody na sociálne zabezpečenie
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumenty súvisiace s tretími stranami
 ECMDocsByProposals=Dokumenty súvisiace s návrhmi
 ECMDocsByOrders=Dokumenty súvisiace s zákazníkmi objednávky
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index f5a8be6e516..7ee7f53eaae 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené
@@ -190,3 +191,4 @@ WarningNotRelevant=Nerozhoduje prevádzku v našom súbore
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index 3b3b9c6a95f..c0f263af214 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Mesačný výkaz
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Dôvod
 UserCP=Užívateľ
 ErrorAddEventToUserCP=Došlo k chybe pri pridávaní výnimočnú dovolenku.
 AddEventToUserOkCP=Pridanie mimoriadnej dovolenky bola dokončená.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Účinkujú
 UserUpdateCP=Pre užívateľa
@@ -93,6 +93,7 @@ ValueOptionCP=Hodnota
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Overenie konfigurácie
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Aktualizované úspešne.
 ErrorUpdateConfCP=Došlo k chybe pri aktualizácii, skúste to prosím znova.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Došlo k chybe pri odosielaní e-mail:
 NoCPforMonth=Nie opustiť tento mesiac.
 nbJours=Počet dní
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Ahoj
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/sk_SK/incoterm.lang b/htdocs/langs/sk_SK/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/sk_SK/incoterm.lang
+++ b/htdocs/langs/sk_SK/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 8af5284c8c4..3fe6e1c6ad7 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Databázový server - prístup Superuser
 CheckToCreateDatabase=Zaškrtnite, ak databáza neexistuje a musí byť vytvorená.<br>V tom prípade musíte zadať prihlasovacie meno / heslo pre administrátora v dolnej časti tejto stránky.
 CheckToCreateUser=Zaškrtnite, ak vlastník databázy neexistuje a musí byť vytvorený.<br>V tomto prípade je nutné zvoliť si prihlasovacie meno a heslo a tiež vyplniť login / heslo administrátora v dolnej časti tejto stránky. Ak toto políčko nie je začiarknuté, vlastník databázy a jeho heslá musia existovať.
 Experimental=(Experimentálne)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Prihlásenie užívateľa oprávneného vytvárať nové databázy alebo nových užívateľov - povinné, ak vaša databáza alebo jej majiteľ ešte neexistuje.
 KeepEmptyIfNoPassword=Ponechajte prázdne, ak užívateľ nemá heslo (neodporúčané)
 SaveConfigurationFile=Uložiť hodnoty
diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
index 14c4979520a..f253a71b156 100644
--- a/htdocs/langs/sk_SK/languages.lang
+++ b/htdocs/langs/sk_SK/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabčina
 Language_ar_SA=Arabčina
+Language_bn_BD=Bengali
 Language_bg_BG=Bulharčina
 Language_bs_BA=Bosniansky
 Language_ca_ES=Katalánčina
@@ -21,9 +22,10 @@ Language_en_SA=Angličtina (Saudská Arábia)
 Language_en_US=Angličtina (Spojené štáty)
 Language_en_ZA=Angličtina (Južná Afrika)
 Language_es_ES=Španielčina
-Language_es_DO=Španielčina (Dominikánska Republika)
 Language_es_AR=Španielčina (Argentína)
 Language_es_CL=Španielčina (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Španielčina (Dominikánska Republika)
 Language_es_HN=Španielčina (Honduras)
 Language_es_MX=Španielčina (Mexiko)
 Language_es_PY=Španielčina (Paraguaj)
@@ -45,7 +47,10 @@ Language_id_ID=Indonézština
 Language_is_IS=Islandský
 Language_it_IT=Taliančina
 Language_ja_JP=Japonština
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Kórejčina
+Language_lo_LA=Lao
 Language_lt_LT=Litovský
 Language_lv_LV=Lotyština
 Language_mk_MK=Macedónsky
@@ -64,6 +69,7 @@ Language_sv_SV=Švédsky
 Language_sv_SE=Švédsky
 Language_sq_AL=Albánčina
 Language_sk_SK=Slovenčina
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrajinec
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/sk_SK/loan.lang b/htdocs/langs/sk_SK/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/sk_SK/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 4b82f3d6326..e14ef14402d 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Prečítanie
 YourMailUnsubcribeOK=Napísať <b>%s</b> správne unsubcribe z mailing listu
 MailtoEMail=Hyper odkaz na e-mail
 ActivateCheckRead=Nechá sa použiť &quot;&quot; Unsubcribe odkaz
-ActivateCheckReadKey=Tlačidlo slúži pre šifrovanie URL využitie pre &quot;prečítanie&quot; a &quot;Unsubcribe&quot; funkcia
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=Email bol odoslaný na %s príjemcom.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Sledovanie zásielok otvorenie
 TagUnsubscribe=Odhlásiť odkaz
 TagSignature=Podpis zasielanie užívateľa
 TagMailtoEmail=E-mail príjemcu
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Upozornenie
 NoNotificationsWillBeSent=Žiadne oznámenia e-mailom sú naplánované pre túto udalosť a spoločnosť
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index bc03cc57f23..5c373022c93 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Niektoré boli nájdené chyby. My rollbac
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> nie je definovaná v súbore config Dolibarr <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Nepodarilo sa nájsť užívateľa <b>%s</b> v databáze Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Chyba, žiadne sadzby DPH stanovenej pre krajinu &quot;%s&quot;.
-ErrorNoSocialContributionForSellerCountry=Chyba, žiadny sociálny príspevok typu definované pre krajinu &quot;%s&quot;.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Chyba sa nepodarilo uložiť súbor.
 SetDate=Nastaviť dátum
 SelectDate=Vybrať dátum
@@ -301,8 +301,8 @@ UnitPriceHT=Jednotková cena (bez DPH)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=UP
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Množstvo
 AmountInvoice=Fakturovaná čiastka
 AmountPayment=Suma platby
@@ -339,6 +339,7 @@ IncludedVAT=Vrátane dane
 HT=Po odpočítaní dane
 TTC=Inc daň
 VAT=Daň z obratu
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Daňová sadzba
@@ -413,6 +414,8 @@ Qty=Množstvo
 ChangedBy=Zmenil
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Prepočítať
 ResultOk=Úspech
 ResultKo=Zlyhanie
@@ -421,7 +424,7 @@ Reportings=Hlásenie
 Draft=Návrh
 Drafts=Dáma
 Validated=Overené
-Opened=Otvorené
+Opened=Open
 New=Nový
 Discount=Zľava
 Unknown=Neznámy
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=V súvislosti s konkrétnym kontakte s užívateľom
 DeleteAFile=Odstránenie súboru
 ConfirmDeleteAFile=Ste si istí, že chcete zmazať súbor
 NoResults=Žiadne výsledky
+SystemTools=System tools
 ModulesSystemTools=Moduly náradie
 Test=Test
 Element=Prvok
@@ -703,6 +707,9 @@ ShowTransaction=Zobraziť transakciu
 GoIntoSetupToChangeLogo=Choďte na Domov - Nastavenie - Spoločnosť pre zmenu loga, alebo na Domov - Nastavenie - Zobrazenie pre skrytie loga.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index eec0d8666a4..cc74c8b8917 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -199,7 +199,8 @@ Entreprises=Firmy
 DOLIBARRFOUNDATION_PAYMENT_FORM=Ak chcete, aby vaše predplatné platbu bankovým prevodom, viď strana <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Ak chcete platiť pomocou kreditnej karty alebo PayPal, kliknite na tlačidlo v dolnej časti tejto stránky. <br>
 ByProperties=Charakteristikami
 MembersStatisticsByProperties=Členovia štatistiky podľa charakteristík
-MembersByNature=Členovia od prírody
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
 NoVatOnSubscription=Nie TVA za upísané vlastné imanie
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozorniť pri Dolibarr obdržíte potvrdenie o overenú platby za predplatné
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index c7a6e7a6a9a..dba2afc904b 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Dodávateľská objednávka
 SuppliersOrders=Dodávateliské objednávky
 SuppliersOrdersRunning=Aktuálne dodávatelské objednávky
 CustomerOrder=Zákaznícka objednávka
-CustomersOrders=Zákaznícke objednávky
-CustomersOrdersRunning=Objednávky aktuálneho zákazníka
-CustomersOrdersAndOrdersLines=Zákaznícke objednávky a objednávky linky
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Dodávateľa objednávky na spracovanie
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Zrušený
 StatusOrderDraftShort=Návrh
 StatusOrderValidatedShort=Overené
@@ -75,8 +75,9 @@ AddToMyOrders=Pridať do mojich objednávok
 AddToOtherOrders=Pridať do iných objednávok
 AddToDraftOrders=Pridať k predlohe
 ShowOrder=Zobraziť objednávku
-NoOpenedOrders=Žiadne otvorené príkazy
-NoOtherOpenedOrders=Žiadny iný otvoril objednávky
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Žiadne návrhy objednávky
 OtherOrders=Ostatné objednávky
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index 78aaab510cd..ebf48639ff8 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervencie overená
 Notify_FICHINTER_SENTBYMAIL=Intervencie poštou
 Notify_BILL_VALIDATE=Zákazník faktúra overená
 Notify_BILL_UNVALIDATE=Zákazník faktúra unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Dodávateľská objednávka zaznamenaná
 Notify_ORDER_SUPPLIER_APPROVE=Dodávateľ aby schválila
 Notify_ORDER_SUPPLIER_REFUSE=Dodávateľ aby odmietol
 Notify_ORDER_VALIDATE=Zákazníka overená
@@ -203,6 +204,7 @@ ClickHereToGoTo=Kliknite tu pre prechod na %s
 YouMustClickToChange=Musíte však najprv kliknúť na nasledujúci odkaz pre potvrdenie tejto zmeny hesla
 ForgetIfNothing=Ak ste o túto zmenu, stačí zabudnúť na tento e-mail. Vaše prihlasovacie údaje sú v bezpečí.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Pridať záznam do kalendára %s
diff --git a/htdocs/langs/sk_SK/printing.lang b/htdocs/langs/sk_SK/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/sk_SK/printing.lang
+++ b/htdocs/langs/sk_SK/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index a18d6578662..761a8dfa6b6 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produkt alebo služba
 ProductsAndServices=Produkty a služby
 ProductsOrServices=Výrobky alebo služby
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Produkty a služby štatistika
 ProductsStatistics=Produkty štatistiky
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Interné referenčné číslo
 LastRecorded=Najnovšie produkty / služby na predaji zaznamenaný
@@ -44,7 +44,7 @@ CardProduct1=Servisná karta
 CardContract=Zmluva karty
 Warehouse=Sklad
 Warehouses=Sklady
-WarehouseOpened=Warehouse otvoril
+WarehouseOpened=Warehouse open
 WarehouseClosed=Sklad uzavretý
 Stock=Sklad
 Stocks=Zásoby
@@ -71,21 +71,21 @@ SellingPriceTTC=Predajná cena (s DPH)
 PublicPrice=Verejné cena
 CurrentPrice=Aktuálna cena
 NewPrice=Nová cena
-MinPrice=Minim. predajná cena
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Predajná cena nesmie byť nižšia ako minimálna povolená pre tento produkt (%s bez dane). Toto hlásenie sa môže tiež zobrazí, ak zadáte príliš dôležitú zľavu.
 ContractStatus=Stav zmluvy
 ContractStatusClosed=Zatvorené
-ContractStatusRunning=Beh
+ContractStatusRunning=Ongoing
 ContractStatusExpired=vypršala
-ContractStatusOnHold=Nebeží
-ContractStatusToRun=To get running
-ContractNotRunning=Táto zmluva nie je v chode
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Výrobok s referenčným %s už existuje.
 ErrorProductBadRefOrLabel=Chybná hodnota pre referenčné alebo etikety.
 ErrorProductClone=Vyskytol sa problém pri pokuse o klonovaní produkt alebo službu.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Dodávatelia
 SupplierRef=Dodávateľa produktov čj.
 ShowProduct=Zobraziť produkt
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobok je služba s obmedzeným trvaním:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Počet cien
 MultiPriceLevelsName=Cenové kategórie
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Asociovať
 Translation=Preklad
 KeywordFilter=Kľúčové slovo filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Hľadanie informácií o produktoch pre pridanie
 AddDel=Pridať / Odstrániť
 Quantity=Množstvo
 NoMatchFound=Nie nájdená zhoda
-ProductAssociationList=Zoznam súvisiacich produktov / služieb: názov produktu / služby (množstvo ovplyvnené)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jedným z vybraného produktu je rodič s aktuálnou produkt
 DeleteProduct=Odstránenie produktu / služby
@@ -179,16 +179,41 @@ CloneProduct=Clone produkt alebo službu
 ConfirmCloneProduct=Ste si istí, že chcete klonovať produktov alebo služieb <b>%s?</b>
 CloneContentProduct=Klon všetky hlavné informácie o produkte / služby
 ClonePricesProduct=Klonovať hlavné informácie a ceny
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Tento produkt sa používa
 NewRefForClone=Ref nového produktu / služby
-CustomerPrices=Zákazníci ceny
-SuppliersPrices=Dodávatelia ceny
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Colné kód
 CountryOrigin=Krajina pôvodu
 HiddenIntoCombo=Skryté do vybraných zoznamov
 Nature=Príroda
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Vytvorte kartu výrobku
@@ -214,7 +239,7 @@ CostPmpHT=Čistá hodnota VWAP
 ProductUsedForBuild=Auto spotrebujú pri výrobe
 ProductBuilded=Výroba dokončená
 ProductsMultiPrice=Produkt multi-cena
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Produkty obrat štvrťročné VWAP
 ServiceSellByQuarterHT=Služby obrat štvrťročné VWAP
 Quarter1=Prvý. Štvrťrok
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 60e0e6713f6..f8f5512426d 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Tento názor predstavuje všetky projekty, ktoré sú prístu
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Tento názor predstavuje všetky projekty (užívateľského oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
 MyTasksDesc=Tento pohľad je obmedzená na projekty alebo úlohy, ktoré sú pre kontakt (nech je to typ).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú prístupné pre čítanie.
 TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľské oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projekty oblasť
 NewProject=Nový projekt
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=Zoznam projektov
 ShowProject=Zobraziť projektu
 SetProject=Nastavenie projektu
 NoProject=Žiadny projekt definovaný alebo vlastné
-NbOpenTasks=Nb otvorených úloh
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb projektov
 TimeSpent=Čas strávený
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nový čas strávený
 MyTimeSpent=Môj čas strávený
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Zoznam výkonov spojených s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Zoznam udalostí spojených s projektom
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Aktivita na projekte tento týždeň
 ActivityOnProjectThisMonth=Aktivita na projekte tento mesiac
 ActivityOnProjectThisYear=Aktivita na projekte v tomto roku
@@ -95,7 +98,7 @@ DeleteATimeSpent=Odstrániť čas strávený
 ConfirmDeleteATimeSpent=Ste si istí, že chcete zmazať tento čas strávený?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Zdroje
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projekty venovaný tejto tretej osobe
 NoTasks=Žiadne úlohy tohto projektu
 LinkedToAnotherCompany=Súvisí s tretej strane
@@ -139,8 +142,15 @@ ProjectReferers=Odkazujúce objekty
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
index ad74694f8cb..42b06536e3f 100644
--- a/htdocs/langs/sk_SK/propal.lang
+++ b/htdocs/langs/sk_SK/propal.lang
@@ -4,7 +4,7 @@ Proposal=Komerčné návrh
 ProposalShort=Návrh
 ProposalsDraft=Navrhnúť obchodné návrhy
 ProposalDraft=Návrh obchodný návrh
-ProposalsOpened=Otvorené obchodné návrhy
+ProposalsOpened=Open commercial proposals
 Prop=Komerčné návrhy
 CommercialProposal=Komerčné návrh
 CommercialProposals=Komerčné návrhy
@@ -16,7 +16,7 @@ Prospect=Vyhliadka
 ProspectList=Prospect zoznam
 DeleteProp=Zmazať obchodné návrh
 ValidateProp=Overiť obchodné návrh
-AddProp=Pridať návrh
+AddProp=Create proposal
 ConfirmDeleteProp=Ste si istí, že chcete zmazať tento obchodný návrh?
 ConfirmValidateProp=Ste si istí, že chcete overiť túto obchodnú návrh pod názvom <b>%s?</b>
 LastPropals=Posledný %s návrhy
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Suma, o mesiac (bez DPH)
 NbOfProposals=Počet obchodných návrhov
 ShowPropal=Zobraziť návrhu
 PropalsDraft=Dáma
-PropalsOpened=Otvorené
+PropalsOpened=Open
 PropalsNotBilled=Uzavreté nie je účtovaná
 PropalStatusDraft=Návrh (musí byť overená)
 PropalStatusValidated=Overené (Návrh je v prevádzke)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nie ste prihlásený (uzavretý)
 PropalStatusBilled=Účtované
 PropalStatusDraftShort=Návrh
 PropalStatusValidatedShort=Overené
-PropalStatusOpenedShort=Otvorené
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Zatvorené
 PropalStatusSignedShort=Podpísaný
 PropalStatusNotSignedShort=Nie ste prihlásený
@@ -51,12 +51,10 @@ PropalsToClose=Komerčné návrhy zavrieť
 PropalsToBill=Podpísali obchodné návrhy zákona
 ListOfProposals=Zoznam obchodných návrhov
 ActionsOnPropal=Udalosti na návrhu
-NoOpenedPropals=Žiadne otvorené obchodné návrhy
-NoOtherOpenedPropals=Žiadny iný otvoril obchodné návrhy
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Komerčné návrh ref
 SendPropalByMail=Poslať obchodný návrh poštou
-FileNotUploaded=Súbor nebol nahraný
-FileUploaded=Súbor bol úspešne nahraný
 AssociatedDocuments=Dokumenty súvisiace s návrhom:
 ErrorCantOpenDir=Nemožno otvoriť adresár
 DatePropal=Dátum návrhu
@@ -100,3 +98,4 @@ DocModelJauneDescription=Jaune návrh modelu
 DefaultModelPropalCreate=Predvolené model, tvorba
 DefaultModelPropalToBill=Predvolená šablóna pri zatváraní obchodnej návrh (bude faktúrovať)
 DefaultModelPropalClosed=Predvolená šablóna pri zatváraní obchodnej návrh (nevyfakturované)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index f222c59dcf8..efa273a5bcf 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Ukázať výplatu mzdy
 THM=Priemerná hodinová cena
 TJM=Priemerná denná cena
 CurrentSalary=Súčasná mzda
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 1e8634c96ec..f81ef904579 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Jednoduché Vzor dokladu
 DocumentModelMerou=Mero A5 modelu
 WarningNoQtyLeftToSend=Varovanie: žiadny tovar majú byť dodané.
 StatsOnShipmentsOnlyValidated=Štatistiky vykonaná na zásielky iba overených. Dátum použité je dátum schválenia zásielky (plánovaný dátum dodania nie je vždy známe).
-DateDeliveryPlanned=Čelné termín dodania
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Dátum doručenia obdržal
 SendShippingByEMail=Poslať zásielku EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index ea2954eee1c..fcdc695fae3 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Sklady
 NewWarehouse=Nový sklad / skladová plocha
 WarehouseEdit=Upraviť sklad
 MenuNewWarehouse=Nový sklad
-WarehouseOpened=Sklad otvorený
+WarehouseOpened=Warehouse open
 WarehouseClosed=Sklad uzavretý
 WarehouseSource=Zdrojový sklad
 WarehouseSourceNotDefined=Nie je definovaný žiadny sklad,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Zvoľte sklad použiť pre zníženie skladom
 SelectWarehouseForStockIncrease=Zvoľte sklad použiť pre zvýšenie stavu zásob
 NoStockAction=Žiadne akcie skladom
 LastWaitingSupplierOrders=Objednávky čakanie na recepciách
-DesiredStock=Požadovaná skladom
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Ak chcete objednať
 Replenishment=Naplnenie
 ReplenishmentOrders=Doplňovanie objednávky
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Používať virtuálne zásoby
 UsePhysicalStock=Používať fyzické zásoby
-CurentSelectionMode=Súčasný spôsob výberu
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtuálne zásoby
 CurentlyUsingPhysicalStock=Fyzické zásoby
 RuleForStockReplenishment=Pravidlo pre doplňovanie zásob
@@ -112,8 +113,8 @@ AlertOnly= Upozornenie iba
 WarehouseForStockDecrease=Skladová <b>%s</b> budú použité pre zníženie skladom
 WarehouseForStockIncrease=Skladová <b>%s</b> budú použité pre zvýšenie stavu zásob
 ForThisWarehouse=Z tohto skladu
-ReplenishmentStatusDesc=Toto je zoznam všetkých produktov, ktorých zásoba je nižšia než požadovaná (alebo nižšia ako hodnota pre výstrahu ak "iba výstrahy" je zaškrtnuté). Odporúča sa vytvorenie dodávateľských objednávok na doplnenie rozdieľov.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Splátky
 NbOfProductBeforePeriod=Množstvo produktov %s na sklade, než zvolené obdobie (&lt;%s)
 NbOfProductAfterPeriod=Množstvo produktov %s na sklade po zvolené obdobie (&gt; %s)
@@ -124,16 +125,16 @@ RecordMovement=Záznam transfert
 ReceivingForSameOrder=Bločky tejto objednávky
 StockMovementRecorded=Zaznamenané pohyby zásob
 RuleForStockAvailability=Pravidlá skladových požiadaviek
-StockMustBeEnoughForInvoice=Úroveň zásob musí byť dostatočná na zahrnutie produktu/služby do faktúry
-StockMustBeEnoughForOrder=Úroveň zásob musí byť dostatočná na zahrnutie produktu/služby do objednávky
-StockMustBeEnoughForShipment= Úroveň zásob musí byť dostatočná na zahrnutie produktu/služby do dodávky
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Štítok pohybu
 InventoryCode=Movement or inventory code
 IsInPackage=Vložené do balíka
 ShowWarehouse=Ukázať sklad
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Transfer zásoby produktu %s do iného skladu
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 696d59df1cc..0f6ef8dd248 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Odoslané dodávateľom
 ListOfSupplierOrders=Zoznam dodávateľských objednávok
 MenuOrdersSupplierToBill=Vytvoriť faktúru z dodávateľskej objednávky
 NbDaysToDelivery=Zdržanie dodávky v dňoch
-DescNbDaysToDelivery=Zobrazené je najväčšie zdržanie spomedzi položiek objednávky 
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
index 3943c585c50..49458c1e926 100644
--- a/htdocs/langs/sk_SK/trips.lang
+++ b/htdocs/langs/sk_SK/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Sadzobník poplatkov
 NewTrip=New expense report
 CompanyVisited=Firma / nadácie navštívil
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index c2d36bc695c..feb7244bbed 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Odstrániť zo skupiny
 PasswordChangedAndSentTo=Heslo bolo zmenené a poslaný do <b>%s.</b>
 PasswordChangeRequestSent=Žiadosť o zmenu hesla <b>%s</b> zaslaná <b>%s.</b>
 MenuUsersAndGroups=Používatelia a skupiny
+MenuMyUserCard=My user card
 LastGroupsCreated=Posledné %s vytvorili skupiny
 LastUsersCreated=Posledné %s používatelia vytvorili
 ShowGroup=Zobraziť skupinu
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index b0cb4d47760..fd9b3854287 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Odstúpenie súbor
 SetToStatusSent=Nastavte na stav &quot;odoslaný súbor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Platba %s trvalého príkazu bankou
diff --git a/htdocs/langs/sk_SK/workflow.lang b/htdocs/langs/sk_SK/workflow.lang
index 58f27b036de..36dcf63ddb6 100644
--- a/htdocs/langs/sk_SK/workflow.lang
+++ b/htdocs/langs/sk_SK/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow modul nastavenia
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Nie je workflow môžete upraviť pre modul bolo aktivované.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Vytvorenie objednávky zákazníka automaticky po komerčné Návrh je podpísaný
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Vytvorte zákazníckej faktúry automaticky po komerčné Návrh je podpísaný
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Vytvorte zákazníckej faktúry automaticky po uzavretí zmluvy overená
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Vytvorte zákazníckej faktúry automaticky po zákazníkovi, aby je uzavretý
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Triediť prepojené zdrojový návrh účtoval keď je objednávka zákazníka nastavený na platenú
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Triediť spojené zdroj objednávka zákazníka (y) účtoval, keď je zákazník faktúry nastavený na platené
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Triediť prepojený zdroj objednávky zákazníka (y) účtoval keď je overený zákazníkmi faktúra
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index c4d4970288b..f236029cea1 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Računovodstvo
 Globalparameters=Globalni parametri
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Dolžina računih tretjih oseb
 
 ACCOUNTING_SELL_JOURNAL=Prodam revija
 ACCOUNTING_PURCHASE_JOURNAL=Nakup revij
-ACCOUNTING_BANK_JOURNAL=Bank revija
-ACCOUNTING_CASH_JOURNAL=Cash revija
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Razno revija
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Socialna revija
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Račun za prenos
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 7e997bd1ab8..0fe87a24819 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Meni za uporabnika
 LangFile=Datoteka .lang
 System=Sistem
 SystemInfo=Sistemske informacije
-SystemTools=Sistemska orodja
 SystemToolsArea=Področje sistemskih orodij
 SystemToolsAreaDesc=To področje omogoča administrativne funkcije. Preko menija izberite funkcijo, ki jo iščete.
 Purge=Počisti
@@ -232,8 +231,8 @@ Security=Varnost
 Passwords=Gesla
 DoNotStoreClearPassword=Ne shranjujte v bazi podatkov celih gesel, temveč samo šifrirane vrednosti (priporočena aktivacija)
 MainDbPasswordFileConfEncrypted=Šifrirana baza podatkov v conf.php (priporočena aktivacija)
-InstrucToEncodePass=Za kodiranje gesel v datoteko <b>conf.php</b>, zamenjajte vrstico <br><b>$dolibarr_main_db_pass="..."</b><br>z<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=Za dekodirana (čista) gesla v datoteki <b>conf.php</b>, zamenjajte vrstico <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>z<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Zaščita generiranih pdf datotek (aktivacija ni priporočena, prekinjeno masovno generiranje pdf)
 ProtectAndEncryptPdfFilesDesc=Zaščiteni PDF se lahko berejo in tiskajo preko kateregakoli PDF bralnika. Vendar pa ni več možno popravljanje in kopiranje. Upoštevajte, da uporaba te funkcije onemogoči izdelavo globalnih zbirnih pdf datotek (kot so neplačani računi).
 Feature=Funkcija
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=To je nastavitev za proces:
 ThisIsAlternativeProcessToFollow=To je alternativna nastavitev za proces:
 StepNb=Korak %s
 FindPackageFromWebSite=Poiščite paket, ki omogoča funkcijo, ki jo želite (na primer na spletni strani %s).
-DownloadPackageFromWebSite=Prenesi paket %s.
-UnpackPackageInDolibarrRoot=Razpakiraj paketno datoteko v mapo, namenjeno eksternim modulom: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Instalacija je zaključena in Dolibarr je pripravljen na uporabo s to novo komponento.
 NotExistsDirect=Ni definirana alternativna korenska mapa.<br>
 InfDirAlt=Od 3. različice dalje je možno definirati alternativno korensko mapo. To omogoča shranjevanje vtičnikov in uporabniških predlog na isto mesto.<br>Ustvariti je potrebno samo mapo v korenu Dolibarr (npr: custom).<br>
 InfDirExample=<br>Nato jo določite v datoteki conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Te vrstice so označene kot komentar z znakom "#", če želite, da bodo vrstice izvedene, odstranite ta znak.
-YouCanSubmitFile=Izberi modul:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Trenutna različica Dolibarr
 CallUpdatePage=Pojdite na stran za nadgradnjo strukture in podatkov v podatkovni bazi: %s.
 LastStableVersion=Zadnja stabilna različica
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Seznam parametrov iz tabele<br>Syntax : table_name:la
 ExtrafieldParamHelpchkbxlst=Seznam parametrov iz tabele<br>Syntax : table_name:label_field:id_field::filter<br>Primer : c_typent:libelle:id::filter<br><br>filter je lahko enostaven test (npr active=1) za prikaz samo aktivne vrednosti <br> če želite filtrirati po dodatnih poljih, uporabite sintakso extra.fieldcode=... (kjer je field code koda dodatnega polja)<br><br>če želite, da je seznam odvisen od drugega :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Uporabljena knjižnica za ustvarjanje PDF
 WarningUsingFPDF=Pozor: vaš <b>conf.php</b> vsebuje direktivo <b>dolibarr_pdf_force_fpdf=1</b>. To pomeni, da uporabljate knjižnico FPDF za generiranje PDF datotek. Ta knjižnica je stara in ne podpira številnih značilnosti (Unicode, transparentnost slike, cirilico, arabske in azijske jezike, ...), zado lahko med generiranjem PDF pride do napak.<br>Za rešitev tega problema in polno podporo PDF generiranja, prosimo da naložite <a href="http://www.tcpdf.org/" target="_blank">TCPDF knjižnico</a>, nato označite kot komentar ali odstranite vrstico <b>$dolibarr_pdf_force_fpdf=1</b>, in namesto nje dodajte <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=V nekaterih državah so na vsako vrstico računa vezani 2 ali 3 davki. V takem primeru izberite tip in stopnjo drugega in tretjega davka. Možni tipi so:<br>1 : lokalni davek na proizvode in storitve brez DDV (lokalni davek se obračuna na znesek brez DDV)<br>2 : lokalni davek na proizvode in storitve z DDV (lokalni davek se obračuna na znesek + DDV)<br>3 : lokalni davek na proizvode brez DDV (lokalni davek se obračuna na znesek brez DDV)<br>4 : lokalni davek na proizvode z DDV (lokalni davek se obračuna na znesek + DDV)<br>5 : lokalni davek na storitve brez DDV (lokalni davek se obračuna na znesek brez DDV)<br>6 : lokalni davek na storitve z DDV (lokalni davek se obračuna na znesek + DDV)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Vnesite telefonsko številko, na katero kličete za prikaz povezave za testiranje ClickToDial url za uporabnika <strong>%s</strong>
 RefreshPhoneLink=Osveži pšovezavo
@@ -430,8 +429,8 @@ Module20Name=Ponudbe
 Module20Desc=Upravljanje komercialnih ponudb
 Module22Name=Masovno E-pošiljanje
 Module22Desc=Upravljanje masovnega E-pošiljanja
-Module23Name= Energija
-Module23Desc= Nadzor porabe energije
+Module23Name=Energija
+Module23Desc=Nadzor porabe energije
 Module25Name=Naročila kupcev
 Module25Desc=Upravljanje naročil kupcev
 Module30Name=Računi
@@ -492,8 +491,8 @@ Module400Name=Projekti/priložnosti/možnosti
 Module400Desc=Upravljanje projektov, priložnosti ali potencialov. Nato lahko dodate vse druge elemente (račun, naročilo, ponudbo, intervencijo, ...) k tem projektom, da dobite transverzalni pogled iz projektnega pogleda.
 Module410Name=Internetni koledar
 Module410Desc=Integracija internetnega koledarja
-Module500Name=Posebni stroški (davki, socialni prispevki, dividende)
-Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki, dividende in plače
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Plače
 Module510Desc=Upravljanje plač in plačil zaposlenim
 Module520Name=Posojilo
@@ -502,7 +501,7 @@ Module600Name=Obvestila
 Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja)
 Module700Name=Donacije
 Module700Desc=Upravljanje donacij
-Module770Name=Stroškovno poročilo
+Module770Name=Expense reports
 Module770Desc=Poročilo upravljanja in stroškov povračil (prevoz, hrana, ...)
 Module1120Name=Komercialna ponudba dobavitelja
 Module1120Desc=Zahteva za komercialno ponudbo in cene dobavitelja
@@ -524,8 +523,10 @@ Module2400Name=Dnevni red
 Module2400Desc=Upravljanje aktivnosti/nalog in dnevnih redov
 Module2500Name=Upravljanje elektronskih vsebin
 Module2500Desc=Shranjevanje dokumentov in dajanje v skupno rabo
-Module2600Name=Spletne storitve
-Module2600Desc=Omogočanje Dolibarr strežnika za spletne storitve
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=Spletne storitve (klient)
 Module2650Desc=Vključitev Dolibarr klienta za mrežni servis (lahko se uporablja za potisk podatkov/zahtev na zunanji strežnik. Zaenkrat so podprta samo naročila pri dobaviteljih)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Kreiranje/spreminjanje proizvodov
 Permission34=Brisanje proizvodov
 Permission36=Pregled/upravljanje skritih proizvodov
 Permission38=Izvoz proizvodov
-Permission41=Branje projektov in nalog
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Kreiranje/spreminjanje projektov, urejanje nalog v mojih projektih
 Permission44=Brisanje projektov
 Permission61=Branje intervencij
@@ -599,10 +600,10 @@ Permission86=Pošiljanje naročil kupcev
 Permission87=Zapiranje naročil kupcev
 Permission88=Preklic naročil kupcev
 Permission89=Brisanje naročil kupcev
-Permission91=Branje socialnih prispevkov in DDV
-Permission92=Kreiranje/spreminjanje socialnih prispevkov in DDV
-Permission93=Brisanje socialnih prispevkov in DDV
-Permission94=Izvoz socialnih prispevkov
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Branje poročil
 Permission101=Branje pošiljk
 Permission102=Kreiranje/spreminjanje pošiljk
@@ -620,9 +621,9 @@ Permission121=Branje partnerjev, vezanih na uporabnika
 Permission122=Kreiranje/spreminjanje partnerjev, vezanih na uporabnika
 Permission125=Brisanje partnerjev, vezanih na uporabnika
 Permission126=Izvoz partnerjev
-Permission141=Branje nalog
-Permission142=Ustvarjanje/spreminjanje nalog
-Permission144=Izbris nalog
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Brisanje ponudnikov
 Permission147=Branje statistike
 Permission151=Branje tekočih naročil
@@ -800,7 +801,7 @@ DictionaryCountry=Države
 DictionaryCurrency=Valute
 DictionaryCivility=Vljudnostni nazivi
 DictionaryActions=Tipi aktivnosti
-DictionarySocialContributions=Vrste socialnih prispevkov
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Stopnje DDV ali davkov
 DictionaryRevenueStamp=Znesek kolekov
 DictionaryPaymentConditions=Pogoji plačil
@@ -817,6 +818,9 @@ DictionarySource=Izvor ponudb/naročil
 DictionaryAccountancyplan=Kontni plan
 DictionaryAccountancysystem=Modeli kontnih planov
 DictionaryEMailTemplates=Predloge za elektronsko pošto
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Nastavitve shranjene
 BackToModuleList=Nazaj na seznam modulov
 BackToDictionaryList=Nazaj na seznam slovarjev
@@ -936,13 +940,14 @@ CompanyZip=Poštna številka
 CompanyTown=Mesto
 CompanyCountry=Država
 CompanyCurrency=Osnovna valuta
+CompanyObject=Object of the company
 Logo=Logotip
 DoNotShow=Ne prikaži
 DoNotSuggestPaymentMode=Ne predlagaj
 NoActiveBankAccountDefined=Ni definiran aktivni bančni račun
 OwnerOfBankAccount=Lastnik bančnega računa %s
 BankModuleNotActive=Modul za bančne račune ni omogočen
-ShowBugTrackLink=Prikaži povezavo "Sporoči hrošča"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Prikaži "delovno površino" na domači strani
 Alerts=Opozorila
 Delays=Zakasnitve
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Največje število decimalk za ceno enote
 MAIN_MAX_DECIMALS_TOT=Največje število decimalk za končno ceno
 MAIN_MAX_DECIMALS_SHOWN=Največje število decimalk za ceno, ki so vidne na zaslonu (Dodajte <b>...</b> za to številko, če želite videti <b>...</b>, kadar je številka skrajšana za prikaz na zaslonu)
 MAIN_DISABLE_PDF_COMPRESSION=Uporaba PDF kompresije za generiranje PDF datotek.
-MAIN_ROUNDING_RULE_TOT= Velikost območja zaokroževanja (pri nekaterih državah, kjer se ne zaokrožuje na osnovo 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Neto cena enote proizvoda
 TotalPriceAfterRounding=Skupna cena z davkom po zaokrožitvi
 ParameterActiveForNextInputOnly=Parameter bo veljal šele pri naslednjem vnosu.
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Skupno število aktiviranih modulov za lastnosti:
 YouMustEnableOneModule=Omogočiti morate vsaj 1 modul
 ClassNotFoundIntoPathWarning=Ratzred %s ni najedn na poti PHP
 YesInSummer=Da poleti
-OnlyFollowingModulesAreOpenedToExternalUsers=Opomba, samo naslednji moduli so odprti za zunanje uporabnike (odvisno od dovoljenje takih uporabnikov):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Shranjevanje seje kriptirano s Suhosin
 ConditionIsCurrently=Trenutni pogoj je %s
 YouUseBestDriver=Uporabljate gonilnik %s , ki je najboljši trenutno na voljo
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Največje število proizvodov na kombiniranih seznam
 ConfirmDeleteProductLineAbility=Potrditev izbrisa vrstice proizvoda z obrazca
 ModifyProductDescAbility=Prilagoditev opisa proizvoda na obrazcu
 ViewProductDescInFormAbility=Ponazoritev opisa proizvoda na obrazcu (kot pojavni opis)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Vizualizacija Poimenovanja izdelkov v thirdparty jeziku
 UseSearchToSelectProductTooltip=Če je število proizvodov zelo veliko (> 100 000), lahko povečate hitrost z nastavitvijo konstante PRODUCT_DONOTSEARCH_ANYWHERE na vrednost 1 v Nastavitve->Ostale nastavitve. S tem bo iskanje omejeno na začetek niza.
 UseSearchToSelectProduct=Uporabi iskanje za izbiro proizvoda (raje kot padajoči seznam)
 UseEcoTaxeAbility=Podpora ekološke takse (WEEE)
 SetDefaultBarcodeTypeProducts=Privzet tip črtne kode za proizvode
 SetDefaultBarcodeTypeThirdParties=Privzet tip črtne kode za partnerje
+UseUnits=Support units
 ProductCodeChecker= Modul za generiranje kode proizvodov in kontrolo (proizvod ali storitev)
 ProductOtherConf= Konfiguracija proizvodov/storitev
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Črtna koda tipa UPC
 BarcodeDescISBN=Črtna koda tipa ISBN
 BarcodeDescC39=Črtna koda tipa C39
 BarcodeDescC128=Črtna koda tipa C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Orodje za generiranje črtne kode preko komandne vrstice (uporablja ga 'internal engine' za nekatere tipe črtnih kod). Mora biti kompatibilen z "genbarcode".<br>Na primer: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Interno orodje
 BarCodeNumberManager=Upravljanje avtomatskega določanja številk črtnih kod
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Ali zares želite izbrisati menijski vnos <b>%s</b> ?
 DeleteLine=Izbris vrstice
 ConfirmDeleteLine=Ali zares želite izbrisati to vrstico ?
 ##### Tax #####
-TaxSetup=Modul za nastavitve davkov, socialnih prispevkov in dividend
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Rok za DDV
 OptionVATDefault=Gotovinska osnova
 OptionVATDebitOption=Povečana osnova
@@ -1552,6 +1561,15 @@ WebServicesSetup=Nastavitev modula za spletne storitve
 WebServicesDesc=Z omogočenjem tega modula postane Dolibarr spletni strežnik za zagotavljanje različnih spletnih storitev.
 WSDLCanBeDownloadedHere=WSDL opisna datoteka omogočenih storitev je na voljo tukaj
 EndPointIs=SOAP klienti morajo poslati zahtevo na Dolibarr končno točko, ki je na voljo na Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Nastavitev modula za banke
 FreeLegalTextOnChequeReceipts=Poljubno besedilo na potrdilu za ček
@@ -1581,6 +1599,7 @@ ProjectsSetup=Nastavitve modula za projekte
 ProjectsModelModule=Vzorec dokumenta poročila o projektih
 TasksNumberingModules=Moduli za številčenje nalog
 TaskModelModule=Modeli obrazcev poročil o nalogah
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Nastavitve GED
 ECMAutoTree = Avtomatska drevesna struktura mape in dokumenta
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Odpri fiskalno leto
 CloseFiscalYear=Zapri fiskalno leto
 DeleteFiscalYear=Izbriši fiskalno leto
 ConfirmDeleteFiscalYear=Ali zares želite izbrisati to fiskalni leto?
-Opened=Odprt
+Opened=Open
 Closed=Zaključeno
 AlwaysEditable=Lahko je vedno urejeno
 MAIN_APPLICATION_TITLE=Prisilni prikaz imena aplikacije (opozorilo: če tukaj nastavite vaše lastno ime, lahko prekinete funkcijo avtomatskega vnosa uporabniškega imena pri uporabi mobilne aplikacije DoliDroid)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega
 SomethingMakeInstallFromWebNotPossible2=Zaradi tega razloga je tukaj opisan postopek samo ročnih korakov, ki jih lahko naredi le uporabnik z dovoljenjem.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplikacije je onemogočil vaš administrator. Prositi ga morate, naj odstrani datoteko <strong>%s</strong>, da bi omogočil to funkcijo.
 ConfFileMuseContainCustom=Instalacija eksternega modula iz aplikacije shrani datoteke modula v mapo <strong>%s</strong>. da bi Dolibarr procesiral to mapo, morate nastaviti vaš <strong>conf/conf.php</strong> tako, da bo opcija<br>- <strong>$dolibarr_main_url_root_alt</strong> omogočena z vrednostjo <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> pa z vrednostjo <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index fb6ebe53903..3c454937cfc 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -49,13 +49,12 @@ InvoiceValidatedInDolibarrFromPos=Račun %s je potrjen preko POS
 InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka
 InvoiceDeleteDolibarr=Račun %s izbrisan
 OrderValidatedInDolibarr=Potrjeno naročilo %s
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Naročilo %s označeno kot "dobavljeno"
 OrderCanceledInDolibarr=Naročilo %s odpovedano
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Naročilo %s označeno kot "zaračunano"
 OrderApprovedInDolibarr=Naročilo %s odobreno
 OrderRefusedInDolibarr=Naročilo %s zavrnjeno
 OrderBackToDraftInDolibarr=Naročilo %s se vrača v status osnutka
-OrderCanceledInDolibarr=Naročilo %s odpovedano
 ProposalSentByEMail=Komercialna ponudba %s poslana po elektronski pošti
 OrderSentByEMail=Naročilo kupca %s poslano po elektronski pošti
 InvoiceSentByEMail=Račun kupcu %s poslan po elektronski pošti
@@ -94,5 +93,7 @@ WorkingTimeRange=Delovni čas
 WorkingDaysRange=Delovni dnevi
 AddEvent=Ustvari dogodek
 MyAvailability=Moja dostopnost
-ActionType=Event type
-DateActionBegin=Start event date
+ActionType=Tip dogodka
+DateActionBegin=Datum začetka dogodka
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index e6d9a86b536..b8d3d93d367 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Uskladi
 Conciliation=Uskladitev
 ConciliationForAccount=Uskladi ta konto
 IncludeClosedAccount=Vključi zaprte račune
-OnlyOpenedAccount=Samo odprti računi
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Kreditni konto
 AccountToDebit=Debetni konto
 DisableConciliation=Onemogoči funkcijo usklajevanja za ta konto
 ConciliationDisabled=Funkcija usklajevanja onemogočena
-StatusAccountOpened=Odprt
+StatusAccountOpened=Open
 StatusAccountClosed=Zaprt
 AccountIdShort=Številka
 EditBankRecord=Urejanje postavk
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Plačilo kupca
 CustomerInvoicePaymentBack=Vrnitev plačila kupcu
 SupplierInvoicePayment=Plačilo dobavitelju
 WithdrawalPayment=Nakazano plačilo
-SocialContributionPayment=Plačilo socialnih prispevkov
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Dnevnik finančnega računa
 BankTransfer=Bančni transfer
 BankTransfers=Bančni transferji
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index f9a76966115..e0102a47268 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -74,9 +74,9 @@ PaymentsAlreadyDone=Izvršena plačila
 PaymentsBackAlreadyDone=Vrnitev plačila že izvršena
 PaymentRule=Pravilo plačila
 PaymentMode=Način plačila
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Rok plačila
+PaymentConditions=Pogoji plačil
+PaymentConditionsShort=Pogoji plačil
 PaymentAmount=Znesek plačila
 ValidatePayment=Potrdi plačilo
 PaymentHigherThanReminderToPay=Plačilo višje od opomina
@@ -178,7 +178,7 @@ NumberOfBills=Število računov
 NumberOfBillsByMonth=Število računov po mesecih
 AmountOfBills=Znesek račuov
 AmountOfBillsByMonthHT=Znesek računov po mesecih (brez DDV)
-ShowSocialContribution=Prikaži socialne prispevke
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Prikaži račun
 ShowInvoice=Prikaži račun
 ShowInvoiceReplace=Prikaži nadomestni račun
@@ -270,7 +270,7 @@ BillAddress=Naslov za račun
 HelpEscompte=Ta popust je bil kupcu odobren zaradi plačila pred rokom zapadlosti.
 HelpAbandonBadCustomer=Ta znesek je bil opuščen (Kupec je označen kot 'slab kupec') in se obravnava kot potencialna izguba.
 HelpAbandonOther=Ta znesek je bil opuščen, ker je prišlo do napake (na primer napačen kupec ali račun, zamenjan z drugim)
-IdSocialContribution=ID socialnih prispevkov
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID plačila
 InvoiceId=ID računa
 InvoiceRef=Referenca računa
@@ -294,10 +294,11 @@ TotalOfTwoDiscountMustEqualsOriginal=Vsota obeh novih popustov mora biti enaka o
 ConfirmRemoveDiscount=Ali zares želite odstraniti ta popust ?
 RelatedBill=Podobni račun
 RelatedBills=Povezani računi
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
+RelatedCustomerInvoices=Povezani računi za kupca
+RelatedSupplierInvoices=Povezani računi dobavitelja
 LatestRelatedBill=Zadnji povezan račun
 WarningBillExist=Pozor, obstaja že en ali več računov
+MergingPDFTool=Orodje za spajanje PDF
 
 # PaymentConditions
 PaymentConditionShortRECEP=Takoj
@@ -429,5 +430,5 @@ NotLastInCycle=Ta račun ni zadnji v ciklu in ga ne morete spremeniti.
 DisabledBecauseNotLastInCycle=Naslednja situacija že obstaja.
 DisabledBecauseFinal=Ta situacija je končna.
 CantBeLessThanMinPercent=Napredek ne more biti manjši, kot je vrednost prejšnje situacije
-NoSituations=Ni odprtih situacij
+NoSituations=No open situations
 InvoiceSituationLast=Končni in skupni račun
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index 5f41943efda..4da188caeb2 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Zadnja naročila
 BoxLastContacts=Zadnji kontakti/naslovi
 BoxLastMembers=Zadnji člani
 BoxFicheInter=Zadnje intervencije
-BoxCurrentAccounts=Stanje odprtih računov
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Prihodek od prodaje
 BoxTotalUnpaidCustomerBills=Skupaj neplačani računi kupca
 BoxTotalUnpaidSuppliersBills=Skupaj neplačani računi dobavitelju
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Zadnjih %s člani
 BoxTitleLastFicheInter=Zadnjih %s spremenjenih intervencij
 BoxTitleOldestUnpaidCustomerBills=Najstarejši %s neplačani računi strank
 BoxTitleOldestUnpaidSupplierBills=Najstarejši %s neplačani računi dobaviteljev
-BoxTitleCurrentAccounts=Stanja odprtih računov
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Prihodek od prodaje
 BoxTitleTotalUnpaidCustomerBills=Neplačani računi strank
 BoxTitleTotalUnpaidSuppliersBills=Neplačani računi dobaviteljev
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 3da509d2dd8..5abf55ed8e1 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-NoCategoryYet=No tag/category of this type created
+Rubrique=Značka/kategorija
+Rubriques=Značke/kategorije
+categories=značke/kategorije
+TheCategorie=Značka/kategorija
+NoCategoryYet=Ni kreirana nobena značka/kategorija te vrste
 In=V
 AddIn=Dodaj v
 modify=spremeni
 Classify=Razvrsti
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
+CategoriesArea=Področje značk/kategorij
+ProductsCategoriesArea=Področje značk/kategorij proizvodov/storitev
+SuppliersCategoriesArea=Področje značk/kategorij dobaviteljev
+CustomersCategoriesArea=Področje značk/kategorij kupcev
+ThirdPartyCategoriesArea=Področje značk/kategorij partnerjev
+MembersCategoriesArea=Področje značk/kategorij članov
+ContactsCategoriesArea=Področje značk/kategorij kontaktov
+MainCats=Glavne značke/kategorije
 SubCats=Podkategorije
 CatStatistics=Statistika
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CatList=Seznam značk/kategorij
+AllCats=Vse značke/kategorije
+ViewCat=Glej značko/kategorijo
+NewCat=Dodaj značko/kategorijo
+NewCategory=Nova značka/kategorija
+ModifCat=Spremeni značko/kategorijo
+CatCreated=Kreirana značka/kategorija
+CreateCat=Kreiraj značko/kategorijo
+CreateThisCat=Kreiraj to značko/kategorijo
 ValidateFields=Potrdi polja
 NoSubCat=Ni podkategorije.
 SubCatOf=Podkategorija
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
+FoundCats=Najdi značke/kategorije
+FoundCatsForName=Najdena značka/kategorija za ime :
+FoundSubCatsIn=Najdena podkategorija v znački/kategoriji
+ErrSameCatSelected=Večkrat ste izbrali enako značko/kategorijo
+ErrForgotCat=Pozabili ste izbrati značko/kategorijo
 ErrForgotField=Pozabili ste izbrati polje
 ErrCatAlreadyExists=To ime je že uporabljeno
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
+AddProductToCat=Želite dodati ta proizvod v značko/kategorijo?
+ImpossibleAddCat=Ni možno dodati značke/kategorije
+ImpossibleAssociateCategory=Ni možno vezati značke/kategorije na
 WasAddedSuccessfully=<b>%s</b> je bil uspešno dodan.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ObjectAlreadyLinkedToCategory=Element je že povezan na to značko/kategorijo.
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=Ta proizvod/storitev ni vključen v nobenoznačko/ kategorijo
+SupplierHasNoCategory=Ta dobavitelj ni vključen v nobeno značko/kategorijo
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
+MemberHasNoCategory=Ta član ni v nobeni znački/kategoriji
+ContactHasNoCategory=Ta kontakt ni v nobeni znački/kategoriji
+ClassifyInCategory=Add to tag/category
 NoneCategory=Nobena
-NotCategorized=Without tag/category
+NotCategorized=Brez značke/kategorije
 CategoryExistsAtSameLevel=Kategorija s to referenco že obstaja
 ReturnInProduct=Nazaj na kartico proizvodov/storitev
 ReturnInSupplier=Nazaj na kartico dobaviteljev
@@ -64,22 +64,22 @@ ReturnInCompany=Nazaj na kartico kupcev/možnih strank
 ContentsVisibleByAll=Vsebina bo vidna vsem
 ContentsVisibleByAllShort=Vsebina vidna vsem
 ContentsNotVisibleByAllShort=Vsebina ni vidna vsem
-CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
+CategoriesTree=Drevesna struktura značk/kategorij
+DeleteCategory=Briši značko/kategorijo
+ConfirmDeleteCategory=Ali zares želite izbrisati to značko/kategorijo?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
+NoCategoriesDefined=Ni določena nobena značka/kategorija
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Značke/kategorije dobaviteljev
+CustomersCategoriesShort=Značke/kategorije kupcev
 CustomersProspectsCategoriesShort=Kategorije kupcev/možnih strank
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
+ProductsCategoriesShort=Značke/kategorije proizvodov
+MembersCategoriesShort=Značke/kategorije članov
+ContactCategoriesShort=Značke/kategorije kontaktov
 ThisCategoryHasNoProduct=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoSupplier=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoCustomer=Ta kategorija ne vsebuje nobenega kupca.
@@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Ta kategorija ne vsebuje nobenega kontakta.
 AssignedToCustomer=Dodeljeno kupcu
 AssignedToTheCustomer=Dodeljeno kupcu
 InternalCategory=Interna kategorija
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
+CategoryContents=Vsebina značke/kategorije
+CategId=ID značke/kategorije
+CatSupList=Seznam značk/kategorij dobaviteljev
+CatCusList=Seznam značk/kategorij kupcev/možnih strank
+CatProdList=Seznam značk/kategorij proizvodov
+CatMemberList=Seznam značk/kategorij članov
+CatContactList=List of contact tags/categories
+CatSupLinks=Povezave med dobavitelji in značkami/kategorijami
+CatCusLinks=Povezave med kupci/možnimi strankami in značkami/kategorijami
+CatProdLinks=Povezave med proizvodi/storitvami in značkami/kategorijami
+CatMemberLinks=Povezave med člani in značkami/kategorijami
+DeleteFromCat=Odstrani iz značk/kategorije
 DeletePicture=Izbriši sliko
 ConfirmDeletePicture=Potrdi izbris slike?
 ExtraFieldsCategories=Koplementarni atributi
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
+CategoriesSetup=Nastavitev značk/kategorij
+CategorieRecursiv=Avtomatsko poveži z nadrejeno značko/kategorijo
 CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo
 AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
-ShowCategory=Show tag/category
+ShowCategory=Pokaži značko/kategorijo
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 32202272217..ff9371a9b19 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Kontakt pri partnerju
 StatusContactValidated=Status kontakta
 Company=Podjetje
 CompanyName=Ime podjetja
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Podjetja
 CountryIsInEEC=Država je članica Evropske Unije
 ThirdPartyName=Ime partnerja
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Možni absolutni popusti
 DiscountNone=Brez popusta
 Supplier=Dobavitelj
 CompanyList=Seznam podjetij
-AddContact=Dodaj kontakt/naslov
-AddContactAddress=Dodaj kontakt/naslov
+AddContact=Ustvari kntakt
+AddContactAddress=Ustvari naslov
 EditContact=Uredi osebo / naslov
 EditContactAddress=Uredi kontakt/naslov
 Contact=Kontakt
@@ -268,8 +269,8 @@ ContactsAddresses=Kontakti/naslovi
 NoContactDefinedForThirdParty=Pri tem partnerju ni definiranega kontakta
 NoContactDefined=Pri tem partnerju ni definiranega kontakta
 DefaultContact=Privzeti kontakt
-AddCompany=Dodaj podjetje
-AddThirdParty=Dodaj partnerja
+AddCompany=Ustvari podjetje
+AddThirdParty=Ustvari partnerja
 DeleteACompany=Izbriši podjetje
 PersonalInformations=Osebni podatki
 AccountancyCode=Računovodska koda
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Oznaka naslova za dostavo
 DeleteDeliveryAddress=Izbriši naslov za dostavo
 ConfirmDeleteDeliveryAddress=Ali zares želite izbrisati ta naslov za dostavo?
 NewDeliveryAddress=Nov naslov za dostavo
-AddDeliveryAddress=Dodaj naslov za dostavo
-AddAddress=Dodaj naslov
+AddDeliveryAddress=Ustvari naslov
+AddAddress=Ustvari naslov
 NoOtherDeliveryAddress=Ni definiran alternativni naslov za dostavo
 SupplierCategory=Kategorija dobavitelja
 JuridicalStatus200=Neodvisno
@@ -397,7 +398,7 @@ YouMustCreateContactFirst=Če želite dodati e-mail obveščanje, morate najprej
 ListSuppliersShort=Seznam dobaviteljev
 ListProspectsShort=Seznam možnih strank
 ListCustomersShort=Seznam kupcev
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Področje partnerjev in kontaktov
 LastModifiedThirdParties=Zadnjih %s spremenjenih partnerjev
 UniqueThirdParties=Skupno število partnerjev
 InActivity=Aktiven
@@ -410,5 +411,10 @@ OutstandingBillReached=Dosežen maksimum za neplačan račun
 MonkeyNumRefModelDesc=Predlaga kodo kupca v formatu %syymm-nnnn in kodo dobavitelja v formatu %syymm-nnnn kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledka, večja od 0.
 LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli spremenite.
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Search third party
+SearchContact=Išči kontakt
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 37512ab743b..4efa3d06aa3 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -3,7 +3,7 @@ Accountancy=Računovodstvo
 AccountancyCard=Računovodska kartica
 Treasury=Blagajna
 MenuFinancial=Finance
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRules=Pojdite na nastavitev <a href="%s">Davčnega modula</a>  za spremembo kalkulacijskih pravil
 TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Opcija za računovodstvo
 OptionModeTrue=Opcija Input-Output
@@ -19,8 +19,8 @@ AmountToBeCharged=Skupni znesek za plačilo :
 AccountsGeneral=Konti
 Account=Konto
 Accounts=Konti
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Nadrejen račun
+Accountsparent=Ndrejeni računi
 BillsForSuppliers=Računi za dobavitelje
 Income=Prejemek
 Outcome=Izdatek
@@ -33,7 +33,7 @@ AccountingResult=Accounting result
 Balance=Bilanca
 Debit=Debit
 Credit=Kredit
-Piece=Accounting Doc.
+Piece=Računovodska dokumentacija
 Withdrawal=Nakazilo
 Withdrawals=Nakazila
 AmountHTVATRealReceived=Neto priliv
@@ -45,7 +45,7 @@ VATSummary=DDV skupaj
 LT2SummaryES=IRPF Balance
 LT1SummaryES=RE Balance
 VATPaid=Plačan DDV
-SalaryPaid=Salary paid
+SalaryPaid=Izplačana plača
 LT2PaidES=IRPF Plačan
 LT1PaidES=RE Paid
 LT2CustomerES=IRPF prodaja
@@ -55,33 +55,33 @@ LT1SupplierES=RE purchases
 VATCollected=Zbir DDV
 ToPay=Za plačilo
 ToGet=Za povračilo
-SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Področje davkov, socialnih prispevkov in dividend
-SocialContribution=Socialni prispevek
-SocialContributions=Socialni prispevki
-MenuSpecialExpenses=Special expenses
+SpecialExpensesArea=Področje za posebna plačila
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+MenuSpecialExpenses=Posebni stroški
 MenuTaxAndDividends=Davki in dividende
-MenuSalaries=Salaries
-MenuSocialContributions=Socialni prispevki
-MenuNewSocialContribution=Novi prispevki
-NewSocialContribution=Novi socialni prispevki
-ContributionsToPay=Prispevki za plačilo
+MenuSalaries=Plače
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Področje računovodstva/blagajne
 AccountancySetup=Nastavitev računovodstva
 NewPayment=Novo plačilo
 Payments=Plačila
 PaymentCustomerInvoice=Plačilo računa kupca
 PaymentSupplierInvoice=Plačilo računa dobavitelju
-PaymentSocialContribution=Plačilo socialnega prispevka
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Plačilo DDV
-PaymentSalary=Salary payment
+PaymentSalary=Izplačilo plače
 ListPayment=Seznam plačil
 ListOfPayments=Seznam plačil
 ListOfCustomerPayments=Seznam plačil kupcev
 ListOfSupplierPayments=Seznam plačil dobaviteljem
 DatePayment=Datum plačila
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Začetni datum obdobja
+DateEndPeriod=Končni datum obdobja
 NewVATPayment=Novo plačilo DDV
 newLT2PaymentES=Nova IRPF plačilo
 newLT1PaymentES=New RE payment
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=Plačilo DDV
 VATPayments=Plačila DDV
-SocialContributionsPayments=Plačila socialnih prispevkov
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Prikaži plačilo DDV
 TotalToPay=Skupaj za plačilo
 TotalVATReceived=Skupaj prejet DDV
@@ -101,7 +101,7 @@ AccountNumberShort=Konto
 AccountNumber=Številka konta
 NewAccount=Nov konto
 SalesTurnover=Promet prodaje
-SalesTurnoverMinimum=Minimum sales turnover
+SalesTurnoverMinimum=Minimalni prihodek od prodaje
 ByThirdParties=Po partnerjih
 ByUserAuthorOfInvoice=Po avtorjih računov
 AccountancyExport=Izvoz računovodstva
@@ -116,11 +116,11 @@ NewCheckDepositOn=Nova kontrola depozita na račun: %s
 NoWaitingChecks=Nobenih čakajočih kontrol depozitov.
 DateChequeReceived=Vnos datuma prejema čeka
 NbOfCheques=Število čekov
-PaySocialContribution=Plačilo socialnega prispevka
-ConfirmPaySocialContribution=Ali zares želite označiti ta socialni prispevek kot 'plačan'?
-DeleteSocialContribution=Brisanje socialnega prispevka
-ConfirmDeleteSocialContribution=Ali zares želite brisati ta socialni prispevek?
-ExportDataset_tax_1=Socialni prispevki in plačila
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -131,32 +131,32 @@ CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
 CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
 CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
 CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualSummaryDueDebtMode=Bilanca prihodkov in stroškov, letni povzetek
+AnnualSummaryInputOutputMode=Bilanca prihodkov in stroškov, letni povzetek
 AnnualByCompaniesDueDebtMode=Bilanca prejemkov in izdatkov, podrobnosti po partnerjih, način <b>%sClaims-Debts%s</b> z nazivom <b>commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Bilanca prejemkov in izdatkov, podrobnosti po partnerjih, način <b>%sRevenues-Expenses%s</b> z nazivom <b>cash accounting</b>.
 SeeReportInInputOutputMode=Glejte poročilo <b>%sIncomes-Expenses%s</b> z nazivom <b>cash accounting</b> za kalkulacijo na osnovi aktualnih izvršenih plačil
 SeeReportInDueDebtMode=Glejte poročilo <b>%sClaims-Debts%s</b> z nazivom <b>commitment accounting</b> za kalkulacijo na osnovi izdanih računov
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded=- Prikazane vrednosti vključujejo vse davke
 RulesResultDue=- Prikazani zneski vključujejo vse davke<br>- Vključuje neporavnane račune, stroške in DDV ne glede ali so plačani ali ne. <br>- Temelji na datumu potrditve računa in DDV in na datumu zapadlosti za stroške.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
+RulesResultInOut=- Prikazani zneski vključujejo vse dejansko plačane račune, stroške in DDV. <br>- Temelji na datumu plačila računa, stroškov in DDV.
 RulesCADue=- Vključuje izdane račune strankam, ne glede ali so plačani ali ne. <br>- Temelji na datumu potrditve teh računov. <br>
 RulesCAIn=- Vključuje vsa dejanska plačila kupcev.<br>- Temelji na datumu plačila teh računov<br>
 DepositsAreNotIncluded=- Vlog računi so prav tako vključeni
 DepositsAreIncluded=- Vključena so vlog računi
 LT2ReportByCustomersInInputOutputModeES=Poročilo tretjih oseb IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
+VATReportByCustomersInInputOutputMode=Poročilo o pobranem in plačanem DDV po kupcih
+VATReportByCustomersInDueDebtMode=Poročilo o pobranem in plačanem DDV po kupcih
+VATReportByQuartersInInputOutputMode=Poročilo o pobranem in plačanem DDV po stopnji DDV
 LT1ReportByQuartersInInputOutputMode=Report by RE rate
 LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
+VATReportByQuartersInDueDebtMode=Poročilo o pobranem in plačanem DDV po stopnji DDV
 LT1ReportByQuartersInDueDebtMode=Report by RE rate
 LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
 SeeVATReportInInputOutputMode=Glej poročilo <b>%sVAT encasement%s</b> za standardno kalkulacijo
 SeeVATReportInDueDebtMode=Glej poročilo <b>%sVAT on flow%s</b> za kalkulacijo z opcijo denarnega toka
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- Za storitve, poročilo vključuje DDV predpise dejansko prejete ali izdane na podlagi datuma plačila.
 RulesVATInProducts=- Za materialnih sredstev, da vključuje DDV račune na podlagi datuma izdaje računa.
 RulesVATDueServices=- Za storitve, poročilo vključuje DDV račune zaradi, plačane ali ne, na podlagi datuma izdaje računa.
 RulesVATDueProducts=- Za materialnih sredstev, vključuje DDV, račune, na podlagi datuma izdaje računa.
@@ -179,29 +179,29 @@ CodeNotDef=Ni definirano
 AddRemind=Odpošlji možen znesek
 RemainToDivide= Preostanek za odpošiljanje :
 WarningDepositsNotIncluded=Avansni računi niso vključeni v tej verziji računovodskega modula.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
-RefExt=External ref
+DatePaymentTermCantBeLowerThanObjectDate=Datum plačila ne more biti nižji od datuma storitve.
+Pcg_version=Pcg verzija
+Pcg_type=Pcg način
+Pcg_subtype=Pcg podtip
+InvoiceLinesToDispatch=Vrstice računa za odpremo
+InvoiceDispatched=Odposlani računi
+AccountancyDashboard=Povzetek računovodstva
+ByProductsAndServices=Po proizvodih in storitvah
+RefExt=Externa ref
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
+LinkedOrder=Povezava do naročila
+ReCalculate=Ponovno izračunaj
+Mode1=Metoda 1
+Mode2=Metoda 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
+CalculationMode=Način kalkulacije
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index e33e79c5442..c49253e6c10 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -4,10 +4,10 @@ About = O programu
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Ukaz
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Naloga
@@ -39,8 +39,8 @@ CronDtStart=Začetni datum
 CronDtEnd=Končni datum
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metoda
 CronModule=Modul
 CronAction=Akcija
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Dodaj naloge
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parametri
 CronSaveSucess=Uspešno shranjeno
 CronNote=Komentar
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Informacija
 # Common
-CronType=Tip naloge
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
index 69d0f8a62bd..9ab013ab3b7 100644
--- a/htdocs/langs/sl_SI/ecm.lang
+++ b/htdocs/langs/sl_SI/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Iskanje po objektu
 ECMSectionOfDocuments=Mape dokumentov
 ECMTypeManual=Ročno
 ECMTypeAuto=Avtomatsko
-ECMDocsBySocialContributions=Dokumenti, povezani s socialnimi prispevki
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokumenti, povezani s partnerjem
 ECMDocsByProposals=Dokumenti, povezani s ponudbami
 ECMDocsByOrders=Dokumenti, povezani z naročili kupcev
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index ef110e2c6f0..707a0fde267 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index e79da2ce081..ebfd96ecefd 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Dopusti
 CPTitreMenu=Dopusti
 MenuReportMonth=Mesečno stanje
-MenuAddCP=Izdelaj zahtevek za dopust
+MenuAddCP=New leave request
 NotActiveModCP=Za ogled te strani morate aktivirati modul za dopust
 NotConfigModCP=Za ogled te strani morate konfigurirati modul za dopust. To lahko storite s klikom <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> tukaj </ a>.
 NoCPforUser=Nimate več na voljo nobenega dneva.
@@ -71,7 +71,7 @@ MotifCP=Razlog
 UserCP=Uporabnik
 ErrorAddEventToUserCP=Prišlo je do napake pri dodajanju izredne odsotnosti.
 AddEventToUserOkCP=Dodajanje izredne odsotnosti je zaključeno.
-MenuLogCP=Ogled dnevnika zahtevkov za dopust
+MenuLogCP=View change logs
 LogCP=Dnevnik posodobitev dni za dopust, ki so na voljo
 ActionByCP=Izvajalec
 UserUpdateCP=Za uporabnika
@@ -93,6 +93,7 @@ ValueOptionCP=Vrednost
 GroupToValidateCP=Skupina z dovoljenjem za odobravanje zahtevkov za dopust
 ConfirmConfigCP=Potrditev konfiguracije
 LastUpdateCP=Zadnja avtomatska posodobitev odobrenih dopustov
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Uspešno posodobljeno.
 ErrorUpdateConfCP=Pri posodabljanju je prišlo do napake, prosimo poskusite ponovno.
 AddCPforUsers=Prosimo dodajte stanje dopustov uporabnikov s <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom tukaj</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Pri pošiljanju e-pošte je prišlo do napake:
 NoCPforMonth=Ta mesec ni odsotnosti.
 nbJours=Število dni
 TitleAdminCP=Konfiguracija dopustov
+NoticePeriod=Notice period
 #Messages
 Hello=Pozdravljeni
 HolidaysToValidate=Potrdi zahtevke za dopust
@@ -139,10 +141,11 @@ HolidaysRefused=Zahtevek je bil zavrnjen
 HolidaysRefusedBody=Vaš zahtevek za dopust od %s do %s je bil zavrnjen zaradi naslednjih razlogov :
 HolidaysCanceled=Preklican zahtevek za dopust
 HolidaysCanceledBody=Vaš zahtevek za dopust od %s do %s je bil preklican.
-Permission20000=Branje vaših lastnih zahtevkov za dopust
-Permission20001=Kreiranje/spreminjanje vašega zahtevka za dopust
-Permission20002=Kreiranje/spreminjanje zahtevkov za dopust za vse
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Brisanje zahtevkov za dopust
-Permission20004=Nastavitev dni za dopust za uporabnika
-Permission20005=Pregled dnevnika spremenjenih zahtevkov za dopust
-Permission20006=Branje mesečnega poročila o dopustih
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/sl_SI/incoterm.lang b/htdocs/langs/sl_SI/incoterm.lang
index 2396d2acb0e..b54364b13fe 100644
--- a/htdocs/langs/sl_SI/incoterm.lang
+++ b/htdocs/langs/sl_SI/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
+IncotermLabel=Incotermi
+IncotermSetupTitle1=Funkcija
 IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetup=Nastavitev Incoterm modula
+IncotermFunctionDesc=Aktivacija Incoterm funkcij (partner, ponudba, naročilo kupca, račun za kupca, odprema, naročilo pri dobavitelju)
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index 824579c3114..6873553b09e 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Strežnik za bazo podatkov – »Super uporabnik« dosto
 CheckToCreateDatabase=Označite kvadratek, če baza podatkov ne obstaja in jo je potrebno ustvariti.<br>V tem primeru morate vnesti uporabniško ime/geslo za račun »Super uporabnik« na dnu te strani.
 CheckToCreateUser=Označite kvadratek, če lastnik ne obstaja in ga je potrebno ustvariti.<br>V tem primeru morate izbrati njegovo uporabniško ime in geslo in vnesti tudi uporabniško ime/geslo za račun »Super uporabnik« na dnu te strani. Če ta kvadratek ni označen, morata obstajati lastnikova baza podatkov in njegovo geslo.
 Experimental=(eksperimentalno)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Uporabniško ime uporabnika omogoča kreiranje nove baze podatkov ali novega uporabnika, razen če vaša baza podatkov in vaše uporabniško ime že obstajata (na primer če gostujete pri spletnem ponudniku).
 KeepEmptyIfNoPassword=Pustite prazno, če uporabnik nima gesla (temu se izogibajte)
 SaveConfigurationFile=Shrani vrednosti
diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang
index cc0981f9726..49816362097 100644
--- a/htdocs/langs/sl_SI/languages.lang
+++ b/htdocs/langs/sl_SI/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabščina
 Language_ar_SA=Arabščina
+Language_bn_BD=Bengali
 Language_bg_BG=Bolgarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonščina
@@ -21,9 +22,10 @@ Language_en_SA=Angleški (Savdska Arabija)
 Language_en_US=Angleščina (ZDA)
 Language_en_ZA=Angleščina (Južna Afrika)
 Language_es_ES=Španščina
-Language_es_DO=Španščina (Dominikanska republika)
 Language_es_AR=Španščina (Argentina)
 Language_es_CL=Španščina (Čile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Španščina (Dominikanska republika)
 Language_es_HN=Španščina (Honduras)
 Language_es_MX=Španščina (Mehika)
 Language_es_PY=Španski (Paragvaj)
@@ -45,7 +47,10 @@ Language_id_ID=Indonezijščina
 Language_is_IS=Islandščina
 Language_it_IT=Italijanščina
 Language_ja_JP=Japonščina
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korejski
+Language_lo_LA=Lao
 Language_lt_LT=Litovska
 Language_lv_LV=Latvijski
 Language_mk_MK=Makedonski
@@ -64,6 +69,7 @@ Language_sv_SV=Švedščina
 Language_sv_SE=Švedščina
 Language_sq_AL=Albanščina
 Language_sk_SK=Slovaški
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrajinski
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/sl_SI/loan.lang b/htdocs/langs/sl_SI/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/sl_SI/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 22bd3d694f3..6ea130ab05d 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Potrditev branja
 YourMailUnsubcribeOK=E-pošni naslov <b>%s</b>  je uspešno odjavljen s seznama za pošiljanje
 MailtoEMail=Hiperovezava na email
 ActivateCheckRead=Dovoljena uporaba povezave za "Odjavo"
-ActivateCheckReadKey=Podatki za kriptiran URL za funkciji "Potrditev branja" in "Odjava"
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-pošta poslana %s prejemnikom.
 XTargetsAdded=<b>%s</b> prejemnikov dodanih na ciljni seznam
 EachInvoiceWillBeAttachedToEmail=Ustvarjen bo dokument na osnovi privzete predloge in pripet k vsakemu elektronskemu sporočilu
@@ -128,6 +128,7 @@ TagCheckMail=Odpiranje sledenja pošte
 TagUnsubscribe=Povezava za odjavo
 TagSignature=Podpis pošiljatelja
 TagMailtoEmail=Prejemnik E-pošte
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Obvestila
 NoNotificationsWillBeSent=Za ta dogodek in podjetje niso predvidena obvestila po e-pošti
@@ -139,5 +140,5 @@ ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
 MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
 MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter <strong>'%s'</strong> za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
 MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
+YouCanAlsoUseSupervisorKeyword=Lahko tudi dodate ključno besedo <strong>__SUPERVISOREMAIL__</strong> da bodo emaili poslani nadzorniku (deluje samo, če je email definiran za tega nadzornika)
+NbOfTargetedContacts=Trenutno število emailov ciljnih kontaktov
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 4dd37fd72d9..1b8a2dcb1dc 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Najdenih je bilo nekaj napak. Spremembe so
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> ni definiran v Dolibarr konfiguracijski datoteki <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Napaka pri iskanju uporabnika <b>%s</b> v Dolibarr bazi podatkov.
 ErrorNoVATRateDefinedForSellerCountry=Napaka, za državo '%s' niso definirane davčna stopnje.
-ErrorNoSocialContributionForSellerCountry=Napaka, za državo '%s' niso definirani socialni prispevki.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Napaka, datoteka ni bila shranjena.
 SetDate=Nastavi datum
 SelectDate=Izberi datum
@@ -301,8 +301,8 @@ UnitPriceHT=Cena enote (neto)
 UnitPriceTTC=Cena enote
 PriceU=C.E.
 PriceUHT=C.E. (neto)
-AskPriceSupplierUHT=Zahtevan P.U. HT
-PriceUTTC=C.E.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Znesek
 AmountInvoice=Znesek računa
 AmountPayment=Znesek za plačilo
@@ -339,6 +339,7 @@ IncludedVAT=Vključen DDV
 HT=Brez DDV
 TTC=Z DDV
 VAT=DDV
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Stopnja DDV
@@ -413,6 +414,8 @@ Qty=Kol.
 ChangedBy=Spremenil
 ApprovedBy=Odobril
 ApprovedBy2=Odobril (drugi nivo)
+Approved=Approved
+Refused=Refused
 ReCalculate=Ponovno izračunaj
 ResultOk=Uspeh
 ResultKo=Napaka
@@ -421,7 +424,7 @@ Reportings=Poročila
 Draft=Osnutek
 Drafts=Osnutki
 Validated=Potrjen
-Opened=Odprt
+Opened=Open
 New=Nov
 Discount=Popust
 Unknown=Neznan
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Povezano z določenim kontaktom uporabnika
 DeleteAFile=Izbriši datoteko
 ConfirmDeleteAFile=Ali zares želite izbrisati datoteko
 NoResults=Ni rezultata
+SystemTools=System tools
 ModulesSystemTools=Orodja za module
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Prikaži transakcijo
 GoIntoSetupToChangeLogo=Pojdite na Domov - Nastavitve - Podjetje za spremembo logotipa oz. na Domov - Nastavitve - Prikaz za njegovo skritje.
 Deny=Zavrni
 Denied=Zavrnjen
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
@@ -732,3 +739,4 @@ ShortThursday=Č
 ShortFriday=P
 ShortSaturday=S
 ShortSunday=N
+SelectMailModel=Select email template
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index a70ea086a12..5ec2c36b3ef 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -199,7 +199,8 @@ Entreprises=Podjetja
 DOLIBARRFOUNDATION_PAYMENT_FORM=Če želite plačati članarino z bančnim nakazilom, glejte stran <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>Za plačilo s kreditno kartico ali Paypal, kliknite na gumb na dnu te strani.<br>
 ByProperties=Po lastnostih
 MembersStatisticsByProperties=Statistika članov po lastnostih
-MembersByNature=Naravni člani
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Stopnja DDV za naročnine
 NoVatOnSubscription=Ni davka za naročnine
 MEMBER_PAYONLINE_SENDEMAIL=Opozorilno e-sporočilo, ko Dilibarr prejme potrdilo potrjenega plačila za naročnino
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 297489f6cf9..74dad31169d 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Naročilo pri dobavitelju
 SuppliersOrders=Naročila pri dobaviteljih
 SuppliersOrdersRunning=Trenutna naročila pri dobaviteljih
 CustomerOrder=Naročilo kupca
-CustomersOrders=Naročila kupcev
-CustomersOrdersRunning=Trenutna naročila kupcev
-CustomersOrdersAndOrdersLines=Naročila kupcev in vrstice naročil
-OrdersToValid=Naročila kupcev za potrditev
-OrdersToBill=Naročila kupcev za fakturiranje
-OrdersInProcess=Naročila kupcev v obdelavi
-OrdersToProcess=Naročila kupcev za obdelavo
-SuppliersOrdersToProcess=Naročila pri dobaviteljih za obdelavo
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Preklicano
 StatusOrderDraftShort=Osnutek
 StatusOrderValidatedShort=Potrjeno
@@ -75,8 +75,9 @@ AddToMyOrders=Dodaj mojim naročilom
 AddToOtherOrders=Dodaj ostalim naročilom
 AddToDraftOrders=Dodaj osnutku naročila
 ShowOrder=Prikaži naročilo
-NoOpenedOrders=Ni odprtih naročil
-NoOtherOpenedOrders=Ni drugih odprtih naročil
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Ni osnutkov naročil
 OtherOrders=Ostala naročila
 LastOrders=Zadnjih %s naročil kupca
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index fb069d54112..ddea7bac42e 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Potrjena intervencija
 Notify_FICHINTER_SENTBYMAIL=Intervencija poslana po EMailu
 Notify_BILL_VALIDATE=Potrjen račun
 Notify_BILL_UNVALIDATE=Račun za kupca ni potrjen
+Notify_ORDER_SUPPLIER_VALIDATE=Naročilo pri dobavitelju je shranjeno
 Notify_ORDER_SUPPLIER_APPROVE=Odobreno naročilo pri dobavitelju
 Notify_ORDER_SUPPLIER_REFUSE=Zavrnjeno naročilo pri dobavitelju
 Notify_ORDER_VALIDATE=Potrjeno naročilo kupca
@@ -203,6 +204,7 @@ ClickHereToGoTo=K.iknite tukaj za vstop v %s
 YouMustClickToChange=Vendar morate najprej klikniti na naslednji link za potrditev spremembe gesla
 ForgetIfNothing=Če niste zahtevali te spremembe, enostavno pozabite na ta email. Vaši prijavni podatki so varno shranjeni.
 IfAmountHigherThan=Če je znesek večji od <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Dodaj vnos v koledar %s
diff --git a/htdocs/langs/sl_SI/printing.lang b/htdocs/langs/sl_SI/printing.lang
index f0cd2a40292..838abdcdf81 100644
--- a/htdocs/langs/sl_SI/printing.lang
+++ b/htdocs/langs/sl_SI/printing.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Nastavitev sistema za direktno tiskanje
+PrintingDesc=Ta modul doda gumb za direktno pošiljanje dokumenta na tiskalnik (brez odpiranja dokumenta v aplikaciji) v različnih modulih.
+ModuleDriverSetup=Nastavitev gonilnika modula
+PrintingDriverDesc=Konfiguracija spremenljivk za gonilnik tiskalnika
+ListDrivers=Seznam gonilnikov
+PrintTestDesc=Seznam tiskalnikov.
+FileWasSentToPrinter=Datoteka %s je bila poslana na tiskalnik
+NoActivePrintingModuleFound=Ni aktivnega modula za tiskanje dokumenta
+PleaseSelectaDriverfromList=Prosimo, izberite gonilnik s seznama.
+SetupDriver=Nastavitev gonilnika
 TestDriver=Test
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP=Google Cloud Print
+TargetedPrinter=Ciljni tiskalnik
+UserConf=Nastavitev po uporabniku
+PRINTGCP=Tiskanje v oblaku Google
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 2a861958aca..621431feabd 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Proizvod ali storitev
 ProductsAndServices=Proizvodi in storitve
 ProductsOrServices=Proizvodi ali storitve
 ProductsAndServicesOnSell=Proizvodi in storitve za prodajo ali nabavo
-ProductsAndServicesNotOnSell=Proizvodi in storitve, ki se ne prodajajo več
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Statistika proizvodov in storitev
 ProductsStatistics=Statistika proizvodov
-ProductsOnSell=Proizvodi za prodajo ali nabavo
-ProductsNotOnSell=Proizvodi, ki se ne prodajajo ali nabavljajo več
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Proizvodi za prodajo ali nabavo
 ServicesOnSell=Storitve za prodajo ali za nakup
-ServicesNotOnSell=Storitve, ki se ne prodajajo več
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Storitve za prodajo ali za nabavo
 InternalRef=Interna referenca
 LastRecorded=Zadnji vneseni proizvodi/storitve za prodajo
@@ -44,7 +44,7 @@ CardProduct1=Kartica storitve
 CardContract=Kartica pogodbe
 Warehouse=Skladišče
 Warehouses=Skladišča
-WarehouseOpened=Skladišče odprto
+WarehouseOpened=Warehouse open
 WarehouseClosed=Skladišče zaprto
 Stock=Zaloga
 Stocks=Zaloge
@@ -71,21 +71,21 @@ SellingPriceTTC=Prodajne cene (z DDV)
 PublicPrice=Javna cena
 CurrentPrice=Trenutna cena
 NewPrice=Nova cena
-MinPrice=Minimalna Prodajna cena
-MinPriceHT=Minimalna prodajna cena (brez DDV)
-MinPriceTTC=Minimalna prodajna cena (z DDV)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust
 ContractStatus=Status pogodbe
 ContractStatusClosed=Zaprta
-ContractStatusRunning=V obdelavi
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Pretečena
-ContractStatusOnHold=V mirovanju
-ContractStatusToRun=Zagnana
-ContractNotRunning=Ta pogodba miruje
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Proizvod z referenco %s že obstaja.
 ErrorProductBadRefOrLabel=Napačna vrednost reference ali naziva.
 ErrorProductClone=Prišlo je do težave pri poskusu kloniranja proizvoda ali storitve.
-ErrorPriceCantBeLowerThanMinPrice=Napaka, cena ne mora biti nižja od minimalne cene.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Dobavitelji
 SupplierRef=Referenca dobavitelja
 ShowProduct=Prikaži proizvod
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Če ima proizvod storitev z omejenim trajanjem:
 MultiPricesAbility=Več nivojev cen za proizvode/storitve
 MultiPricesNumPrices=Število cen
 MultiPriceLevelsName=Kategorije cen
-AssociatedProductsAbility=Vklopi možnost navidezne sestave izdelka
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Sestavljen izdelek
-AssociatedProductsNumber=Število izdelkov, ki sestavljajo navidezni sestavljeni izdelek
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Število nadrejenih sestavljenih izdelkov
-IfZeroItIsNotAVirtualProduct=Če je 0, ta izdelek ni navidezno sestavljen
-IfZeroItIsNotUsedByVirtualProduct=Če je 0, ta izdelek ni uporabljen v nobenem navideznem sestavljenem izdelku
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Poveži
 Translation=Prevod
 KeywordFilter=Filter ključnih besed
@@ -131,7 +131,7 @@ ProductToAddSearch=Iskanje proizvoda za dodajanje
 AddDel=Dodaj/briši
 Quantity=Količina
 NoMatchFound=Ni ujemanja
-ProductAssociationList=Seznam odvisnih proizvodov/storitev: ime proizvoda/storitve (količina, na katero se nanaša)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Seznam zavitkov izdelkov / storitev, pri tem izdelku, kot sestavnega dela
 ErrorAssociationIsFatherOfThis=Eden od izbranih proizvodov je nadrejen trenutnemu proizvodu
 DeleteProduct=Izbriši proizvod/storitev
@@ -179,16 +179,41 @@ CloneProduct=Kloniraj proizvod ali storitev
 ConfirmCloneProduct=Ali zares želite klonirati ta proizvod ali storitev <b>%s</b> ?
 CloneContentProduct=Klonirajte vse osnovne podatke proizvoda/storitve
 ClonePricesProduct=Klonirajte osnovne podatke in cene
-CloneCompositionProduct=Kloniraj sestavljen izdelek/storitev
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Ta proizvod je rabljen
 NewRefForClone=Ref. novega proizvoda/storitve
-CustomerPrices=Cene za kupce
-SuppliersPrices=Nabavne cene
-SuppliersPricesOfProductsOrServices=Cene dobaviteljev (proizvodov ali storitev)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Carinska tarifa
 CountryOrigin=Država porekla
 HiddenIntoCombo=Skrito v izbranem seznamu
 Nature=Narava
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Predloga za referenco proizvoda
 ServiceCodeModel=Predloga za referenco storitve
 AddThisProductCard=Ustvari kartico proizvoda
@@ -214,7 +239,7 @@ CostPmpHT=Neto skupna VWAP
 ProductUsedForBuild=Lastna poraba za proizvodnjo
 ProductBuilded=Zaključena proizvodnja
 ProductsMultiPrice=Večcenovni proizvod
-ProductsOrServiceMultiPrice=Cene za kupce (proizvodov ali storitev, različne cene)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Četrtletni prihodek prooizvoda po VWAP 
 ServiceSellByQuarterHT=Četrtletni prihodek storitev po VWAP
 Quarter1=1. četrtletje
@@ -237,33 +262,37 @@ ResetBarcodeForAllRecords=Določite vrednost črtnih kod za vse zapise (s tem bo
 PriceByCustomer=Različne cene za vsakega kupca
 PriceCatalogue=Enolična cena po proizvodu/storitvi
 PricingRule=Pravila za cene za kupce
-AddCustomerPrice=Dodaj ceno po strankah
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Določi enako ceno za podružnice stranke
 PriceByCustomerLog=Cena po imenu stranke
-MinimumPriceLimit=Minimalna cena ne more biti nižja od %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimalna priporočena cena je : %s
 PriceExpressionEditor=Urejevalnik prikaza cene
 PriceExpressionSelected=Izbran prikaz cene
 PriceExpressionEditorHelp1="cena = 2 + 2" ali "2 + 2" za nastavitev cene. Uporabite ; za ločitev izrazov
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp2=Lahko dostopate do EkstraPolj s spremenljivkami kot  <b>#extrafield_myextrafieldkey#</b> in globalnimi spremenljivkami kot <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=Tako za proizvode/storitve, kot za nabavne cene, so na voljo naslednje spremenljivke:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=Samo za cene proizvodov/storitev: <b>#supplier_min_price#</b><br>Samo za nabavne cene: <b>#supplier_quantity# in #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
+PriceExpressionEditorHelp5=Globalne vrednosti, ki so na voljo:
 PriceMode=Način cene
 PriceNumeric=Številka
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-DynamicPriceConfiguration=Dynamic price configuration
-GlobalVariables=Global variables
-GlobalVariableUpdaters=Global variable updaters
-GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
+DefaultPrice=Privzeta cena
+ComposedProductIncDecStock=Povečanje/znmanjšanje zaloge pri spremembi nadrejenega
+ComposedProduct=Pod-proizvod
+MinSupplierPrice=Najnižja cena dobavitelja
+DynamicPriceConfiguration=Dimnamična konfiguracija cene
+GlobalVariables=Globalne spremenljivke
+GlobalVariableUpdaters=Posodobitve globalnih spremenljivk
+GlobalVariableUpdaterType0=JSON podatki
+GlobalVariableUpdaterHelp0=Razčleni JSON podatke iz specifičnega URL, VALUE določa lokacijo ustrezne vrednosti,
+GlobalVariableUpdaterHelpFormat0=format je {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Podatki spletnih storitev
+GlobalVariableUpdaterHelp1=Razčleni podatke spletnih storitve iz specifičnega URL, NS doliča prostor za ime, VALUE določa lokacijo ustreznih podatkov, DATA mora vsebovati podatke za pošiljanje in METHOD je metoda za WS klicanje
+GlobalVariableUpdaterHelpFormat1=format je {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Interval posodobitve (minute)
+LastUpdated=Nazadnje posodobljeno
+CorrectlyUpdated=Pravilno posodobljeno
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 8ccd9ea2e49..f571e17ade2 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=To pogled predstavlja vse projekte, za katere imate dovoljenj
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Ta pogled predstavlja vse projekte (vaše uporabniško dovoljenje vam omogoča ogled vseh).
 MyTasksDesc=Ta pogled je omejen na projekte ali naloge, za katere ste kontaktna oseba (ne glede na vrsto).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate dovoljenje za branje.
 TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovoljenje vam omogoča ogled vseh).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Področje projektov
 NewProject=Nov projekt
 AddProject=Ustvari projekt
@@ -29,7 +30,7 @@ ProjectsList=Seznam projektov
 ShowProject=Prikaži projekt
 SetProject=Nastavi projekt
 NoProject=Nimate definiranega ali lastnega projekta
-NbOpenTasks=Število odprtih nalog
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Število projektov
 TimeSpent=Porabljen čas
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Uporabnik
 TaskTimeNote=Beležka
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nov porabljen čas
 MyTimeSpent=Moj porabljen čas
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Seznam intervencij, povezanih s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Seznam aktivnosti, povezanih s projektom
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Aktivnosti na projektu v tem tednu
 ActivityOnProjectThisMonth=Aktivnosti na projektu v tem mesecu
 ActivityOnProjectThisYear=Aktivnosti na projektu v tem letu
@@ -95,7 +98,7 @@ DeleteATimeSpent=Izbrišite porabljen čas
 ConfirmDeleteATimeSpent=Ali zares želite izbrisati porabljen čas?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Izvori
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projekti, ki so povezani s tem partnerjem
 NoTasks=Ni nalog za ta projekt
 LinkedToAnotherCompany=Povezane z drugimi partnerji
@@ -139,8 +142,15 @@ ProjectReferers=Referenčni objekti
 SearchAProject=Iskanje projekta
 ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
 ProjectDraft=Osnutek projekta
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang
index 5068047ba25..b080d9c1230 100644
--- a/htdocs/langs/sl_SI/propal.lang
+++ b/htdocs/langs/sl_SI/propal.lang
@@ -4,7 +4,7 @@ Proposal=Komercialna ponudba
 ProposalShort=Ponudba
 ProposalsDraft=Osnutek komercialnih ponudb
 ProposalDraft=Osnutek komercialne ponudbe
-ProposalsOpened=Odprte komercialne ponudbe
+ProposalsOpened=Open commercial proposals
 Prop=Komercialne ponudbe
 CommercialProposal=Komercialna ponudba
 CommercialProposals=Komercialne ponudbe
@@ -16,7 +16,7 @@ Prospect=Možna stranka
 ProspectList=Seznam možnih strank
 DeleteProp=Izbriši komercialno ponudbo
 ValidateProp=Potrdi komercialno ponudbo
-AddProp=Dodaj ponudbo
+AddProp=Ustvari predlog
 ConfirmDeleteProp=Ali zares želite izbrisati to komercialno ponudbo ?
 ConfirmValidateProp=Ali zares želite potrditi to komercialno ponudbo?
 LastPropals=Zadnjih %s ponudb
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Znesek po mesecih(brez DDV)
 NbOfProposals=Število komercialnih ponudb
 ShowPropal=Prikaži ponudbo
 PropalsDraft=Osnutki
-PropalsOpened=Odprte
+PropalsOpened=Open
 PropalsNotBilled=Zaključene, ne fakturirane
 PropalStatusDraft=Osnutek (potrebno potrditi)
 PropalStatusValidated=Potrjena (ponudba je odprta)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nepodpisana (zaprta)
 PropalStatusBilled=Fakturirana
 PropalStatusDraftShort=Osnutek
 PropalStatusValidatedShort=Potrjena
-PropalStatusOpenedShort=Odprta
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Zaprta
 PropalStatusSignedShort=Podpisana
 PropalStatusNotSignedShort=Nepodpisana
@@ -51,12 +51,10 @@ PropalsToClose=Komercialne ponudbe, ki jih je potrebno zapreti
 PropalsToBill=Podpisane komercialne ponudbe, ki jih je potrebno fakturirati
 ListOfProposals=Seznam komercialnih ponudb
 ActionsOnPropal=Aktivnosti v zvezi s ponudbo
-NoOpenedPropals=Komercialne ponudbe, ki niso odprte
-NoOtherOpenedPropals=Ni drugih odprtih komercialnih ponudb
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Referenca komercialne ponudbe
 SendPropalByMail=Pošlji komercialno ponudbo po pošti
-FileNotUploaded=Datoteka ni bila prenesena
-FileUploaded=Datoteka je bila uspešno prenesena
 AssociatedDocuments=Dokumenti, povezani s ponudbo:
 ErrorCantOpenDir=Ne morem odpreti mape
 DatePropal=Datum ponudbe
@@ -100,3 +98,4 @@ DocModelJauneDescription=Vzorec ponudbe Jaune
 DefaultModelPropalCreate=Ustvarjanje privzetega modela
 DefaultModelPropalToBill=Privzeta predloga za zaključek ponudbe (za fakturiranje)
 DefaultModelPropalClosed=Privzeta predloga za zaključek ponudbe (nefakturirana)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index 6ac11760aea..5dd6dd5b250 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Računovodska koda za izplačilo plač
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Računovodska koda za finančno bremenitev
 Salary=Plača
 Salaries=Plače
 Employee=Zaposleni
@@ -8,6 +8,8 @@ NewSalaryPayment=Novo izplačilo plače
 SalaryPayment=Izplačilo plače
 SalariesPayments=Izplačila plač
 ShowSalaryPayment=Prikaži izplačilo plač
-THM=Average hourly price
-TJM=Average daily price
-CurrentSalary=Current salary
+THM=Povprečna urna postavka
+TJM=Povprečna dnevna postavka
+CurrentSalary=Trenutna plača
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 21aa1dc06bf..58b077d5d93 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Enostaven vzorec dokumenta
 DocumentModelMerou=Vzorec dokumenta Merou A5
 WarningNoQtyLeftToSend=Pozor, noben proizvod ne čaka na pošiljanje.
 StatsOnShipmentsOnlyValidated=Statistika na osnovi potrjenih pošiljk. Uporabljen je datum potrditve pošiljanja (planiran datum dobave ni vedno znan)
-DateDeliveryPlanned=Planiran datum dobave
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Datum prejema dobave
 SendShippingByEMail=Pošlji odpremnico po e-mailu
 SendShippingRef=Oddaja pošiljke %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index d0bd66253de..272b7f4fc82 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Skladišča
 NewWarehouse=Novo skladišče / skladiščni prostor
 WarehouseEdit=Uredi skladišče
 MenuNewWarehouse=Novo skladišče
-WarehouseOpened=Skladišče odprto
+WarehouseOpened=Warehouse open
 WarehouseClosed=Skladišče zaprto
 WarehouseSource=Izvorno skladišče
 WarehouseSourceNotDefined=Ni definirano skladišče,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Izberite skladišče uporabiti za zmanjšanje za
 SelectWarehouseForStockIncrease=Izberite skladišče uporabiti za povečanje zalog
 NoStockAction=Ni aktivnosti zaloge
 LastWaitingSupplierOrders=Naročila, ki čakajo na prevzem
-DesiredStock=Želena zaloga
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Za naročiti
 Replenishment=Obnavljanje
 ReplenishmentOrders=Naročila za obnavljanje
-VirtualDiffersFromPhysical=Glede na opcije povečanja/zmanjšanja zaloge, se lahko fizična in virtualna zaloga (fizična + trenutna naročila) razlikujeta
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Privzeto uporabljaj virtualno zalogo namesto fizične za funkcijo obnovitve zaloge
 UseVirtualStock=Uporabi virtualno zalogo
 UsePhysicalStock=Uporabi fizično zalogo
-CurentSelectionMode=Trenutno izbran način
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtualna zaloga
 CurentlyUsingPhysicalStock=Fizična zaloga
 RuleForStockReplenishment=Pravilo za obnavljanje zalog
@@ -112,8 +113,8 @@ AlertOnly= Samo opozorila
 WarehouseForStockDecrease=Skladiščee <b>%s</b> bo uporabljeno za zmanjšanje zaloge
 WarehouseForStockIncrease=Skladišče <b>%s</b> bo uporabljeno za povečanje zaloge
 ForThisWarehouse=Za to skladišče
-ReplenishmentStatusDesc=Seznam vseh proizvodov, ki imajo nižje stanje zaloge od želenega (ali nižje od opozorilne vrednosti, če je kvadratek "samo opozorilo" odkljukan) in predlog za kreiranje naročila pri dobavitelju za dopolnitev razlike.
-ReplenishmentOrdersDesc=To je seznam vseh odprih naročil pri dobaviteljih vključno s prednaročenimi proizvodi. Vidna so samo odprta naročila s prednaročenimi proizvodi, ki lahko vplivajo na stanje zaloge.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Obnovitve
 NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Zapis prenešen
 ReceivingForSameOrder=Prevzem tega naročila
 StockMovementRecorded=Zapisan premik zaloge
 RuleForStockAvailability=Pravila za zahtevane zaloge
-StockMustBeEnoughForInvoice=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na račun
-StockMustBeEnoughForOrder=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na naročilo
-StockMustBeEnoughForShipment= Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na odpremnico
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Nalepka gibanja
 InventoryCode=Koda gibanja ali zaloge
 IsInPackage=Vsebina paketa
 ShowWarehouse=Prikaži skladišče
-MovementCorrectStock=Popravek količine zaloge za proizvod %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Ko je vključen modul "produktni lot", mora biti tukaj določeno izvorno skladišče. Uporablja se za seznam lotov/serijskih številk, ki so na voljo za proizvod, ki za premik zahteva lot/serijsko številko. Če želite poslati proizvode iz različnih skladišč, morate narediti pošiljko v več korakih.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Koda zaloge/premika
-NoPendingReceptionOnSupplierOrder=Nobeno odprto naročilo pri dobavitelju ne čaka na dobavo
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=Ta lot/serijska številka (<strong>%s</strong>) že obstaja, vendar z drugim datumom vstopa ali izstopa (najden je <strong>%s</strong>, vi pa ste vnesli <strong>%s</strong>).
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index 76afb645b51..1e869ec570b 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Pošlji dobaviteljem
 ListOfSupplierOrders=Seznam naročil dobaviitelja
 MenuOrdersSupplierToBill=Zaračunavanje naročil dobavitelja
 NbDaysToDelivery=Zakasnitev dobave v dnevih
-DescNbDaysToDelivery=Največja zakasnitev je prikazana med seznami naročenih proizvodov
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Uporabi dvojno potrjevanje (drugo potrditev lahko izvrši katerikoli uporabnik z dodeljenim dovoljenjem)
diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang
index 25ec423814a..367e67b722e 100644
--- a/htdocs/langs/sl_SI/trips.lang
+++ b/htdocs/langs/sl_SI/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Seznam stroškov
 NewTrip=New expense report
 CompanyVisited=Obiskano podjetje/ustanova
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 1f41a6282af..922c75c9244 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Odstrani iz skupine
 PasswordChangedAndSentTo=Geslo spremenjeno in poslano <b>%s</b>.
 PasswordChangeRequestSent=Zahtevek za spremembo gesla <b>%s</b> poslan <b>%s</b>.
 MenuUsersAndGroups=Uporabniki & Skupine
+MenuMyUserCard=My user card
 LastGroupsCreated=Zadnjih %s kreiranih skupin
 LastUsersCreated=Zadnjih %s kreiranih uporabnikov
 ShowGroup=Prikaži skupino
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 989d8223eeb..d8cf8ac20d8 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Datoteka nakazila
 SetToStatusSent=Nastavi status na "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=S tem bodo plačila povezana z računi, ki bodo spremenili status v "Plačano"
 StatisticsByLineStatus=Statistika po statusu vrstic
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Plačilo odprtega naročila %s s strani banke
diff --git a/htdocs/langs/sl_SI/workflow.lang b/htdocs/langs/sl_SI/workflow.lang
index 523db79b632..100ff5aa550 100644
--- a/htdocs/langs/sl_SI/workflow.lang
+++ b/htdocs/langs/sl_SI/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Nastavitev modula poteka dela
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Za aktiviran modul ni na voljo poteka dela, ki bi ga lahko spreminjali
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Po podpisu komercialne ponudbe avtomatsko ustvari naročilo kupca
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Po podpisu komercialne ponudbe avtomatsko ustvari račun za kupca
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Po potrditvi pogodbe avtomatsko ustvari račun za kupca
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Po zaključku naročila kupca avtomatsko ustvari račun za kupca
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označi povezano izvorno ponudbo kot "zaračunano", ko naročilo kupca dobi status "plačano"
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označi povezano izvorno naročilo (ali več naročil) kupca kot "zaračunano", ko račun za kupca dobi status "plačano"
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označi povezano izvorno naročilo (ali več naročil) kupca kot "zaračunano", ko naročilo kupca dobi status "potrjeno"
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index e823d364258..13f7eb7c6ec 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 55fde86864b..3e8b2309f8f 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 5580d87b517..42a9a884c76 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +269,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/sq_AL/incoterm.lang b/htdocs/langs/sq_AL/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/sq_AL/incoterm.lang
+++ b/htdocs/langs/sq_AL/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index d20aab00146..aaeeb235544 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spanish (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
 Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/sq_AL/loan.lang b/htdocs/langs/sq_AL/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/sq_AL/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index ce5849c43ba..ff0b6414f1e 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/sq_AL/printing.lang b/htdocs/langs/sq_AL/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/sq_AL/printing.lang
+++ b/htdocs/langs/sq_AL/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index 8970d1eb2df..d10dbb15122 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Prospect list
 DeleteProp=Delete commercial proposal
 ValidateProp=Validate commercial proposal
-AddProp=Add proposal
+AddProp=Create proposal
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
 ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
 LastPropals=Last %s proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,12 +51,10 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
 AssociatedDocuments=Documents associated with the proposal:
 ErrorCantOpenDir=Can't open directory
 DatePropal=Date of proposal
@@ -100,3 +98,4 @@ DocModelJauneDescription=Jaune proposal model
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/sq_AL/workflow.lang b/htdocs/langs/sq_AL/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/sq_AL/workflow.lang
+++ b/htdocs/langs/sq_AL/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index a0f32ed0aa5..eeb08266f77 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Redovisning
 Globalparameters=Globala parametrar
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Längd av tredjepartskonton
 
 ACCOUNTING_SELL_JOURNAL=Sell ​​tidskrift
 ACCOUNTING_PURCHASE_JOURNAL=Bara tidskrift
-ACCOUNTING_BANK_JOURNAL=Bank tidskrift
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverse tidskrift
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social tidskrift
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Redogörelse för överföring
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 789630e2262..37d3e5037a5 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Meny för användare
 LangFile=Fil. Lang
 System=System
 SystemInfo=Systeminformation
-SystemTools=Systemverktyg
 SystemToolsArea=Systemverktyg område
 SystemToolsAreaDesc=Detta område ger förvaltningen funktioner. Använd menyn för att välja den funktion du letar efter.
 Purge=Rensa
@@ -232,8 +231,8 @@ Security=Säkerhet
 Passwords=Lösenord
 DoNotStoreClearPassword=Har ingen butik tydlig lösenord i databasen, men endast lagra krypterade värde (Aktiverad rekommenderas)
 MainDbPasswordFileConfEncrypted=Databas lösenord krypterat i conf.php (Aktiverad rekommenderas)
-InstrucToEncodePass=För att få lösenord kodad på <b>conf.php</b> filen, byt ut raden <br> <b>$ Dolibarr_main_db_pass =&quot;...&quot;</b> <br> av <br> <b>$ Dolibarr_main_db_pass = &quot;krypterade: %s&quot;</b>
-InstrucToClearPass=För att få lösenord avkodas (klar) i <b>conf.php</b> filen, byt ut raden <br> <b>$ Dolibarr_main_db_pass = &quot;krypterad :...&quot;</b> <br> av <br> <b>$ Dolibarr_main_db_pass = &quot;%s&quot;</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Skydd av genererade pdf-filer (Aktiverad rekommenderas inte, raster massa pdf generationen)
 ProtectAndEncryptPdfFilesDesc=Skydd av ett PDF-dokument håller den tillgänglig att läsa och skriva ut alla PDF webbläsare. Det är dock redigering och kopiering inte möjligt längre. Observera att använda den här funktionen gör byggandet av en samlad global pdf inte fungerar (t.ex. obetalda fakturor).
 Feature=Huvudnummer
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Detta är inställd för att behandla:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Steg %s
 FindPackageFromWebSite=Hitta ett paket som ger funktionen du vill ha (till exempel om %s webbplats).
-DownloadPackageFromWebSite=Ladda hem paket %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten.
 NotExistsDirect=Den alternativa rotkatalogen är inte definierad.<br>
 InfDirAlt=Sedab version 3 är det möjligt att definiera en alternativ rotkatalog. Detta medger en gemensam plats att lagra plugin och anpassade mallar.<br>Skapa en katalog i Dolibarrs rot (t.ex. custom).<br>
 InfDirExample=<br> Sedan förklara den i filen conf.php <br> $ Dolibarr_main_url_root_alt = 'http: // myserver / anpassad " <br> $ Dolibarr_main_document_root_alt = '/ sökväg / till / Dolibarr / htdocs / anpassad " <br> * Dessa linjer kommen med "#", för att kommentera bort bara ta bort tecknet.
-YouCanSubmitFile=Välj modul:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr nuvarande version
 CallUpdatePage=Gå till sidan som uppdaterar databasen struktur och data: %s.
 LastStableVersion=Senaste stabila version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parametrar lista kommer från en tabell <br> Syntax:
 ExtrafieldParamHelpchkbxlst=Parameterlista från en tabell<br>Syntax : table_name:label_field:id_field::filter<br>Exempel: c_typent:libelle:id::filter<br><br>filter kan vara ett enkelt test (t.ex. active=1) för att visa enbart aktiva värden <br> Använd  extra.fieldcode=... (där fältkod är extrafält) syntax för att filtrera på extrafält.<br><br>För att få listan beroende en annan:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Katalog som används för att skapa PDF
 WarningUsingFPDF=Varning: Din <b>conf.php</b> innehåller direktiv <b>dolibarr_pdf_force_fpdf = 1.</b> Detta innebär att du använder fpdf bibliotek för att generera PDF-filer. Detta bibliotek är gammalt och inte stöder en mängd funktioner (Unicode, bild öppenhet, kyrilliska, arabiska och asiatiska språk, ...), så att du kan uppleva fel under PDF generation. <br> För att lösa detta och ha ett fullt stöd för PDF-generering, ladda ner <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotek</a> , sedan kommentera eller ta bort linjen <b>$ dolibarr_pdf_force_fpdf = 1,</b> och lägg istället <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Skriv in ett telefonnummer att ringa upp för att visa en länk för att prova ClickToDial url för användare <strong>%s</strong>
 RefreshPhoneLink=Uppdatera länk
@@ -430,8 +429,8 @@ Module20Name=Förslag
 Module20Desc=Hantering av affärsförslag
 Module22Name=Massutskick av e-utskick
 Module22Desc=Massa E-posta ledning
-Module23Name= Energi
-Module23Desc= Övervakning av förbrukningen av energi
+Module23Name=Energi
+Module23Desc=Övervakning av förbrukningen av energi
 Module25Name=Kundorder
 Module25Desc=Kundorder ledning
 Module30Name=Fakturor
@@ -492,8 +491,8 @@ Module400Name=Projekt / Möjligheter / Leads
 Module400Desc=Förvaltning av projekt, möjligheter eller leads. Du kan sedan tilldela varje element (faktura, beställning, förslag, ingripande, ...) till ett projekt och få ett övergripande vy från projekt vyn.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
-Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
-Module500Desc=Förvaltning av särskilda kostnader som skatter, sociala avgifter, utdelningar och löner
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Löner
 Module510Desc=Förvaltning av de anställdas löner och betalningar
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Anmälningar
 Module600Desc=Skicka e-postmeddelanden på vissa Dolibarr affärshändelser till kontakter tredjeparts (inställnings definieras på varje tredjeparts)
 Module700Name=Donationer
 Module700Desc=Donation ledning
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Åtgärder / uppgifter och dagordning förvaltning
 Module2500Name=Electronic Content Management
 Module2500Desc=Spara och dela dokument
-Module2600Name=WebServices
-Module2600Desc=Aktivera Dolibarr webbtjänster server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (klient)
 Module2650Desc=Aktivera Dolibarr webbtjänster klient (Kan användas för att driva data / ansökningar till externa servrar. Leverantörs order stöds bara för stunden)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Skapa / modifiera produkter
 Permission34=Ta bort produkter
 Permission36=Se / hantera dold produkter
 Permission38=EXPORTVARA
-Permission41=Läs projekt (gemensamma projekt och projekt som jag är kontaktperson för)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Skapa / modifiera projekt (gemensamma projekt och projekt som jag är kontaktperson för)
 Permission44=Ta bort projekt (gemensamma projekt och projekt som jag är kontaktperson för)
 Permission61=Läs insatser
@@ -599,10 +600,10 @@ Permission86=Skicka kunder order
 Permission87=Stäng kunder order
 Permission88=Avbryt kunder order
 Permission89=Ta bort kunder order
-Permission91=Läs sociala avgifter och moms
-Permission92=Skapa / ändra sociala avgifter och moms
-Permission93=Ta bort sociala avgifter och moms
-Permission94=Export sociala avgifter
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Läs rapporter
 Permission101=Läs sendings
 Permission102=Skapa / ändra sendings
@@ -620,9 +621,9 @@ Permission121=Läs tredje part kopplad till användaren
 Permission122=Skapa / ändra tredje part kopplad till användaren
 Permission125=Radera tredje part kopplad till användaren
 Permission126=Export tredje part
-Permission141=Läs arbetsuppgifter
-Permission142=Skapa / ändra uppgifter
-Permission144=Ta bort uppgifter
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Läs leverantörer
 Permission147=Läs statistik
 Permission151=Läs stående order
@@ -800,7 +801,7 @@ DictionaryCountry=Länder
 DictionaryCurrency=Valutor
 DictionaryCivility=Civility titel
 DictionaryActions=Typ av dagordningen händelser
-DictionarySocialContributions=Sociala avgifter typer
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Moms Priser och Sales Tax Rates
 DictionaryRevenueStamp=Mängd skattestämpel
 DictionaryPaymentConditions=Betalningsvillkor
@@ -817,6 +818,9 @@ DictionarySource=Ursprung av affärsförslag / beställning
 DictionaryAccountancyplan=Kontoplan
 DictionaryAccountancysystem=Modeller för kontoplan
 DictionaryEMailTemplates=E-postmeddelanden mallar
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup sparas
 BackToModuleList=Tillbaka till moduler lista
 BackToDictionaryList=Tillbaka till ordlistan
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Staden
 CompanyCountry=Land
 CompanyCurrency=Viktigaste valuta
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Visa inte
 DoNotSuggestPaymentMode=Pekar inte
 NoActiveBankAccountDefined=Inga aktiva bankkonto definierade
 OwnerOfBankAccount=Ägare till %s bankkonto
 BankModuleNotActive=Bankkonton modulen inte aktiverad
-ShowBugTrackLink=Visa länken &quot;Rapportera en bugg&quot;
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Visa &quot;arbetsbänk&quot; på hemsidan
 Alerts=Varningar
 Delays=Förseningar
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimaler för priserna per enhet
 MAIN_MAX_DECIMALS_TOT=Max decimaler för total priser
 MAIN_MAX_DECIMALS_SHOWN=Max decimaler för priser som visas på skärmen (Lägg <b>...</b> efter detta nummer om du vill se <b>...</b> när numret är avkortas vid visas på skärmen)
 MAIN_DISABLE_PDF_COMPRESSION=Använd PDF-komprimering för genererade PDF-filer.
-MAIN_ROUNDING_RULE_TOT= Storlek på avrundning område (för sällsynta länder där avrundning görs på något annat än bas 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net priset per enhet för en produkt
 TotalPriceAfterRounding=Total kostnad (netto / behållare / inkl moms) efter avrundning
 ParameterActiveForNextInputOnly=Parameter effektiv för nästa inmatning
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Totalt antal aktiverade <b>funktionsmoduler:% s</b
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
 ClassNotFoundIntoPathWarning=Klass %s inte funnen i PHP-sökvägen
 YesInSummer=Ja, under sommaren
-OnlyFollowingModulesAreOpenedToExternalUsers=Obs, endast följande moduler öppnas för externa användare (oavsett är tillstånd från sådana användare):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session lagring krypteras av Suhosin
 ConditionIsCurrently=Condition är för närvarande% s
 YouUseBestDriver=Du använder drivrutinen %s som är bäst drivrutin tillgänglig för tillfället.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max antal produkter i combos välj listor (0 = ingen
 ConfirmDeleteProductLineAbility=Bekräftelse vid borttagning produktserier i former
 ModifyProductDescAbility=Anpassning av produktbeskrivning i former
 ViewProductDescInFormAbility=Visualisering av produktbeskrivning i formulären (i övrigt enligt popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualisering av produktbeskrivningar på tredjeparts språket
 UseSearchToSelectProductTooltip=Även om du har ett stort antal produkter (> 100 000), kan du öka hastigheten genom att sätta konstant PRODUCT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 UseSearchToSelectProduct=Använd ett sökformuläret för att välja en produkt (i stället för en listruta).
 UseEcoTaxeAbility=Stöd Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Standard streckkod som ska användas för produkter
 SetDefaultBarcodeTypeThirdParties=Standard streckkod som ska användas för tredje part
+UseUnits=Support units
 ProductCodeChecker= Modul för produkt kodgenerering och kontroll (produkt eller tjänst)
 ProductOtherConf= Produkt / tjänst konfiguration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode av typ UPC
 BarcodeDescISBN=Barcode av typ ISBN
 BarcodeDescC39=Streckkod av typen C39
 BarcodeDescC128=Barcode av typ C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Intern motor
 BarCodeNumberManager=Manager för att automatiskt definiera streckkodsnummer
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Är du säker på att du vill ta bort posten <b>%s</b> menyn?
 DeleteLine=Radera rad
 ConfirmDeleteLine=Är du säker på att du vill ta bort denna linje?
 ##### Tax #####
-TaxSetup=Skatter, sociala avgifter och utdelningar modul setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Mervärdesskatt
 OptionVATDefault=Kontantmetoden
 OptionVATDebitOption=Periodiseringsprincipen
@@ -1552,6 +1561,15 @@ WebServicesSetup=WebServices modul setup
 WebServicesDesc=Genom att aktivera denna modul Dolibarr bli en webbtjänst server för att tillhandahålla diverse webbtjänster.
 WSDLCanBeDownloadedHere=WSDL-deskriptor fil som serviceses kan ladda ner här
 EndPointIs=SOAP klienter måste skicka in sina ansökningar till Dolibarr endpoint finns på URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank modul setup
 FreeLegalTextOnChequeReceipts=Fri text om kontrollera kvitton
@@ -1581,6 +1599,7 @@ ProjectsSetup=Projekt modul setup
 ProjectsModelModule=S rapport dokument modell
 TasksNumberingModules=Uppgifter nummermodulen
 TaskModelModule=Uppgifter rapporter dokumentmodell
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatisk träd mapp och dokument
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Öppet räkenskapsår
 CloseFiscalYear=Close räkenskapsår
 DeleteFiscalYear=Radera räkenskapsår
 ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhetsår?
-Opened=Öppnad
+Opened=Open
 Closed=Stängt
 AlwaysEditable=Kan alltid redigeras
 MAIN_APPLICATION_TITLE=Tvinga synliga namn ansökan (varning: ställa ditt eget namn här kan bryta funktionen Autofyll inloggning när du använder DoliDroid mobil applikation)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index 366c6dfb486..45026016bd8 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Ordningens %s godkänd
 OrderRefusedInDolibarr=Order %s vägrade
 OrderBackToDraftInDolibarr=Beställ %s gå tillbaka till förslaget status
-OrderCanceledInDolibarr=Beställ %s avbryts
 ProposalSentByEMail=Kommersiella förslag %s via e-post
 OrderSentByEMail=Kundorderprojekt %s via e-post
 InvoiceSentByEMail=Kundfaktura %s via e-post
@@ -96,3 +95,5 @@ AddEvent=Skapa event
 MyAvailability=Min tillgänglighet
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 647f145563c..ca986e499f9 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Avstämning
 ConciliationForAccount=Förena detta konto
 IncludeClosedAccount=Inkludera stängda konton
-OnlyOpenedAccount=Endast öppnat konton
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Hänsyn till kreditinstitut
 AccountToDebit=Konto att debitera
 DisableConciliation=Inaktivera försoning för den här kontot
 ConciliationDisabled=Avstämning inaktiverad
-StatusAccountOpened=Öppnade
+StatusAccountOpened=Open
 StatusAccountClosed=Stängt
 AccountIdShort=Antal
 EditBankRecord=Ändra post
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Kundbetalning
 CustomerInvoicePaymentBack=Kund betalning tillbaka
 SupplierInvoicePayment=Leverantör betalning
 WithdrawalPayment=Tillbakadragande betalning
-SocialContributionPayment=Sociala avgifter betalas
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Finansiell balans tidskrift
 BankTransfer=Banköverföring
 BankTransfers=Banköverföringar
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 4ffc34b5e39..966d3f704ad 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Antal av fakturor
 NumberOfBillsByMonth=Antal av fakturor per månad
 AmountOfBills=Belopp för fakturor
 AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
-ShowSocialContribution=Visa sociala avgifter
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Visa faktura
 ShowInvoice=Visa faktura
 ShowInvoiceReplace=Visa ersätter faktura
@@ -270,7 +270,7 @@ BillAddress=Faktureringsadress
 HelpEscompte=Denna rabatt är en rabatt som kund eftersom betalningen gjordes före sikt.
 HelpAbandonBadCustomer=Detta belopp har övergivits (kund sägs vara en dålig kund) och anses som en exceptionell lös.
 HelpAbandonOther=Detta belopp har övergivits eftersom det var ett misstag (fel kund eller faktura ersättas av en annan till exempel)
-IdSocialContribution=Sociala avgifter id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Betalning id
 InvoiceId=Faktura id
 InvoiceRef=Faktura ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Senast relaterad faktura
 WarningBillExist=Varning, en eller flera fakturor finns redan
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Omedelbar
@@ -429,5 +430,5 @@ NotLastInCycle=Denna faktura är inte den sista i en serie och får inte ändras
 DisabledBecauseNotLastInCycle=Påföljande avstämning finns redan.
 DisabledBecauseFinal=Denna avstämning är slutlig.
 CantBeLessThanMinPercent=Framsteget kan inte vara mindre än dess värde vid förra avstämningen.
-NoSituations=Inga öppnade löpande räkningar
+NoSituations=No open situations
 InvoiceSituationLast=Slutlig sammanställningsfaktura.
diff --git a/htdocs/langs/sv_SE/bookmarks.lang b/htdocs/langs/sv_SE/bookmarks.lang
index 7c0fb73a457..de877eecf6e 100644
--- a/htdocs/langs/sv_SE/bookmarks.lang
+++ b/htdocs/langs/sv_SE/bookmarks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Lägg till sidan som bokmärken
-Bookmark=Bokmärk
+AddThisPageToBookmarks=Lägg till sidan som bokmärke
+Bookmark=Bokmärke
 Bookmarks=Bokmärken
 NewBookmark=Nytt bokmärke
 ShowBookmark=Visa bokmärke
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index ba87abe3aaf..dc02f0cc8d5 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Senaste kontrakt
 BoxLastContacts=Senaste kontakter / adresser
 BoxLastMembers=Sista medlemmar
 BoxFicheInter=Sista interventioner
-BoxCurrentAccounts=Öppnade balans konton
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Omsättningen
 BoxTotalUnpaidCustomerBills=Totalt obetalda kundens fakturor
 BoxTotalUnpaidSuppliersBills=Totalt obetalda leverantörs fakturor
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Senaste %s medlemmar
 BoxTitleLastFicheInter=Senaste %s modifierade ingripande
 BoxTitleOldestUnpaidCustomerBills=Äldsta %s obetalda kundfakturor
 BoxTitleOldestUnpaidSupplierBills=Äldsta %s obetalda leverantörsfakturor
-BoxTitleCurrentAccounts=Öppnade kontots saldon
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Omsättningen
 BoxTitleTotalUnpaidCustomerBills=Obetalda kundfakturor
 BoxTitleTotalUnpaidSuppliersBills=Obetalda leverantörsfakturor
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 7963867f0be..8d54ad9b4e0 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> har lagts till.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Ingen
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denna kategori finns redan med denna ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Innehåll inte synlig för alla
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / kommande utvecklingen. kategorier
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 1e640e1b80e..b30c9002626 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Tredje part kontakt/adress
 StatusContactValidated=Status för kontakt/adress
 Company=Företag
 CompanyName=Företagets namn
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Företag
 CountryIsInEEC=Landet är inom Europeiska ekonomiska gemenskapen
 ThirdPartyName=Tredje parts namn
@@ -410,5 +411,10 @@ OutstandingBillReached=Upnått tak för obetalda fakturor
 MonkeyNumRefModelDesc=Ger nummer med format %syymm-nnnn för kundnummer och %syymm-nnnn för leverantörnummer där YY är år, mm månad och nnnn är en sekvens utan avbrott och utan återgång till 0.
 LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändras när som helst.
 ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...)
-SearchThirdparty=Sök tredjeparts
+SearchThirdparty=Search third party
 SearchContact=Sök kontakt
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index f412350b869..05ed39af0f9 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Momsintäkterna
 ToPay=Att betala
 ToGet=För att komma tillbaka
 SpecialExpensesArea=Område för alla special betalningar
-TaxAndDividendsArea=Skatt, sociala avgifter och utdelningar område
-SocialContribution=Sociala avgifter
-SocialContributions=Sociala avgifter
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Särskilda kostnader
 MenuTaxAndDividends=Skatter och utdelning
 MenuSalaries=Löner
-MenuSocialContributions=Sociala avgifter
-MenuNewSocialContribution=Nya bidrag
-NewSocialContribution=Nya sociala bidrag
-ContributionsToPay=Bidrag till lön
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Bokföring / Treasury område
 AccountancySetup=Bokföring setup
 NewPayment=Ny betalning
 Payments=Betalningar
 PaymentCustomerInvoice=Kundfaktura betalning
 PaymentSupplierInvoice=Leverantörsfaktura betalning
-PaymentSocialContribution=Sociala avgifter betalas
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Moms betalning
 PaymentSalary=Lön betalning
 ListPayment=Lista över betalningar
@@ -91,7 +91,7 @@ LT1PaymentES=RE Betalning
 LT1PaymentsES=RE Betalningar
 VATPayment=Moms Betalning
 VATPayments=Momsbetalningar
-SocialContributionsPayments=Sociala avgifter betalningar
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Visa mervärdesskatteskäl
 TotalToPay=Totalt att betala
 TotalVATReceived=Total moms fått
@@ -116,11 +116,11 @@ NewCheckDepositOn=Skapa kvitto för insättning på konto: %s
 NoWaitingChecks=Inga kontroller väntar på insättning.
 DateChequeReceived=Kontrollera datum mottagning ingång
 NbOfCheques=Nb av kontroller
-PaySocialContribution=Betala en social avgift
-ConfirmPaySocialContribution=Är du säker på att du vill klassificera denna sociala bidrag som betalas ut?
-DeleteSocialContribution=Ta bort en social avgift
-ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna sociala avgifter?
-ExportDataset_tax_1=Sociala avgifter och betalningar
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
 CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
 CalcModeDebt=<b>Läges% sClaims-Skulder% s</b> sa <b>Åtagande redovisning.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=enligt leverantör, väljer lämplig metod att till
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omsättning rapport per produkt, när du använder en <b>kontantredovisningsläge</b> inte är relevant. Denna rapport är endast tillgänglig när du använder <b>engagemang bokföring</b> läge (se inställning av bokföring modul).
 CalculationMode=Beräkning läge
 AccountancyJournal=Bokförings kod tidskrift
-ACCOUNTING_VAT_ACCOUNT=Standard bokföring kod för uppbörden av moms
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Standard bokföring kod för att betala moms
 ACCOUNTING_ACCOUNT_CUSTOMER=Bokföring kod som standard för kund thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Bokföring kod som standard för leverantörs thirdparties
-CloneTax=Klona en social avgift
-ConfirmCloneTax=Bekräfta klon av en social bidrag
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Klona det för nästa månad
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 07ae8ba906a..4d03ee13a3c 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -4,10 +4,10 @@ About = Om
 CronAbout = Om Cron
 CronAboutPage = Cron om sidan
 # Right
-Permission23101 = Läs schedulerad uppgift
-Permission23102 = Skapa / uppdatera Schemalagd aktivitet
-Permission23103 = Ta bort schemalagd aktivitet
-Permission23104 = Kör schemalagd aktivitet
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Planerad jobbhantering installation
 URLToLaunchCronJobs=URL för att kontrollera och starta cron-jobb om det behövs
@@ -26,11 +26,11 @@ CronLastOutput=Sista loppet utgång
 CronLastResult=Senaste resultat code
 CronListOfCronJobs=Lista över schemalagda jobb
 CronCommand=Kommando
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Jobb
@@ -39,8 +39,8 @@ CronDtStart=Startdatum
 CronDtEnd=Slutdatum
 CronDtNextLaunch=Nästa exekvering
 CronDtLastLaunch=Senaste exekvering
-CronFrequency=Frekvens
-CronClass=Klass
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Metod
 CronModule=Modul
 CronAction=Åtgärd
@@ -55,9 +55,9 @@ CronEach=Varje
 JobFinished=Job lanserad och klar
 #Page card
 CronAdd= Lägg till jobb
-CronHourStart= Start Hour och datum för uppgiften
-CronEvery= Och köra uppgiften varje
-CronObject= Instans / Object för att skapa
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instans / Object för att skapa
 CronArgs=Parametrar
 CronSaveSucess=Spara framgångsrikt
 CronNote=Kommentar
@@ -76,13 +76,14 @@ CronMethodHelp=Objektet metod för att starta. <BR> För exemple att hämta meto
 CronArgsHelp=Metoden argument. <BR> Till exemple att hämta förfarande för Dolibarr Produkt objekt /htdocs/product/class/product.class.php kan värdet av paramters vara <i>0, ProductRef</i>
 CronCommandHelp=Systemet kommandoraden som ska köras.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task typ
+CronType=Job type
 CronType_method=Call metod för en Dolibarr klass
 CronType_command=Skalkommando
 CronMenu=Cron
 CronCannotLoadClass=Det går inte att läsa in klassen% s eller objekt% s
 UseMenuModuleToolsToAddCronJobs=Gå in på menyn "Home - Moduler verktyg - Job list" för att se och redigera schemalagda jobb.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 19b3f75848e..51a40594bc3 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Sök på objektet
 ECMSectionOfDocuments=Register över handlingar
 ECMTypeManual=Manuell
 ECMTypeAuto=Automatisk
-ECMDocsBySocialContributions=Handlingar som är kopplade till sociala avgifter
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Dokument med koppling till tredje part
 ECMDocsByProposals=Dokument med koppling till förslagen
 ECMDocsByOrders=Dokument med koppling till kunderna order
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 1cb706ce1da..3437a1724f5 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation för denna datamängd
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature inaktiveras när display inställning är optimerad för blinda personer eller textbaserade webbläsare.
 WarningPaymentDateLowerThanInvoiceDate=Betalningsdag (%s) är tidigare än fakturadatum (%s) för faktura %s.
 WarningTooManyDataPleaseUseMoreFilters=För många uppgifter. Använd flera filter
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index 2c04b219b95..01586feb012 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Löv
 CPTitreMenu=Löv
 MenuReportMonth=Månatlig rapport
-MenuAddCP=Gör en förfrågan ledighet
+MenuAddCP=New leave request
 NotActiveModCP=Du måste aktivera modulen Löv att se denna sida.
 NotConfigModCP=Du måste konfigurera modulen Lämnar för att se den här sidan. För att göra detta, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">klicka här</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
 NoCPforUser=Du har inte någon tillgänglig dag.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=Användare
 ErrorAddEventToUserCP=Ett fel uppstod när den exceptionella ledighet.
 AddEventToUserOkCP=Tillägget av den exceptionella ledigheten har slutförts.
-MenuLogCP=Visa loggar för ledighet förfrågningar
+MenuLogCP=View change logs
 LogCP=Log av uppdateringar av tillgängliga semesterdagar
 ActionByCP=Framförd av
 UserUpdateCP=För användaren
@@ -93,6 +93,7 @@ ValueOptionCP=Värde
 GroupToValidateCP=Grupp med möjlighet att godkänna ledighet förfrågningar
 ConfirmConfigCP=Bekräfta konfigurationen
 LastUpdateCP=Senast automatisk uppdatering av löv fördelning
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Uppdaterats.
 ErrorUpdateConfCP=Ett fel uppstod under uppdateringen, vänligen försök igen.
 AddCPforUsers=Vänligen lägg till balansen i bladen fördelning av användare genom <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">att klicka här</a> .
@@ -127,6 +128,7 @@ ErrorMailNotSend=Ett fel uppstod när du skickar e-post:
 NoCPforMonth=Ingen lämnar denna månad.
 nbJours=Antal dagar
 TitleAdminCP=Konfiguration av Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hallå
 HolidaysToValidate=Validera ledighets förfrågningar
@@ -139,10 +141,11 @@ HolidaysRefused=Begäran nekades
 HolidaysRefusedBody=Din ledighet begäran om %s till %s har nekats av följande skäl:
 HolidaysCanceled=Annulleras leaved begäran
 HolidaysCanceledBody=Din ledighet begäran om %s till %s har avbrutits.
-Permission20000=Läs du äger ledighet förfrågningar
-Permission20001=Skapa / ändra dina ledighet förfrågningar
-Permission20002=Skapa / ändra ledighetsansökningar för alla
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Radera ledighets förfrågningar
-Permission20004=Setup användare tillgängliga semesterdagar
-Permission20005=Omdöme logg över modifierade ledighets förfrågningar
-Permission20006=Läs lämnar månadsrapport
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/sv_SE/incoterm.lang b/htdocs/langs/sv_SE/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/sv_SE/incoterm.lang
+++ b/htdocs/langs/sv_SE/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index c5380d1f831..3064b727156 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Databasserver - superanvändare tillgång
 CheckToCreateDatabase=Kryssrutan om databasen inte existerar och måste skapas. <br> I så fall måste du fylla i login / lösenord för superanvändare konto längst ner på denna sida.
 CheckToCreateUser=Kryssrutan om databas ägaren inte existerar och måste skapas. <br> I så fall måste du välja sin inloggning och lösenord och fylla i användarnamn / lösenord för superanvändaren konto längst ner på denna sida. Om denna ruta är markerad, ägare databas och lösenord måste finns.
 Experimental=(Experimentell)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Logga in på användaren möjlighet att skapa nya databaser eller nya användare, värdelösa om din databas och databasen inloggning redan finns (som när du är värd ett webbhotell leverantör).
 KeepEmptyIfNoPassword=Lämna tomt om användaren har inget lösenord (undvik detta)
 SaveConfigurationFile=Spara värden
diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 031b70fc398..30fa433dd2d 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabiska
 Language_ar_SA=Arabiskt
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgariska
 Language_bs_BA=Bosniska
 Language_ca_ES=Katalanska
@@ -21,9 +22,10 @@ Language_en_SA=Engelska (Saudiarabien)
 Language_en_US=Engelska (USA)
 Language_en_ZA=Engelska (Sydafrika)
 Language_es_ES=Spanska
-Language_es_DO=Spanska (Dominikanska republiken)
 Language_es_AR=Spanska (Argentina)
 Language_es_CL=Spanska (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanska (Dominikanska republiken)
 Language_es_HN=Spanska (Honduras)
 Language_es_MX=Spanska (Mexiko)
 Language_es_PY=Spanska (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesiska
 Language_is_IS=Isländska
 Language_it_IT=Italienska
 Language_ja_JP=Japanska
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Koreanska
+Language_lo_LA=Lao
 Language_lt_LT=Litauiska
 Language_lv_LV=Lettländska
 Language_mk_MK=Makedonska
@@ -64,6 +69,7 @@ Language_sv_SV=Svenska
 Language_sv_SE=Svenskt
 Language_sq_AL=Albanska
 Language_sk_SK=Slovakiska
+Language_sw_SW=Kiswahili
 Language_th_TH=Thailändska
 Language_uk_UA=Ukrainska
 Language_uz_UZ=Uzbekiska
diff --git a/htdocs/langs/sv_SE/loan.lang b/htdocs/langs/sv_SE/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/sv_SE/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 2dc5eb785cd..27232cc5ae5 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Läs Kvitto
 YourMailUnsubcribeOK=<b>E-post %s</b> är korrekt avbeställt från sändlistan
 MailtoEMail=Hyper länk till e-post
 ActivateCheckRead=Låt använd länken "Unsubcribe"
-ActivateCheckReadKey=Key bruk för att kryptera URL användning för "Läs Kvitto" och "Unsubcribe" -funktionen
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail skickas till% s mottagare.
 XTargetsAdded=<b>% s</b> mottagare läggs in i målet listan
 EachInvoiceWillBeAttachedToEmail=Ett dokument med standardfakturadokumentmall kommer att skapas och bifogas varje e-postmeddelande.
@@ -128,6 +128,7 @@ TagCheckMail=Spår post öppning
 TagUnsubscribe=Avanmälan länk
 TagSignature=Signatur sändande användarens
 TagMailtoEmail=Mottagarens EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Anmälningar
 NoNotificationsWillBeSent=Inga e-postmeddelanden planeras för detta evenemang och företag
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 4e333c261f0..9fb906da69b 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Fel hittades. Vi återställer förändrin
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> är inte definierad i Dolibarr konfigurationsfil <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Det gick inte att hitta användare <b>%s</b> i Dolibarr databas.
 ErrorNoVATRateDefinedForSellerCountry=Fel, ingen moms har definierats för landet '%s'.
-ErrorNoSocialContributionForSellerCountry=Fel, inga sociala avgifter har definierats för land '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Fel, kunde inte spara filen.
 SetDate=Ställ in datum
 SelectDate=Välj datum
@@ -301,8 +301,8 @@ UnitPriceHT=Pris per enhet (netto)
 UnitPriceTTC=Pris per enhet
 PriceU=Styckpris
 PriceUHT=St.pris(net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=St.pris
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Belopp
 AmountInvoice=Fakturabelopp
 AmountPayment=Betalningsbelopp
@@ -339,6 +339,7 @@ IncludedVAT=Ingår moms
 HT=Netto efter skatt
 TTC=Inkl. moms
 VAT=Moms
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Mervärdesskattesats
@@ -413,6 +414,8 @@ Qty=Antal
 ChangedBy=Ändrad av
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Uppdatera beräkning
 ResultOk=Framgång
 ResultKo=Misslyckande
@@ -421,7 +424,7 @@ Reportings=Rapportering
 Draft=Utkast
 Drafts=Utkast
 Validated=Validerad
-Opened=Öppnad
+Opened=Open
 New=Ny
 Discount=Rabatt
 Unknown=Okänd
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Länkad till särskild användarekontakt
 DeleteAFile=Radera fil
 ConfirmDeleteAFile=Är du säker på att du vill radera fil
 NoResults=Inga resultat
+SystemTools=System tools
 ModulesSystemTools=Modulverktyg
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 3fb67836367..c1a43f9f227 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -199,7 +199,8 @@ Entreprises=Företag
 DOLIBARRFOUNDATION_PAYMENT_FORM=För att göra din prenumeration betalning via en banköverföring, se sidan <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Att betala med kreditkort eller Paypal, klicka på knappen längst ner på denna sida. <br>
 ByProperties=På egenskaper
 MembersStatisticsByProperties=Medlemsstatistik på egenskaper
-MembersByNature=Medlemmar på sort
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Moms-sats för prenumeration
 NoVatOnSubscription=Ingen moms för prenumeration
 MEMBER_PAYONLINE_SENDEMAIL=E-post för att varna när Dolibarr mottager en bekräftelse för en validerad betalning för en prenumeration
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 79132298553..2b90c93f03e 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Leverantör för
 SuppliersOrders=Leverantörens order
 SuppliersOrdersRunning=Nuvarande leverantörens order
 CustomerOrder=Kundorder
-CustomersOrders=Kundorder
-CustomersOrdersRunning=Nuvarande kundens order
-CustomersOrdersAndOrdersLines=Kundorder och ordning: s linjer
-OrdersToValid=Kundorder att validera
-OrdersToBill=Levererade kundorder
-OrdersInProcess=Kundorder under behandling
-OrdersToProcess=Kundorder att behandla
-SuppliersOrdersToProcess=Leverantörens order att behandla
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Annullerad
 StatusOrderDraftShort=Förslag
 StatusOrderValidatedShort=Validerad
@@ -75,8 +75,9 @@ AddToMyOrders=Lägg till i mitt order
 AddToOtherOrders=Lägg till övriga beställningar
 AddToDraftOrders=Lägg till förlags order
 ShowOrder=Visa att
-NoOpenedOrders=Ingen öppnade order
-NoOtherOpenedOrders=Ingen annan öppnas order
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Inga förslag till beslut
 OtherOrders=Övriga beställningar
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index d314a81ea92..c94a0b49856 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validerade
 Notify_FICHINTER_SENTBYMAIL=Ingripande skickas per post
 Notify_BILL_VALIDATE=Kundfaktura validerade
 Notify_BILL_UNVALIDATE=Kundfakturan Fraktpris saknas
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverantör för godkänd
 Notify_ORDER_SUPPLIER_REFUSE=Leverantör för vägrat
 Notify_ORDER_VALIDATE=Kundorder validerade
@@ -203,6 +204,7 @@ ClickHereToGoTo=Klicka här för att gå till %s
 YouMustClickToChange=Du måste dock först klicka på följande länk för att bekräfta detta lösenord förändring
 ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta mail. Dina referenser förvaras säkert.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Lägg till post i kalendern %s
diff --git a/htdocs/langs/sv_SE/printing.lang b/htdocs/langs/sv_SE/printing.lang
index 22d1d42401b..bde4729a3cc 100644
--- a/htdocs/langs/sv_SE/printing.lang
+++ b/htdocs/langs/sv_SE/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direkt utskrift
-Module112000Desc=Aktivera System för Direkt Utskrift
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Inställningar av System för Direkt Utskrift
 PrintingDesc=Denna modul lägger till en Utskrift-knapp i diverse moduler för att skicka dokument direkt till en skrivare (utan att öppna dokumentet i någon tillämpning).
 ModuleDriverSetup=Inställningar för Modul drivrutiner
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Inlogg
 PRINTIPP_PASSWORD=Lösenord
 NoPrinterFound=Ingen skrivare funnen (kontrollera CUPS-inställningar)
-FileWasSentToPrinter=Fil %s skickades till utskrift
 NoDefaultPrinterDefined=Ingen standarskrivare är definerad
 DefaultPrinter=Standard skrivare
 Printer=Skrivare
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index bb7a9acdc8e..9c8e70f7a5b 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Antal: %d
 AddDispatchBatchLine=Lägg en linje för Hållbarhet avsändning
 BatchDefaultNumber=Odefinierat
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=Denna artikel använder inte batch- / serienummer
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 401789f8a22..157db6caa44 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Produkt eller tjänst
 ProductsAndServices=Produkter och tjänster
 ProductsOrServices=Produkter eller tjänster
 ProductsAndServicesOnSell=Produkter och tjänster till försäljning eller inköp
-ProductsAndServicesNotOnSell=Utgångna produkter och tjänster m.a.p. försäljning
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Produkter och tjänster statistik
 ProductsStatistics=Produkter statistik
-ProductsOnSell=Produkter till försäljning eller inköp
-ProductsNotOnSell=Utgångna produkter m.a.p. försäljning och inköp
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Produkter till försäljning och inköp
 ServicesOnSell=Tjänster till försäljning eller inköp
-ServicesNotOnSell=Utgångna tjänster m.a.p. försäljning
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Tjänster till försäljning och inköp
 InternalRef=Intern hänvisning
 LastRecorded=Senaste produkter / tjänster att sälja in
@@ -44,7 +44,7 @@ CardProduct1=Tjänstekort
 CardContract=Kontrakt kort
 Warehouse=Warehouse
 Warehouses=Lager
-WarehouseOpened=Warehouse öppnade
+WarehouseOpened=Warehouse open
 WarehouseClosed=Lager stängt
 Stock=Lager
 Stocks=Lager
@@ -66,26 +66,26 @@ ProductStatusNotOnBuyShort=Föråldrade
 UpdatePrice=Uppdatera pris
 AppliedPricesFrom=Tillämpad priser från
 SellingPrice=Försäljningspris
-SellingPriceHT=Försäljningspris (exklusive skatt)
+SellingPriceHT=Försäljningspris (exkl skatt)
 SellingPriceTTC=Försäljningspris (inkl. moms)
 PublicPrice=Offentliga pris
 CurrentPrice=Nuvarande pris
 NewPrice=Nytt pris
-MinPrice=Halvnot. försäljningspris
-MinPriceHT=Minim. försäljningspris (netto efter skatt)
-MinPriceTTC=Minim. försäljningspris (inkl. moms)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
 ContractStatus=Kontrakt status
 ContractStatusClosed=Stängt
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=löpt ut
-ContractStatusOnHold=Inte kör
-ContractStatusToRun=För att få igång
-ContractNotRunning=Detta kontrakt är inte igång
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=En produkt med hänvisning %s finns redan.
 ErrorProductBadRefOrLabel=Felaktigt värde för referens eller etikett.
 ErrorProductClone=Ett problem uppstod vid kloning av produkten eller tjänsten.
-ErrorPriceCantBeLowerThanMinPrice=Fel Pris Kan inte vara lägre än Lägsta pris.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Leverantörer
 SupplierRef=Leverantör ref.
 ShowProduct=Visa produkt
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Om produkten är en tjänst med begränsad varaktighet:
 MultiPricesAbility=Flera prisnivåer per produkt eller tjänst
 MultiPricesNumPrices=Antal pris
 MultiPriceLevelsName=Pris kategorier
-AssociatedProductsAbility=Aktivera virtuellt paket funktionen
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Paket produkt
-AssociatedProductsNumber=Antal produkter komponera denna virtuellt paket produkt
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Antal förälder förpackningsartikel
-IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte ett virtuellt paket produkt
-IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte används av någon virtuellt paket produkt
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Översättning
 KeywordFilter=Nyckelord filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Sök produkt att lägga till
 AddDel=Lägg till / Ta bort
 Quantity=Kvantitet
 NoMatchFound=Ingen matchning hittades
-ProductAssociationList=Lista över relaterade produkter / tjänster: namn på produkten / tjänsten (kvantitet påverkas)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=Lista över paket produkter / tjänster med denna produkt som en komponent
 ErrorAssociationIsFatherOfThis=Ett av valda produkten är förälder med nuvarande produkt
 DeleteProduct=Ta bort en produkt / tjänst
@@ -179,16 +179,41 @@ CloneProduct=Klon produkt eller tjänst
 ConfirmCloneProduct=Är du säker på att du vill klona produkt eller tjänst <b>%s?</b>
 CloneContentProduct=Klona alla viktiga informationer av produkt / tjänst
 ClonePricesProduct=Klona viktigaste informationer och priser
-CloneCompositionProduct=Klon förpackad produkt / tjänster
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Denna produkt används
 NewRefForClone=Ref. av ny produkt / tjänst
-CustomerPrices=Kunder priser
-SuppliersPrices=Leverantörer priser
-SuppliersPricesOfProductsOrServices=Leverantörer priser (av produkter eller tjänster)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Tullkodex
 CountryOrigin=Ursprungsland
 HiddenIntoCombo=Dold i vissa utvalda listor
 Nature=Naturen
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Produktmall, ref.
 ServiceCodeModel=Tjänstmall, ref.
 AddThisProductCard=Skapa produktkort
@@ -214,7 +239,7 @@ CostPmpHT=Totalt netto VWAP
 ProductUsedForBuild=Automatiskt förbrukad för tillverkning
 ProductBuilded=Tillverkning klar
 ProductsMultiPrice=Produkt multi-priser
-ProductsOrServiceMultiPrice=Kunder priser (av produkter eller tjänster, multi-priser)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Produkter omsättning kvartalsvis VWAP
 ServiceSellByQuarterHT=Tjänster omsättning kvartalsvis VWAP
 Quarter1=1:a kvartalet
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Definiera streckkodsvärde för alla poster (detta kom
 PriceByCustomer=Olika pris m.a.p. kund
 PriceCatalogue=Unikt pris för produkt eller tjänst
 PricingRule=Regler för kundpriser
-AddCustomerPrice=Lägg till pris per kund
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
 PriceByCustomerLog=Pris per kundlogg
-MinimumPriceLimit=Minimipris kan inte vara lägre än %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
 PriceExpressionEditor=Pris uttryck redigerare
 PriceExpressionSelected=Valda pris uttryck
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 72c4e61630c..7276d4da6a9 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Denna uppfattning presenterar alla projekt du har rätt att l
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Denna uppfattning presenterar alla projekt (din användarbehörighet tillåta dig att visa allt).
 MyTasksDesc=Denna syn är begränsad till projekt eller uppdrag du en kontakt för (allt som är &quot;typ&quot;).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
 TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din användarbehörighet tillåta dig att visa allt).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projekt område
 NewProject=Nytt projekt
 AddProject=Skapa projekt
@@ -29,7 +30,7 @@ ProjectsList=Förteckning över projekt
 ShowProject=Visa projekt
 SetProject=Ställ projekt
 NoProject=Inget projekt definieras eller ägs
-NbOpenTasks=Nb i öppnade uppgifter
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb av projekt
 TimeSpent=Tid som tillbringas
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Tid som ägnas åt uppgifter
 TaskTimeUser=Användare
 TaskTimeNote=Anmärkning
 TaskTimeDate=Datum
-TasksOnOpenedProject=Uppgifter om öppnade projekt
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Arbetsbelastning inte definierad
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Lista över åtgärder i samband med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Förteckning över åtgärder i samband med projektet
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Aktivitet på projekt den här veckan
 ActivityOnProjectThisMonth=Aktivitet på projekt denna månad
 ActivityOnProjectThisYear=Aktivitet på projekt i år
@@ -95,7 +98,7 @@ DeleteATimeSpent=Ta bort tid
 ConfirmDeleteATimeSpent=Är du säker på att du vill ta bort denna tid?
 DoNotShowMyTasksOnly=Se även uppgifter som inte tilldelats mig
 ShowMyTasksOnly=Visa bara aktiviteter för mig
-TaskRessourceLinks=Resurser
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part
 NoTasks=Inga uppgifter för detta projekt
 LinkedToAnotherCompany=Kopplat till annan tredje part
@@ -139,8 +142,15 @@ ProjectReferers=Med hänvisning objekt
 SearchAProject=Sök ett projekt
 ProjectMustBeValidatedFirst=Projekt måste valideras först
 ProjectDraft=Utkast projekt
-FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
index c4a0da04ecb..6125f3e2490 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -4,7 +4,7 @@ Proposal=Kommersiella förslag
 ProposalShort=Förslag
 ProposalsDraft=Utkast till kommersiella förslag
 ProposalDraft=Utkast till kommersiella förslag
-ProposalsOpened=Öppnade kommersiella förslag
+ProposalsOpened=Open commercial proposals
 Prop=Kommersiella förslag
 CommercialProposal=Kommersiella förslag
 CommercialProposals=Kommersiella förslag
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Belopp per månad (efter skatt)
 NbOfProposals=Antal kommersiella förslag
 ShowPropal=Visa förslag
 PropalsDraft=Utkast
-PropalsOpened=Öppnade
+PropalsOpened=Open
 PropalsNotBilled=Stängt faktureras inte
 PropalStatusDraft=Utkast (måste valideras)
 PropalStatusValidated=Validerad (förslag är öppen)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Inte undertecknat (stängt)
 PropalStatusBilled=Fakturerade
 PropalStatusDraftShort=Förslag
 PropalStatusValidatedShort=Validerad
-PropalStatusOpenedShort=Öppnade
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Stängt
 PropalStatusSignedShort=Signerad
 PropalStatusNotSignedShort=Inte undertecknat
@@ -51,8 +51,8 @@ PropalsToClose=Kommersiella förslag att stänga
 PropalsToBill=Signerad kommersiella förslag till proposition
 ListOfProposals=Förteckning över kommersiella förslag
 ActionsOnPropal=Åtgärder för förslag
-NoOpenedPropals=Ingen öppnade kommersiella förslag
-NoOtherOpenedPropals=Ingen annan öppnas kommersiella förslag
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Kommersiella förslag ref
 SendPropalByMail=Skicka kommersiella förslag per post
 AssociatedDocuments=Handlingar i samband med förslaget:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune förslag modell
 DefaultModelPropalCreate=Skapa standardmodell
 DefaultModelPropalToBill=Standardmall när ett affärsförslag sluts (att fakturera)
 DefaultModelPropalClosed=Standardmall när ett affärsförslag sluts (ofakturerat)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index 93545569c2f..804f3601c6b 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Visa löneutbetalning
 THM=Genomsnitt timpris
 TJM=Genomsnittlig dagligt pris
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 31de11fb426..ac940cbc42d 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Enkel förlagan
 DocumentModelMerou=Merou A5-modellen
 WarningNoQtyLeftToSend=Varning, att inga produkter väntar sändas.
 StatsOnShipmentsOnlyValidated=Statistik utförda på försändelser endast valideras. Datum som används är datum för godkännandet av leveransen (planerat leveransdatum är inte alltid känt).
-DateDeliveryPlanned=Hyvlat leveransdatum
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Datum leverans fick
 SendShippingByEMail=Skicka leverans via e-post
 SendShippingRef=Inlämning av leveransen %s
@@ -67,7 +67,7 @@ SendingRunning=Produkt från beställda kundorder
 SuppliersReceiptRunning=Produkt från beställda leverantörsorder
 ProductQtyInCustomersOrdersRunning=Produktkvantitet till öppnade kundorder
 ProductQtyInSuppliersOrdersRunning=Produktkvantitet till öppnade leverantörsorder
-ProductQtyInShipmentAlreadySent=Produktkvantitet från öppnade kundorder är redan skickade
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Produktkvantitet från öppnade leverantörsorder är redan skickade
 
 # Sending methods
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 124e0ad96ad..bd39347859f 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Lager
 NewWarehouse=Nytt lager / Lagerområde
 WarehouseEdit=Ändra lager
 MenuNewWarehouse=Nytt lager
-WarehouseOpened=Warehouse öppet
+WarehouseOpened=Warehouse open
 WarehouseClosed=Lager stängt
 WarehouseSource=Ursprungslager
 WarehouseSourceNotDefined=Inget lager definierat
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Välj lager som ska användas för lagerminsknin
 SelectWarehouseForStockIncrease=Välj lager som ska användas för lagerökningen
 NoStockAction=Ingen lageråtgärd
 LastWaitingSupplierOrders=Beställningar väntande på leverans
-DesiredStock=Önskat lager
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Att beställa
 Replenishment=Påfyllning
 ReplenishmentOrders=Påfyllningsbeställningar
-VirtualDiffersFromPhysical=Enligt öka / minska aktieoptioner, fysiska lagret och virtuella lager (fysiska + aktuella beställningar) kan skilja
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Använd virtuellt lager som standard, i stället för fysiska lager, för påfyllning funktion
 UseVirtualStock=Använd virtuellt lager
 UsePhysicalStock=Använd fysiskt lager
-CurentSelectionMode=Curent urvalsläget
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtuell lager
 CurentlyUsingPhysicalStock=Fysiskt lager
 RuleForStockReplenishment=Regel för påfyllning av lager
@@ -112,8 +113,8 @@ AlertOnly= Endast larm
 WarehouseForStockDecrease=Lager <b>%s</b> kommer att användas för lagerminskning
 WarehouseForStockIncrease=Lager <b>%s</b> kommer att användas för lagerökning
 ForThisWarehouse=För detta lager
-ReplenishmentStatusDesc=Detta är en lista över allla produkter med lägre lagersaldo än önskat lager (eller lägre än larmvärde om "Endast larm" är markerad). Föreslagen åtgärd är att skapa leverantörsordrar för att fylla på lagren.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Påfyllningar
 NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s)
 NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Spela in överföring
 ReceivingForSameOrder=Kvitton för denna beställning
 StockMovementRecorded=Sparade lageröverföringar
 RuleForStockAvailability=Regler om krav på lagerhållning
-StockMustBeEnoughForInvoice=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i faktura
-StockMustBeEnoughForOrder=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i beställning
-StockMustBeEnoughForShipment= Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i transporten
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Etikett för lagerrörelse
 InventoryCode=Lagerrörelse- eller inventeringskod
 IsInPackage=Ingår i förpackning
 ShowWarehouse=Visa lagret
-MovementCorrectStock=Lagerrättelse för produkt %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Lagerförflyttning av produkt %s till ett annat lager
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index b90a57d97de..4b222442b16 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Skickas till leverantörer
 ListOfSupplierOrders=Lista över leverantörsorder
 MenuOrdersSupplierToBill=Leverantörs order att fakturera
 NbDaysToDelivery=Leveransförsening, dagar
-DescNbDaysToDelivery=Den största förseningen visas med produktbeställningslista
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index 00656349659..12ab62faea0 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Prislista för
 NewTrip=New expense report
 CompanyVisited=Företag / stiftelse besökt
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 34a10699b5c..f7368942a78 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Ta bort från grupp
 PasswordChangedAndSentTo=Lösenord ändras och skickas till <b>%s.</b>
 PasswordChangeRequestSent=Begäran om att ändra lösenord för <b>%s</b> skickas till <b>%s.</b>
 MenuUsersAndGroups=Användare & grupper
+MenuMyUserCard=My user card
 LastGroupsCreated=Senaste %s skapat grupper
 LastUsersCreated=Senaste %s användare skapade
 ShowGroup=Visa grupp
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 724d7766e0c..f10b491e8ed 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Utträde fil
 SetToStatusSent=Ställ in på status "File Skickat"
 ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid"
 StatisticsByLineStatus=Statistik efter status linjer
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Betalning av %s stående order av banken
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index fd2d15713bd..8097dd55b98 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Arbetsflöde modul konfiguration
-WorkflowDesc=Denna modul ändrar beteendet av automatiska händelser i tillämpningar. Standardbeteende är att arbetsflöde öppnas (du gör saker i den ordning du vill). Automatiska händelser kan aktiveras för de händelser som önskas.
-ThereIsNoWorkflowToModify=Det finns ingen arbetsflöde du kan ändra för modul du har aktiverat.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Skapa en kundorder automatiskt efter en kommersiell förslag undertecknas
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kommersiell förslag undertecknas
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter ett avtal validerad
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kundorder är stängd
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificera länkad förslag källa att faktureras när kundorder är inställd på betald
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura är inställd på betald
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura valideras
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index e823d364258..13f7eb7c6ec 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index 55fde86864b..3e8b2309f8f 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 8abf1fd1c5a..42a9a884c76 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/sw_SW/ecm.lang
+++ b/htdocs/langs/sw_SW/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/sw_SW/incoterm.lang b/htdocs/langs/sw_SW/incoterm.lang
new file mode 100644
index 00000000000..3065894865e
--- /dev/null
+++ b/htdocs/langs/sw_SW/incoterm.lang
@@ -0,0 +1,7 @@
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
+IncotermLabel=Incoterms
+IncotermSetupTitle1=Feature
+IncotermSetupTitle2=Status
+IncotermSetup=Setup of module Incoterm
+IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
index acd737c3711..774a591c825 100644
--- a/htdocs/langs/sw_SW/languages.lang
+++ b/htdocs/langs/sw_SW/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Kiarabu
 Language_ar_SA=Kiarabu
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Kikatalani
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_en_ZA=English (Afrika Kusini)
 Language_es_ES=Spanish
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Kihispania (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Kihispania (Mexico)
 Language_es_PY=Kihispania (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Kiaislandi
 Language_it_IT=Italia
 Language_ja_JP=Japan
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korea
+Language_lo_LA=Lao
 Language_lt_LT=Kilithuania
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakiska
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Kiukreni
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/sw_SW/loan.lang b/htdocs/langs/sw_SW/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/sw_SW/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 9a32ee6f1ea..12d9337641d 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/sw_SW/printing.lang b/htdocs/langs/sw_SW/printing.lang
new file mode 100644
index 00000000000..b4956e59c01
--- /dev/null
+++ b/htdocs/langs/sw_SW/printing.lang
@@ -0,0 +1,73 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
+ModuleDriverSetup=Setup Module Driver
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+NoActivePrintingModuleFound=No active module to print document
+PleaseSelectaDriverfromList=Please select a driver from list.
+SetupDriver=Driver setup
+TestDriver=Test
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP=Google Cloud Print
+PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PRINTGCP_LOGIN=Google Account Login
+PRINTGCP_PASSWORD=Google Account Password
+STATE_ONLINE=Online
+STATE_UNKNOWN=Unknown
+STATE_OFFLINE=Offline
+STATE_DORMANT=Offline for quite a while
+TYPE_GOOGLE=Google
+TYPE_HP=HP Printer
+TYPE_DOCS=DOCS
+TYPE_DRIVE=Google Drive
+TYPE_FEDEX=Fedex
+TYPE_ANDROID_CHROME_SNAPSHOT=Android
+TYPE_IOS_CHROME_SNAPSHOT=IOS
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PRINTIPP=PrintIPP Driver
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
+PrintTestDescprintipp=List of Printers for driver PrintIPP.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+STATE_IPP_idle=Idle
+STATE_IPP_stopped=Stopped
+STATE_IPP_paused=Paused
+STATE_IPP_toner-low-report=Low Toner
+STATE_IPP_none=None
+MEDIA_IPP_stationery=Stationery
+MEDIA_IPP_thermal=Thermal
+IPP_COLOR_print-black=BW Printer
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang
index 2b6d12870a1..d10dbb15122 100644
--- a/htdocs/langs/sw_SW/propal.lang
+++ b/htdocs/langs/sw_SW/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,8 +51,8 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
 AssociatedDocuments=Documents associated with the proposal:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Jaune proposal model
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/sw_SW/salaries.lang
+++ b/htdocs/langs/sw_SW/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/sw_SW/trips.lang
+++ b/htdocs/langs/sw_SW/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/sw_SW/workflow.lang
+++ b/htdocs/langs/sw_SW/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index bb9b358c045..8a77feacba3 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -1,160 +1,166 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=คั่นคอลัมน์สำหรับแฟ้มส่งออก
+ACCOUNTING_EXPORT_DATE=รูปแบบวันที่สำหรับไฟล์การส่งออก
+ACCOUNTING_EXPORT_PIECE=การส่งออกจำนวนของชิ้น?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=ส่งออกกับบัญชีทั่วโลกหรือไม่
+ACCOUNTING_EXPORT_LABEL=ส่งออกฉลาก?
+ACCOUNTING_EXPORT_AMOUNT=การส่งออกจำนวน?
+ACCOUNTING_EXPORT_DEVISE=ส่งออกประดิษฐ์?
 
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+Accounting=การบัญชี
+Globalparameters=พารามิเตอร์ทั่วโลก
+Chartofaccounts=ผังบัญชี
+Fiscalyear=รอบระยะเวลาบัญชี
+Menuaccount=บัญชีการบัญชี
+Menuthirdpartyaccount=บัญชี Thirdparty
+MenuTools=เครื่องมือ
 
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Export=Export
-Modelcsv=Model of export
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
-Back=Return
+ConfigAccountingExpert=การกำหนดค่าของบัญชีโมดูลผู้เชี่ยวชาญ
+Journaux=วารสาร
+JournalFinancial=วารสารการเงิน
+Exports=การส่งออก
+Export=ส่งออก
+Modelcsv=รูปแบบของการส่งออก
+OptionsDeactivatedForThisExportModel=สำหรับรูปแบบการส่งออกนี้ตัวเลือกที่จะปิดการใช้งาน
+Selectmodelcsv=เลือกรูปแบบของการส่งออก
+Modelcsv_normal=การส่งออกคลาสสิก
+Modelcsv_CEGID=การส่งออกที่มีต่อ CEGID ผู้เชี่ยวชาญ
+BackToChartofaccounts=กลับผังบัญชี
+Back=กลับ
 
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+Definechartofaccounts=กำหนดผังบัญชี
+Selectchartofaccounts=เลือกผังบัญชี
+Validate=ตรวจสอบ
+Addanaccount=เพิ่มบัญชีบัญชี
+AccountAccounting=บัญชีการบัญชี
+Ventilation=การเสีย
+ToDispatch=ที่จะส่ง
+Dispatched=ส่ง
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+CustomersVentilation=รายละเอียดของลูกค้า
+SuppliersVentilation=ซัพพลายเออร์ที่พังทลาย
+TradeMargin=อัตรากำไรขั้นต้นการค้า
+Reports=รายงาน
+ByCustomerInvoice=โดยลูกค้าใบแจ้งหนี้
+ByMonth=โดยเดือน
+NewAccount=บัญชีการบัญชีใหม่
+Update=ปรับปรุง
+List=รายการ
+Create=สร้าง
+UpdateAccount=การเปลี่ยนแปลงของบัญชีบัญชี
+UpdateMvts=การปรับเปลี่ยนของการเคลื่อนไหว
+WriteBookKeeping=บันทึกในบัญชีแยกประเภททั่วไป
+Bookkeeping=บัญชีแยกประเภททั่วไป
+AccountBalanceByMonth=ยอดเงินในบัญชีโดย
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+AccountingVentilation=รายละเอียดบัญชี
+AccountingVentilationSupplier=รายละเอียดผู้จัดจำหน่ายบัญชี
+AccountingVentilationCustomer=รายละเอียดบัญชีของลูกค้า
+Line=สาย
 
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
+CAHTF=HT ซัพพลายเออร์ที่ซื้อทั้งหมด
+InvoiceLines=เส้นของใบแจ้งหนี้ที่จะต้องมีการระบายอากาศ
+InvoiceLinesDone=สายช่องระบายความร้อนของใบแจ้งหนี้
+IntoAccount=ในบัญชีของบัญชี
 
-Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+Ventilate=ระบายอากาศ
+VentilationAuto=สลายอัตโนมัติ
 
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+Processing=การประมวลผล
+EndProcessing=ในตอนท้ายของการประมวลผล
+AnyLineVentilate=สายการใด ๆ เพื่อระบายอากาศ
+SelectedLines=เลือกสาย
+Lineofinvoice=สายของใบแจ้งหนี้
+VentilatedinAccount=อากาศถ่ายเทได้ประสบความสำเร็จในบัญชีของบัญชี
+NotVentilatedinAccount=การระบายอากาศไม่ได้อยู่ในบัญชีการบัญชี
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=คั่นคอลัมน์ในไฟล์การส่งออก
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=จำนวนขององค์ประกอบที่จะเป็นรายละเอียดที่แสดงโดยหน้า (สูงสุดที่แนะนำ: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=เริ่มต้นการเรียงลำดับของรายละเอียดหน้า "มีการสลาย" โดยองค์ประกอบล่าสุด
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=เริ่มต้นการเรียงลำดับของรายละเอียดหน้า "ถล่ม" โดยองค์ประกอบล่าสุด
 
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+AccountLength=ความยาวของบัญชีที่แสดงในบัญชี Dolibarr
+AccountLengthDesc=ฟังก์ชั่นที่ช่วยให้การแสร้งความยาวของบัญชีบัญชีโดยการเปลี่ยนพื้นที่โดยตัวเลขที่ศูนย์ ฟังก์ชั่นนี้เพียงสัมผัสหน้าจอก็ไม่ได้ปรับเปลี่ยนบัญชีบัญชีจดทะเบียนใน Dolibarr เพื่อการส่งออก, ฟังก์ชั่นนี้มีความจำเป็นต้องใช้งานร่วมกับซอฟต์แวร์
+ACCOUNTING_LENGTH_GACCOUNT=ความยาวของบัญชีทั่วไป
+ACCOUNTING_LENGTH_AACCOUNT=ความยาวของบัญชีของบุคคลที่สาม
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=ขายวารสาร
+ACCOUNTING_PURCHASE_JOURNAL=วารสารการสั่งซื้อ
+ACCOUNTING_MISCELLANEOUS_JOURNAL=วารสารเบ็ดเตล็ด
+ACCOUNTING_EXPENSEREPORT_JOURNAL=รายงานค่าใช้จ่ายวารสาร
+ACCOUNTING_SOCIAL_JOURNAL=วารสารสังคม
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=บัญชีการโอน
+ACCOUNTING_ACCOUNT_SUSPENSE=บัญชีของการรอคอย
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=บัญชีบัญชีโดยค่าเริ่มต้นสำหรับผลิตภัณฑ์ที่ซื้อ (ถ้าไม่ได้กำหนดไว้ในแผ่นผลิตภัณฑ์)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=บัญชีบัญชีโดยเริ่มต้นสำหรับผลิตภัณฑ์ที่ขาย (ถ้าไม่ได้กำหนดไว้ในแผ่นผลิตภัณฑ์)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=บัญชีบัญชีโดยค่าเริ่มต้นสำหรับการให้บริการซื้อ (ถ้าไม่ได้กำหนดไว้ในแผ่นบริการ)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=บัญชีบัญชีโดยค่าเริ่มต้นสำหรับการให้บริการขาย (ถ้าไม่ได้กำหนดไว้ในแผ่นบริการ)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
+Doctype=ประเภทของเอกสาร
+Docdate=วันที่
+Docref=การอ้างอิง
+Numerocompte=บัญชี
 Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
-Sens=Sens
-Codejournal=Journal
+Labelcompte=บัญชีฉลาก
+Debit=หักบัญชี
+Credit=เครดิต
+Amount=จำนวน
+Sens=ซองส์
+Codejournal=วารสาร
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=ลบบันทึกบัญชีแยกประเภททั่วไป
 
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=วารสารขาย
+PurchasesJournal=ซื้อวารสาร
+DescSellsJournal=วารสารขาย
+DescPurchasesJournal=ซื้อวารสาร
+BankJournal=ธนาคารวารสาร
+DescBankJournal=วารสารธนาคารรวมถึงประเภททั้งหมดของการชำระเงินอื่นที่ไม่ใช่เงินสด
+CashJournal=วารสารเงินสด
+DescCashJournal=วารสารเงินสดรวมทั้งประเภทของการชำระเงินเงินสด
 
-CashPayment=Cash Payment
+CashPayment=ชำระด้วยเงินสด
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=การชำระเงินของผู้จัดจำหน่ายใบแจ้งหนี้
+CustomerInvoicePayment=การชำระเงินของลูกค้าใบแจ้งหนี้
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=บัญชี Thirdparty
 
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=การเคลื่อนไหวใหม่
+NumMvts=จำนวนของการเคลื่อนไหว
+ListeMvts=รายชื่อของการเคลื่อนไหว
+ErrorDebitCredit=เดบิตและเครดิตไม่สามารถมีค่าในเวลาเดียวกัน
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=ชื่อบัญชี thirdparty
+DescThirdPartyReport=ให้คำปรึกษาที่นี่รายชื่อของลูกค้าและซัพพลายเออร์ thirdparty และบัญชีบัญชีของพวกเขา
 
-ListAccounts=List of the accounting accounts
+ListAccounts=รายการบัญชีที่บัญชี
 
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgversion=รุ่นของแผน
+Pcgtype=ชั้นบัญชี
+Pcgsubtype=ภายใต้ระดับบัญชี
+Accountparent=รากของบัญชี
+Active=คำแถลง
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=ปีงบประมาณใหม่
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=ที่นี่ให้คำปรึกษารายละเอียดบัญชีของลูกค้าประจำปีของใบแจ้งหนี้ของคุณ
+TotalVente=HT มูลค่าการซื้อขายรวม
+TotalMarge=อัตรากำไรขั้นต้นรวมยอดขาย
+DescVentilDoneCustomer=ให้คำปรึกษาที่นี่รายชื่อของสายของลูกค้าใบแจ้งหนี้และบัญชีบัญชีของพวกเขา
+DescVentilTodoCustomer=ระบายอากาศในสายของคุณใบแจ้งหนี้ลูกค้าที่มีบัญชีการบัญชี
+ChangeAccount=เปลี่ยนบัญชีบัญชีสำหรับสายการคัดเลือกจากบัญชี:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=ที่นี่ให้คำปรึกษารายละเอียดบัญชีประจำปีของซัพพลายเออร์ใบแจ้งหนี้ของคุณ
+DescVentilTodoSupplier=ระบายอากาศในสายของคุณผู้จัดจำหน่ายใบแจ้งหนี้กับบัญชีการบัญชี
+DescVentilDoneSupplier=ให้คำปรึกษาที่นี่รายชื่อของเส้นของผู้จัดจำหน่ายใบแจ้งหนี้และบัญชีบัญชีของพวกเขา
 
-ValidateHistory=Validate Automatically
+ValidateHistory=ตรวจสอบโดยอัตโนมัติ
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=ข้อผิดพลาดที่คุณไม่สามารถลบบัญชีบัญชีนี้เพราะมันถูกนำมาใช้
 
-FicheVentilation=Breakdown card
+FicheVentilation=บัตรพังทลาย
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 6ee60191c3e..01e602d7f83 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -1,1624 +1,1652 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=มูลนิธิ
-Version=เวอร์ชั่น
-VersionProgram=โปรแกรมเวอร์ชั่น
-VersionLastInstall=เวอร์ชั่นที่เริ่มติดตั้ง
-VersionLastUpgrade=เวอร์ชั่นที่อัพเกรดล่าสุด
-VersionExperimental=Experimental
-VersionDevelopment=การพัฒนา
-VersionUnknown=ไม่มีข้อมูล
+Version=รุ่น
+VersionProgram=โปรแกรมรุ่น
+VersionLastInstall=เริ่มต้นรุ่นที่ติดตั้ง
+VersionLastUpgrade=เวอร์ชั่นอัพเกรดล่าสุด
+VersionExperimental=การทดลอง
+VersionDevelopment=พัฒนาการ
+VersionUnknown=ไม่ทราบ
 VersionRecommanded=แนะนำ
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-HTMLCharset=Charset สำหรับสร้างหน้า HTML 
-DBStoringCharset=Database charset สำหรับเก็บข้อมูล
-DBSortingCharset=Database charset สำหรับเรียงข้อมูล
-WarningModuleNotActive=โมดูล <b>%s</b> จะต้องเปิดใช้งาน
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=ติดตั้ง Dolibarr หรืออัพเกรด
+FileCheck=ความสมบูรณ์ของไฟล์
+FilesMissing=ไฟล์ที่ขาดหายไป
+FilesUpdated=ไฟล์ล่าสุด
+FileCheckDolibarr=ตรวจสอบความสมบูรณ์ของไฟล์ Dolibarr
+XmlNotFound=ไฟล์ XML ของ Dolibarr ซื่อสัตย์ไม่พบ
+SessionId=ID เซสชั่น
+SessionSaveHandler=จัดการที่จะบันทึกการประชุม
+SessionSavePath=การจัดเก็บข้อมูลการแปลเซสชั่น
+PurgeSessions=ล้างของการประชุม
+ConfirmPurgeSessions=คุณต้องการที่จะล้างการประชุมทั้งหมดหรือไม่ ซึ่งจะตัดการเชื่อมต่อผู้ใช้ทุกคน (ยกเว้นตัวเอง)
+NoSessionListWithThisHandler=จัดการประหยัดเซสชั่นการกำหนดค่าใน PHP ของคุณไม่อนุญาตให้มีการแสดงรายการทั้งหมดประชุมทำงาน
+LockNewSessions=ล็อคการเชื่อมต่อใหม่
+ConfirmLockNewSessions=คุณแน่ใจหรือว่าต้องการ จำกัด การเชื่อมต่อ Dolibarr ใหม่ ๆ ให้กับตัวเอง <b>ผู้ใช้% s</b> เท่านั้นที่จะสามารถเชื่อมต่อหลังจากนั้น
+UnlockNewSessions=ถอดตัวล็อคเชื่อมต่อ
+YourSession=เซสชั่นของคุณ
+Sessions=เซสชั่นผู้ใช้
+WebUserGroup=ผู้ใช้เว็บเซิร์ฟเวอร์ / กลุ่ม
+NoSessionFound=PHP ของคุณดูเหมือนว่าจะไม่อนุญาตให้มีการแสดงรายการการประชุมที่ใช้งาน ไดเรกทอรีที่ใช้ในการบันทึกการประชุม <b>(% s)</b> อาจได้รับการคุ้มครอง (ตัวอย่างเช่นโดยการใช้สิทธิ์ OS หรือ PHP สั่ง open_basedir)
+HTMLCharset=charset สำหรับสร้างหน้าเว็บ HTML
+DBStoringCharset=ฐานข้อมูล charset ในการเก็บข้อมูล
+DBSortingCharset=ฐานข้อมูล charset ในการจัดเรียงข้อมูล
+WarningModuleNotActive=<b>% s</b> โมดูลต้องเปิดใช้งาน
+WarningOnlyPermissionOfActivatedModules=สิทธิ์เฉพาะที่เกี่ยวข้องกับการเปิดใช้งานโมดูลจะแสดงที่นี่ คุณสามารถเปิดใช้งานโมดูลอื่น ๆ ในหน้าแรก> Setup-> หน้าโมดูล
+DolibarrSetup=Dolibarr ติดตั้งหรืออัพเกรด
 DolibarrUser=ผู้ใช้ Dolibarr
-InternalUser= ผู้ใช้ ภายใน
-ExternalUser=ผู้ใช้ ภายนอก
+InternalUser=ผู้ใช้งานภายใน
+ExternalUser=ผู้ใช้ภายนอก
 InternalUsers=ผู้ใช้ภายใน
 ExternalUsers=ผู้ใช้ภายนอก
-GlobalSetup=การตั้งค่า
-GUISetup=การแสดงผล
-SetupArea=ส่วนการติดตั้ง
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=หมายเหตุ: ใช่ จะมีผลเฉพาะโมดูล <b>%s</b> ที่เปิดใช้งาน
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-ConfirmAjax=Use Ajax confirmation popups
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
-ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
-SearchFilter=Search filters options
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-ViewFullDateActions=Show full dates events in the third sheet
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-JavascriptDisabled=JavaScript disabled
-UsePopupCalendar=Use popup for dates input
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
-MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-UseAvToScanUploadedFiles=Use anti-virus to scan uploaded files
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MenuSetup=Menu management setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-PersonalizedMenusNotSupported=Personalized menus not supported
-AllMenus=All
-NotConfigured=Module not configured
-Setup=Setup
-Activation=Activation
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-ModulesCommon=Main modules
-ModulesOther=Other modules
-ModulesInterfaces=Interfaces modules
-ModulesSpecial=Modules very specific
-ParameterInDolibarr=Parameter %s
-LanguageParameter=Language parameter %s
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
-ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds)
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CompanyTZ=Company Time Zone (main company)
-CompanyHour=Company Time (main company)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-OSEnv=OS Environment
-Box=Box
-Boxes=Boxes
-MaxNbOfLinesForBoxes=Max number of lines for boxes
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar).
-MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.<br>Some modules add entries in the menus (in menu <b>All</b> in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemTools=System tools
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or file to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed.
-NewBackup=New backup
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-RunCommandSummaryToLaunch=Backup can be launched with the following command
-WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-Datas=Data
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
-Yes=Yes
-No=No
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-Rights=Permissions
-BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
-ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services.
-ModulesSpecialDesc=Special modules are very specific or seldom used modules.
-ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business.
-ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
-ModulesMarketPlaces=More modules...
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
-DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
-WebSiteDesc=Web site providers you can search to find more modules...
-URL=Link
-BoxesAvailable=Boxes available
-BoxesActivated=Boxes activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
-AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
-ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-DolibarrProjectLeader=Project leader
-Developpers=Developers/contributors
-OtherDeveloppers=Other developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteFr=French official web site
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentTopMenuHandler=Current top menu handler
-CurrentLeftMenuHandler=Current left menu handler
-CurrentMenuHandler=Current menu handler
-CurrentSmartphoneMenuHandler=Current smartphone menu handler
-MeasuringUnit=Measuring unit
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
-MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
-MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on www.dolibarr.org forum.
-ModuleSetup=Module setup
-ModulesSetup=Modules setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilyProducts=Products Management
-ModuleFamilyHr=Human Resource Management
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
-StepNb=Step %s
-FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and datas: %s.
-LastStableVersion=Last stable version
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link "<b>%s Online help</b>" on left menu
-AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea.
-ModuleDisabled=Module disabled
-ModuleDisabledSoNoEvent=Module disabled so event never created
-ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+GlobalSetup=การติดตั้งทั่วโลก
+GUISetup=แสดง
+SetupArea=พื้นที่ติดตั้ง
+FormToTestFileUploadForm=แบบทดสอบการอัปโหลดไฟล์ (ตามการตั้งค่า)
+IfModuleEnabled=หมายเหตุ: <b>ใช่จะมีผลเฉพาะถ้าโมดูล% s</b> ถูกเปิดใช้งาน
+RemoveLock=<b>ลบไฟล์% s</b> ถ้ามันมีอยู่เพื่อช่วยให้การใช้งานของเครื่องมือการปรับปรุง
+RestoreLock=<b>เรียกคืนไฟล์% s</b> ที่มีสิทธิ์ในการอ่านเท่านั้นที่จะปิดการใช้งานของเครื่องมือการปรับปรุงใด ๆ
+SecuritySetup=การตั้งค่าการรักษาความปลอดภัย
+ErrorModuleRequirePHPVersion=ข้อผิดพลาดนี้ต้องใช้โมดูล PHP รุ่น% s หรือสูงกว่า
+ErrorModuleRequireDolibarrVersion=ข้อผิดพลาดในโมดูลนี้ต้อง s Dolibarr รุ่น% หรือสูงกว่า
+ErrorDecimalLargerThanAreForbidden=ข้อผิดพลาด, <b>ความแม่นยำสูงกว่า% s</b> ไม่ได้รับการสนับสนุน
+DictionarySetup=การติดตั้งพจนานุกรม
+Dictionary=พจนานุกรม
+Chartofaccounts=ผังบัญชี
+Fiscalyear=รอบระยะเวลาบัญชี
+ErrorReservedTypeSystemSystemAuto=ค่า 'ระบบ' และ 'systemauto' สำหรับประเภทถูกสงวนไว้ คุณสามารถใช้ 'ของผู้ใช้เป็นค่าที่จะเพิ่มบันทึกของคุณเอง
+ErrorCodeCantContainZero=รหัสไม่สามารถมีค่า 0
+DisableJavascript=ปิดการใช้งาน JavaScript และฟังก์ชั่นอาแจ็กซ์ (แนะนำสำหรับคนตาบอดหรือเบราว์เซอร์ข้อความ)
+ConfirmAjax=ใช้ป๊อบอัพอาแจ็กซ์ยืนยัน
+UseSearchToSelectCompanyTooltip=นอกจากนี้ถ้าคุณมีจำนวนมากของบุคคลที่สาม (> 100 000) คุณสามารถเพิ่มความเร็วโดยการตั้งค่า COMPANY_DONOTSEARCH_ANYWHERE คงเป็น 1 ใน Setup-> อื่น ๆ ค้นหาแล้วจะถูก จำกัด ในการเริ่มต้นของสตริง
+UseSearchToSelectCompany=ใช้ฟิลด์เติมข้อความอัตโนมัติที่จะเลือกบุคคลที่สามแทนการใช้กล่องรายการ
+ActivityStateToSelectCompany= เพิ่มตัวเลือกตัวกรองเพื่อแสดง / ซ่อน thirdparties ซึ่งกำลังอยู่ในกิจกรรมหรือได้หยุดมัน
+UseSearchToSelectContactTooltip=นอกจากนี้ถ้าคุณมีจำนวนมากของบุคคลที่สาม (> 100 000) คุณสามารถเพิ่มความเร็วโดยการตั้งค่า CONTACT_DONOTSEARCH_ANYWHERE คงเป็น 1 ใน Setup-> อื่น ๆ ค้นหาแล้วจะถูก จำกัด ในการเริ่มต้นของสตริง
+UseSearchToSelectContact=ใช้ฟิลด์การเติมข้อความอัตโนมัติให้เลือกติดต่อ (แทนการใช้กล่องรายการ)
+DelaiedFullListToSelectCompany=รอคุณกดปุ่มก่อนที่จะโหลดของเนื้อหา thirdparties รายการคำสั่งผสม (ซึ่งอาจจะเพิ่มประสิทธิภาพการทำงานถ้าคุณมีจำนวนมากของ thirdparties)
+DelaiedFullListToSelectContact=รอคุณกดปุ่มก่อนที่จะโหลดเนื้อหาของการติดต่อรายการคำสั่งผสม (ซึ่งอาจจะเพิ่มประสิทธิภาพการทำงานถ้าคุณมีจำนวนมากของการติดต่อ)
+SearchFilter=ค้นหาตัวกรองตัวเลือก
+NumberOfKeyToSearch=Nbr ของตัวละครที่จะเรียกการค้นหา:% s
+ViewFullDateActions=แสดงกิจกรรมเต็มรูปแบบในวันที่สามแผ่น
+NotAvailableWhenAjaxDisabled=ไม่สามารถใช้ได้เมื่ออาแจ็กซ์ปิดการใช้งาน
+JavascriptDisabled=ปิดใช้งาน JavaScript
+UsePopupCalendar=ใช้สำหรับใส่ป๊อปอัพวันที่
+UsePreviewTabs=ใช้แท็บตัวอย่าง
+ShowPreview=แสดงตัวอย่าง
+PreviewNotAvailable=ตัวอย่างที่ไม่สามารถใช้ได้
+ThemeCurrentlyActive=รูปแบบที่ใช้งานอยู่ในปัจจุบัน
+CurrentTimeZone=เขต PHP (เซิร์ฟเวอร์)
+MySQLTimeZone=เขตฐาน (ฐานข้อมูล)
+TZHasNoEffect=วันที่มีการจัดเก็บและส่งกลับโดยเซิร์ฟเวอร์ฐานข้อมูลราวกับว่าพวกเขาจะถูกเก็บไว้เป็นสตริงยื่น เขตมีผลเฉพาะเมื่อใช้ฟังก์ชั่น UNIX_TIMESTAMP (ที่ไม่ควรนำมาใช้โดย Dolibarr ดังนั้นฐานข้อมูล TZ ควรจะมีไม่มีผลกระทบแม้ว่าการเปลี่ยนแปลงหลังจากถูกป้อนข้อมูล)
+Space=ช่องว่าง
+Table=ตาราง
+Fields=ทุ่ง
+Index=ดัชนี
+Mask=หน้ากาก
+NextValue=ค่าถัดไป
+NextValueForInvoices=ค่าถัดไป (ใบแจ้งหนี้)
+NextValueForCreditNotes=ค่าถัดไป (บันทึกเครดิต)
+NextValueForDeposit=ค่าถัดไป (เงินฝาก)
+NextValueForReplacements=ค่าถัดไป (เปลี่ยน)
+MustBeLowerThanPHPLimit=หมายเหตุ: PHP ของคุณ จำกัด <b>ขนาดอัปโหลดไฟล์แต่ละ% s%</b> s สิ่งที่ค่าพารามิเตอร์นี้คือ
+NoMaxSizeByPHPLimit=หมายเหตุ: ไม่ จำกัด มีการตั้งค่าในการกำหนดค่าของ PHP
+MaxSizeForUploadedFiles=ขนาดสูงสุดของไฟล์ที่อัปโหลด (0 ไม่อนุญาตให้อัปโหลดใด ๆ )
+UseCaptchaCode=ใช้รหัสแบบกราฟิก (CAPTCHA) บนหน้าเข้าสู่ระบบ
+UseAvToScanUploadedFiles=ใช้ป้องกันไวรัสในการสแกนไฟล์ที่อัปโหลด
+AntiVirusCommand= เส้นทางแบบเต็มคำสั่งป้องกันไวรัส
+AntiVirusCommandExample= ตัวอย่าง ClamWin: c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe <br> ตัวอย่าง ClamAV: / usr / bin / clamscan
+AntiVirusParam= พารามิเตอร์เพิ่มเติมเกี่ยวกับบรรทัดคำสั่ง
+AntiVirusParamExample= ตัวอย่าง ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
+ComptaSetup=บัญชีการติดตั้งโมดูล
+UserSetup=การตั้งค่าการจัดการผู้ใช้
+MenuSetup=เมนูการตั้งค่าการจัดการ
+MenuLimits=ข้อ จำกัด และความถูกต้อง
+MenuIdParent=ID เมนูผู้ปกครอง
+DetailMenuIdParent=ID ของเมนูปกครอง (ที่ว่างเปล่าสำหรับเมนูด้านบน)
+DetailPosition=เรียงลำดับหมายเลขในการกำหนดตำแหน่งที่เมนู
+PersonalizedMenusNotSupported=เมนูส่วนบุคคลไม่ได้รับการสนับสนุน
+AllMenus=ทั้งหมด
+NotConfigured=โมดูลไม่ได้กำหนดค่า
+Setup=การติดตั้ง
+Activation=การกระตุ้น
+Active=กระตือรือร้น
+SetupShort=การติดตั้ง
+OtherOptions=ตัวเลือกอื่น ๆ
+OtherSetup=ตั้งค่าอื่น ๆ
+CurrentValueSeparatorDecimal=คั่นทศนิยม
+CurrentValueSeparatorThousand=พันคั่น
+Destination=ปลายทาง
+IdModule=โมดูล ID
+IdPermissions=ID สิทธิ์
+Modules=โมดูล
+ModulesCommon=โมดูลหลัก
+ModulesOther=โมดูลอื่น ๆ
+ModulesInterfaces=การเชื่อมต่อโมดูล
+ModulesSpecial=โมดูลที่เฉพาะเจาะจงมาก
+ParameterInDolibarr=s พารามิเตอร์%
+LanguageParameter=ภาษาพารามิเตอร์% s
+LanguageBrowserParameter=s พารามิเตอร์%
+LocalisationDolibarrParameters=พารามิเตอร์ภาษาท้องถิ่น
+ClientTZ=โซนเวลาไคลเอ็นต์ (ผู้ใช้)
+ClientHour=เวลาไคลเอ็นต์ (ผู้ใช้)
+OSTZ=ระบบปฏิบัติการเซิร์ฟเวอร์โซนเวลา
+PHPTZ=PHP เซิร์ฟเวอร์โซนเวลา
+PHPServerOffsetWithGreenwich=PHP เซิร์ฟเวอร์ชดเชยความกว้างมาตรฐานกรีนิช (วินาที)
+ClientOffsetWithGreenwich=Client / เบราว์เซอร์ชดเชยความกว้างมาตรฐานกรีนิช (วินาที)
+DaylingSavingTime=ปรับเวลาตามฤดูกาล
+CurrentHour=PHP เวลา (เซิร์ฟเวอร์)
+CompanyTZ=บริษัท Time Zone (บริษัท หลัก)
+CompanyHour=เวลา บริษัท (บริษัท หลัก)
+CurrentSessionTimeOut=หมดเวลาการใช้งานปัจจุบัน
+YouCanEditPHPTZ=การตั้งค่าเขตเวลาที่แตกต่างกัน PHP (ไม่จำเป็น) คุณสามารถพยายามที่จะเพิ่ม .htacces ไฟล์ที่มีสายเช่นนี้ "SetEnv TZ ยุโรป / ปารีส"
+OSEnv=ระบบปฏิบัติการสิ่งแวดล้อม
+Box=กล่อง
+Boxes=กล่อง
+MaxNbOfLinesForBoxes=จำนวนสูงสุดของสายสำหรับกล่อง
+PositionByDefault=เพื่อเริ่มต้น
+Position=ตำแหน่ง
+MenusDesc=ผู้จัดการเมนูกำหนดเนื้อหาของแถบเมนู 2 (แถบแนวนอนและแถบแนวตั้ง)
+MenusEditorDesc=แก้ไขเมนูช่วยให้คุณสามารถกำหนดรายการส่วนบุคคลในเมนู ใช้มันอย่างระมัดระวังเพื่อหลีกเลี่ยงการทำ dolibarr ไม่เสถียรและรายการเมนูที่ไม่สามารถเข้าถึงได้อย่างถาวร <br> บางโมดูลเพิ่มรายการในเมนู <b>(ในเมนูทั้งหมดในกรณีส่วนใหญ่)</b> ถ้าคุณเอาบางส่วนของรายการเหล่านี้โดยไม่ได้ตั้งใจคุณสามารถเรียกคืนได้โดยการปิดและ reenabling โมดูล
+MenuForUsers=เมนูสำหรับผู้ใช้
+LangFile=ไฟล์ .lang
+System=ระบบ
+SystemInfo=ข้อมูลของระบบ
+SystemToolsArea=พื้นที่เครื่องมือของระบบ
+SystemToolsAreaDesc=บริเวณนี้มีคุณสมบัติการบริหาร ใช้เมนูเพื่อเลือกคุณลักษณะที่คุณกำลังมองหา
+Purge=ล้าง
+PurgeAreaDesc=หน้านี้ช่วยให้คุณสามารถลบไฟล์ทั้งหมดที่สร้างขึ้นหรือจัดเก็บโดย Dolibarr <b>(ไฟล์ชั่วคราวหรือไฟล์ทั้งหมดในไดเรกทอรี% s)</b> การใช้คุณลักษณะนี้ไม่จำเป็น มันมีไว้สำหรับผู้ใช้ที่มี Dolibarr เป็นเจ้าภาพโดยผู้ให้บริการที่ไม่ได้มีสิทธิ์ในการลบไฟล์ที่สร้างขึ้นโดยเว็บเซิร์ฟเวอร์
+PurgeDeleteLogFile=<b>ลบแฟ้มบันทึก% s</b> กำหนดไว้สำหรับโมดูล Syslog (ความเสี่ยงข้อมูลหลวมไม่ได้)
+PurgeDeleteTemporaryFiles=ลบไฟล์ชั่วคราวทั้งหมด (ไม่มีความเสี่ยงที่จะสูญเสียข้อมูล)
+PurgeDeleteAllFilesInDocumentsDir=<b>ลบไฟล์ทั้งหมดในไดเรกทอรี%</b> s แฟ้มชั่วคราว แต่ยังทิ้งการสำรองฐานข้อมูลไฟล์ที่แนบมากับองค์ประกอบ (บุคคลที่สาม, ใบแจ้งหนี้, ... ) และอัปโหลดลงในโมดูล ECM จะถูกลบออก
+PurgeRunNow=ล้างในขณะนี้
+PurgeNothingToDelete=ไม่มีไดเรกทอรีหรือไฟล์ที่จะลบ
+PurgeNDirectoriesDeleted=<b>% ไฟล์หรือไดเรกทอรีลบ</b>
+PurgeAuditEvents=ล้างทุกเหตุการณ์การรักษาความปลอดภัย
+ConfirmPurgeAuditEvents=คุณแน่ใจหรือว่าต้องการล้างเหตุการณ์การรักษาความปลอดภัยทั้งหมดหรือไม่ บันทึกการรักษาความปลอดภัยทั้งหมดจะถูกลบไม่มีข้อมูลอื่น ๆ จะถูกลบออก
+NewBackup=การสำรองข้อมูลใหม่
+GenerateBackup=สร้างการสำรองข้อมูล
+Backup=การสำรองข้อมูล
+Restore=ฟื้นฟู
+RunCommandSummary=การสำรองข้อมูลได้รับการเปิดตัวที่มีคำสั่งต่อไป
+RunCommandSummaryToLaunch=การสำรองข้อมูลสามารถเปิดด้วยคำสั่งดังต่อไปนี้
+WebServerMustHavePermissionForCommand=เว็บเซิร์ฟเวอร์ของคุณจะต้องได้รับอนุญาตให้เรียกใช้คำสั่งดังกล่าว
+BackupResult=ผลการสำรองข้อมูล
+BackupFileSuccessfullyCreated=แฟ้มสำรองข้อมูลที่สร้างที่ประสบความสำเร็จ
+YouCanDownloadBackupFile=ไฟล์ที่สร้างขึ้นในขณะนี้สามารถดาวน์โหลดได้
+NoBackupFileAvailable=ไม่มีไฟล์สำรองข้อมูลที่มี
+ExportMethod=วิธีการส่งออก
+ImportMethod=วิธีนำเข้า
+ToBuildBackupFileClickHere=เพื่อสร้างแฟ้มสำรองข้อมูลคลิก <a href="%s">ที่นี่</a>
+ImportMySqlDesc=ที่จะนำเข้าแฟ้มสำรองข้อมูลคุณต้องใช้คำสั่ง MySQL จากบรรทัดคำสั่ง:
+ImportPostgreSqlDesc=ที่จะนำเข้าแฟ้มสำรองข้อมูลคุณต้องใช้คำสั่ง pg_restore จากบรรทัดคำสั่ง:
+ImportMySqlCommand=% s% s <mybackupfile.sql
+ImportPostgreSqlCommand=% s% s mybackupfile.sql
+FileNameToGenerate=ชื่อไฟล์ที่จะสร้าง
+Compression=การอัด
+CommandsToDisableForeignKeysForImport=คำสั่งปิดการใช้งานปุ่มต่างประเทศในการนำเข้า
+CommandsToDisableForeignKeysForImportWarning=บังคับถ้าคุณต้องการที่จะสามารถที่จะเรียกคืนการถ่ายโอนข้อมูล SQL ของคุณในภายหลัง
+ExportCompatibility=ความเข้ากันได้ของไฟล์การส่งออกที่สร้าง
+MySqlExportParameters=MySQL พารามิเตอร์การส่งออก
+PostgreSqlExportParameters= PostgreSQL พารามิเตอร์การส่งออก
+UseTransactionnalMode=ใช้โหมดการทำธุรกรรม
+FullPathToMysqldumpCommand=เส้นทางแบบเต็มไป mysqldump คำสั่ง
+FullPathToPostgreSQLdumpCommand=เส้นทางแบบเต็มไป pg_dump คำสั่ง
+ExportOptions=ตัวเลือกการส่งออก
+AddDropDatabase=เพิ่มคำสั่ง DROP DATABASE
+AddDropTable=เพิ่มคำสั่ง DROP ตาราง
+ExportStructure=โครงสร้าง
+Datas=ข้อมูล
+NameColumn=คอลัมน์ชื่อ
+ExtendedInsert=ขยายแทรก
+NoLockBeforeInsert=ไม่มีคำสั่งล็อครอบแทรก
+DelayedInsert=แทรกล่าช้า
+EncodeBinariesInHexa=เข้ารหัสข้อมูลไบนารีในเลขฐานสิบหก
+IgnoreDuplicateRecords=ละเว้นข้อผิดพลาดของระเบียนที่ซ้ำกัน (INSERT IGNORE)
+Yes=ใช่
+No=ไม่
+AutoDetectLang=Autodetect (ภาษาเบราว์เซอร์)
+FeatureDisabledInDemo=ปิดใช้งานคุณลักษณะในการสาธิต
+Rights=สิทธิ์
+BoxesDesc=กล่องมีพื้นที่หน้าจอที่แสดงให้เห็นชิ้นส่วนของข้อมูลบนหน้าบาง คุณสามารถเลือกระหว่างการแสดงกล่องหรือไม่โดยการเลือกเพจเป้าหมายและคลิก 'เปิดใช้งาน' หรือโดยการคลิกที่ถังขยะปิดการใช้งาน
+OnlyActiveElementsAreShown=องค์ประกอบเฉพาะจาก <a href="%s">โมดูลที่เปิดใช้งาน</a> จะแสดง
+ModulesDesc=โมดูล Dolibarr กำหนดฟังก์ชั่นที่มีการใช้งานซอฟต์แวร์ โมดูลบางอย่างต้องใช้สิทธิ์ของคุณต้องให้กับผู้ใช้งานหลังจากการเปิดใช้งานโมดูล คลิกที่ปุ่มเปิด / ปิดในคอลัมน์ "สถานะ" เพื่อเปิดใช้งานโมดูล / คุณลักษณะ
+ModulesInterfaceDesc=อินเตอร์เฟซโมดูล Dolibarr ช่วยให้คุณสามารถเพิ่มคุณสมบัติขึ้นอยู่กับซอฟต์แวร์ระบบภายนอกหรือบริการ
+ModulesSpecialDesc=โมดูลพิเศษโมดูลที่เฉพาะเจาะจงมากหรือไม่ค่อยมีใครใช้
+ModulesJobDesc=โมดูลธุรกิจให้การตั้งค่าที่กำหนดไว้ล่วงหน้าที่เรียบง่ายของ Dolibarr สำหรับธุรกิจโดยเฉพาะอย่างยิ่ง
+ModulesMarketPlaceDesc=คุณสามารถค้นหาโมดูลมากขึ้นในการดาวน์โหลดจากเว็บไซต์ภายนอกบนอินเทอร์เน็ต ...
+ModulesMarketPlaces=โมดูลอื่น ๆ ...
+DoliStoreDesc=DoliStore สถานที่อย่างเป็นทางการสำหรับตลาด Dolibarr ERP / CRM โมดูลภายนอก
+DoliPartnersDesc=รายการที่มีบาง บริษัท ที่สามารถให้บริการ / พัฒนาโมดูลตามความต้องการหรือคุณลักษณะ (หมายเหตุ: บริษัท ใด บริษัท ที่มาเปิด knowning ภาษา PHP สามารถให้คุณพัฒนาเฉพาะ)
+WebSiteDesc=ผู้ให้บริการเว็บไซต์คุณสามารถค้นหาเพื่อหาโมดูลเพิ่มเติม ...
+URL=ลิงค์
+BoxesAvailable=กล่องที่มีอยู่
+BoxesActivated=กล่องเปิดใช้งาน
+ActivateOn=เปิดใช้งานบน
+ActiveOn=เปิดใช้งานใน
+SourceFile=แฟ้มแหล่งที่มา
+AutomaticIfJavascriptDisabled=อัตโนมัติถ้าถูกปิดใช้งานจาวาสคริ
+AvailableOnlyIfJavascriptNotDisabled=มีจำหน่ายเฉพาะในกรณีที่ไม่ได้ใช้งาน JavaScript ปิดการใช้งาน
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=มีจำหน่ายเฉพาะในกรณีที่ไม่ได้ใช้งาน JavaScript ปิดการใช้งาน
+Required=ที่จำเป็น
+UsedOnlyWithTypeOption=ตัวเลือกที่ใช้โดยวาระการประชุมบางส่วนเท่านั้น
+Security=ความปลอดภัย
+Passwords=รหัสผ่าน
+DoNotStoreClearPassword=จะไม่จัดเก็บรหัสผ่านที่ชัดเจน แต่ในฐานข้อมูลการจัดเก็บเพียงค่าการเข้ารหัส (เปิดใช้แนะนำ)
+MainDbPasswordFileConfEncrypted=รหัสผ่านฐานข้อมูลการเข้ารหัสใน conf.php (เปิดใช้แนะนำ)
+InstrucToEncodePass=จะมีรหัสผ่านที่เข้ารหัสเป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "crypted:% s";</b>
+InstrucToClearPass=จะมีรหัสผ่านถอดรหัส (ชัดเจน) เป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "crypted ... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "% s";</b>
+ProtectAndEncryptPdfFiles=การคุ้มครองของไฟล์ PDF ที่สร้าง (เปิดใช้งานไม่แนะนำแบ่งไฟล์ PDF รุ่นมวล)
+ProtectAndEncryptPdfFilesDesc=คุ้มครองเอกสาร PDF ช่วยให้มันสามารถอ่านและพิมพ์ไฟล์ PDF กับเบราว์เซอร์ใด ๆ อย่างไรก็ตามการแก้ไขและการคัดลอกเป็นไปไม่ได้อีกต่อไป โปรดทราบว่าการใช้คุณลักษณะนี้ทำให้การสร้างไฟล์ PDF สะสมทั่วโลกไม่ทำงาน (เช่นใบแจ้งหนี้ที่ค้างชำระ)
+Feature=ลักษณะ
+DolibarrLicense=อนุญาต
+DolibarrProjectLeader=หัวหน้าโครงการ
+Developpers=นักพัฒนา / ผู้ร่วมสมทบ
+OtherDeveloppers=นักพัฒนาอื่น ๆ / ผู้ร่วมสมทบ
+OfficialWebSite=Dolibarr เว็บไซต์อย่างเป็นทางการระหว่างประเทศ
+OfficialWebSiteFr=เว็บไซต์อย่างเป็นทางการฝรั่งเศส
+OfficialWiki=เอกสาร Dolibarr ในวิกิพีเดีย
+OfficialDemo=Dolibarr สาธิตออนไลน์
+OfficialMarketPlace=ตลาดอย่างเป็นทางการสำหรับโมดูลภายนอก / addons
+OfficialWebHostingService=อ้างอิงเว็บโฮสติ้ง (Cloud โฮสติ้ง)
+ReferencedPreferredPartners=พาร์ทเนอร์ที่ต้องการ
+OtherResources=สารสนเทศ autres
+ForDocumentationSeeWiki=สำหรับผู้ใช้หรือเอกสารพัฒนา (หมอคำถามที่พบบ่อย ... ), <br> ดูที่วิกิพีเดีย Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
+ForAnswersSeeForum=สำหรับคำถามใด ๆ / ความช่วยเหลือคุณสามารถใช้ฟอรั่ม Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
+HelpCenterDesc1=พื้นที่บริเวณนี้จะสามารถช่วยให้คุณได้รับบริการสนับสนุนช่วยเหลือใน Dolibarr
+HelpCenterDesc2=<b>เป็นส่วนหนึ่งของบริการนี้บางส่วนที่มีอยู่ในภาษาอังกฤษเท่านั้น</b>
+CurrentTopMenuHandler=ปัจจุบันการจัดการเมนูด้านบน
+CurrentLeftMenuHandler=จัดการเมนูด้านซ้ายปัจจุบัน
+CurrentMenuHandler=จัดการเมนูปัจจุบัน
+CurrentSmartphoneMenuHandler=มาร์ทโฟนในปัจจุบันการจัดการเมนู
+MeasuringUnit=หน่วยการวัด
+Emails=E-mail
+EMailsSetup=การตั้งค่าอีเมล์
+EMailsDesc=หน้านี้ช่วยให้คุณสามารถเขียนทับพารามิเตอร์ PHP ของคุณสำหรับอีเมลส่ง ในกรณีส่วนใหญ่บน Unix / Linux OS, การติดตั้ง PHP ของคุณถูกต้องและพารามิเตอร์เหล่านี้จะไร้ประโยชน์
+MAIN_MAIL_SMTP_PORT=SMTP / SMTPS พอร์ต (โดยค่าเริ่มต้นใน <b>php.ini:% s)</b>
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS โฮสต์ (โดยค่าเริ่มต้นใน <b>php.ini:% s)</b>
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS พอร์ต (ไม่กำหนดเข้า PHP บนระบบปฏิบัติการยูนิกซ์เช่นระบบ)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS โฮสต์ (ไม่กำหนดเข้า PHP บนระบบปฏิบัติการยูนิกซ์เช่นระบบ)
+MAIN_MAIL_EMAIL_FROM=ส่งอีเมลสำหรับอีเมลอัตโนมัติ (โดยค่าเริ่มต้นใน <b>php.ini:% s)</b>
+MAIN_MAIL_ERRORS_TO=อีเมลของผู้ส่งใช้สำหรับข้อผิดพลาดกลับอีเมลที่ส่ง
+MAIN_MAIL_AUTOCOPY_TO= ส่งระบบคาร์บอนสำเนาซ่อนของอีเมลที่ส่งไปทั้งหมด
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= ส่งระบบคาร์บอนสำเนาซ่อนของข้อเสนอที่ส่งทางอีเมลไปยัง
+MAIN_MAIL_AUTOCOPY_ORDER_TO= ส่งระบบคาร์บอนสำเนาซ่อนของคำสั่งที่ส่งมาจากอีเมลไปที่
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= ส่งระบบคาร์บอนซ่อนสำเนาใบแจ้งหนี้ส่งโดยอีเมลไปยัง
+MAIN_DISABLE_ALL_MAILS=ปิดใช้งานอีเมลตอบรับ (สำหรับวัตถุประสงค์ในการทดสอบหรือการสาธิต)
+MAIN_MAIL_SENDMODE=วิธีการที่จะใช้ในการส่งอีเมล
+MAIN_MAIL_SMTPS_ID=ID SMTP หากตร​​วจสอบที่จำเป็น
+MAIN_MAIL_SMTPS_PW=รหัสผ่าน SMTP หากตร​​วจสอบที่จำเป็น
+MAIN_MAIL_EMAIL_TLS= ใช้ TLS (SSL) เข้ารหัส
+MAIN_DISABLE_ALL_SMS=ปิดการใช้งานตอบรับ SMS ทั้งหมด (สำหรับวัตถุประสงค์ในการทดสอบหรือการสาธิต)
+MAIN_SMS_SENDMODE=วิธีการที่จะใช้ในการส่ง SMS
+MAIN_MAIL_SMS_FROM=เริ่มต้นหมายเลขโทรศัพท์ของผู้ส่งสำหรับการส่ง SMS
+FeatureNotAvailableOnLinux=คุณลักษณะที่ไม่สามารถใช้ได้บน Unix เหมือนระบบ ทดสอบโปรแกรม sendmail ในประเทศของคุณ
+SubmitTranslation=หากการแปลภาษานี้ไม่สมบูรณ์หรือคุณพบข้อผิดพลาดคุณสามารถแก้ไขปัญหานี้ได้โดยการแก้ไขไฟล์ลงในไดเรกทอรี <b>langs /% s</b> และส่งไฟล์แก้ไขในฟอรั่ม www.dolibarr.org
+ModuleSetup=การติดตั้งโมดูล
+ModulesSetup=การติดตั้งโมดูล
+ModuleFamilyBase=ระบบ
+ModuleFamilyCrm=การบริหารลูกค้าสัมพันธ์ (CRM)
+ModuleFamilyProducts=การจัดการผลิตภัณฑ์
+ModuleFamilyHr=การบริหารงานบุคคล
+ModuleFamilyProjects=โครงการ / ทำงานร่วมกัน
+ModuleFamilyOther=อื่น ๆ
+ModuleFamilyTechnic=เครื่องมือโมดูลหลาย
+ModuleFamilyExperimental=โมดูลทดลอง
+ModuleFamilyFinancial=โมดูลการเงิน (บัญชี / กระทรวงการคลัง)
+ModuleFamilyECM=การจัดการเนื้อหาอิเล็กทรอนิกส์ (ECM)
+MenuHandlers=รถยกเมนู
+MenuAdmin=แก้ไขเมนู
+DoNotUseInProduction=อย่าใช้ในการผลิต
+ThisIsProcessToFollow=นี่คือการตั้งค่าที่จะดำเนินการ:
+ThisIsAlternativeProcessToFollow=นี่คือทางเลือกในการติดตั้งกระบวนการ:
+StepNb=ขั้นตอนที่% s
+FindPackageFromWebSite=หาแพคเกจที่มีคุณลักษณะที่คุณต้องการ (ตัวอย่างเช่นในเว็บไซต์อย่างเป็นทางการของ% s)
+DownloadPackageFromWebSite=แพคเกจการดาวน์โหลด (เช่นจากเว็บไซต์อย่างเป็นทางการ% s)
+UnpackPackageInDolibarrRoot=แฟ้มแพคเกจแกะลงในไดเรกทอรีเซิร์ฟเวอร์ Dolibarr <b>ทุ่มเทให้กับโมดูลภายนอก:% s</b>
+SetupIsReadyForUse=ติดตั้งเสร็จสิ้นแล้วและ Dolibarr พร้อมที่จะใช้กับองค์ประกอบใหม่นี้
+NotExistsDirect=ไดเรกทอรีรากทางเลือกที่ไม่ได้กำหนดไว้ <br>
+InfDirAlt=ตั้งแต่รุ่นที่ 3 ก็เป็นไปได้ที่จะกำหนด directory.This รากทางเลือกที่ช่วยให้คุณสามารถจัดเก็บสถานที่เดียวกันปลั๊กอินและแม่แบบกำหนดเอง <br> เพียงแค่สร้างไดเรกทอรีที่รากของ Dolibarr (เช่นที่กำหนดเอง) <br>
+InfDirExample=<br> จากนั้นประกาศใน conf.php ไฟล์ <br> $ dolibarr_main_url_root_alt = 'http: // myserver / กำหนดเอง' <br> $ dolibarr_main_document_root_alt = '/ เส้นทาง / ของ / dolibarr / htdocs / กำหนดเอง' <br> * เส้นเหล่านี้จะให้ความเห็นกับ "#" เพื่อ uncomment ลบตัวอักษร
+YouCanSubmitFile=สำหรับขั้นตอนนี้คุณสามารถส่งแพคเกจการใช้เครื่องมือนี้: เลือกไฟล์โมดูล
+CurrentVersion=รุ่นปัจจุบัน Dolibarr
+CallUpdatePage=ไปที่หน้าที่ปรับปรุงโครงสร้างฐานข้อมูลและข้อมูล:% s
+LastStableVersion=รุ่นล่าสุดที่มีเสถียรภาพ
+UpdateServerOffline=เซิร์ฟเวอร์การอัพเดทออฟไลน์
+GenericMaskCodes=คุณอาจป้อนหน้ากากเลขใด ๆ ในหน้ากากนี้แท็กต่อไปนี้สามารถนำมาใช้: <br> <b>{000000}</b> สอดคล้องกับจำนวนที่จะเพิ่มขึ้นในแต่ละ% s ใส่เลขศูนย์เป็นจำนวนมากตามความยาวที่ต้องการของเคาน์เตอร์ เคาน์เตอร์จะแล้วเสร็จภายในศูนย์จากซ้ายเพื่อให้มีศูนย์มากที่สุดเท่าที่เป็นหน้ากาก <br> <b>{000000} + 000</b> เช่นเดียวกับก่อนหน้านี้ แต่ชดเชยที่สอดคล้องกับจำนวนที่อยู่ทางขวาของเครื่องหมาย + ถูกนำไปใช้ในการเริ่มต้นครั้งแรก% <br> <b>{000000 @ x}</b> เดียวกับก่อนหน้านี้ แต่นับตั้งค่าใหม่เป็นศูนย์เมื่อเดือน x ถึง (x ระหว่างวันที่ 1 และ 12 หรือ 0 จะใช้เดือนแรกของปีงบประมาณที่กำหนดไว้ในการกำหนดค่าของคุณหรือ 99 เพื่อตั้งค่าให้เป็นศูนย์ทุกเดือน ) ถ้าตัวเลือกนี้ถูกนำมาใช้และ x 2 หรือสูงกว่านั้นลำดับ {yy} {} มิลลิเมตรหรือปปปป {} {} มิลลิเมตรจะต้องมี <br> <b>{} วววัน</b> (01-31) <br> <b>{} มิลลิเมตรเดือน</b> (01-12) <br> <b>yy {}, {} หรือปปปป {y}</b> มากกว่าปีที่ 2, 4 หรือ 1 หมายเลข <br>
+GenericMaskCodes2=<b>{} CCCC</b> รหัสลูกค้าตัวอักษร n <br> <b>{} cccc000</b> รหัสลูกค้าตัวอักษร n จะตามมาด้วยความมุ่งมั่นที่เคาน์เตอร์สำหรับลูกค้า นับนี้ที่ทุ่มเทให้กับลูกค้าจะตั้งค่าในเวลาเดียวกันกว่าเคาน์เตอร์ทั่วโลก <br> <b>{} tttt</b> รหัสประเภท thirdparty ตัวอักษร n (ดูประเภทพจนานุกรม thirdparty) <br>
+GenericMaskCodes3=ทุกตัวละครอื่น ๆ ในหน้ากากจะยังคงเหมือนเดิม <br> ช่องว่างที่ไม่ได้รับอนุญาต <br>
+GenericMaskCodes4a=<u>ตัวอย่างใน% s 99 ของ thecompany บุคคลที่สามทำ 2007/01/31:</u> <br>
+GenericMaskCodes4b=<u>ตัวอย่างของบุคคลที่สามที่สร้างขึ้นบน 2007/03/01:</u> <br>
+GenericMaskCodes4c=<u>ตัวอย่างสินค้าที่สร้างขึ้นบน 2007/03/01:</u> <br>
+GenericMaskCodes5=<b>เอบีซี yy {} {} มิลลิเมตร - {000000}</b> จะให้ <b>ABC0701-000099</b> <br> <b>{0000 + 100 @ 1} -ZZZ / {} วว / XXX</b> จะให้ <b>ZZZ-0199/31 / XXX</b>
+GenericNumRefModelDesc=ส่งกลับจำนวนที่ปรับแต่งได้ตามที่กำหนดไว้หน้ากาก
+ServerAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่มีอยู่ในที่อยู่% s พอร์ต% s</b>
+ServerNotAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่ไม่สามารถใช้ได้ตามที่อยู่% s พอร์ต% s</b>
+DoTestServerAvailability=ทดสอบการเชื่อมต่อเซิร์ฟเวอร์
+DoTestSend=ทดสอบการส่ง
+DoTestSendHTML=ทดสอบการส่ง HTM​​L
+ErrorCantUseRazIfNoYearInMask=ข้อผิดพลาดไม่สามารถใช้ตัวเลือกการตั้งค่าใหม่ @ เคาน์เตอร์ในแต่ละปีถ้าลำดับ {} ปปปปปปปปหรือ {} ไม่ได้อยู่ในหน้ากาก
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=ข้อผิดพลาดที่ไม่สามารถใช้ตัวเลือก @ ถ้าลำดับ {yy} {} มิลลิเมตรหรือปปปป {} {} มมไม่ได้อยู่ในหน้ากาก
+UMask=umask พารามิเตอร์สำหรับไฟล์ใหม่ใน Unix / Linux / BSD / ระบบไฟล์ Mac
+UMaskExplanation=พารามิเตอร์นี้จะช่วยให้คุณสามารถกำหนดสิทธิ์ในการตั้งค่าได้โดยเริ่มต้นในไฟล์ที่สร้างขึ้นโดย Dolibarr บนเซิร์ฟเวอร์ (ระหว่างการอัปโหลดตัวอย่าง) <br> มันจะต้องเป็นค่าฐานแปด (ตัวอย่างเช่น 0666 หมายถึงการอ่านและเขียนสำหรับทุกคน) <br> พารามิเตอร์นี้จะไม่ได้ผลในเซิร์ฟเวอร์ Windows
+SeeWikiForAllTeam=ลองดูที่หน้าวิกิพีเดียสำหรับรายชื่อของนักแสดงทุกคนและองค์กรของพวกเขา
+UseACacheDelay= สำหรับการตอบสนองที่ล่าช้าในการส่งออกในไม่กี่วินาทีแคช (0 หรือที่ว่างเปล่าสำหรับแคชไม่ได้)
+DisableLinkToHelpCenter=ซ่อนลิงค์ <b>"ต้องการความช่วยเหลือหรือการสนับสนุน"</b> ในหน้าเข้าสู่ระบบ
+DisableLinkToHelp=ซ่อนลิงค์ <b>"% s ออนไลน์ช่วย"</b> ในเมนูด้านซ้าย
+AddCRIfTooLong=ไม่มีการตัดอัตโนมัติดังนั้นหากสายจะออกจากหน้าเอกสารที่ยาวเกินไปเพราะคุณต้องเพิ่มผลตอบแทนการขนส่งด้วยตัวคุณเองใน textarea
+ModuleDisabled=ปิดการใช้งานโมดูล
+ModuleDisabledSoNoEvent=ปิดการใช้งานโมดูลเพื่อให้เหตุการณ์ที่ไม่เคยสร้าง
+ConfirmPurge=คุณแน่ใจหรือว่าต้องการที่จะดำเนินการล้างนี้หรือไม่? <br> นี้จะลบไฟล์ทั้งหมดแน่นอนข้อมูลของคุณด้วยวิธีที่จะเรียกคืนได้ (ECM ไฟล์, ไฟล์ที่แนบมา ... )
+MinLength=ระยะเวลาขั้นต่ำ
+LanguageFilesCachedIntoShmopSharedMemory=ไฟล์ .lang โหลดในหน่วยความจำที่ใช้ร่วมกัน
+ExamplesWithCurrentSetup=ตัวอย่างกับการตั้งค่าการทำงานในปัจจุบัน
+ListOfDirectories=รายการ OpenDocument ไดเรกทอรีแม่
+ListOfDirectoriesForModelGenODT=รายชื่อของไดเรกทอรีที่มีแม่แบบไฟล์ที่มีรูปแบบ OpenDocument <br><br> ใส่เส้นทางแบบเต็มของไดเรกทอรีที่นี่ <br> เพิ่มกลับสายการบินระหว่างไดเรกทอรี Eah <br> ในการเพิ่มไดเรกทอรีของโมดูล GED, เพิ่มที่นี่ <b>DOL_DATA_ROOT / ECM / yourdirectoryname</b> <br><br> แฟ้มในไดเรกทอรีเหล่านั้นจะต้องจบลงด้วยการ <b>.odt</b>
+NumberOfModelFilesFound=จำนวน ODT / ODS ไฟล์แม่แบบที่พบในไดเรกทอรีเหล่านั้น
+ExampleOfDirectoriesForModelGen=ตัวอย่างของไวยากรณ์: <br> C: \\ mydir <br> / home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br> หากต้องการทราบวิธีการสร้างเอกสารของคุณ ODT แม่ก่อนที่จะเก็บไว้ในไดเรกทอรีเหล่านั้นอ่านเอกสารวิกิพีเดีย:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
-DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
-KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
-TestSubmitForm=Input test form
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first before using this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide products lines details on generated PDF
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+FirstnameNamePosition=ตำแหน่งชื่อ / นามสกุล
+DescWeather=ภาพต่อไปนี้จะแสดงบนหน้าปัดเมื่อจำนวนของการกระทำในช่วงปลายถึงค่าต่อไปนี้:
+KeyForWebServicesAccess=กุญแจสำคัญในการใช้บริการเว็บ (พารามิเตอร์ "dolibarrkey" ใน webservices)
+TestSubmitForm=รูปแบบการทดสอบการป้อนข้อมูล
+ThisForceAlsoTheme=การใช้ตัวจัดการเมนูนี้จะใช้รูปแบบของตัวเองสิ่งที่เป็นทางเลือกของผู้ใช้ นอกจากนี้ผู้จัดการเมนูนี้พิเศษสำหรับมาร์ทโฟนไม่ได้งานมาร์ทโฟนทั้งหมด ใช้จัดการเมนูอื่นหากคุณพบปัญหากับคุณ
+ThemeDir=ไดเรกทอรีกิน
+ConnectionTimeout=Connexion หมดเวลา
+ResponseTimeout=หมดเวลาการตอบสนอง
+SmsTestMessage=ข้อความทดสอบจาก __PHONEFROM__ เพื่อ __PHONETO__
+ModuleMustBeEnabledFirst=<b>% s</b> โมดูลต้องเปิดใช้งานก่อนที่จะใช้คุณลักษณะนี้
+SecurityToken=กุญแจสำคัญในการรักษาความปลอดภัย URL ที่
+NoSmsEngine=ไม่มีผู้จัดการผู้ส่ง SMS ที่มีอยู่ ผู้จัดการผู้ส่ง SMS ไม่ได้ติดตั้งที่มีการกระจายค่าเริ่มต้น (เพราะพวกเขาขึ้นอยู่กับผู้จัดจำหน่ายภายนอก) แต่คุณสามารถหาบางอย่างเกี่ยวกับ% s
+PDF=รูปแบบไฟล์ PDF
+PDFDesc=คุณสามารถตั้งค่าตัวเลือกในแต่ละระดับโลกที่เกี่ยวข้องกับการสร้างรูปแบบไฟล์ PDF
+PDFAddressForging=กฎการปลอมกล่องที่อยู่
+HideAnyVATInformationOnPDF=ซ่อนข้อมูลทั้งหมดที่เกี่ยวข้องกับภาษีมูลค่าเพิ่มในการสร้างรูปแบบไฟล์ PDF
+HideDescOnPDF=ซ่อนรายละเอียดผลิตภัณฑ์ที่เกี่ยวกับการสร้างรูปแบบไฟล์ PDF
+HideRefOnPDF=ซ่อนอ้างอิงผลิตภัณฑ์ ในการสร้างรูปแบบไฟล์ PDF
+HideDetailsOnPDF=ซ่อนสายผลิตภัณฑ์รายละเอียดเกี่ยวกับการสร้างรูปแบบไฟล์ PDF
+Library=ห้องสมุด
+UrlGenerationParameters=พารามิเตอร์ URL ที่การรักษาความปลอดภัย
+SecurityTokenIsUnique=ใช้พารามิเตอร์ SecureKey ไม่ซ้ำกันสำหรับแต่ละ URL
+EnterRefToBuildUrl=ป้อนการอ้างอิงสำหรับวัตถุ% s
+GetSecuredUrl=รับ URL คำนวณ
+ButtonHideUnauthorized=ปุ่มซ่อนสำหรับการดำเนินการไม่ได้รับอนุญาตแทนที่จะแสดงปุ่มปิดการใช้งาน
+OldVATRates=อัตราภาษีมูลค่าเพิ่มเก่า
+NewVATRates=ใหม่อัตราภาษีมูลค่าเพิ่ม
+PriceBaseTypeToChange=การปรับเปลี่ยนราคาค่าอ้างอิงกับฐานที่กำหนดไว้ใน
+MassConvert=เปิดมวลแปลง
+String=เชือก
+TextLong=ข้อความยาว
+Int=จำนวนเต็ม
+Float=ลอย
+DateAndTime=วันที่และชั่วโมง
+Unique=เป็นเอกลักษณ์
+Boolean=บูลีน (Checkbox)
+ExtrafieldPhone = โทรศัพท์
+ExtrafieldPrice = ราคา
+ExtrafieldMail = อีเมล์
+ExtrafieldSelect = เลือกรายการ
+ExtrafieldSelectList = เลือกจากตาราง
+ExtrafieldSeparator=เครื่องสกัด
+ExtrafieldCheckBox=ช่องทำเครื่องหมาย
+ExtrafieldRadio=ปุ่ม
+ExtrafieldCheckBoxFromList= Checkbox จากตาราง
+ExtrafieldLink=เชื่อมโยงไปยังวัตถุ
+ExtrafieldParamHelpselect=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ... <br><br> เพื่อที่จะมีรายชื่อขึ้นอยู่กับอื่น: <br> 1 ค่า 1 | parent_list_code: parent_key <br> 2 value2 | parent_list_code: parent_key
+ExtrafieldParamHelpcheckbox=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ...
+ExtrafieldParamHelpradio=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ...
+ExtrafieldParamHelpsellist=รายการพารามิเตอร์มาจากโต๊ะ <br> ไวยากรณ์: table_name: label_field: id_field :: กรอง <br> ตัวอย่าง: c_typent: Libelle: ID :: กรอง <br><br> กรองสามารถทดสอบอย่างง่าย (เช่นการใช้งาน = 1) เพื่อแสดงค่าที่ใช้งานเท่านั้น <br> ถ้าคุณต้องการที่จะกรอง extrafields ใช้ syntaxt extra.fieldcode = ... (ที่รหัสสนามเป็นรหัสของ extrafield) <br><br> เพื่อที่จะมีรายชื่อขึ้นอยู่กับอื่น: <br> c_typent: Libelle: id: parent_list_code | parent_column: ตัวกรอง
+ExtrafieldParamHelpchkbxlst=รายการพารามิเตอร์มาจากโต๊ะ <br> ไวยากรณ์: table_name: label_field: id_field :: กรอง <br> ตัวอย่าง: c_typent: Libelle: ID :: กรอง <br><br> กรองสามารถทดสอบอย่างง่าย (เช่นการใช้งาน = 1) เพื่อแสดงค่าที่ใช้งานเท่านั้น <br> ถ้าคุณต้องการที่จะกรอง extrafields ใช้ syntaxt extra.fieldcode = ... (ที่รหัสสนามเป็นรหัสของ extrafield) <br><br> เพื่อที่จะมีรายชื่อขึ้นอยู่กับอื่น: <br> c_typent: Libelle: id: parent_list_code | parent_column: ตัวกรอง
+LibraryToBuildPDF=ห้องสมุดใช้ในการสร้างรูปแบบไฟล์ PDF
+WarningUsingFPDF=คำเตือน: <b>conf.php</b> ของคุณมี <b>dolibarr_pdf_force_fpdf</b> สั่ง <b>=</b> 1 ซึ่งหมายความว่าคุณใช้ห้องสมุด FPDF ในการสร้างไฟล์ PDF ห้องสมุดนี้จะเก่าและไม่สนับสนุนจำนวนมากของคุณสมบัติ (Unicode โปร่งใสภาพ Cyrillic ภาษาอาหรับและเอเซีย, ... ) ดังนั้นคุณอาจพบข้อผิดพลาดระหว่างการสร้างรูปแบบไฟล์ PDF <br> เพื่อแก้ปัญหานี้และมีการสนับสนุนอย่างเต็มที่จากการสร้างรูปแบบไฟล์ PDF โปรดดาวน์โหลด <a href="http://www.tcpdf.org/" target="_blank">ห้องสมุด TCPDF</a> แล้วแสดงความคิดเห็นหรือลบบรรทัด <b>$ dolibarr_pdf_force_fpdf = 1</b> และเพิ่มแทน <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
+LocalTaxDesc=บางประเทศใช้ 2 หรือ 3 ภาษีในแต่ละบรรทัดใบแจ้งหนี้ หากเป็นกรณีนี้เลือกประเภทภาษีที่สองและสามและอัตรา ชนิดที่เป็นไปได้: <br> 1: ภาษีท้องถิ่นนำไปใช้กับผลิตภัณฑ์และบริการโดยไม่ต้องภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินที่ไม่เสียภาษี) <br> 2: ภาษีท้องถิ่นนำไปใช้กับผลิตภัณฑ์และบริการรวมทั้งภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินภาษี + หลัก) <br> 3: ภาษีท้องถิ่นนำไปใช้กับผลิตภัณฑ์โดยไม่ต้องภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินที่ไม่เสียภาษี) <br> 4: ภาษีท้องถิ่นนำไปใช้บนผลิตภัณฑ์รวมถึงภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงิน + ถังหลัก) <br> 5 ภาษีท้องถิ่นนำไปใช้ในการให้บริการไม่รวมภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงินที่ไม่เสียภาษี) <br> 6: ภาษีท้องถิ่นนำไปใช้ในการให้บริการรวมทั้งภาษีมูลค่าเพิ่ม (localtax มีการคำนวณเกี่ยวกับจำนวนเงิน + ภาษี)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+LinkToTestClickToDial=ป้อนหมายเลขโทรศัพท์เพื่อโทรไปที่จะแสดงการเชื่อมโยงเพื่อทดสอบสมาชิก ClickToDial <strong>สำหรับผู้ใช้% s</strong>
+RefreshPhoneLink=การเชื่อมโยงการฟื้นฟู
+LinkToTest=<strong>ลิงค์ที่สร้างขึ้นสำหรับผู้ใช้% s</strong> (คลิกหมายเลขโทรศัพท์เพื่อทดสอบ)
+KeepEmptyToUseDefault=ให้ว่างเพื่อใช้ค่าเริ่มต้น
+DefaultLink=เริ่มต้นการเชื่อมโยง
+ValueOverwrittenByUserSetup=คำเตือนค่านี้อาจถูกเขียนทับโดยการตั้งค่าของผู้ใช้เฉพาะ (ผู้ใช้แต่ละคนสามารถตั้งค่า URL clicktodial ของตัวเอง)
+ExternalModule=โมดูลภายนอก - ติดตั้งลงในไดเรกทอรี% s
+BarcodeInitForThirdparties=init บาร์โค้ดมวลสำหรับ thirdparties
+BarcodeInitForProductsOrServices=init บาร์โค้ดมวลหรือตั้งค่าสำหรับผลิตภัณฑ์หรือบริการ
+CurrentlyNWithoutBarCode=<strong>ขณะนี้คุณมีบันทึก% s ใน% s%</strong> s โดยไม่ต้องกำหนดบาร์โค้ด
+InitEmptyBarCode=ค่า init สำหรับถัด% ระเบียนที่ว่างเปล่า
+EraseAllCurrentBarCode=ลบทุกค่าบาร์โค้ดปัจจุบัน
+ConfirmEraseAllCurrentBarCode=คุณแน่ใจว่าคุณต้องการที่จะลบทุกค่าบาร์โค้ดปัจจุบันหรือไม่?
+AllBarcodeReset=ทั้งหมดค่าบาร์โค้ดได้ถูกลบออก
+NoBarcodeNumberingTemplateDefined=ไม่มีแม่แบบบาร์โค้ดเลขที่เปิดใช้งานลงในการติดตั้งโมดูลบาร์โค้ด
+NoRecordWithoutBarcodeDefined=บันทึกที่มีค่าไม่มีบาร์โค้ดที่กำหนดไว้ไม่มี
 
 # Modules
-Module0Name=Users & groups
-Module0Desc=Users and groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module0Name=และกลุ่มผู้ใช้
+Module0Desc=ผู้ใช้และกลุ่มการจัดการ
+Module1Name=บุคคลที่สาม
+Module1Desc=บริษัท และการจัดการรายชื่อผู้ติดต่อ (ลูกค้ากลุ่มเป้าหมาย ... )
+Module2Name=เชิงพาณิชย์
+Module2Desc=การจัดการเชิงพาณิชย์
+Module10Name=การบัญชี
+Module10Desc=รายงานบัญชีง่าย (วารสารหมุนเวียน) ตามไปยังเนื้อหาของฐานข้อมูล ไม่มีการฝึกอบรม
+Module20Name=ข้อเสนอ
+Module20Desc=การจัดการข้อเสนอในเชิงพาณิชย์
+Module22Name=E-จดหมายจำนวนมาก
+Module22Desc=มวลการจัดการ E-ทางไปรษณีย์
+Module23Name=พลังงาน
+Module23Desc=การตรวจสอบการใช้พลังงาน
+Module25Name=คำสั่งซื้อของลูกค้า
+Module25Desc=การบริหารลูกค้าสั่งซื้อ
+Module30Name=ใบแจ้งหนี้
+Module30Desc=ใบแจ้งหนี้และการจัดการใบลดหนี้สำหรับลูกค้า การจัดการใบแจ้งหนี้สำหรับซัพพลายเออร์
+Module40Name=ซัพพลายเออร์
+Module40Desc=จัดการซัพพลายเออร์และการซื้อ (คำสั่งซื้อและใบแจ้งหนี้)
+Module42Name=บันทึก
+Module42Desc=สิ่งอำนวยความสะดวกการบันทึกข้อมูล (ไฟล์ syslog, ... )
+Module49Name=บรรณาธิการ
+Module49Desc=การจัดการแก้ไข
+Module50Name=ผลิตภัณฑ์
+Module50Desc=การจัดการสินค้า
+Module51Name=จดหมายจำนวนมาก
+Module51Desc=กระดาษมวลจัดการทางไปรษณีย์
+Module52Name=หุ้น
+Module52Desc=การบริหารจัดการสต็อก (สินค้า)
+Module53Name=บริการ
+Module53Desc=การจัดการบริการ
+Module54Name=สัญญา / สมัครสมาชิก
+Module54Desc=การบริหารจัดการของสัญญา (บริการหรือการสมัครสมาชิก reccuring)
+Module55Name=บาร์โค้ด
+Module55Desc=การจัดการบาร์โค้ด
+Module56Name=โทรศัพท์
+Module56Desc=รวมโทรศัพท์
+Module57Name=ยืนคำสั่งซื้อ
+Module57Desc=คำสั่งยืนและการจัดการถอน นอกจากนี้ยังมีการสร้างไฟล์ SEPA สำหรับประเทศในยุโรป
 Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module58Desc=บูรณาการของระบบ ClickToDial (ดอกจัน, ... )
 Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
+Module59Desc=เพิ่มฟังก์ชั่นในการสร้างบัญชี Bookmark4u จากบัญชี Dolibarr
+Module70Name=การแทรกแซง
+Module70Desc=การจัดการการแทรกแซง
+Module75Name=ค่าใช้จ่ายและบันทึกการเดินทาง
+Module75Desc=ค่าใช้จ่ายและการจัดการบันทึกการเดินทาง
+Module80Name=การจัดส่ง
+Module80Desc=การจัดส่งและการจัดการการสั่งซื้อการจัดส่ง
+Module85Name=ธนาคารและเงินสด
+Module85Desc=การบริหารจัดการของธนาคารหรือบัญชีเงินสด
+Module100Name=เว็บไซต์ภายนอก
+Module100Desc=โมดูลนี้จะรวมถึงเว็บไซต์ภายนอกหรือหน้าในเมนู Dolibarr และดูเป็นกรอบ Dolibarr
+Module105Name=บุรุษไปรษณีย์และหลักสูตรนานาชาติ
+Module105Desc=บุรุษไปรษณีย์หรือหลักสูตรนานาชาติอินเตอร์เฟซสำหรับโมดูลสมาชิก
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
+Module200Desc=ประสานไดเรกทอรี LDAP
 Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr datas (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import datas in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
+Module210Desc=บูรณาการ PostNuke
+Module240Name=ข้อมูลการส่งออก
+Module240Desc=เครื่องมือในการส่งออกข้อมูล Dolibarr (มีผู้ช่วย)
+Module250Name=การนำเข้าข้อมูล
+Module250Desc=เครื่องมือที่จะนำเข้าข้อมูลใน Dolibarr (มีผู้ช่วย)
+Module310Name=สมาชิก
+Module310Desc=มูลนิธิการจัดการสมาชิก
 Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmark management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module320Desc=เพิ่มฟีด RSS ภายใน Dolibarr หน้าจอ
+Module330Name=ที่คั่นหน้า
+Module330Desc=การจัดการ Bookmark
+Module400Name=โครงการ / โอกาส / นำ
+Module400Desc=การบริหารจัดการของโครงการหรือนำไปสู่​​โอกาส จากนั้นคุณสามารถกำหนดองค์ประกอบใด ๆ (ใบแจ้งหนี้เพื่อข้อเสนอการแทรกแซง, ... ) กับโครงการและได้รับมุมมองจากมุมมองขวางโครงการ
 Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module410Desc=บูรณาการ Webcalendar
+Module500Name=ค่าใช้จ่ายพิเศษ
+Module500Desc=การบริหารจัดการค่าใช้จ่ายพิเศษ (ภาษีภาษีสังคมหรือการเงินการจ่ายเงินปันผล)
+Module510Name=เงินเดือน
+Module510Desc=การบริหารจัดการของเงินเดือนพนักงานและการชำระเงิน
+Module520Name=เงินกู้
+Module520Desc=การบริหารจัดการของเงินให้สินเชื่อ
+Module600Name=การแจ้งเตือน
+Module600Desc=ส่งการแจ้งเตือนอีเมลในบางกิจกรรมทางธุรกิจ Dolibarr ไปยังรายชื่อของบุคคลที่สาม (การตั้งค่าที่กำหนดไว้ในแต่ละ thirdparty)
+Module700Name=การบริจาค
+Module700Desc=การจัดการการบริจาค
+Module770Name=รายงานค่าใช้จ่าย
+Module770Desc=การบริหารจัดการและการเรียกร้องรายงานค่าใช้จ่าย (การขนส่ง, อาหาร, ... )
+Module1120Name=ข้อเสนอในเชิงพาณิชย์ผู้ผลิต
+Module1120Desc=ขอข้อเสนอในเชิงพาณิชย์ผู้จัดจำหน่ายและราคา
+Module1200Name=ตั๊กแตนตำข้าว
+Module1200Desc=บูรณาการตั๊กแตนตำข้าว
+Module1400Name=การบัญชี
+Module1400Desc=การจัดการการบัญชี (ฝ่ายคู่)
+Module1520Name=การสร้างเอกสาร
+Module1520Desc=สร้างเอกสารอีเมล์จำนวนมาก
+Module1780Name=แท็ก / หมวดหมู่
+Module1780Desc=สร้างแท็ก / หมวดหมู่ (ผลิตภัณฑ์ลูกค้าซัพพลายเออร์รายชื่อหรือสมาชิก)
+Module2000Name=แก้ไขแบบ WYSIWYG
+Module2000Desc=อนุญาตให้มีการแก้ไขข้อความบางส่วนในพื้นที่โดยใช้โปรแกรมแก้ไขขั้นสูง
+Module2200Name=ราคาแบบไดนามิก
+Module2200Desc=เปิดใช้งานการใช้งานของการแสดงออกทางคณิตศาสตร์สำหรับราคา
 Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Agenda
-Module2400Desc=Events/tasks and agenda management
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
-Module2650Name=WebServices (client)
-Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2300Desc=การจัดการงานตามเวลาที่กำหนด
+Module2400Name=ระเบียบวาระการประชุม
+Module2400Desc=เหตุการณ์ / งานและการจัดการวาระการประชุม
+Module2500Name=การจัดการเนื้อหาอิเล็กทรอนิกส์
+Module2500Desc=บันทึกและแบ่งปันเอกสาร
+Module2600Name=บริการ API (SOAP บริการเว็บ)
+Module2600Desc=เปิดใช้งานเซิร์ฟเวอร์ SOAP Dolibarr ให้บริการ API
+Module2610Name=บริการ API (บริการเว็บ REST)
+Module2610Desc=เปิดใช้งานเซิร์ฟเวอร์ Dolibarr REST API ให้บริการ
+Module2650Name=WebServices (ลูกค้า)
+Module2650Desc=เปิดใช้งานเว็บ Dolibarr บริการลูกค้า (สามารถใช้ในการผลักดันข้อมูล / การร้องขอไปยังเซิร์ฟเวอร์ภายนอก. คำสั่งผู้สนับสนุนเฉพาะสำหรับช่วงเวลา)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
+Module2700Desc=ใช้บริการ Gravatar ออนไลน์ (www.gravatar.com) เพื่อแสดงภาพของผู้ใช้ / สมาชิก (พบกับอีเมลของพวกเขา) ต้องเชื่อมต่ออินเทอร์เน็ต
+Module2800Desc=ไคลเอนต์ FTP
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
+Module2900Desc=GeoIP Maxmind ความสามารถในการแปลง
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
+Module3100Desc=เพิ่มปุ่ม Skype ลงในบัตรสมัครพรรคพวก / บุคคลที่สาม / รายชื่อผู้ติดต่อ
+Module5000Name=หลาย บริษัท
+Module5000Desc=ช่วยให้คุณสามารถจัดการกับหลาย บริษัท
+Module6000Name=ขั้นตอนการทำงาน
+Module6000Desc=การจัดการเวิร์กโฟลว์
+Module20000Name=ขอออกจากการบริหารจัดการ
+Module20000Desc=ประกาศและติดตามพนักงานใบร้องขอ
+Module39000Name=สินค้าจำนวนมาก
+Module39000Desc=จำนวนมากหรือหมายเลขกินโดยและขายโดยการจัดการวันที่เกี่ยวกับผลิตภัณฑ์
 Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module
+Module50000Desc=โมดูลที่จะนำเสนอหน้าการชำระเงินออนไลน์ผ่านบัตรเครดิตกับ PayBox
+Module50100Name=จุดขาย
+Module50100Desc=จุดขายของโมดูล
 Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
+Module50200Desc=โมดูลที่จะนำเสนอหน้าการชำระเงินออนไลน์ผ่านบัตรเครดิตกับ Paypal
+Module50400Name=บัญชี (ขั้นสูง)
+Module50400Desc=การจัดการการบัญชี (ฝ่ายคู่)
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export datas
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
-Permission146=Read providers
-Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-PermissionAdvanced253=Create/modify internal/external users and permissions
-Permission254=Create/modify external users only
-Permission255=Modify other users password
-Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1421=Export customer orders and attributes
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
+Module54000Desc=พิมพ์โดยตรง (โดยไม่ต้องเปิดเอกสาร) โดยใช้อินเตอร์เฟซถ้วยไอพีพี (เครื่องพิมพ์จะต้องมองเห็นจากเซิร์ฟเวอร์และ CUPS จะต้อง installe บนเซิร์ฟเวอร์)
+Module55000Name=โพล
+Module55000Desc=โมดูลที่จะทำให้การเลือกตั้งออนไลน์ (เช่น Doodle, กระดุม, Rdvz, ... )
+Module59000Name=อัตรากำไรขั้นต้น
+Module59000Desc=โมดูลการจัดการอัตรากำไรขั้นต้น
+Module60000Name=คณะกรรมการ
+Module60000Desc=โมดูลการจัดการค่าคอมมิชชั่น
+Permission11=อ่านใบแจ้งหนี้ของลูกค้า
+Permission12=สร้าง / แก้ไขใบแจ้งหนี้ของลูกค้า
+Permission13=ใบแจ้งหนี้ของลูกค้า Unvalidate
+Permission14=ตรวจสอบใบแจ้งหนี้ของลูกค้า
+Permission15=ส่งใบแจ้งหนี้ของลูกค้าโดยการส่งอีเมล์
+Permission16=สร้างใบแจ้งหนี้การชำระเงินสำหรับลูกค้า
+Permission19=ลบใบแจ้งหนี้ของลูกค้า
+Permission21=อ่านข้อเสนอในเชิงพาณิชย์
+Permission22=สร้าง / แก้ไขข้อเสนอในเชิงพาณิชย์
+Permission24=ตรวจสอบข้อเสนอในเชิงพาณิชย์
+Permission25=ส่งข้อเสนอในเชิงพาณิชย์
+Permission26=ข้อเสนอในเชิงพาณิชย์ปิด
+Permission27=ลบข้อเสนอในเชิงพาณิชย์
+Permission28=ข้อเสนอในเชิงพาณิชย์เพื่อการส่งออก
+Permission31=อ่านผลิตภัณฑ์
+Permission32=สร้าง / แก้ไขผลิตภัณฑ์
+Permission34=ลบผลิตภัณฑ์
+Permission36=ดู / จัดการผลิตภัณฑ์ที่ซ่อน
+Permission38=สินค้าส่งออก
+Permission41=อ่านโครงการและงาน (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ) นอกจากนี้ยังสามารถใส่เวลาที่ใช้ในงานที่ได้รับมอบหมาย (timesheet)
+Permission42=สร้าง / แก้ไขโครงการ (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ)
+Permission44=ลบโครงการ (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ)
+Permission61=อ่านการแทรกแซง
+Permission62=สร้าง / แก้ไขการแทรกแซง
+Permission64=ลบแทรกแซง
+Permission67=การแทรกแซงการส่งออก
+Permission71=อ่านสมาชิก
+Permission72=สร้าง / แก้ไขสมาชิก
+Permission74=ลบสมาชิก
+Permission75=ชนิดติดตั้งของการเป็นสมาชิก
+Permission76=ข้อมูลการส่งออก
+Permission78=อ่านการสมัครสมาชิก
+Permission79=สร้าง / แก้ไขการสมัครสมาชิก
+Permission81=อ่านคำสั่งซื้อของลูกค้า
+Permission82=สร้าง / แก้ไขคำสั่งซื้อของลูกค้า
+Permission84=ตรวจสอบการสั่งซื้อของลูกค้า
+Permission86=ส่งคำสั่งซื้อของลูกค้า
+Permission87=ลูกค้าปิดการสั่งซื้อ
+Permission88=ยกเลิกคำสั่งซื้อของลูกค้า
+Permission89=ลบคำสั่งซื้อของลูกค้า
+Permission91=อ่านภาษีทางสังคมหรือทางการคลังและภาษีมูลค่าเพิ่ม
+Permission92=สร้าง / แก้ไขภาษีทางสังคมหรือทางการคลังและภาษีมูลค่าเพิ่ม
+Permission93=ลบภาษีทางสังคมหรือทางการคลังและภาษีมูลค่าเพิ่ม
+Permission94=ส่งออกสังคมหรือภาษีการคลัง
+Permission95=อ่านรายงาน
+Permission101=อ่านตอบรับ
+Permission102=สร้าง / แก้ไขตอบรับ
+Permission104=ตรวจสอบตอบรับ
+Permission106=ตอบรับการส่งออก
+Permission109=ลบตอบรับ
+Permission111=อ่านบัญชีการเงิน
+Permission112=สร้าง / แก้ไข / ลบและเปรียบเทียบการทำธุรกรรม
+Permission113=การตั้งค่าบัญชีการเงิน (สร้างจัดการหมวดหมู่)
+Permission114=Reconciliate การทำธุรกรรม
+Permission115=การทำธุรกรรมการส่งออกและงบบัญชี
+Permission116=โอนเงินระหว่างบัญชี
+Permission117=จัดการฝึกอบรมการตรวจสอบ
+Permission121=อ่านบุคคลที่สามที่เชื่อมโยงไปยังผู้ใช้
+Permission122=สร้าง / แก้ไขบุคคลที่สามที่เชื่อมโยงไปยังผู้ใช้
+Permission125=ลบบุคคลที่สามที่เชื่อมโยงไปยังผู้ใช้
+Permission126=บุคคลที่สามส่งออก
+Permission141=อ่านทุกโครงการและงาน (ยังเป็นโครงการส่วนตัวฉันไม่ได้ติดต่อเพื่อขอ)
+Permission142=สร้าง / แก้ไขทุกโครงการและงาน (ยังเป็นโครงการส่วนตัวฉันไม่ได้ติดต่อเพื่อขอ)
+Permission144=ลบทุกโครงการและงาน (ยังเป็นโครงการส่วนตัวฉันไม่ได้ติดต่อเพื่อขอ)
+Permission146=อ่านให้บริการ
+Permission147=อ่านสถิติ
+Permission151=อ่านคำสั่งยืน
+Permission152=สร้าง / แก้ไขคำสั่งยืนตามคำขอ
+Permission153=ใบเสร็จรับเงินการส่งคำสั่งยืน
+Permission154=เครดิต / ปฏิเสธยืนใบเสร็จรับเงินการสั่งซื้อ
+Permission161=อ่านสัญญา / สมัครสมาชิก
+Permission162=สร้าง / แก้ไขสัญญา / สมัครสมาชิก
+Permission163=เปิดใช้งานบริการ / สมัครสมาชิกของสัญญา
+Permission164=ปิดการใช้งานบริการ / สมัครสมาชิกของสัญญา
+Permission165=ลบสัญญา / สมัครสมาชิก
+Permission171=อ่านการเดินทางและค่าใช้จ่าย (ของตัวเองและผู้ใต้บังคับบัญชาของเขา)
+Permission172=สร้าง / แก้ไขการเดินทางและค่าใช้จ่าย
+Permission173=ลบการเดินทางและค่าใช้จ่าย
+Permission174=อ่านการเดินทางและค่าใช้จ่ายทั้งหมด
+Permission178=ส่งออกการเดินทางและค่าใช้จ่าย
+Permission180=อ่านซัพพลายเออร์
+Permission181=อ่านคำสั่งของผู้จัดจำหน่าย
+Permission182=สร้าง / แก้ไขคำสั่งผู้จัดจำหน่าย
+Permission183=ตรวจสอบการสั่งซื้อผู้จัดจำหน่าย
+Permission184=อนุมัติคำสั่งผู้จัดจำหน่าย
+Permission185=สั่งซื้อหรือยกเลิกคำสั่งผู้จัดจำหน่าย
+Permission186=รับการสั่งซื้อผู้จัดจำหน่าย
+Permission187=คำสั่งซัพพลายเออร์ปิด
+Permission188=ยกเลิกคำสั่งผู้จัดจำหน่าย
+Permission192=สร้างเส้น
+Permission193=ยกเลิกสาย
+Permission194=อ่านเส้นแบนด์วิดธ์
+Permission202=สร้างการเชื่อมต่อ ADSL
+Permission203=การเชื่อมต่อการสั่งซื้อสั่งซื้อสินค้า
+Permission204=การเชื่อมต่อการสั่งซื้อ
+Permission205=จัดการการเชื่อมต่อ
+Permission206=อ่านการเชื่อมต่อ
+Permission211=อ่านโทรศัพท์
+Permission212=สายการสั่งซื้อสินค้า
+Permission213=เปิดใช้งานสาย
+Permission214=การติดตั้งโทรศัพท์
+Permission215=ผู้ให้บริการติดตั้ง
+Permission221=อ่าน emailings
+Permission222=สร้าง / แก้ไข emailings (หัวข้อผู้รับ ... )
+Permission223=ตรวจสอบ emailings (ช่วยให้การส่ง)
+Permission229=ลบ emailings
+Permission237=ดูผู้รับและข้อมูล
+Permission238=ด้วยตนเองส่งจดหมาย
+Permission239=ลบหลังจากการตรวจสอบการส่งจดหมายหรือส่ง
+Permission241=อ่านประเภท
+Permission242=สร้าง / แก้ไขประเภท
+Permission243=ลบประเภท
+Permission244=ดูเนื้อหาของหมวดหมู่ที่ซ่อนอยู่
+Permission251=อ่านผู้ใช้และกลุ่มอื่น ๆ
+PermissionAdvanced251=อ่านผู้ใช้อื่น ๆ
+Permission252=อ่านสิทธิ์ของผู้อื่น
+Permission253=สร้าง / แก้ไขผู้ใช้อื่น ๆ กลุ่มและ permisssions
+PermissionAdvanced253=สร้าง / แก้ไขผู้ใช้ภายใน / ภายนอกและการอนุญาต
+Permission254=สร้าง / แก้ไขผู้ใช้ภายนอกเท่านั้น
+Permission255=แก้ไขรหัสผ่านผู้ใช้อื่น ๆ
+Permission256=ลบหรือปิดการใช้งานผู้ใช้อื่น ๆ
+Permission262=ขยายการเข้าถึงบุคคลที่สามทั้งหมด (ไม่เพียง แต่ผู้ที่เชื่อมโยงกับผู้ใช้) ที่มีประสิทธิภาพไม่ได้สำหรับผู้ใช้ภายนอก (จำกัด เสมอกับตัวเอง)
+Permission271=อ่าน CA
+Permission272=อ่านใบแจ้งหนี้
+Permission273=ใบแจ้งหนี้ฉบับ
+Permission281=อ่านรายชื่อผู้ติดต่อ
+Permission282=สร้าง / แก้ไขรายชื่อ
+Permission283=ลบรายชื่อ
+Permission286=รายชื่อที่ส่งออก
+Permission291=อ่านภาษี
+Permission292=กำหนดสิทธิในการเก็บภาษีศุลกากร
+Permission293=การปรับเปลี่ยนอัตราภาษีศุลกากรซอ
+Permission300=อ่านบาร์โค้ด
+Permission301=สร้าง / แก้ไขบาร์โค้ด
+Permission302=ลบบาร์โค้ด
+Permission311=อ่านบริการ
+Permission312=กำหนดบริการ / สมัครสมาชิกที่จะทำสัญญา
+Permission331=อ่านบุ๊คมาร์ค
+Permission332=สร้าง / แก้ไขบุ๊คมาร์ค
+Permission333=ลบบุ๊คมาร์ค
+Permission341=อ่านสิทธิ์ของตัวเอง
+Permission342=สร้าง / แก้ไขข้อมูลของผู้ใช้ของตัวเอง
+Permission343=แก้ไขรหัสผ่านของตัวเอง
+Permission344=ปรับเปลี่ยนสิทธิ์ของตัวเอง
+Permission351=อ่านกลุ่ม
+Permission352=อ่านสิทธิ์กลุ่ม
+Permission353=สร้าง / แก้ไขกลุ่ม
+Permission354=ลบหรือกลุ่มปิดการใช้งาน
+Permission358=ผู้ใช้ส่งออก
+Permission401=อ่านส่วนลด
+Permission402=สร้าง / แก้ไขส่วนลด
+Permission403=ตรวจสอบส่วนลด
+Permission404=ลบส่วนลด
+Permission510=อ่านเงินเดือน
+Permission512=สร้าง / แก้ไขเงินเดือน
+Permission514=ลบเงินเดือน
+Permission517=เงินเดือนส่งออก
+Permission520=อ่านสินเชื่อ
+Permission522=สร้าง / แก้ไขการให้กู้ยืมเงิน
+Permission524=ลบเงินให้สินเชื่อ
+Permission525=เครื่องคิดเลขสินเชื่อเข้าถึง
+Permission527=เงินให้กู้ยืมเพื่อการส่งออก
+Permission531=อ่านบริการ
+Permission532=สร้าง / แก้ไขบริการ
+Permission534=ลบบริการ
+Permission536=ดู / จัดการบริการซ่อน
+Permission538=บริการส่งออก
+Permission701=อ่านบริจาค
+Permission702=สร้าง / แก้ไขการบริจาค
+Permission703=ลบบริจาค
+Permission771=อ่านรายงานค่าใช้จ่าย (ของตัวเองและผู้ใต้บังคับบัญชาของเขา)
+Permission772=สร้าง / แก้ไขรายงานค่าใช้จ่าย
+Permission773=ลบรายงานค่าใช้จ่าย
+Permission774=อ่านรายงานค่าใช้จ่ายทั้งหมด (แม้จะไม่ได้สำหรับผู้ใช้ผู้ใต้บังคับบัญชา)
+Permission775=อนุมัติรายงานค่าใช้จ่าย
+Permission776=จ่ายรายงานค่าใช้จ่าย
+Permission779=รายงานค่าใช้จ่ายส่งออก
+Permission1001=อ่านหุ้น
+Permission1002=สร้าง / แก้ไขคลังสินค้า
+Permission1003=ลบคลังสินค้า
+Permission1004=อ่านการเคลื่อนไหวของหุ้น
+Permission1005=สร้าง / แก้ไขการเคลื่อนไหวของหุ้น
+Permission1101=อ่านคำสั่งซื้อการจัดส่ง
+Permission1102=สร้าง / แก้ไขคำสั่งซื้อการจัดส่ง
+Permission1104=ตรวจสอบการสั่งซื้อการจัดส่ง
+Permission1109=ลบคำสั่งซื้อการจัดส่ง
+Permission1181=อ่านซัพพลายเออร์
+Permission1182=อ่านคำสั่งของผู้จัดจำหน่าย
+Permission1183=สร้าง / แก้ไขคำสั่งผู้จัดจำหน่าย
+Permission1184=ตรวจสอบการสั่งซื้อผู้จัดจำหน่าย
+Permission1185=อนุมัติคำสั่งผู้จัดจำหน่าย
+Permission1186=การสั่งซื้อสั่งซื้อสินค้าผู้จัดจำหน่าย
+Permission1187=รับทราบคำสั่งของผู้จัดจำหน่าย
+Permission1188=ลบคำสั่งผู้จัดจำหน่าย
+Permission1190=อนุมัติ (อนุมัติวินาที) คำสั่งผู้จัดจำหน่าย
+Permission1201=ได้รับผลจากการส่งออก
+Permission1202=สร้าง / แก้ไขการส่งออก
+Permission1231=อ่านใบแจ้งหนี้จัดจำหน่าย
+Permission1232=สร้าง / แก้ไขใบแจ้งหนี้จัดจำหน่าย
+Permission1233=ตรวจสอบใบแจ้งหนี้จัดจำหน่าย
+Permission1234=ลบใบแจ้งหนี้จัดจำหน่าย
+Permission1235=ส่งใบแจ้งหนี้จัดจำหน่ายโดยการส่งอีเมล์
+Permission1236=ส่งออกใบแจ้งหนี้, การจัดหาคุณลักษณะและการชำระเงิน
+Permission1237=ส่งออกคำสั่งผู้จัดจำหน่ายและรายละเอียดของพวกเขา
+Permission1251=เรียกมวลของการนำเข้าข้อมูลภายนอกลงในฐานข้อมูล (โหลดข้อมูล)
+Permission1321=ส่งออกใบแจ้งหนี้ของลูกค้าคุณลักษณะและการชำระเงิน
+Permission1421=ส่งออกสั่งซื้อของลูกค้าและคุณลักษณะ
+Permission23001=อ่านงานที่กำหนดเวลาไว้
+Permission23002=สร้าง / การปรับปรุงกำหนดเวลางาน
+Permission23003=ลบงานที่กำหนด
+Permission23004=การดำเนินงานที่กำหนด
+Permission2401=อ่านการกระทำ (เหตุการณ์หรืองาน) ที่เชื่อมโยงกับบัญชีของเขา
+Permission2402=สร้าง / แก้ไขการกระทำ (เหตุการณ์หรืองาน) ที่เชื่อมโยงกับบัญชีของเขา
+Permission2403=ลบการกระทำ (เหตุการณ์หรืองาน) ที่เชื่อมโยงกับบัญชีของเขา
+Permission2411=อ่านการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
+Permission2412=สร้าง / แก้ไขการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
+Permission2413=ลบการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
+Permission2501=อ่าน / ดาวน์โหลดเอกสาร
+Permission2502=ดาวน์โหลดเอกสาร
+Permission2503=ส่งเอกสารหรือลบ
+Permission2515=ไดเรกทอรีเอกสารการติดตั้ง
+Permission2801=ใช้โปรแกรม FTP ในโหมดอ่าน (เรียกดูและดาวน์โหลดเท่านั้น)
+Permission2802=ใช้โปรแกรม FTP ในโหมดเขียน (ลบหรืออัปโหลดไฟล์)
+Permission50101=ใช้จุดขาย
+Permission50201=อ่านการทำธุรกรรม
+Permission50202=การทำธุรกรรมนำเข้า
+Permission54001=พิมพ์
+Permission55001=อ่านโพลล์
+Permission55002=สร้าง / แก้ไขโพลล์
+Permission59001=อ่านอัตรากำไรขั้นต้นในเชิงพาณิชย์
+Permission59002=กำหนดอัตรากำไรขั้นต้นในเชิงพาณิชย์
+Permission59003=อ่านอัตรากำไรขั้นต้นผู้ใช้ทุกคน
+DictionaryCompanyType=ประเภท Thirdparties
+DictionaryCompanyJuridicalType=ชนิดของการพิจารณาคดี thirdparties
+DictionaryProspectLevel=ระดับศักยภาพ Prospect
+DictionaryCanton=รัฐ / Cantons
+DictionaryRegion=ภูมิภาค
+DictionaryCountry=ประเทศ
+DictionaryCurrency=สกุลเงิน
+DictionaryCivility=ชื่อสุภาพ
+DictionaryActions=ประเภทของกิจกรรมวาระการประชุม
+DictionarySocialContributions=ภาษีทางสังคมหรือทางการคลังประเภท
+DictionaryVAT=ภาษีมูลค่าเพิ่มราคาหรืออัตราภาษีการขาย
+DictionaryRevenueStamp=จำนวนเงินรายได้ของแสตมป์
+DictionaryPaymentConditions=เงื่อนไขการชำระเงิน
+DictionaryPaymentModes=โหมดการชำระเงิน
+DictionaryTypeContact=ติดต่อเรา / ที่อยู่ประเภท
 DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATReceivedOnly=Special rate not charged
-VATManagement=VAT Management
-VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to VAT, then VAT by default=0. End of rule.<br>If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule. <br>If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.<br>If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold.  End of rule.<br>If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.<br>Else the proposed default VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+DictionaryPaperFormat=รูปแบบกระดาษ
+DictionaryFees=ประเภทค่าธรรมเนียม
+DictionarySendingMethods=วิธีการจัดส่งสินค้า
+DictionaryStaff=บุคลากร
+DictionaryAvailability=ความล่าช้าในการจัดส่งสินค้า
+DictionaryOrderMethods=วิธีการสั่งซื้อ
+DictionarySource=แหล่งที่มาของข้อเสนอ / การสั่งซื้อ
+DictionaryAccountancyplan=ผังบัญชี
+DictionaryAccountancysystem=รุ่นสำหรับผังบัญชี
+DictionaryEMailTemplates=แม่แบบอีเมล
+DictionaryUnits=หน่วย
+DictionaryProspectStatus=สถานะ prospection
+DictionaryHolidayTypes=ประเภทของใบ
+SetupSaved=การตั้งค่าที่บันทึกไว้
+BackToModuleList=กลับไปยังรายการโมดูล
+BackToDictionaryList=กลับไปยังรายการพจนานุกรม
+VATReceivedOnly=ราคาพิเศษไม่คิดค่าบริการ
+VATManagement=การบริหารจัดการภาษีมูลค่าเพิ่ม
+VATIsUsedDesc=อัตราภาษีมูลค่าเพิ่มตามค่าเริ่มต้นเมื่อมีการสร้างโอกาสในใบแจ้งหนี้การสั่งซื้อ ฯลฯ ตามกฎมาตรฐานที่ใช้งาน: <br> หากผู้ขายไม่ได้อยู่ภายใต้การภาษีมูลค่าเพิ่มแล้วภาษีมูลค่าเพิ่มตามค่าเริ่มต้น = 0 ในตอนท้ายของการปกครอง <br> ถ้า (ขายประเทศ = การซื้อประเทศ) แล้วภาษีมูลค่าเพิ่มตามค่าเริ่มต้น = ภาษีมูลค่าเพิ่มของผลิตภัณฑ์ที่ขายในประเทศ ในตอนท้ายของการปกครอง <br> หากผู้ขายและผู้ซื้อในประชาคมยุโรปและสินค้าที่เป็นผลิตภัณฑ์การขนส่ง (รถเรือเครื่องบิน) ภาษีมูลค่าเพิ่มเริ่มต้น = 0 (ภาษีมูลค่าเพิ่มควรจะจ่ายโดยผู้ซื้อที่ customoffice ของประเทศของเขาและไม่ได้อยู่ที่ผู้ขาย) ในตอนท้ายของการปกครอง <br> หากผู้ขายและผู้ซื้อในประชาคมยุโรปและผู้ซื้อไม่ได้เป็น บริษัท แล้วภาษีมูลค่าเพิ่มตามค่าเริ่มต้น = ภาษีมูลค่าเพิ่มของสินค้าที่ขาย ในตอนท้ายของการปกครอง <br> หากผู้ขายและผู้ซื้อในประชาคมยุโรปและผู้ซื้อเป็น บริษัท แล้วภาษีมูลค่าเพิ่มตามค่าเริ่มต้น = 0 ในตอนท้ายของการปกครอง <br> อื่น ๆ เริ่มต้นที่นำเสนอภาษีมูลค่าเพิ่ม = 0 ในตอนท้ายของการปกครอง
+VATIsNotUsedDesc=โดยเริ่มต้นภาษีมูลค่าเพิ่มเสนอเป็น 0 ซึ่งสามารถนำมาใช้สำหรับกรณีเช่นสมาคมบุคคลอู บริษัท ขนาดเล็ก
+VATIsUsedExampleFR=ในประเทศฝรั่งเศสก็หมายความว่า บริษัท หรือองค์กรที่มีระบบการคลังที่แท้จริง (ประยุกต์ปกติจริงหรือจริง) ระบบที่มีการประกาศภาษีมูลค่าเพิ่ม
+VATIsNotUsedExampleFR=ในประเทศฝรั่งเศสก็หมายความว่าสมาคมที่ไม่ใช่ภาษีมูลค่าเพิ่มประกาศหรือ บริษัท องค์กรหรือเสรีนิยมอาชีพที่ได้รับการแต่งตั้งองค์กรขนาดเล็กระบบการคลัง (VAT ในแฟรนไชส์​​) และจ่ายเงินภาษีมูลค่าเพิ่มแฟรนไชส์​​โดยไม่มีการประกาศใด ๆ ภาษีมูลค่าเพิ่ม ทางเลือกนี้จะแสดงอ้างอิง "ไม่บังคับภาษีมูลค่าเพิ่ม - ศิลปะ 293B ซีจี" ในใบแจ้งหนี้
 ##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsUsed=Use second tax
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
+LTRate=ประเมิน
+LocalTax1IsUsed=ใช้ภาษีที่สอง
+LocalTax1IsNotUsed=อย่าใช้ภาษีที่สอง
+LocalTax1IsUsedDesc=ใช้ประเภทที่สองของภาษี (นอกเหนือจากภาษีมูลค่าเพิ่ม)
+LocalTax1IsNotUsedDesc=อย่าใช้ชนิดอื่น ๆ ของภาษี (นอกเหนือจากภาษีมูลค่าเพิ่ม)
+LocalTax1Management=ประเภทที่สองของภาษี
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2IsUsed=ใช้ภาษีที่สาม
+LocalTax2IsNotUsed=อย่าใช้ภาษีที่สาม
+LocalTax2IsUsedDesc=ใช้ชนิดที่สามของภาษี (นอกเหนือจากภาษีมูลค่าเพิ่ม)
+LocalTax2IsNotUsedDesc=อย่าใช้ชนิดอื่น ๆ ของภาษี (นอกเหนือจากภาษีมูลค่าเพิ่ม)
+LocalTax2Management=ชนิดที่สามของภาษี
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-Offset=Offset
-AlwaysActive=Always active
-UpdateRequired=Your system needs to be updated. To do this, click on <a href="%s">Update now</a>.
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
+LocalTax1ManagementES= การบริหารจัดการเรื่อง
+LocalTax1IsUsedDescES= อัตรา RE โดยค่าเริ่มต้นเมื่อมีการสร้างโอกาสในใบแจ้งหนี้การสั่งซื้อ ฯลฯ ตามกฎมาตรฐานที่ใช้งาน: <br> ถ้าผู้ซื้อเต้ไม่ได้อยู่ภายใต้การ RE, RE โดยค่าเริ่มต้น = 0 ในตอนท้ายของการปกครอง <br> ถ้าผู้ซื้ออยู่ภายใต้การ RE RE แล้วโดยปริยาย ในตอนท้ายของการปกครอง <br>
+LocalTax1IsNotUsedDescES= โดยค่าเริ่มต้นเรื่องที่นำเสนอเป็น 0 ในตอนท้ายของการปกครอง
+LocalTax1IsUsedExampleES= ในประเทศสเปนพวกเขาเป็นมืออาชีพภายใต้บางส่วนที่เฉพาะเจาะจงของสเปน IAE
+LocalTax1IsNotUsedExampleES= ในประเทศสเปนพวกเขาเป็นมืออาชีพและสังคมและอาจมีบางส่วนของสเปน IAE
+LocalTax2ManagementES= การบริหารจัดการ IRPF
+LocalTax2IsUsedDescES= อัตรา RE โดยค่าเริ่มต้นเมื่อมีการสร้างโอกาสในใบแจ้งหนี้การสั่งซื้อ ฯลฯ ตามกฎมาตรฐานที่ใช้งาน: <br> หากผู้ขายไม่ได้อยู่ภายใต้การ IRPF แล้ว IRPF โดยค่าเริ่มต้น = 0 ในตอนท้ายของการปกครอง <br> หากผู้ขายได้อยู่ภายใต้การ IRPF แล้ว IRPF โดยค่าเริ่มต้น ในตอนท้ายของการปกครอง <br>
+LocalTax2IsNotUsedDescES= โดยค่าเริ่มต้น IRPF เสนอคือ 0 สิ้นสุดของการปกครอง
+LocalTax2IsUsedExampleES= ในสเปนมือปืนรับจ้างและอาชีพอิสระที่ให้บริการและ บริษัท ที่ได้รับเลือกให้ระบบภาษีของโมดูล
+LocalTax2IsNotUsedExampleES= ในประเทศสเปนพวกเขาจะ bussines ไม่อยู่ภายใต้ระบบภาษีของโมดูล
+CalcLocaltax=รายงานเกี่ยวกับภาษีท้องถิ่น
+CalcLocaltax1=ขาย - ซื้อ
+CalcLocaltax1Desc=รายงานภาษีท้องถิ่นที่มีการคำนวณมีความแตกต่างระหว่างการขายและการซื้อ localtaxes localtaxes
+CalcLocaltax2=การสั่งซื้อสินค้า
+CalcLocaltax2Desc=รายงานภาษีท้องถิ่นรวมของการซื้อ localtaxes
+CalcLocaltax3=ขาย
+CalcLocaltax3Desc=รายงานภาษีท้องถิ่นรวมของยอดขาย localtaxes
+LabelUsedByDefault=ฉลากใช้โดยเริ่มต้นถ้าแปลไม่สามารถพบได้สำหรับรหัส
+LabelOnDocuments=ป้ายเกี่ยวกับเอกสาร
+NbOfDays=nb วัน
+AtEndOfMonth=ในตอนท้ายของเดือน
+Offset=สาขา
+AlwaysActive=ใช้งานอยู่เสมอ
+UpdateRequired=ระบบของคุณต้องมีการปรับปรุง การทำเช่นนี้ให้คลิกที่ <a href="%s">การปรับปรุงในขณะนี้</a>
+Upgrade=อัพเกรด
+MenuUpgrade=อัพเกรด / ขยาย
+AddExtensionThemeModuleOrOther=เพิ่มส่วนขยาย (ชุดรูปแบบโมดูล, ... )
+WebServer=เว็บเซิร์ฟเวอร์
+DocumentRootServer=ไดเรกทอรีรากของเว็บเซิร์ฟเวอร์
+DataRootServer=ไดเรกทอรีไฟล์ข้อมูล
 IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-AllParameters=All parameters
-OS=OS
+Port=พอร์ต
+VirtualServerName=ชื่อเซิร์ฟเวอร์เสมือนจริง
+AllParameters=พารามิเตอร์ทั้งหมด
+OS=ระบบปฏิบัติการ
 PhpEnv=Env
-PhpModules=Modules
-PhpConf=Conf
-PhpWebLink=Web-Php link
-Pear=Pear
-PearPackages=Pear Packages
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-DatabaseConfiguration=Database setup
-Tables=Tables
-TableName=Table name
-TableLineFormat=Line format
-NbOfRecord=Nb of records
-Constraints=Constraints
-ConstraintsType=Constraints type
-ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry
-AllMustBeOk=All of these must be checked
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-SystemUpdate=System update
-SystemSuccessfulyUpdate=Your system has been updated successfuly
-MenuCompanySetup=Company/Foundation
-MenuNewUser=New user
-MenuTopManager=Top menu manager
-MenuLeftManager=Left menu manager
-MenuManager=Menu manager
-MenuSmartphoneManager=Smartphone menu manager
-DefaultMenuTopManager=Top menu manager
-DefaultMenuLeftManager=Left menu manager
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for list
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
-SystemSuccessfulyUpdated=Your system has been updated successfully
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-Logo=Logo
-DoNotShow=Do not show
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
-ShowWorkBoard=Show "workbench" on homepage
-Alerts=Alerts
-Delays=Delays
-DelayBeforeWarning=Delay before warning
-DelaysBeforeWarning=Delays before warning
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it.
-SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus.
-SetupDescription5=Other menu entries manage optional parameters.
-EventsSetup=Setup for events logs
-LogEvents=Security audit events
-Audit=Audit
+PhpModules=โมดูล
+PhpConf=conf
+PhpWebLink=การเชื่อมโยงเว็บ Php
+Pear=ลูกแพร์
+PearPackages=แพคเกจลูกแพร์
+Browser=เบราว์เซอร์
+Server=เซิร์ฟเวอร์
+Database=ฐานข้อมูล
+DatabaseServer=โฮสต์ฐานข้อมูล
+DatabaseName=ชื่อฐานข้อมูล
+DatabasePort=พอร์ตฐานข้อมูล
+DatabaseUser=ผู้ใช้ฐานข้อมูล
+DatabasePassword=รหัสผ่านฐานข้อมูล
+DatabaseConfiguration=การติดตั้งฐานข้อมูล
+Tables=ตาราง
+TableName=ชื่อตาราง
+TableLineFormat=รูปแบบสาย
+NbOfRecord=nb ของระเบียน
+Constraints=ข้อ จำกัด
+ConstraintsType=ประเภท จำกัด
+ConstraintsToShowOrNotEntry=ข้อ จำกัด ที่จะแสดงหรือไม่เข้าเมนู
+AllMustBeOk=ทั้งหมดเหล่านี้จะต้องได้รับการตรวจสอบ
+Host=เซิร์ฟเวอร์
+DriverType=ชนิดตัวขับ
+SummarySystem=สรุปข้อมูลระบบ
+SummaryConst=รายชื่อของพารามิเตอร์การตั้งค่า Dolibarr
+SystemUpdate=อัปเดตระบบ
+SystemSuccessfulyUpdate=ระบบของคุณได้รับการปรับปรุง successfuly
+MenuCompanySetup=บริษัท / มูลนิธิ
+MenuNewUser=ผู้ใช้ใหม่
+MenuTopManager=ผู้จัดการเมนูด้านบน
+MenuLeftManager=ผู้จัดการเมนูซ้าย
+MenuManager=ผู้จัดการเมนู
+MenuSmartphoneManager=ผู้จัดการเมนูมาร์ทโฟน
+DefaultMenuTopManager=ผู้จัดการเมนูด้านบน
+DefaultMenuLeftManager=ผู้จัดการเมนูซ้าย
+DefaultMenuManager= ผู้จัดการเมนูมาตรฐาน
+DefaultMenuSmartphoneManager=ผู้จัดการเมนูมาร์ทโฟน
+Skin=ธีมผิว
+DefaultSkin=ธีมเริ่มต้นผิว
+MaxSizeList=ความยาวสูงสุดสำหรับรายชื่อ
+DefaultMaxSizeList=เริ่มต้นมีความยาวสูงสุดสำหรับรายชื่อ
+MessageOfDay=ข้อความของวัน
+MessageLogin=ข้อความหน้าเข้าสู่ระบบ
+PermanentLeftSearchForm=แบบฟอร์มการค้นหาถาวรบนเมนูด้านซ้าย
+DefaultLanguage=ภาษาเริ่มต้นที่จะใช้ (รหัสภาษา)
+EnableMultilangInterface=เปิดใช้งานอินเตอร์เฟซที่พูดได้หลายภาษา
+EnableShowLogo=โลโก้แสดงบนเมนูด้านซ้าย
+EnableHtml5=เปิดใช้งาน Html5 (Developement - ใช้ได้เฉพาะในแม่แบบ Eldy)
+SystemSuccessfulyUpdated=ระบบของคุณได้รับการปรับปรุงเรียบร้อยแล้ว
+CompanyInfo=บริษัท / ข้อมูลมูลนิธิ
+CompanyIds=บริษัท / อัตลักษณ์ของมูลนิธิ
+CompanyName=ชื่อ
+CompanyAddress=ที่อยู่
+CompanyZip=ไปรษณีย์
+CompanyTown=ตัวเมือง
+CompanyCountry=ประเทศ
+CompanyCurrency=สกุลเงินหลัก
+CompanyObject=เป้าหมายของ บริษัท
+Logo=เครื่องหมาย
+DoNotShow=ไม่ต้องแสดง
+DoNotSuggestPaymentMode=ไม่แนะนำ
+NoActiveBankAccountDefined=ไม่มีบัญชีธนาคารที่ใช้งานที่กำหนดไว้
+OwnerOfBankAccount=เจ้าของบัญชีธนาคารของ% s
+BankModuleNotActive=โมดูลบัญชีธนาคารไม่ได้เปิดใช้
+ShowBugTrackLink=แสดงการเชื่อมโยง <strong>"% s"</strong>
+ShowWorkBoard=โชว์ "ปรับแต่ง" ในหน้าแรก
+Alerts=การแจ้งเตือน
+Delays=ความล่าช้า
+DelayBeforeWarning=หน่วงเวลาก่อนที่จะเตือน
+DelaysBeforeWarning=ความล่าช้าก่อนที่จะเตือน
+DelaysOfToleranceBeforeWarning=ความล่าช้าความอดทนก่อนที่จะเตือน
+DelaysOfToleranceDesc=หน้าจอนี้จะช่วยให้คุณสามารถกำหนดความล่าช้าทนแจ้งเตือนก่อนที่จะมีรายงานบนหน้าจอด้วย s picto% สำหรับแต่ละองค์ประกอบปลาย
+Delays_MAIN_DELAY_ACTIONS_TODO=ความอดทนล่าช้า (ในวัน) ก่อนที่จะแจ้งเตือนเกี่ยวกับเหตุการณ์ที่วางแผนไว้ยังไม่ได้ตระหนักถึง
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=ความอดทนล่าช้า (ในวัน) ก่อนที่จะแจ้งเตือนในการสั่งซื้อที่ยังไม่ได้ดำเนินการ
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=ความอดทนล่าช้า (ในวัน) ก่อนที่จะแจ้งเตือนในการสั่งซื้อซัพพลายเออร์ที่ยังไม่ได้ดำเนินการ
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=ความอดทนล่าช้า (ในวัน) ก่อนที่จะแจ้งเตือนเกี่ยวกับข้อเสนอที่จะปิด
+Delays_MAIN_DELAY_PROPALS_TO_BILL=ความอดทนล่าช้า (ในวัน) ก่อนที่จะแจ้งเตือนเกี่ยวกับข้อเสนอการเรียกเก็บเงินไม่ได้
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนในการให้บริการเพื่อเปิดใช้งาน
+Delays_MAIN_DELAY_RUNNING_SERVICES=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนเกี่ยวกับการบริการที่หมดอายุ
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนในใบแจ้งหนี้ที่ค้างชำระผู้จัดจำหน่าย
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=ความล่าช้าอดทน (ในวัน) ก่อนที่จะแจ้งเตือนในใบแจ้งหนี้ลูกค้าที่ค้างชำระ
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนเกี่ยวกับการตรวจสอบธนาคารอยู่ระหว่างดำเนินการ
+Delays_MAIN_DELAY_MEMBERS=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนเกี่ยวกับค่าสมาชิกล่าช้า
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนสำหรับการฝากเงินการตรวจสอบที่จะทำ
+SetupDescription1=พารามิเตอร์ทั้งหมดที่มีอยู่ในพื้นที่ติดตั้งช่วยให้คุณสามารถตั้งค่า Dolibarr ก่อนที่จะเริ่มใช้มัน
+SetupDescription2=2 ที่สำคัญที่สุดขั้นตอนการติดตั้งมี 2 คนแรกในเมนูการตั้งค่าด้านซ้ายที่นี้หมายถึง บริษัท / หน้าการตั้งค่าการวางรากฐานและการติดตั้งโมดูลหน้า:
+SetupDescription3=พารามิเตอร์ในเมนู <a href="%s">การตั้งค่า -> บริษัท / มูลนิธิ</a> จะต้องเพราะข้อมูลของท่านจะถูกใช้ในการแสดง Dolibarr และเพื่อปรับเปลี่ยนพฤติกรรม Dolibarr (ตัวอย่างเช่นสำหรับคุณสมบัติที่เกี่ยวข้องกับประเทศของคุณ)
+SetupDescription4=พารามิเตอร์ในเมนู <a href="%s">การตั้งค่า -> โมดูล</a> จะต้อง Dolibarr เพราะไม่ได้รับการแก้ไข ERP / CRM แต่ผลรวมของหลายโมดูลทั้งหมดอิสระมากหรือน้อย มันเฉพาะหลังจากการเปิดใช้งานโมดูลที่คุณกำลังสนใจในการที่คุณจะเห็นคุณสมบัติที่ปรากฏอยู่ในเมนู
+SetupDescription5=รายการเมนูอื่น ๆ จัดการพารามิเตอร์ที่ไม่จำเป็น
+EventsSetup=การตั้งค่าสำหรับการบันทึกเหตุการณ์ที่เกิดขึ้น
+LogEvents=ตรวจสอบเหตุการณ์การรักษาความปลอดภัย
+Audit=การตรวจสอบบัญชี
 InfoDolibarr=Infos Dolibarr
-InfoBrowser=Infos Browser
+InfoBrowser=Infos เบราว์เซอร์
 InfoOS=Infos OS
-InfoWebServer=Infos web server
-InfoDatabase=Infos database
+InfoWebServer=Infos เว็บเซิร์ฟเวอร์
+InfoDatabase=ฐานข้อมูลข่าวสาร
 InfoPHP=Infos PHP
-InfoPerf=Infos performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListEvents=Audit events
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available modules
-ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
-SessionTimeOut=Time out for session
-SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every <b>%s/%s</b> access, but only during access made by other sessions.<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default <strong>session.gc_maxlifetime</strong>, no matter what the value entered here.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. They are reserved parameters for advanced developers or for troubleshouting.
-OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu.
-MiscellaneousDesc=Define here all other parameters related to security.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-SeeLocalSendMailSetup=See your local sendmail setup
-BackupDesc=To make a complete backup of Dolibarr, you must:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-RestoreDesc=To restore a Dolibarr backup, you must:
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
-PreviousDumpFiles=Available database backup dump files
-WeekStartOnDay=First day of week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
-YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled)
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-MAIN_PROXY_HOST=Name/Address of proxy server
-MAIN_PROXY_PORT=Port of proxy server
-MAIN_PROXY_USER=Login to use the proxy server
-MAIN_PROXY_PASS=Password to use the proxy server
-DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendingMailSetup=Setup of sendings by email
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
-SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+InfoPerf=แสดง Infos
+BrowserName=ชื่อเบราว์เซอร์
+BrowserOS=ระบบปฏิบัติการเบราว์เซอร์
+ListEvents=ตรวจสอบเหตุการณ์ที่เกิดขึ้น
+ListOfSecurityEvents=รายการ Dolibarr เหตุการณ์การรักษาความปลอดภัย
+SecurityEventsPurged=เหตุการณ์การรักษาความปลอดภัยกำจัด
+LogEventDesc=คุณสามารถเปิดใช้การเข้าสู่ระบบที่นี่สำหรับ Dolibarr เหตุการณ์การรักษาความปลอดภัย <b>ผู้ดูแลระบบแล้วสามารถมองเห็นเนื้อหาผ่านทางเครื่องมือของระบบเมนู - ตรวจสอบ</b> คำเตือนคุณลักษณะนี้สามารถใช้ข้อมูลจำนวนมากในฐานข้อมูล
+AreaForAdminOnly=<b>คุณสมบัติเหล่านั้นสามารถนำมาใช้โดยผู้ใช้ผู้ดูแลระบบเท่านั้น</b>
+SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
+SystemAreaForAdminOnly=บริเวณนี้เป็นที่ใช้ได้สำหรับผู้ใช้ผู้ดูแลระบบเท่านั้น ไม่มีสิทธิ์ Dolibarr สามารถลดขีด จำกัด นี้
+CompanyFundationDesc=แก้ไขในหน้านี้ข้อมูลทั้งหมดที่รู้จักกันของ บริษัท หรือมูลนิธิคุณจะต้องจัดการ (สำหรับเรื่องนี้คลิกที่ปุ่ม "แก้ไข" ที่ด้านล่างของหน้า)
+DisplayDesc=คุณสามารถเลือกแต่ละพารามิเตอร์ที่เกี่ยวข้องกับ Dolibarr มองและความรู้สึกที่นี่
+AvailableModules=โมดูลที่มีจำหน่าย
+ToActivateModule=เพื่อเปิดใช้งานโมดูลไปในพื้นที่การติดตั้ง (หน้าแรก> Setup-> โมดูล)
+SessionTimeOut=หมดเวลาสำหรับเซสชั่น
+SessionExplanation=รับประกันหมายเลขนี้ที่เซสชั่นจะไม่มีวันหมดอายุก่อนที่จะล่าช้านี้ถ้าทำความสะอาดเซสชั่นจะกระทำโดยการทำความสะอาดภายใน PHP เซสชั่น (และไม่มีอะไรอื่น) PHP เซสชั่นทำความสะอาดภายในไม่รับประกันว่าเซสชั่นจะหมดอายุหลังจากที่ล่าช้านี้ <b>มันจะหมดอายุหลังจากที่ล่าช้านี้และเมื่อทำความสะอาดเซสชั่นที่มีการวิ่งเพื่อให้ทุก% s /% s</b> เข้าถึง แต่เฉพาะในช่วงการเข้าถึงที่ทำโดยการประชุมอื่น ๆ <br> หมายเหตุ: บนเซิร์ฟเวอร์บางคนที่มีกลไกการทำความสะอาดเซสชั่นภายนอก (cron ภายใต้เดเบียน, อูบุนตู ... ), การประชุมสามารถถูกทำลายหลังจากระยะเวลาที่กำหนดโดย <strong>session.gc_maxlifetime</strong> เริ่มต้นไม่ว่าสิ่งที่มีค่าเข้ามาที่นี่
+TriggersAvailable=มีจำหน่ายทริกเกอร์
+TriggersDesc=ทริกเกอร์เป็นไฟล์ที่จะปรับเปลี่ยนพฤติกรรมของ Dolibarr เวิร์กโฟลว์เคยถูกคัดลอกลงใน <b>htdocs</b> ไดเรกทอรี <b>/ core / ทริกเกอร์</b> พวกเขาตระหนักถึงการกระทำใหม่เปิดใช้งานเกี่ยวกับเหตุการณ์ Dolibarr (การสร้าง บริษัท ใหม่การตรวจสอบใบแจ้งหนี้, ... )
+TriggerDisabledByName=ทริกเกอร์ในแฟ้มนี้มีการปิดใช้งานโดยต่อท้าย <b>-NORUN</b> ในชื่อของพวกเขา
+TriggerDisabledAsModuleDisabled=<b>ทริกเกอร์ในแฟ้มนี้ถูกปิดใช้งานเป็นของโมดูล%</b> ถูกปิดใช้งาน
+TriggerAlwaysActive=ทริกเกอร์ในแฟ้มนี้มีการใช้งานอยู่เสมอสิ่งที่มีการเปิดใช้งานโมดูล Dolibarr
+TriggerActiveAsModuleActive=<b>ทริกเกอร์ในแฟ้มนี้มีการใช้งานเป็นโมดูล% s</b> ถูกเปิดใช้งาน
+GeneratedPasswordDesc=กำหนดกฎที่นี่ที่คุณต้องการที่จะใช้ในการสร้างรหัสผ่านใหม่ถ้าคุณขอให้มีรหัสผ่านที่สร้างอัตโนมัติ
+DictionaryDesc=กำหนดข้อมูลอ้างอิงที่นี่ทั้งหมด คุณสามารถดำเนินการค่าที่กำหนดไว้ล่วงหน้ากับคุณ
+ConstDesc=หน้านี้จะช่วยให้คุณสามารถแก้ไขพารามิเตอร์อื่น ๆ ทั้งหมดที่ไม่ได้อยู่ในหน้าก่อนหน้านี้ พวกเขาจะถูกสงวนไว้พารามิเตอร์สำหรับนักพัฒนาขั้นสูงหรือ troubleshouting
+OnceSetupFinishedCreateUsers=คำเตือนคุณเป็นผู้ใช้ผู้ดูแลระบบ Dolibarr ผู้ใช้ผู้ดูแลระบบที่ใช้ในการติดตั้ง Dolibarr สำหรับการใช้งานตามปกติของ Dolibarr ก็จะแนะนำให้ใช้ผู้ดูแลระบบที่ไม่ได้สร้างขึ้นจากผู้ใช้และกลุ่มเมนู
+MiscellaneousDesc=กําหนดที่นี่ทุกพารามิเตอร์อื่น ๆ ที่เกี่ยวข้องกับการรักษาความปลอดภัย
+LimitsSetup=ข้อ จำกัด / การตั้งค่าความแม่นยำ
+LimitsDesc=คุณสามารถกำหนดวงเงินแม่นยำและ optimisations ใช้โดย Dolibarr ที่นี่
+MAIN_MAX_DECIMALS_UNIT=ทศนิยมซ์ราคาต่อหน่วย
+MAIN_MAX_DECIMALS_TOT=ทศนิยมแม็กซ์ราคารวม
+MAIN_MAX_DECIMALS_SHOWN=แม็กซ์ทศนิยมสำหรับราคาที่แสดงบนหน้าจอ (เพิ่ม <b>...</b> หลังจากนี้ถ้าคุณต้องการที่จะเห็น <b>...</b> เมื่อจำนวนถูกตัดทอนเมื่อแสดงบนหน้าจอ)
+MAIN_DISABLE_PDF_COMPRESSION=ใช้การบีบอัด PDF สำหรับสร้างไฟล์ PDF
+MAIN_ROUNDING_RULE_TOT=ขั้นตอนของช่วงปัดเศษ (สำหรับประเทศที่มีการปัดเศษจะทำในบางสิ่งบางอย่างอื่นมากกว่าฐาน 10. ตัวอย่างเช่นถ้าใส่ 0.05 ปัดเศษจะกระทำโดยขั้นตอนที่ 0.05)
+UnitPriceOfProduct=ราคาต่อหน่วยสุทธิของผลิตภัณฑ์
+TotalPriceAfterRounding=ราคารวม (บาท / ถัง / รวมภาษี) หลังจากการปัดเศษ
+ParameterActiveForNextInputOnly=พารามิเตอร์ที่มีประสิทธิภาพสำหรับการป้อนข้อมูลต่อไปเท่านั้น
+NoEventOrNoAuditSetup=เหตุการณ์การรักษาความปลอดภัยที่ไม่ได้รับการบันทึกไว้ยัง นี้จะมีการตรวจสอบตามปกติถ้าไม่ได้รับการเปิดใช้งานบน "การตั้งค่า - การรักษาความปลอดภัย - การตรวจสอบหน้า"
+NoEventFoundWithCriteria=เหตุการณ์การรักษาความปลอดภัยที่ไม่ได้พบเกณฑ์การค้นหาดังกล่าว
+SeeLocalSendMailSetup=ดูการตั้งค่าของคุณ sendmail ท้องถิ่น
+BackupDesc=เพื่อให้การสำรองข้อมูลที่สมบูรณ์ของ Dolibarr คุณต้อง:
+BackupDesc2=บันทึกเนื้อหาของไดเรกทอรีเอกสาร <b>(% s)</b> ที่มีไฟล์ที่อัปโหลดและสร้างทั้งหมด (คุณสามารถทำเช่นซิป)
+BackupDesc3=บันทึกเนื้อหาของฐานข้อมูลของคุณ <b>(% s)</b> ลงในแฟ้มการถ่ายโอนข้อมูล สำหรับนี้คุณสามารถใช้ผู้ช่วยต่อไปนี้
+BackupDescX=ไดเรกทอรีเก็บควรเก็บไว้ในสถานที่ที่ปลอดภัย
+BackupDescY=สร้างแฟ้มการถ่ายโอนควรเก็บไว้ในสถานที่ที่ปลอดภัย
+BackupPHPWarning=การสำรองข้อมูลไม่สามารถ guaranted ด้วยวิธีนี้ ชอบก่อนหน้านี้
+RestoreDesc=ในการเรียกคืนการสำรองข้อมูล Dolibarr คุณต้อง:
+RestoreDesc2=เรียกคืนไฟล์ที่เก็บถาวร (zip ไฟล์ตัวอย่าง) ของไดเรกทอรีเอกสารที่จะดึงต้นไม้ของไฟล์ในไดเรกทอรีเอกสารของการติดตั้งใหม่หรือ Dolibarr ลงในเอกสารปัจจุบันนี้ Directoy <b>(% s)</b>
+RestoreDesc3=เรียกคืนข้อมูลจากแฟ้มการถ่ายโอนข้อมูลการสำรองข้อมูลลงในฐานข้อมูลของการติดตั้ง Dolibarr ใหม่หรือลงในฐานข้อมูลของการติดตั้งปัจจุบันนี้ <b>(% s)</b> คำเตือนเมื่อคืนเสร็จแล้วคุณต้องใช้เข้าสู่ระบบ / รหัสผ่านที่มีอยู่เมื่อการสำรองข้อมูลที่ถูกสร้างขึ้นเพื่อเชื่อมต่ออีกครั้ง เพื่อเรียกคืนฐานข้อมูลสำรองลงในนี้ติดตั้งปัจจุบันคุณสามารถทำตามนี้ช่วย
+RestoreMySQL=นำเข้า MySQL
+ForcedToByAModule= <b>กฎนี้ถูกบังคับให้% โดยการเปิดใช้งานโมดูล</b>
+PreviousDumpFiles=แฟ้มการถ่ายโอนการสำรองฐานข้อมูลที่มีจำหน่าย
+WeekStartOnDay=วันแรกของสัปดาห์
+RunningUpdateProcessMayBeRequired=ใช้กระบวนการอัพเกรดน่าจะเป็นที่ต้องการ (รุ่น% s โปรแกรมที่แตกต่างจากเวอร์ชั่นฐานข้อมูล%)
+YouMustRunCommandFromCommandLineAfterLoginToUser=<b>คุณต้องเรียกใช้คำสั่งจากบรรทัดคำสั่งนี้หลังจากที่เข้าสู่ระบบไปยังเปลือกกับผู้ใช้% s</b> หรือคุณต้องเพิ่มตัวเลือก -W <b>ที่ท้ายบรรทัดคำสั่งที่จะให้รหัสผ่าน% s</b>
+YourPHPDoesNotHaveSSLSupport=ฟังก์ชั่น SSL ไม่สามารถใช้ได้ใน PHP ของคุณ
+DownloadMoreSkins=กินมากขึ้นในการดาวน์โหลด
+SimpleNumRefModelDesc=ส่งกลับจำนวนการอ้างอิงที่มีรูปแบบ% syymm-nnnn ที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับโดยไม่ต้องหลุมและมีการตั้งค่าไม่มี
+ShowProfIdInAddress=แสดงรหัสวิชาชีพที่มีที่อยู่ในเอกสาร
+ShowVATIntaInAddress=ซ่อน NUM ภาษีมูลค่าเพิ่มภายในที่มีที่อยู่ในเอกสาร
+TranslationUncomplete=แปลบางส่วน
+SomeTranslationAreUncomplete=ภาษาบางคนอาจได้รับการแปลบางส่วนหรืออาจมีข้อผิดพลาด หากคุณตรวจสอบบางอย่างที่คุณสามารถแก้ไขไฟล์ภาษาลงทะเบียน <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>
+MenuUseLayout=เมนูให้ hidable แนวตั้ง (ตัวเลือก Javascript หากจะต้องไม่ถูกปิดการใช้งาน)
+MAIN_DISABLE_METEO=ปิดการใช้งานมุมมอง Meteo
+TestLoginToAPI=เข้าสู่ระบบทดสอบ API
+ProxyDesc=คุณลักษณะบางอย่างของ Dolibarr จำเป็นต้องมีการเข้าถึงอินเทอร์เน็ตที่ทำงาน กำหนดค่าพารามิเตอร์ที่นี่สำหรับเรื่องนี้ ถ้าเซิร์ฟเวอร์ Dolibarr อยู่เบื้องหลังเซิร์ฟเวอร์พร็อกซีพารามิเตอร์เหล่านั้นบอก Dolibarr วิธีการเข้าถึงอินเทอร์เน็ตผ่านมัน
+ExternalAccess=การเข้าถึงจากภายนอก
+MAIN_PROXY_USE=ใช้พร็อกซีเซิร์ฟเวอร์ (เข้าถึงโดยตรงกับอินเทอร์เน็ตเป็นอย่างอื่น)
+MAIN_PROXY_HOST=ชื่อ / ที่อยู่ของเซิร์ฟเวอร์พร็อกซี่
+MAIN_PROXY_PORT=ท่าเรือร็อกซี่เซิร์ฟเวอร์
+MAIN_PROXY_USER=เข้าสู่ระบบที่จะใช้พร็อกซีเซิร์ฟเวอร์
+MAIN_PROXY_PASS=รหัสผ่านที่จะใช้พร็อกซีเซิร์ฟเวอร์
+DefineHereComplementaryAttributes=กำหนดคุณลักษณะที่นี่ทั้งหมดไม่ได้อยู่แล้วโดยเริ่มต้นและที่คุณต้องการที่จะได้รับการสนับสนุนสำหรับ% s
+ExtraFields=คุณลักษณะที่สมบูรณ์
+ExtraFieldsLines=คุณลักษณะเสริม (เส้น)
+ExtraFieldsSupplierOrdersLines=คุณลักษณะเสริม (เส้นตามลำดับ)
+ExtraFieldsSupplierInvoicesLines=คุณลักษณะเสริม (เส้นใบแจ้งหนี้)
+ExtraFieldsThirdParties=คุณลักษณะเสริม (thirdparty)
+ExtraFieldsContacts=คุณลักษณะเสริม (ติดต่อ / ที่อยู่)
+ExtraFieldsMember=คุณลักษณะเสริม (สมาชิก)
+ExtraFieldsMemberType=คุณลักษณะเสริม (ประเภทสมาชิก)
+ExtraFieldsCustomerOrders=คุณลักษณะเสริม (คำสั่งซื้อ)
+ExtraFieldsCustomerInvoices=คุณลักษณะเสริม (ใบแจ้งหนี้)
+ExtraFieldsSupplierOrders=คุณลักษณะเสริม (คำสั่งซื้อ)
+ExtraFieldsSupplierInvoices=คุณลักษณะเสริม (ใบแจ้งหนี้)
+ExtraFieldsProject=คุณลักษณะเสริม (โครงการ)
+ExtraFieldsProjectTask=คุณลักษณะเสริม (งาน)
+ExtraFieldHasWrongValue=s Attribute% มีค่าที่ไม่ถูกต้อง
+AlphaNumOnlyCharsAndNoSpace=ตัวอักษรเพียงอย่างเดียวโดยไม่ต้อง alphanumericals พื้นที่
+AlphaNumOnlyLowerCharsAndNoSpace=alphanumericals เท่านั้นและอักขระตัวพิมพ์เล็กโดยไม่ต้องพื้นที่
+SendingMailSetup=การตั้งค่าของตอบรับทางอีเมล
+SendmailOptionNotComplete=คำเตือนในบางระบบลินุกซ์ที่จะส่งอีเมลจากอีเมลของคุณตั้งค่าการดำเนินการต้องมี sendmail -ba ตัวเลือก (mail.force_extra_parameters พารามิเตอร์ลงในไฟล์ php.ini ของคุณ) หากผู้รับบางคนไม่เคยได้รับอีเมลพยายามที่จะแก้ไขพารามิเตอร์ PHP นี้กับ mail.force_extra_parameters = -ba)
+PathToDocuments=เส้นทางไปยังเอกสาร
+PathDirectory=สารบบ
+SendmailOptionMayHurtBuggedMTA=คุณสมบัติที่จะส่งอีเมลโดยใช้วิธีการ "PHP mail โดยตรง" จะสร้างข้อความอีเมลที่อาจจะไม่ได้แยกวิเคราะห์ได้อย่างถูกต้องโดยบางส่วนที่ได้รับเมลเซิร์ฟเวอร์ ผลที่ได้คืออีเมลบางอย่างไม่สามารถอ่านได้โดยคนที่เป็นเจ้าภาพโดยแพลตฟอร์มร้องเหล่านั้น เป็นกรณีสำหรับบางผู้ให้บริการอินเทอร์เน็ต (Ex: ออเรนจ์ในประเทศฝรั่งเศส) ซึ่งไม่เป็นปัญหาเข้า Dolibarr หรือเข้า PHP แต่บนเซิร์ฟเวอร์อีเมลที่ได้รับ แต่คุณสามารถเพิ่มตัวเลือก MAIN_FIX_FOR_BUGGED_MTA 1 เข้าสู่การตั้งค่า - อื่น ๆ ที่จะปรับเปลี่ยน Dolibarr หลีกเลี่ยงปัญหานี้ แต่คุณอาจพบปัญหากับเซิร์ฟเวอร์อื่น ๆ ที่เคารพอย่างเคร่งครัดมาตรฐาน SMTP วิธีการแก้ปัญหาอื่น ๆ (แนะนำ) คือการใช้วิธีการ "ห้องสมุด SMTP ซ็อกเก็ต" ที่มีข้อเสียไม่มี
+TranslationSetup=การกำหนดค่า de la traduction
+TranslationDesc=ทางเลือกของภาษาที่ปรากฏบนหน้าจอสามารถปรับเปลี่ยนได้: <br> * <strong>ทั่วโลกจากที่บ้านเมนู - การติดตั้ง - จอแสดงผล</strong> <br> * <strong>สำหรับผู้ใช้เท่านั้นจากแท็บการแสดงผลผู้ใช้บัตรผู้ใช้</strong> (คลิกที่เข้าสู่ระบบที่ด้านบนของหน้าจอ)
+TotalNumberOfActivatedModules=<b>จำนวนโมดูลเปิดใช้งานคุณลักษณะ:% s</b>
+YouMustEnableOneModule=คุณต้องเปิดการใช้งานอย่างน้อย 1 โมดูล
+ClassNotFoundIntoPathWarning=คลาส% s ไม่พบเ​​ข้ามาในเส้นทาง PHP
+YesInSummer=ใช่ในช่วงฤดู​​ร้อน
+OnlyFollowingModulesAreOpenedToExternalUsers=หมายเหตุเฉพาะโมดูลต่อไปนี้มีการเปิดให้ผู้ใช้ภายนอก (สิ่งที่มีได้รับอนุญาตจากผู้ใช้ดังกล่าว):
+SuhosinSessionEncrypt=เซสชั่นการจัดเก็บข้อมูลที่มีการเข้ารหัสโดย Suhosin
+ConditionIsCurrently=สภาพปัจจุบันคือ% s
+YouUseBestDriver=คุณสามารถใช้โปรแกรมควบคุม% s ที่เป็นคนขับรถที่ดีที่สุดที่มีอยู่ในปัจจุบัน
+YouDoNotUseBestDriver=คุณสามารถใช้ไดรฟ์% s แต่คนขับ% s จะแนะนำ
+NbOfProductIsLowerThanNoPb=คุณมีเพียง% s ผลิตภัณฑ์ / บริการลงในฐานข้อมูล นี้ไม่จำเป็นต้องมีการเพิ่มประสิทธิภาพใด ๆ โดยเฉพาะอย่างยิ่ง
+SearchOptim=ค้นหาการเพิ่มประสิทธิภาพ
+YouHaveXProductUseSearchOptim=คุณมีผลิตภัณฑ์% s ลงในฐานข้อมูล คุณควรเพิ่ม PRODUCT_DONOTSEARCH_ANYWHERE คงที่ 1 เข้าไปในบ้านติดตั้งแบบอื่น ๆ , คุณ จำกัด การค้นหาเพื่อจุดเริ่มต้นของสายทำให้เป็นไปได้สำหรับฐานข้อมูลเพื่อใช้ดัชนีและคุณควรจะได้รับการตอบสนองทันที
+BrowserIsOK=คุณกำลังใช้เบราว์เซอร์% s เบราว์เซอร์นี้เป็น ok สำหรับการรักษาความปลอดภัยและประสิทธิภาพการทำงาน
+BrowserIsKO=คุณกำลังใช้เบราว์เซอร์% s เบราว์เซอร์นี้เป็นที่รู้จักกันจะเป็นทางเลือกที่ดีสำหรับการรักษาความปลอดภัยประสิทธิภาพและความน่าเชื่อถือ เรา recommand คุณใช้ Firefox, Chrome, Opera หรือ Safari
+XDebugInstalled=XDebug โหลด
+XCacheInstalled=XCache โหลด
+AddRefInList=ลูกค้าแสดง / ผู้จัดจำหน่ายอ้างอิงในรายการ (เลือกรายการหรือ ComboBox) และส่วนใหญ่เชื่อมโยงหลายมิติ บุคคลที่สามจะปรากฏขึ้นพร้อมกับชื่อ "CC12345 - SC45678 - บริษัท ขนาดใหญ่ coorp" แทนที่จะเป็น "บริษัท ขนาดใหญ่ coorp"
+FieldEdition=ฉบับของสนาม% s
+FixTZ=แก้ไขเขตเวลา
+FillThisOnlyIfRequired=ตัวอย่าง: 2 (กรอกข้อมูลเฉพาะในกรณีที่เขตเวลาชดเชยปัญหาที่มีประสบการณ์)
+GetBarCode=รับบาร์โค้ด
+EmptyNumRefModelDesc=รหัสที่เป็นอิสระ รหัสนี้สามารถแก้ไขได้ในเวลาใดก็ได้
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually.
+PasswordGenerationStandard=กลับสร้างรหัสผ่านตามขั้นตอนวิธี Dolibarr ภายใน: 8 ตัวอักษรที่ใช้ร่วมกันที่มีตัวเลขและตัวอักษรตัวพิมพ์เล็ก
+PasswordGenerationNone=ไม่แนะนำให้รหัสผ่านที่สร้างใด ๆ รหัสผ่านจะต้องพิมพ์ด้วยตนเอง
 ##### Users setup #####
-UserGroupSetup=Users and groups module setup
-GeneratePassword=Suggest a generated password
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DoNotSuggest=Do not suggest any password
-EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
+UserGroupSetup=ผู้ใช้และกลุ่มติดตั้งโมดูล
+GeneratePassword=แนะนำรหัสผ่านที่สร้าง
+RuleForGeneratedPasswords=กฎข้อแนะนำในการสร้างรหัสผ่านหรือตรวจสอบรหัสผ่าน
+DoNotSuggest=ไม่แนะนำให้รหัสผ่านใด ๆ
+EncryptedPasswordInDatabase=หากต้องการให้มีการเข้ารหัสลับของรหัสผ่านในฐานข้อมูล
+DisableForgetPasswordLinkOnLogonPage=ไม่ต้องแสดงการเชื่อมโยง "ลืมรหัสผ่าน" ที่หน้าเข้าสู่ระบบ
+UsersSetup=ผู้ใช้ติดตั้งโมดูล
+UserMailRequired=อีเมลที่จำเป็นในการสร้างผู้ใช้ใหม่
 ##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
-UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique ?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
-Miscellaneous=Miscellaneous
+CompanySetup=บริษัท ติดตั้งโมดูล
+CompanyCodeChecker=Module สำหรับการสร้างรหัสบุคคลที่สามและการตรวจสอบ (ลูกค้าหรือผู้จัดจำหน่าย)
+AccountCodeManager=Module สำหรับการสร้างรหัสบัญชี (ลูกค้าหรือผู้จัดจำหน่าย)
+ModuleCompanyCodeAquarium=กลับรหัสบัญชีที่สร้างโดย: <br> % s ตามด้วยรหัสผู้จัดจำหน่ายของบุคคลที่สามสำหรับรหัสบัญชีผู้จัดจำหน่าย, <br> % s ตามด้วยรหัสลูกค้าบุคคลที่สามสำหรับรหัสบัญชีของลูกค้า
+ModuleCompanyCodePanicum=กลับรหัสบัญชีที่ว่างเปล่า
+ModuleCompanyCodeDigitaria=รหัสบัญชีรหัสขึ้นอยู่กับบุคคลที่สาม รหัสประกอบด้วยตัวอักษร "C" ในตำแหน่งแรกตามด้วย 5 ตัวอักษรแรกของรหัสของบุคคลที่สาม
+UseNotifications=ใช้การแจ้งเตือน
+NotificationsDesc=การแจ้งเตือนอีเมลคุณลักษณะที่ช่วยให้คุณสามารถเงียบส่งอีเมลโดยอัตโนมัติสำหรับบางเหตุการณ์ Dolibarr เป้าหมายของการแจ้งเตือนสามารถกำหนด: <br> * รายชื่อต่อบุคคลที่สาม (ลูกค้าหรือซัพพลายเออร์) หนึ่งในรายชื่อผู้ติดต่อได้ตลอดเวลา <br> * หรือโดยการตั้งค่าที่อยู่อีเมลเป้าหมายระดับโลกในหน้าการตั้งค่าโมดูล
+ModelModules=แม่แบบเอกสาร
+DocumentModelOdt=เอกสารที่สร้างจากแม่แบบ OpenDocuments (.odt หรือไฟล์ .ods สำหรับ OpenOffice, KOffice, TextEdit, ... )
+WatermarkOnDraft=ลายน้ำในเอกสารร่าง
+JSOnPaimentBill=เปิดใช้งานคุณลักษณะในการป้อนอัตโนมัติสายการชำระเงินในรูปแบบการชำระเงิน
+CompanyIdProfChecker=หลักเกณฑ์ในการมืออาชีพหมายเลข
+MustBeUnique=ต้องไม่ซ้ำกัน?
+MustBeMandatory=บังคับในการสร้างบุคคลที่สาม?
+MustBeInvoiceMandatory=บังคับในการตรวจสอบใบแจ้งหนี้?
+Miscellaneous=เบ็ดเตล็ด
 ##### Webcal setup #####
-WebCalSetup=Webcalendar link setup
-WebCalSyncro=Add Dolibarr events to WebCalendar
-WebCalAllways=Always, no asking
-WebCalYesByDefault=On demand (yes by default)
-WebCalNoByDefault=On demand (no by default)
-WebCalNever=Never
-WebCalURL=URL for calendar access
-WebCalServer=Server hosting calendar database
-WebCalDatabaseName=Database name
-WebCalUser=User to access database
-WebCalSetupSaved=Webcalendar setup saved successfully.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
-WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-WebCalTestKo2=Connection to server '%s' with user '%s' failed.
-WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database.
-WebCalAddEventOnCreateActions=Add calendar event on actions create
-WebCalAddEventOnCreateCompany=Add calendar event on companies create
-WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change
-WebCalAddEventOnStatusContract=Add calendar event on contracts status change
-WebCalAddEventOnStatusBill=Add calendar event on bills status change
-WebCalAddEventOnStatusMember=Add calendar event on members status change
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct.
+WebCalSetup=การตั้งค่าการเชื่อมโยง Webcalendar
+WebCalSyncro=เพิ่มเหตุการณ์ Dolibarr เพื่อ WebCalendar
+WebCalAllways=มักจะไม่ถาม
+WebCalYesByDefault=ตามความต้องการ (ใช่ค่าเริ่มต้น)
+WebCalNoByDefault=ตามความต้องการ (ไม่มีค่าเริ่มต้น)
+WebCalNever=ไม่เคย
+WebCalURL=URL สำหรับการเข้าถึงปฏิทิน
+WebCalServer=เซิร์ฟเวอร์ฐานข้อมูลปฏิทิน
+WebCalDatabaseName=ชื่อฐานข้อมูล
+WebCalUser=ผู้ใช้สามารถเข้าถึงฐานข้อมูล
+WebCalSetupSaved=การติดตั้ง Webcalendar บันทึกเรียบร้อยแล้ว
+WebCalTestOk=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' ในฐานข้อมูล '% s' กับผู้ใช้ '% s' ที่ประสบความสำเร็จ
+WebCalTestKo1=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' ประสบความสำเร็จ แต่ฐานข้อมูล '% s' ไม่สามารถเข้าถึงได้
+WebCalTestKo2=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' กับผู้ใช้ '% s' ล้มเหลว
+WebCalErrorConnectOkButWrongDatabase=ประสบความสำเร็จในการเชื่อมต่อฐานข้อมูล แต่ไม่ได้ดูจะเป็นฐานข้อมูล Webcalendar
+WebCalAddEventOnCreateActions=เพิ่มเหตุการณ์ปฏิทินบนสร้างการกระทำ
+WebCalAddEventOnCreateCompany=เพิ่มเหตุการณ์ปฏิทินบนให้ บริษัท สร้าง
+WebCalAddEventOnStatusPropal=เพิ่มเหตุการณ์ปฏิทินเกี่ยวกับข้อเสนอในเชิงพาณิชย์การเปลี่ยนแปลงสถานะ
+WebCalAddEventOnStatusContract=เพิ่มเหตุการณ์ปฏิทินในการทำสัญญาการเปลี่ยนแปลงสถานะ
+WebCalAddEventOnStatusBill=เพิ่มเหตุการณ์ปฏิทินเกี่ยวกับสถานะการเปลี่ยนแปลงค่า
+WebCalAddEventOnStatusMember=เพิ่มเหตุการณ์ปฏิทินบนการเปลี่ยนแปลงสถานะสมาชิก
+WebCalUrlForVCalExport=<b>การเชื่อมโยงการส่งออกไปยังรูปแบบ% s</b> สามารถดูได้ที่ลิงค์ต่อไปนี้:% s
+WebCalCheckWebcalSetup=บางทีการติดตั้งโมดูล webcal ไม่ถูกต้อง
 ##### Invoices #####
-BillsSetup=Invoices module setup
-BillsDate=Invoices date
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNoteSetup=Credit note module setup
-CreditNotePDFModules=Credit note document models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-DisableRepeatable=Disable repeatable invoices
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+BillsSetup=ใบแจ้งหนี้การติดตั้งโมดูล
+BillsDate=วันที่ใบแจ้งหนี้
+BillsNumberingModule=ใบแจ้งหนี้และบันทึกหมายเลขบัตรเครดิตรูปแบบ
+BillsPDFModules=รูปแบบเอกสารใบแจ้งหนี้
+CreditNoteSetup=ใบลดหนี้การติดตั้งโมดูล
+CreditNotePDFModules=รูปแบบเอกสารใบลดหนี้
+CreditNote=ใบลดหนี้
+CreditNotes=บันทึกเครดิต
+ForceInvoiceDate=วันที่ใบแจ้งหนี้กองทัพวันที่ตรวจสอบ
+DisableRepeatable=ปิดการใช้งานใบแจ้งหนี้การทำซ้ำ
+SuggestedPaymentModesIfNotDefinedInInvoice=โหมดการชำระเงินในใบแจ้งหนี้ที่แนะนำโดยค่าเริ่มต้นหากไม่ได้กำหนดไว้สำหรับใบแจ้งหนี้
+EnableEditDeleteValidInvoice=เปิดใช้งานไปได้ในการแก้ไข / ลบใบแจ้งหนี้ที่ถูกต้องกับการชำระเงินไม่มี
+SuggestPaymentByRIBOnAccount=แนะนำการชำระเงินโดยการถอนตัวในบัญชี
+SuggestPaymentByChequeToAddress=แนะนำการชำระเงินด้วยเช็ค
+FreeLegalTextOnInvoices=ข้อความฟรีในใบแจ้งหนี้
+WatermarkOnDraftInvoices=ลายน้ำบนร่างใบแจ้งหนี้ (ไม่มีถ้าว่างเปล่า)
 ##### Proposals #####
-PropalSetup=Commercial proposals module setup
-CreateForm=Create forms
-NumberOfProductLines=Number of product lines
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-ClassifiedInvoiced=Classified invoiced
-HideTreadedPropal=Hide the treated commercial proposals in the list
-AddShippingDateAbility=Add shipping date ability
-AddDeliveryAddressAbility=Add delivery date ability
-UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+PropalSetup=ข้อเสนอเชิงพาณิชย์การติดตั้งโมดูล
+CreateForm=สร้างรูปแบบ
+NumberOfProductLines=จำนวนสายผลิตภัณฑ์
+ProposalsNumberingModules=จำนวนข้อเสนอในเชิงพาณิชย์รุ่น
+ProposalsPDFModules=เอกสารข้อเสนอในเชิงพาณิชย์รุ่น
+ClassifiedInvoiced=จำแนกออกใบแจ้งหนี้
+HideTreadedPropal=ซ่อนข้อเสนอในเชิงพาณิชย์ได้รับการรักษาในรายการ
+AddShippingDateAbility=เพิ่มความสามารถในการจัดส่งสินค้าวันที่
+AddDeliveryAddressAbility=เพิ่มความสามารถในวันที่ส่งมอบ
+UseOptionLineIfNoQuantity=สายผลิตภัณฑ์ / บริการกับศูนย์จำนวนเงินถือเป็นตัวเลือก
+FreeLegalTextOnProposal=ข้อความฟรีเกี่ยวกับข้อเสนอในเชิงพาณิชย์
+WatermarkOnDraftProposal=ลายน้ำในร่างข้อเสนอในเชิงพาณิชย์ (ไม่มีถ้าว่างเปล่า)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=ขอปลายทางบัญชีธนาคารของข้อเสนอ
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=ราคาขอซัพพลายเออร์ที่ติดตั้งโมดูล
+AskPriceSupplierNumberingModules=ราคาผู้ผลิตร้องขอหมายเลขรุ่น
+AskPriceSupplierPDFModules=ราคาขอซัพพลายเออร์รูปแบบเอกสาร
+FreeLegalTextOnAskPriceSupplier=ข้อความฟรีในราคาผู้ผลิตร้องขอ
+WatermarkOnDraftAskPriceSupplier=ลายน้ำราคาร่างซัพพลายเออร์ขอ (ไม่เลยถ้าว่างเปล่า)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=ขอบัญชีธนาคารปลายทางของการร้องขอราคา
 ##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-HideTreadedOrders=Hide the treated or cancelled orders in the list
-ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+OrdersSetup=การตั้งค่าการจัดการการสั่งซื้อ
+OrdersNumberingModules=สั่งซื้อจำนวนรุ่น
+OrdersModelModule=เอกสารการสั่งซื้อรุ่น
+HideTreadedOrders=ซ่อนคำสั่งได้รับการรักษาหรือยกเลิกไปในรายการ
+ValidOrderAfterPropalClosed=ในการตรวจสอบการสั่งซื้อหลังจากข้อเสนอที่ใกล้ชิดและทำให้มันเป็นไปไม่ได้ที่จะก้าวตามคำสั่งชั่วคราว
+FreeLegalTextOnOrders=ข้อความฟรีเมื่อสั่งซื้อ
+WatermarkOnDraftOrders=ลายน้ำในการสั่งซื้อร่าง (ไม่มีถ้าว่างเปล่า)
+ShippableOrderIconInList=ไอคอนเพิ่มในรายการสั่งซื้อที่แสดงถ้าสั่งเป็น shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=ขอบัญชีธนาคารปลายทางของการสั่งซื้อ
 ##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล
+ClickToDialUrlDesc=url ที่เรียกว่าเมื่อการคลิกที่ picto โทรศัพท์จะทำ ใน URL คุณสามารถใช้แท็ก <br> <b>__PHONETO__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่จะเรียก <br> <b>__PHONEFROM__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่โทร (คุณ) <br> <b>__LOGIN__</b> ที่จะถูกแทนที่ด้วยการเข้าสู่ระบบของคุณ clicktodial (ตามที่กำหนดในบัตรผู้ใช้ของคุณ) <br> <b>__PASS__</b> ที่จะถูกแทนที่ด้วยรหัสผ่าน clicktodial คุณ (ที่กำหนดไว้ในบัตรผู้ใช้ของคุณ)
 ##### Bookmark4u #####
-Bookmark4uSetup=Bookmark4u module setup
+Bookmark4uSetup=Bookmark4u ติดตั้งโมดูล
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=การแทรกแซงการติดตั้งโมดูล
+FreeLegalTextOnInterventions=ข้อความฟรีเกี่ยวกับเอกสารการแทรกแซง
+FicheinterNumberingModules=รุ่นเลขแทรกแซง
+TemplatePDFInterventions=บัตรแทรกแซงรูปแบบเอกสาร
+WatermarkOnDraftInterventionCards=ลายน้ำบนเอกสารบัตรแทรกแซง (ไม่มีถ้าว่างเปล่า)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=สัญญา / สมัครสมาชิกการติดตั้งโมดูล
+ContractsNumberingModules=สัญญาเลขโมดูล
+TemplatePDFContracts=รูปแบบเอกสารสัญญา
+FreeLegalTextOnContracts=ข้อความฟรีในการทำสัญญา
+WatermarkOnDraftContractCards=ลายน้ำในสัญญาร่าง (ไม่มีถ้าว่างเปล่า)
 ##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MembersSetup=สมาชิกติดตั้งโมดูล
+MemberMainOptions=ตัวเลือกหลัก
+AddSubscriptionIntoAccount=แนะนำโดยค่าเริ่มต้นในการสร้างการทำธุรกรรมธนาคารในโมดูลธนาคารเมื่อมีการเพิ่มการสมัครสมาชิก payed ใหม่
+AdherentLoginRequired= เข้าสู่ระบบการจัดการสำหรับสมาชิกแต่ละคน
+AdherentMailRequired=อีเมลจำเป็นในการสร้างสมาชิกใหม่
+MemberSendInformationByMailByDefault=ช่องทำเครื่องหมายยืนยันที่จะส่งอีเมลไปยังสมาชิก (การตรวจสอบหรือการสมัครสมาชิกใหม่) เป็นตามค่าเริ่มต้น
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPSetup=ติดตั้ง LDAP
+LDAPGlobalParameters=พารามิเตอร์ทั่วโลก
+LDAPUsersSynchro=ผู้ใช้
+LDAPGroupsSynchro=กลุ่ม
+LDAPContactsSynchro=รายชื่อผู้ติดต่อ
+LDAPMembersSynchro=สมาชิก
+LDAPSynchronization=ประสาน LDAP
+LDAPFunctionsNotAvailableOnPHP=ฟังก์ชั่น LDAP ไม่สามารถใช้ได้ใน PHP ของคุณ
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPTypeExample=OpenLdap, Egroupware or Active Directory
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPPasswordExample=Admin password
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveYes=Activated synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPMemberTypeDn=Dolibarr members type DN
-LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPUnbindSuccessfull=Disconnect successful
-LDAPUnbindFailed=Disconnect failed
-LDAPConnectToDNSuccessfull=Connection to DN (%s) successful
-LDAPConnectToDNFailed=Connection to DN (%s) failed
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPassword=Password
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonName=Common name
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldCountryExample=Example : c
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldBirthdateExample=Example :
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
+LDAPNamingAttribute=ที่สำคัญใน LDAP
+LDAPSynchronizeUsers=องค์กรของผู้ใช้ใน LDAP
+LDAPSynchronizeGroups=องค์กรของกลุ่ม LDAP
+LDAPSynchronizeContacts=องค์การของรายชื่อใน LDAP
+LDAPSynchronizeMembers=องค์กรของสมาชิกของมูลนิธิใน LDAP
+LDAPTypeExample=OpenLDAP, eGroupware หรือของ Active Directory
+LDAPPrimaryServer=เซิร์ฟเวอร์หลัก
+LDAPSecondaryServer=เซิร์ฟเวอร์รอง
+LDAPServerPort=พอร์ตของเซิร์ฟเวอร์
+LDAPServerPortExample=พอร์ตเริ่มต้น: 389
+LDAPServerProtocolVersion=Protocol รุ่น
+LDAPServerUseTLS=ใช้ TLS
+LDAPServerUseTLSExample=เซิร์ฟเวอร์ LDAP ใช้ TLS ของคุณ
+LDAPServerDn=เซิร์ฟเวอร์ DN
+LDAPAdminDn=DN ผู้ดูแลระบบ
+LDAPAdminDnExample=สมบูรณ์ DN (เช่น: cn = admin, dc = ตัวอย่างเช่น dc = com)
+LDAPPassword=รหัสผ่านผู้ดูแลระบบ
+LDAPUserDn=ผู้ใช้ DN
+LDAPUserDnExample=สมบูรณ์ DN (เช่น: อู = ผู้ใช้ dc = ตัวอย่างเช่น dc = com)
+LDAPGroupDn=กลุ่ม DN
+LDAPGroupDnExample=สมบูรณ์ DN (เช่น: อู = กลุ่ม dc = ตัวอย่างเช่น dc = com)
+LDAPServerExample=ที่อยู่ของเซิร์ฟเวอร์ (เช่น: localhost, 192.168.0.2, LDAPS: //ldap.example.com/)
+LDAPServerDnExample=สมบูรณ์ DN (เช่น: dc = ตัวอย่างเช่น dc = com)
+LDAPPasswordExample=รหัสผ่านของผู้ดูแลระบบ
+LDAPDnSynchroActive=ผู้ใช้งานและการประสานกลุ่ม
+LDAPDnSynchroActiveExample=LDAP เพื่อ Dolibarr หรือ Dolibarr การประสาน LDAP
+LDAPDnContactActive=ประสานติดต่อ '
+LDAPDnContactActiveYes=ประสานการเปิดใช้งาน
+LDAPDnContactActiveExample=เปิดใช้งาน / ประสานไม่มีการเปิดใช้
+LDAPDnMemberActive=ประสานสมาชิก
+LDAPDnMemberActiveExample=เปิดใช้งาน / ประสานไม่มีการเปิดใช้
+LDAPContactDn=รายชื่อ Dolibarr 'DN
+LDAPContactDnExample=สมบูรณ์ DN (เช่น: อู = ชื่อ, dc = ตัวอย่างเช่น dc = com)
+LDAPMemberDn=Dolibarr สมาชิก DN
+LDAPMemberDnExample=สมบูรณ์ DN (เช่น: อู = สมาชิก dc = ตัวอย่างเช่น dc = com)
+LDAPMemberObjectClassList=รายการ objectClass
+LDAPMemberObjectClassListExample=รายการ objectClass บันทึกการกำหนดคุณลักษณะ (เช่นด้านบนหรือด้านบน inetOrgPerson ผู้ใช้ไดเรกทอรีที่ใช้งาน)
+LDAPUserObjectClassList=รายการ objectClass
+LDAPUserObjectClassListExample=รายการ objectClass บันทึกการกำหนดคุณลักษณะ (เช่นด้านบนหรือด้านบน inetOrgPerson ผู้ใช้ไดเรกทอรีที่ใช้งาน)
+LDAPGroupObjectClassList=รายการ objectClass
+LDAPGroupObjectClassListExample=รายการ objectClass บันทึกการกำหนดคุณลักษณะ (เช่นบน groupOfUniqueNames)
+LDAPContactObjectClassList=รายการ objectClass
+LDAPContactObjectClassListExample=รายการ objectClass บันทึกการกำหนดคุณลักษณะ (เช่นด้านบนหรือด้านบน inetOrgPerson ผู้ใช้ไดเรกทอรีที่ใช้งาน)
+LDAPMemberTypeDn=สมาชิก Dolibarr DN พิมพ์
+LDAPMemberTypeDnExample=สมบูรณ์ DN (เช่น: อู = type_members, dc = ตัวอย่างเช่น dc = com)
+LDAPTestConnect=ทดสอบการเชื่อมต่อ LDAP
+LDAPTestSynchroContact=ทดสอบการประสานรายชื่อ
+LDAPTestSynchroUser=ประสานผู้ใช้ทดสอบ
+LDAPTestSynchroGroup=ทดสอบการประสานกลุ่ม
+LDAPTestSynchroMember=ทดสอบการประสานสมาชิก
+LDAPTestSearch= ทดสอบค้นหา LDAP
+LDAPSynchroOK=การประสานข้อมูลการทดสอบที่ประสบความสำเร็จ
+LDAPSynchroKO=การทดสอบการประสานล้มเหลว
+LDAPSynchroKOMayBePermissions=การทดสอบการประสานล้มเหลว ตรวจสอบการเชื่อมโยงไปยังเซิร์ฟเวอร์ที่มีการกำหนดค่าได้อย่างถูกต้องและช่วยให้ udpates LDAP
+LDAPTCPConnectOK=TCP เชื่อมต่อกับเซิร์ฟเวอร์ LDAP ที่ประสบความสำเร็จ (เซิร์ฟเวอร์ =% s พอร์ต =% s)
+LDAPTCPConnectKO=TCP เชื่อมต่อกับเซิร์ฟเวอร์ LDAP ล้มเหลว (เซิร์ฟเวอร์ =% s พอร์ต =% s)
+LDAPBindOK=เชื่อมต่อ / Authentificate ไปยังเซิร์ฟเวอร์ LDAP ที่ประสบความสำเร็จ (เซิร์ฟเวอร์ =% s พอร์ต =% s, Admin =% s, รหัสผ่าน =% s)
+LDAPBindKO=เชื่อมต่อ / Authentificate ไปยังเซิร์ฟเวอร์ LDAP ล้มเหลว (เซิร์ฟเวอร์ =% s พอร์ต =% s, Admin =% s, รหัสผ่าน =% s)
+LDAPUnbindSuccessfull=ตัดการเชื่อมต่อที่ประสบความสำเร็จ
+LDAPUnbindFailed=ยกเลิกการเชื่อมต่อล้มเหลว
+LDAPConnectToDNSuccessfull=การเชื่อมต่อกับ DN (% s) ที่ประสบความสำเร็จ
+LDAPConnectToDNFailed=การเชื่อมต่อกับ DN (% s) ล้มเหลว
+LDAPSetupForVersion3=การกำหนดค่าเซิร์ฟเวอร์ LDAP สำหรับรุ่นที่ 3
+LDAPSetupForVersion2=เซิร์ฟเวอร์ LDAP การกำหนดค่าสำหรับรุ่นที่ 2
+LDAPDolibarrMapping=Dolibarr แมป
+LDAPLdapMapping=แมป LDAP
+LDAPFieldLoginUnix=เข้าสู่ระบบ (ยูนิกซ์)
+LDAPFieldLoginExample=ตัวอย่าง: uid
+LDAPFilterConnection=ตัวกรองการค้นหา
+LDAPFilterConnectionExample=ตัวอย่าง: & (objectClass = inetOrgPerson)
+LDAPFieldLoginSamba=เข้าสู่ระบบ (samba, ActiveDirectory)
+LDAPFieldLoginSambaExample=ตัวอย่าง: samAccountName
+LDAPFieldFullname=ชื่อเต็ม
+LDAPFieldFullnameExample=ตัวอย่าง: CN
+LDAPFieldPassword=รหัสผ่าน
+LDAPFieldPasswordNotCrypted=รหัสผ่านไม่ crypted
+LDAPFieldPasswordCrypted=รหัสผ่าน crypted
+LDAPFieldPasswordExample=ตัวอย่าง: userpassword
+LDAPFieldCommonName=ชื่อสามัญ
+LDAPFieldCommonNameExample=ตัวอย่าง: CN
+LDAPFieldName=ชื่อ
+LDAPFieldNameExample=ตัวอย่าง: SN
+LDAPFieldFirstName=ชื่อแรก
+LDAPFieldFirstNameExample=ตัวอย่าง: givenName
+LDAPFieldMail=ที่อยู่อีเมล์
+LDAPFieldMailExample=ตัวอย่าง: อีเมล
+LDAPFieldPhone=หมายเลขโทรศัพท์มืออาชีพ
+LDAPFieldPhoneExample=ตัวอย่าง: telephoneNumber
+LDAPFieldHomePhone=หมายเลขโทรศัพท์ส่วนตัว
+LDAPFieldHomePhoneExample=ตัวอย่าง: homephone
+LDAPFieldMobile=โทรศัพท์เคลื่อนที่
+LDAPFieldMobileExample=ตัวอย่าง: โทรศัพท์มือถือ
+LDAPFieldFax=หมายเลขโทรสาร
+LDAPFieldFaxExample=ตัวอย่าง: facsimiletelephonenumber
+LDAPFieldAddress=ถนน
+LDAPFieldAddressExample=ตัวอย่าง: ถนน
+LDAPFieldZip=ไปรษณีย์
+LDAPFieldZipExample=ตัวอย่าง: รหัสไปรษณีย์
+LDAPFieldTown=ตัวเมือง
+LDAPFieldTownExample=ตัวอย่าง: ลิตร
+LDAPFieldCountry=ประเทศ
+LDAPFieldCountryExample=ตัวอย่าง: ค
+LDAPFieldDescription=ลักษณะ
+LDAPFieldDescriptionExample=ตัวอย่าง: คำอธิบาย
+LDAPFieldNotePublic=หมายเหตุสาธารณะ
+LDAPFieldNotePublicExample=ตัวอย่าง: publicnote
+LDAPFieldGroupMembers= สมาชิกในกลุ่ม
+LDAPFieldGroupMembersExample= ตัวอย่าง: uniqueMember
+LDAPFieldBirthdate=วันเกิด
+LDAPFieldBirthdateExample=ตัวอย่าง:
+LDAPFieldCompany=บริษัท
+LDAPFieldCompanyExample=ตัวอย่าง: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated access (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+LDAPFieldSidExample=ตัวอย่าง: objectsid
+LDAPFieldEndLastSubscription=วันที่สิ้นสุดการสมัครสมาชิก
+LDAPFieldTitle=โพสต์ / ฟังก์ชั่น
+LDAPFieldTitleExample=ตัวอย่าง: ชื่อ
+LDAPParametersAreStillHardCoded=พารามิเตอร์ LDAP ยังคง hardcoded (ในชั้นเรียนติดต่อ)
+LDAPSetupNotComplete=การติดตั้ง LDAP ไม่สมบูรณ์ (ไปที่แท็บอื่น ๆ )
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=ผู้ดูแลระบบหรือรหัสผ่าน เข้าถึง LDAP จะไม่ระบุชื่อและที่อยู่ในโหมดอ่านอย่างเดียว
+LDAPDescContact=หน้านี้จะช่วยให้คุณสามารถกำหนด LDAP แอตทริบิวต์ชื่อในต้นไม้ LDAP สำหรับข้อมูลแต่ละที่พบในรายชื่อ Dolibarr
+LDAPDescUsers=หน้านี้จะช่วยให้คุณสามารถกำหนด LDAP แอตทริบิวต์ชื่อในต้นไม้ LDAP สำหรับข้อมูลแต่ละที่พบในผู้ใช้ Dolibarr
+LDAPDescGroups=หน้านี้จะช่วยให้คุณสามารถกำหนด LDAP แอตทริบิวต์ชื่อในต้นไม้ LDAP สำหรับข้อมูลแต่ละที่พบในกลุ่ม Dolibarr
+LDAPDescMembers=หน้านี้จะช่วยให้คุณสามารถกำหนด LDAP แอตทริบิวต์ชื่อในต้นไม้ LDAP สำหรับข้อมูลแต่ละที่พบใน Dolibarr โมดูลสมาชิก
+LDAPDescValues=ค่าตัวอย่างได้รับการออกแบบสำหรับ <b>OpenLDAP</b> กับแบบแผนโหลดต่อไปนี้: <b>core.schema, cosine.schema, inetorgperson.schema)</b> ถ้าคุณใช้ค่า thoose และ OpenLDAP แก้ไขไฟล์ config LDAP ของคุณ <b>slapd.conf</b> จะมีแบบแผน thoose ทั้งหมดที่โหลด
+ForANonAnonymousAccess=สำหรับการเข้าถึงรับรองความถูกต้อง (สำหรับการเข้าถึงการเขียนตัวอย่าง)
+PerfDolibarr=ผลการดำเนินงานการติดตั้ง / รายงานการเพิ่มประสิทธิภาพ
+YouMayFindPerfAdviceHere=คุณจะพบในหน้านี้การตรวจสอบบางส่วนหรือคำแนะนำที่เกี่ยวข้องกับประสิทธิภาพ
+NotInstalled=ไม่ได้ติดตั้งเพื่อให้เซิร์ฟเวอร์ของคุณไม่ได้ชะลอตัวลงนี้
+ApplicativeCache=แคชปรับใช้
+MemcachedNotAvailable=ไม่มีแคช applicative พบ คุณสามารถเพิ่มประสิทธิภาพการทำงานโดยการติดตั้งเซิร์ฟเวอร์แคช Memcached โมดูลและสามารถที่จะใช้เซิร์ฟเวอร์แคชนี้ <br> ข้อมูลเพิ่มเติมที่นี่ <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> <br> โปรดทราบว่าจำนวนมากของผู้ให้บริการเว็บโฮสติ้งไม่ได้ให้เซิร์ฟเวอร์แคชดังกล่าว
+MemcachedModuleAvailableButNotSetup=โมดูล memcached สำหรับแคช applicative พบ แต่การตั้งค่าของโมดูลยังไม่สมบูรณ์
+MemcachedAvailableAndSetup=โมดูล memcached ทุ่มเทให้กับการใช้เซิร์ฟเวอร์ memcached ถูกเปิดใช้งาน
+OPCodeCache=แคช opcode
+NoOPCodeCacheFound=ไม่มีแคช opcode พบ คุณอาจจะใช้แคช opcode อีกกว่า XCache หรือ eAccelerator (ดี) อาจจะเป็นคุณไม่ได้มีแคช opcode (ดีมาก)
+HTTPCacheStaticResources=แคช HTTP สำหรับทรัพยากรแบบคงที่ (CSS, img, JavaScript)
+FilesOfTypeCached=แฟ้ม s พิมพ์% จะถูกเก็บไว้โดยเซิร์ฟเวอร์ HTTP
+FilesOfTypeNotCached=แฟ้ม s พิมพ์% ไม่ได้เก็บไว้โดยเซิร์ฟเวอร์ HTTP
+FilesOfTypeCompressed=ไฟล์ประเภท% s จะถูกบีบอัดโดยเซิร์ฟเวอร์ HTTP
+FilesOfTypeNotCompressed=แฟ้ม s พิมพ์% ไม่ได้บีบอัดโดยเซิร์ฟเวอร์ HTTP
+CacheByServer=แคชโดยเซิร์ฟเวอร์
+CacheByClient=แคชเบราว์เซอร์
+CompressionOfResources=การบีบอัดของการตอบสนอง HTTP
+TestNotPossibleWithCurrentBrowsers=ดังกล่าวตรวจสอบโดยอัตโนมัติเป็นไปไม่ได้กับเบราว์เซอร์ในปัจจุบัน
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Services module setup
-ProductServiceSetup=Products and Services modules setup
-NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
-ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
-ModifyProductDescAbility=Personalization of product descriptions in forms
-ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
-UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
+ProductSetup=ผลิตภัณฑ์การติดตั้งโมดูล
+ServiceSetup=บริการติดตั้งโมดูล
+ProductServiceSetup=ผลิตภัณฑ์และบริการการติดตั้งโมดูล
+NumberOfProductShowInSelect=จำนวนสูงสุดของผลิตภัณฑ์ในคอมโบเลือกรายการ (0 = ไม่ จำกัด )
+ConfirmDeleteProductLineAbility=ยืนยันเมื่อถอดสายผลิตภัณฑ์ในรูปแบบ
+ModifyProductDescAbility=ส่วนบุคคลของรายละเอียดผลิตภัณฑ์ในรูปแบบ
+ViewProductDescInFormAbility=การแสดงของคำอธิบายผลิตภัณฑ์ในรูปแบบ (คำแนะนำเป็นอย่างอื่นเป็นป๊อปอัพ)
+MergePropalProductCard=เปิดใช้งานในผลิตภัณฑ์ / บริการที่แนบมาไฟล์ที่แท็บตัวเลือกที่จะผสานเอกสาร PDF สินค้ากับข้อเสนอในรูปแบบ PDF azur หากผลิตภัณฑ์ / บริการที่อยู่ในข้อเสนอ
+ViewProductDescInThirdpartyLanguageAbility=แสดงรายละเอียดของผลิตภัณฑ์ในภาษา thirdparty
+UseSearchToSelectProductTooltip=นอกจากนี้ถ้าคุณมีจำนวนมากของผลิตภัณฑ์ (> 100 000) คุณสามารถเพิ่มความเร็วโดยการตั้งค่า PRODUCT_DONOTSEARCH_ANYWHERE คงเป็น 1 ใน Setup-> อื่น ๆ ค้นหาแล้วจะถูก จำกัด ในการเริ่มต้นของสตริง
+UseSearchToSelectProduct=ใช้แบบฟอร์มการค้นหาที่จะเลือกผลิตภัณฑ์ (มากกว่ารายการแบบหล่นลง)
+UseEcoTaxeAbility=สนับสนุน Eco-Taxe (WEEE)
+SetDefaultBarcodeTypeProducts=ประเภทบาร์โค้ดเริ่มต้นที่จะใช้สำหรับผลิตภัณฑ์
+SetDefaultBarcodeTypeThirdParties=ประเภทบาร์โค้ดเริ่มต้นที่จะใช้สำหรับบุคคลที่สาม
+UseUnits=หน่วยสนับสนุน
+ProductCodeChecker= Module สำหรับรุ่นรหัสสินค้าและการตรวจสอบ (สินค้าหรือบริการ)
+ProductOtherConf= สินค้า / การกำหนดค่าบริการ
 ##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
+SyslogSetup=บันทึกการติดตั้งโมดูล
+SyslogOutput=บันทึกผล
 SyslogSyslog=Syslog
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogSimpleFile=File
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+SyslogFacility=สิ่งอำนวยความสะดวก
+SyslogLevel=ชั้น
+SyslogSimpleFile=ไฟล์
+SyslogFilename=ชื่อแฟ้มและเส้นทาง
+YouCanUseDOL_DATA_ROOT=คุณสามารถใช้ DOL_DATA_ROOT / dolibarr.log สำหรับล็อกไฟล์ใน Dolibarr "เอกสาร" ไดเรกทอรี คุณสามารถตั้งค่าเส้นทางที่แตกต่างกันในการจัดเก็บไฟล์นี้
+ErrorUnknownSyslogConstant=% s คงไม่ได้เป็นที่รู้จักกันอย่างต่อเนื่อง Syslog
+OnlyWindowsLOG_USER=Windows เท่านั้นสนับสนุน LOG_USER
 ##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
+DonationsSetup=บริจาคการติดตั้งโมดูล
+DonationsReceiptModel=แม่แบบที่ได้รับการบริจาค
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-UseBarcodeInProductModule=Use bar codes for products
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeSetup=การติดตั้งเครื่องอ่านบาร์โค้ด
+PaperFormatModule=พิมพ์รูปแบบโมดูล
+BarcodeEncodeModule=ประเภทการเข้ารหัสบาร์โค้ด
+UseBarcodeInProductModule=ใช้บาร์โค้ดสำหรับผลิตภัณฑ์
+CodeBarGenerator=เครื่องกำเนิดไฟฟ้าเครื่องอ่านบาร์โค้ด
+ChooseABarCode=เครื่องกำเนิดไฟฟ้าไม่มีกำหนด
+FormatNotSupportedByGenerator=รูปแบบไม่ได้รับการสนับสนุนโดยเครื่องกำเนิดไฟฟ้านี้
+BarcodeDescEAN8=เครื่องอ่านบาร์โค้ดชนิด EAN8
+BarcodeDescEAN13=เครื่องอ่านบาร์โค้ดชนิด EAN13
+BarcodeDescUPC=เครื่องอ่านบาร์โค้ดของ UPC ประเภท
+BarcodeDescISBN=เครื่องอ่านบาร์โค้ดของไอประเภท
+BarcodeDescC39=เครื่องอ่านบาร์โค้ดชนิด C39
+BarcodeDescC128=เครื่องอ่านบาร์โค้ดชนิด C128
+BarcodeDescDATAMATRIX=เครื่องอ่านบาร์โค้ดประเภทดาต้าเมตริกซ์
+BarcodeDescQRCODE=เครื่องอ่านบาร์โค้ดชนิดรหัส QR
+GenbarcodeLocation=บาร์โค้ดเครื่องมือบรรทัดคำสั่งรุ่น (ใช้ภายในเครื่องยนต์ชนิดบาร์โค้ดบางส่วน) จะต้องเข้ากันได้กับ "genbarcode" <br> ตัวอย่างเช่น: / usr / local / bin / genbarcode
+BarcodeInternalEngine=ภายในเครื่องยนต์
+BarCodeNumberManager=ผู้จัดการอัตโนมัติกำหนดหมายเลขบาร์โค้ด
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=การถอนการติดตั้งโมดูล
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+ExternalRSSSetup=การติดตั้งภายนอก RSS การนำเข้า
+NewRSS=RSS ฟีดใหม่
+RSSUrl=URL RSS
+RSSUrlExample=ฟีด RSS ที่น่าสนใจ
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=ส่งอีเมลการติดตั้งโมดูล
+MailingEMailFrom=ส่งอีเมล (จาก) สำหรับอีเมลที่ส่งโดยการส่งอีเมลโมดูล
+MailingEMailError=กลับอีเมล (ข้อผิดพลาดต่อ) สำหรับอีเมลที่มีข้อผิดพลาด
+MailingDelay=วินาทีที่จะรอหลังจากที่ส่งข้อความถัดไป
 ##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
-FixedEmailTarget=Fixed email target
+NotificationSetup=การติดตั้งโมดูลการแจ้งเตือนอีเมล
+NotificationEMailFrom=ส่งอีเมล (จาก) สำหรับอีเมลที่ส่งสำหรับการแจ้งเตือน
+ListOfAvailableNotifications=รายการของเหตุการณ์ที่คุณสามารถตั้งค่าการแจ้งเตือนในสำหรับแต่ละ thirdparty (ไปลงในบัตร thirdparty การติดตั้ง) หรือโดยการตั้งค่าอีเมลคงที่ (รายชื่อขึ้นอยู่กับการเปิดใช้งานโมดูล)
+FixedEmailTarget=เป้าหมายคงที่อีเมล
 ##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=ส่งติดตั้งโมดูล
+SendingsReceiptModel=รูปแบบการส่งใบเสร็จรับเงิน
+SendingsNumberingModules=sendings โมดูลจำนวน
+SendingsAbility=การสนับสนุนการจัดส่งแผ่นสำหรับการส่งมอบลูกค้า
+NoNeedForDeliveryReceipts=ในกรณีส่วนใหญ่ตอบรับใบเสร็จรับเงินที่มีการใช้ทั้งสองเป็นแผ่นสำหรับการส่งมอบลูกค้า (รายชื่อของผลิตภัณฑ์ที่จะส่ง) และแผ่นที่ recevied และลงนามโดยลูกค้า ดังนั้นใบเสร็จรับเงินการส่งมอบผลิตภัณฑ์ที่มีคุณลักษณะที่ซ้ำกันและมีการเปิดใช้งานไม่ค่อย
+FreeLegalTextOnShippings=ข้อความฟรีในการจัดส่ง
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=สินค้าที่ได้รับการส่งมอบโมดูลหมายเลข
+DeliveryOrderModel=ผลิตภัณฑ์รุ่นได้รับการส่งมอบ
+DeliveriesOrderAbility=ผลิตภัณฑ์ใบเสร็จรับเงินสนับสนุนการส่งมอบ
+FreeLegalTextOnDeliveryReceipts=ข้อความฟรีในการจัดส่งใบเสร็จรับเงิน
 ##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+AdvancedEditor=ตกแต่ง
+ActivateFCKeditor=เปิดใช้งานขั้นสูงสำหรับบรรณาธิการ:
+FCKeditorForCompany=WYSIWIG สร้าง / ฉบับคำอธิบายองค์ประกอบและทราบ (ยกเว้นผลิตภัณฑ์ / บริการ)
+FCKeditorForProduct=สร้าง WYSIWIG / รุ่นของผลิตภัณฑ์ / คำอธิบายการบริการและการบันทึก
+FCKeditorForProductDetails=WYSIWIG สร้าง / รุ่นของผลิตภัณฑ์เส้นรายละเอียดสำหรับทุกหน่วยงาน (ข้อเสนอการสั่งซื้อใบแจ้งหนี้ ฯลฯ ... ) <font class="warning">คำเตือน:. ใช้ตัวเลือกนี้สำหรับกรณีนี้อย่างจริงจังไม่แนะนำเท่าที่จะสามารถสร้างปัญหาที่มีตัวอักษรพิเศษและหน้า formating เมื่อมีการสร้างรูปแบบไฟล์ PDF ไฟล์</font>
+FCKeditorForMailing= สร้าง WYSIWIG / รุ่นสำหรับ eMailings มวล (Tools-> ส่งอีเมล)
+FCKeditorForUserSignature=สร้าง WYSIWIG / ฉบับลายเซ็นของผู้ใช้
+FCKeditorForMail=สร้าง WYSIWIG / สำหรับจดหมายฉบับ (ยกเว้น Outils-> ส่งอีเมล)
 ##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
+OSCommerceErrorConnectOkButWrongDatabase=ประสบความสำเร็จในการเชื่อมต่อฐานข้อมูล แต่ไม่ได้ดูจะเป็นฐานข้อมูล OSCommerce (% s สำคัญไม่พบในตาราง% s)
+OSCommerceTestOk=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' ในฐานข้อมูล '% s' กับผู้ใช้ '% s' ประสบความสำเร็จ
+OSCommerceTestKo1=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' ประสบความสำเร็จ แต่ฐานข้อมูล '% s' ไม่สามารถเข้าถึงได้
+OSCommerceTestKo2=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' กับผู้ใช้ '% s' ล้มเหลว
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=โกดังสินค้าติดตั้งโมดูล
+UserWarehouse=ผู้ใช้ส่วนบุคคลคลังสินค้า
+IfYouUsePointOfSaleCheckModule=ถ้าคุณใช้โมดูลจุดขาย (POS ให้โมดูลโดยค่าเริ่มต้นหรือโมดูลภายนอกอื่น) การตั้งค่านี้อาจได้รับการปฏิเสธโดยจุดขายของโมดูล จุดส่วนใหญ่ของโมดูลการขายได้รับการออกแบบเพื่อสร้างทันทีใบแจ้งหนี้และลดหุ้นโดยเริ่มต้นสิ่งที่เป็นตัวเลือกที่นี่ ดังนั้นถ้าคุณต้องการหรือไม่ที่จะมีการลดลงของหุ้นเมื่อลงทะเบียนขายจากจุดขายของคุณให้ตรวจสอบยังโมดูล POS ของคุณตั้งค่า
 ##### Menu #####
-MenuDeleted=Menu deleted
-TreeMenu=Tree menus
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NewMenu=New menu
-MenuConf=Menus setup
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailMainmenu=Group for which it belongs (obsolete)
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailLeftmenu=Display condition or not (obsolete)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line ?
+MenuDeleted=เมนูลบ
+TreeMenu=เมนูต้นไม้
+Menus=เมนู
+TreeMenuPersonalized=เมนูส่วนบุคคล
+NewMenu=เมนูใหม่
+MenuConf=เมนูการตั้งค่า
+Menu=เลือกเมนู
+MenuHandler=จัดการเมนู
+MenuModule=โมดูลที่มา
+HideUnauthorizedMenu= ซ่อนเมนูไม่ได้รับอนุญาต (สีเทา)
+DetailId=เมนู Id
+DetailMenuHandler=จัดการเมนูที่จะแสดงเมนูใหม่
+DetailMenuModule=ชื่อโมดูลถ้ารายการเมนูมาจากโมดูล
+DetailType=ประเภทเมนู (ด้านบนหรือด้านซ้าย)
+DetailTitre=ป้ายเมนูหรือรหัสฉลากสำหรับการแปล
+DetailMainmenu=กลุ่มที่มันเป็นของ (เก่า)
+DetailUrl=URL ที่เมนูส่ง (ลิงค์ URL ของแอบโซลูทหรือการเชื่อมโยงจากภายนอกด้วย http: //)
+DetailLeftmenu=เงื่อนไขการแสดงผลหรือไม่ (เก่า)
+DetailEnabled=สภาพที่จะแสดงหรือไม่เข้า
+DetailRight=สภาพที่จะแสดงเมนูสีเทาไม่ได้รับอนุญาต
+DetailLangs=ชื่อไฟล์ Lang สำหรับการแปลรหัสฉลาก
+DetailUser=ฝึกงาน / Extern / ทั้งหมด
+Target=เป้า
+DetailTarget=เป้าหมายสำหรับการเชื่อมโยง (_ blank ด้านบนเปิดหน้าต่างใหม่)
+DetailLevel=ระดับ (-1: เมนูด้านบน 0: เมนูส่วนหัว> 0 เมนูและเมนูย่อย)
+ModifMenu=เมนูการเปลี่ยนแปลง
+DeleteMenu=ลบรายการเมนู
+ConfirmDeleteMenu=<b>คุณแน่ใจหรือว่าต้องการลบเมนูรายการ% s?</b>
+DeleteLine=ลบบรรทัด
+ConfirmDeleteLine=คุณแน่ใจหรือว่าต้องการลบบรรทัดนี้หรือไม่?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+TaxSetup=ภาษีภาษีทางสังคมหรือทางการคลังและการติดตั้งโมดูลเงินปันผล
+OptionVatMode=เนื่องจากภาษีมูลค่าเพิ่ม
+OptionVATDefault=เกณฑ์เงินสด
+OptionVATDebitOption=ตามเกณฑ์คงค้าง
+OptionVatDefaultDesc=ภาษีมูลค่าเพิ่มเนื่องจาก: <br> - ในการจัดส่งสินค้า (วันที่เราใช้ใบแจ้งหนี้) <br> - การชำระเงินสำหรับการให้บริการ
+OptionVatDebitOptionDesc=ภาษีมูลค่าเพิ่มเนื่องจาก: <br> - ในการจัดส่งสินค้า (วันที่เราใช้ใบแจ้งหนี้) <br> - ในใบแจ้งหนี้ (เดบิต) สำหรับการให้บริการ
+SummaryOfVatExigibilityUsedByDefault=เวลาภาษีมูลค่าเพิ่ม exigibility โดยค่าเริ่มต้นเป็นไปตามตัวเลือกที่เลือก:
+OnDelivery=ในการจัดส่ง
+OnPayment=ในการชำระเงิน
+OnInvoice=ในใบแจ้งหนี้
+SupposedToBePaymentDate=วันที่ชำระเงินที่ใช้
+SupposedToBeInvoiceDate=วันที่ใบแจ้งหนี้ที่ใช้
+Buy=ซื้อ
+Sell=ขาย
+InvoiceDateUsed=วันที่ใบแจ้งหนี้ที่ใช้
+YourCompanyDoesNotUseVAT=บริษัท ของคุณได้รับการกำหนดที่จะไม่ใช้ภาษีมูลค่าเพิ่ม (หน้าหลัก - การติดตั้ง - บริษัท / มูลนิธิ) ดังนั้นจึงไม่มีตัวเลือกในการติดตั้งภาษีมูลค่าเพิ่ม
+AccountancyCode=รหัสบัญชี
+AccountancyCodeSell=บัญชีการขาย รหัส
+AccountancyCodeBuy=บัญชีซื้อ รหัส
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
-PastDelayVCalExport=Do not export event older than
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AgendaSetup=กิจกรรมและวาระการติดตั้งโมดูล
+PasswordTogetVCalExport=กุญแจสำคัญในการอนุญาตการเชื่อมโยงการส่งออก
+PastDelayVCalExport=อย่าส่งออกเหตุการณ์ที่มีอายุมากกว่า
+AGENDA_USE_EVENT_TYPE=ประเภทการใช้เหตุการณ์ที่เกิดขึ้น (การจัดการการติดตั้งลงในเมนู -> พจนานุกรม -> ประเภทของเหตุการณ์วาระ)
+AGENDA_DEFAULT_FILTER_TYPE=ตั้งค่าโดยอัตโนมัติประเภทของเหตุการณ์นี้ในการกรองการค้นหาในมุมมองของวาระการประชุม
+AGENDA_DEFAULT_FILTER_STATUS=ตั้งค่าโดยอัตโนมัติสถานะสำหรับการจัดกิจกรรมนี้ในการกรองการค้นหาในมุมมองของวาระการประชุม
+AGENDA_DEFAULT_VIEW=ซึ่งแท็บที่คุณต้องการที่จะเปิดตามค่าเริ่มต้นเมื่อมีการเลือกวาระที่เมนู
 ##### ClickToDial #####
-ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=โมดูลนี้จะช่วยให้การเพิ่มไอคอนหลังจากที่หมายเลขโทรศัพท์ คลิกที่ไอคอนนี้จะเรียกเซิร์ฟเวอร์ที่มี URL โดยเฉพาะอย่างยิ่งที่คุณกำหนดดังต่อไปนี้ นี้สามารถใช้ในการเรียกระบบศูนย์บริการจาก Dolibarr ที่สามารถโทรไปยังหมายเลขโทรศัพท์มือถือในระบบ SIP ตัวอย่างเช่น
 ##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
-CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDesk=จุดขาย
+CashDeskSetup=จุดขายการติดตั้งโมดูล
+CashDeskThirdPartyForSell=เริ่มต้นของบุคคลที่สามทั่วไปจะใช้สำหรับการขาย
+CashDeskBankAccountForSell=บัญชีเริ่มต้นที่จะใช้ในการรับชำระเงินด้วยเงินสด
+CashDeskBankAccountForCheque= บัญชีเริ่มต้นที่จะใช้ในการรับชำระเงินด้วยเช็ค
+CashDeskBankAccountForCB= บัญชีเริ่มต้นที่จะใช้ในการรับชำระเงินด้วยบัตรเครดิต
+CashDeskDoNotDecreaseStock=ปิดการใช้งานลดลงหุ้นเมื่อขายจะทำจากจุดขาย (ถ้ามี "ไม่" การลดลงของหุ้นที่จะทำสำหรับแต่ละขาย POS ทำได้จากสิ่งที่เป็นตัวเลือกที่ตั้งในสต็อกโมดูล)
+CashDeskIdWareHouse=และ จำกัด การบังคับคลังสินค้าที่จะใช้สำหรับการลดลงของหุ้น
+StockDecreaseForPointOfSaleDisabled=หุ้นลดลงจากจุดขายปิดการใช้งาน
+StockDecreaseForPointOfSaleDisabledbyBatch=การลดลงของหุ้นใน POS เข้ากันไม่ได้กับการจัดการจำนวนมาก
+CashDeskYouDidNotDisableStockDecease=คุณไม่ได้ปิดการใช้งานลดลงหุ้นเมื่อมีการขายจากจุดขายของ ดังนั้นคลังสินค้าจะต้อง
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+BookmarkSetup=Bookmark ติดตั้งโมดูล
+BookmarkDesc=โมดูลนี้จะช่วยให้คุณสามารถจัดการบุ๊คมาร์ค นอกจากนี้คุณยังสามารถเพิ่มทางลัดไปยังหน้าเว็บใด ๆ Dolibarr หรือเว็บไซต์ externale บนเมนูด้านซ้ายของคุณ
+NbOfBoomarkToShow=จำนวนสูงสุดของบุ๊คมาร์คที่จะแสดงในเมนูด้านซ้าย
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+WebServicesSetup=webservices ติดตั้งโมดูล
+WebServicesDesc=โดยการเปิดใช้โมดูลนี้ Dolibarr กลายเป็นบริการเว็บเซิร์ฟเวอร์เพื่อให้บริการเว็บอื่น ๆ
+WSDLCanBeDownloadedHere=ไฟล์บ่ง WSDL ของการให้บริการสามารถดาวน์โหลดได้ที่นี่
+EndPointIs=สบู่ลูกค้าจะต้องส่งคำขอของพวกเขาไปยังปลายทาง Dolibarr สามารถดูได้ที่ Url
+##### API ####
+ApiSetup=API การติดตั้งโมดูล
+ApiDesc=โดยการเปิดใช้โมดูลนี้ Dolibarr กลายเป็นเซิร์ฟเวอร์ REST เพื่อให้บริการเว็บอื่น ๆ
+KeyForApiAccess=กุญแจสำคัญในการใช้ API (พารามิเตอร์ "api_key")
+ApiProductionMode=เปิดใช้งานโหมดการผลิต
+ApiEndPointIs=คุณสามารถเข้าถึง API ที่ URL
+ApiExporerIs=คุณสามารถสำรวจ API ที่ URL
+OnlyActiveElementsAreExposed=องค์ประกอบเฉพาะจากโมดูลมีการเปิดใช้งาน
+ApiKey=ที่สำคัญสำหรับ API
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
+BankSetupModule=ธนาคารติดตั้งโมดูล
+FreeLegalTextOnChequeReceipts=ข้อความฟรีในการตรวจสอบใบเสร็จรับเงิน
+BankOrderShow=เพื่อการแสดงผลของบัญชีเงินฝากธนาคารของประเทศโดยใช้ "เลขที่ธนาคารรายละเอียด"
+BankOrderGlobal=ทั่วไป
+BankOrderGlobalDesc=ลำดับการแสดงทั่วไป
+BankOrderES=สเปน
+BankOrderESDesc=เพื่อการแสดงผลภาษาสเปน
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=หลาย บริษัท ติดตั้งโมดูล
 ##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=ผู้ผลิตติดตั้งโมดูล
+SuppliersCommandModel=แม่แบบที่สมบูรณ์ของคำสั่งผู้จัดจำหน่าย (โลโก้ ... )
+SuppliersInvoiceModel=แม่แบบที่สมบูรณ์ของใบแจ้งหนี้จัดจำหน่าย (โลโก้ ... )
+SuppliersInvoiceNumberingModel=ผู้ผลิตใบแจ้งหนี้เลขรุ่น
+IfSetToYesDontForgetPermission=หากการตั้งค่าใช่ไม่ลืมที่จะให้สิทธิ์กับกลุ่มหรือผู้ใช้ที่ได้รับอนุญาตให้ได้รับการอนุมัติที่สอง
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+GeoIPMaxmindSetup=GeoIP Maxmind การติดตั้งโมดูล
+PathToGeoIPMaxmindCountryDataFile=เส้นทางไปยังแฟ้มที่มีไอพี Maxmind กับการแปลประเทศ <br> ตัวอย่าง: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+NoteOnPathLocation=โปรดทราบว่าทรัพย์สินทางปัญญาไปยังแฟ้มข้อมูลประเทศของคุณจะต้องอยู่ภายในไดเรกทอรี PHP คุณสามารถอ่าน (ตรวจสอบการติดตั้ง PHP open_basedir ของคุณและสิทธิ์ระบบแฟ้ม)
+YouCanDownloadFreeDatFileTo=<b>คุณสามารถดาวน์โหลดรุ่นสาธิตฟรีของแฟ้ม</b> Maxmind GeoIP ประเทศที่% s
+YouCanDownloadAdvancedDatFileTo=<b>นอกจากนี้คุณยังสามารถดาวน์โหลดรุ่นที่สมบูรณ์มากขึ้นมีการปรับปรุงของ</b> Maxmind GeoIP ประเทศที่ไฟล์% s
+TestGeoIPResult=ทดสอบการแปลง IP -> ประเทศ
 ##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
+ProjectsNumberingModules=จำนวนโมดูลโครงการ
+ProjectsSetup=โครงการติดตั้งโมดูล
+ProjectsModelModule=โครงการรายงานรูปแบบเอกสาร
+TasksNumberingModules=งานจำนวนโมดูล
+TaskModelModule=รายงานงานรูปแบบเอกสาร
+UseSearchToSelectProject=ใช้ฟิลด์เติมข้อความอัตโนมัติที่จะเลือกโครงการ (แทนการใช้กล่องรายการ)
 ##### ECM (GED) #####
-ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMSetup = GED ติดตั้ง
+ECMAutoTree = ต้นไม้โฟลเดอร์โดยอัตโนมัติและเอกสาร
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerContact=List of notifications per contact*
-ListOfFixedNotifications=List of fixed notifications
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build database backup dump file
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+FiscalYears=รอบระยะเวลาบัญชี
+FiscalYear=ปีงบประมาณ
+FiscalYearCard=บัตรปีงบประมาณ
+NewFiscalYear=ปีงบประมาณใหม่
+EditFiscalYear=แก้ไขปีงบประมาณ
+OpenFiscalYear=เปิดปีงบประมาณ
+CloseFiscalYear=ปิดปีงบประมาณ
+DeleteFiscalYear=ลบปีงบประมาณ
+ConfirmDeleteFiscalYear=คุณแน่ใจที่จะลบปีงบประมาณนี้หรือไม่?
+Opened=เปิด
+Closed=ปิด
+AlwaysEditable=มักจะสามารถแก้ไขได้
+MAIN_APPLICATION_TITLE=บังคับให้มองเห็นชื่อของโปรแกรม (คำเตือน: การตั้งชื่อของคุณเองที่นี่อาจแบ่งคุณลักษณะเข้าสู่ระบบอัตโนมัติเมื่อใช้โปรแกรม DoliDroid มือถือ)
+NbMajMin=จำนวนขั้นต่ำของอักขระตัวพิมพ์ใหญ่
+NbNumMin=จำนวนขั้นต่ำของตัวละครที่เป็นตัวเลข
+NbSpeMin=จำนวนขั้นต่ำของตัวอักษรพิเศษ
+NbIteConsecutive=จำนวนสูงสุดของการทำซ้ำตัวอักษรเดียวกัน
+NoAmbiCaracAutoGeneration=อย่าใช้ตัวอักษรที่ไม่ชัดเจน ("1", "L" "ฉัน", "|", "0", "O") สำหรับรุ่นอัตโนมัติ
+SalariesSetup=การติดตั้งโมดูลของเงินเดือน
+SortOrder=การเรียงลำดับการสั่งซื้อ
+Format=รูป
+TypePaymentDesc=0: ประเภทการชำระเงินของลูกค้าที่ 1: ประเภทการชำระเงินผู้ผลิต, 2: ทั้งลูกค้าและซัพพลายเออประเภทการชำระเงิน
+IncludePath=รวมถึงเส้นทาง (ตามที่กำหนดลงในตัวแปร s%)
+ExpenseReportsSetup=การติดตั้งโมดูลรายงานค่าใช้จ่าย
+TemplatePDFExpenseReports=เอกสารแม่แบบในการสร้างเอกสารรายงานค่าใช้จ่าย
+NoModueToManageStockDecrease=ไม่มีโมดูลสามารถจัดการกับการลดลงของสต็อกอัตโนมัติถูกเปิดใช้งาน การลดลงของสต็อกจะทำได้ในการป้อนข้อมูลด้วยตนเอง
+NoModueToManageStockIncrease=ไม่มีโมดูลสามารถจัดการกับการเพิ่มขึ้นของสต็อกอัตโนมัติถูกเปิดใช้งาน การเพิ่มขึ้นของสต็อกจะทำได้ในการป้อนข้อมูลด้วยตนเอง
+YouMayFindNotificationsFeaturesIntoModuleNotification=คุณอาจพบว่าตัวเลือกสำหรับการแจ้งเตือนทางอีเมลโดยการเปิดและการกำหนดค่าโมดูล "ประกาศ"
+ListOfNotificationsPerContact=รายการของการแจ้งเตือนต่อการติดต่อ *
+ListOfFixedNotifications=รายการของการแจ้งเตือนคงที่
+GoOntoContactCardToAddMore=ไปที่แท็บ "การแจ้งเตือน" ของการติดต่อ thirdparty เพื่อเพิ่มหรือลบการแจ้งเตือนสำหรับรายชื่อ / ที่อยู่
+Threshold=ธรณีประตู
+BackupDumpWizard=ตัวช่วยสร้างการสร้างแฟ้มการถ่ายโอนการสำรองฐานข้อมูล
+SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
+SomethingMakeInstallFromWebNotPossible2=ด้วยเหตุนี้กระบวนการอัพเกรดอธิบายไว้ที่นี่เป็นเพียงไม่กี่ก้าวคู่มือผู้ใช้สิทธิพิเศษที่สามารถทำ
+InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูลภายนอกจากโปรแกรมที่ได้รับการปิดใช้งานโดยผู้ดูแลระบบ <strong>คุณต้องขอให้เขาลบไฟล์% s</strong> เพื่อให้คุณลักษณะนี้
+ConfFileMuseContainCustom=<strong>การติดตั้งโมดูลภายนอกจากโปรแกรมบันทึกไฟล์โมดูลลงในไดเรกทอรี%</strong> s จะมีไดเรกทอรีนี้ประมวลผลโดย Dolibarr คุณต้องติดตั้ง <strong>conf / conf.php</strong> ของคุณจะมีตัวเลือก <br> - <strong>$ dolibarr_main_url_root_alt</strong> การใช้งานมูลค่า <strong>$ dolibarr_main_url_root_alt = "/ กำหนดเอง"</strong> <br> - <strong>$ dolibarr_main_document_root_alt</strong> การใช้งานค่า <strong>"% s / กำหนดเอง"</strong>
+HighlightLinesOnMouseHover=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
+PressF5AfterChangingThis=กด F5 บนแป้นพิมพ์หลังจากเปลี่ยนค่านี้จะมีมันที่มีประสิทธิภาพ
+NotSupportedByAllThemes=จะทำงานร่วมกับธีม Eldy แต่ไม่ได้รับการสนับสนุนจากทุกรูปแบบ
+BackgroundColor=สีพื้นหลัง
+TopMenuBackgroundColor=สีพื้นหลังสำหรับเมนูยอดนิยม
+LeftMenuBackgroundColor=สีพื้นหลังสำหรับเมนูด้านซ้าย
+BackgroundTableTitleColor=สีพื้นหลังสำหรับสายชื่อตาราง
+BackgroundTableLineOddColor=สีพื้นหลังสำหรับสายตารางแปลก
+BackgroundTableLineEvenColor=สีพื้นหลังสำหรับแม้แต่เส้นตาราง
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 55fde86864b..dbd78c85cac 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -1,98 +1,99 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
-Actions=Events
-ActionsArea=Events area (Actions and tasks)
-Agenda=Agenda
-Agendas=Agendas
-Calendar=Calendar
-Calendars=Calendars
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
-AffectedTo=Assigned to
-DoneBy=Done by
-Event=Event
-Events=Events
-EventsNb=Number of events
-MyEvents=My events
-OtherEvents=Other events
-ListOfActions=List of events
-Location=Location
-EventOnFullDay=Event on all day(s)
-SearchAnAction= Search an event/task
-MenuToDoActions=All incomplete events
-MenuDoneActions=All terminated events
-MenuToDoMyActions=My incomplete events
-MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
-ActionsAskedBy=Events reported by
-ActionsToDoBy=Events assigned to
-ActionsDoneBy=Events done by
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
-AllMyActions= All my events/tasks
-AllActions= All events/tasks
-ViewList=List view
-ViewCal=Month view
-ViewDay=Day view
-ViewWeek=Week view
-ViewPerUser=Per user view
-ViewWithPredefinedFilters= View with predefined filters
-AutoActions= Automatic filling
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
-AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
-AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr=Proposal %s validated
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
-InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
-InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr=Order %s validated
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=Order %s canceled
-OrderBilledInDolibarr=Order %s classified billed
-OrderApprovedInDolibarr=Order %s approved
-OrderRefusedInDolibarr=Order %s refused
-OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
-ProposalSentByEMail=Commercial proposal %s sent by EMail
-OrderSentByEMail=Customer order %s sent by EMail
-InvoiceSentByEMail=Customer invoice %s sent by EMail
-SupplierOrderSentByEMail=Supplier order %s sent by EMail
-SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-NewCompanyToDolibarr= Third party created
-DateActionPlannedStart= Planned start date
-DateActionPlannedEnd= Planned end date
-DateActionDoneStart= Real start date
-DateActionDoneEnd= Real end date
-DateActionStart= Start date
-DateActionEnd= End date
-AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthday's contacts
-AgendaHideBirthdayEvents=Hide birthday's contacts
-Busy=Busy
-ExportDataset_event1=List of agenda events
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+IdAgenda=รหัสเหตุการณ์
+Actions=เหตุการณ์ที่เกิดขึ้น
+ActionsArea=พื้นที่กิจกรรม (การดำเนินการและงาน)
+Agenda=ระเบียบวาระการประชุม
+Agendas=วาระ
+Calendar=ปฏิทิน
+Calendars=ปฏิทิน
+LocalAgenda=ปฏิทินภายใน
+ActionsOwnedBy=เหตุการณ์ที่เป็นเจ้าของโดย
+AffectedTo=ได้รับมอบหมายให้
+DoneBy=ทำโดย
+Event=เหตุการณ์
+Events=เหตุการณ์ที่เกิดขึ้น
+EventsNb=จำนวนของเหตุการณ์ที่
+MyEvents=เหตุการณ์ของฉัน
+OtherEvents=กิจกรรมอื่น ๆ
+ListOfActions=รายการของเหตุการณ์
+Location=สถานที่
+EventOnFullDay=เหตุการณ์ทุกวัน (s)
+SearchAnAction= ค้นหาเหตุการณ์ / งาน
+MenuToDoActions=ทุกเหตุการณ์ที่ไม่สมบูรณ์
+MenuDoneActions=เหตุการณ์ยกเลิกทั้งหมด
+MenuToDoMyActions=เหตุการณ์ที่ไม่สมบูรณ์ของฉัน
+MenuDoneMyActions=เหตุการณ์สิ้นสุดของฉัน
+ListOfEvents=รายการของเหตุการณ์ (ปฏิทินภายใน)
+ActionsAskedBy=เหตุการณ์รายงานโดย
+ActionsToDoBy=เหตุการณ์ที่เกิดขึ้นได้รับมอบหมายให้
+ActionsDoneBy=เหตุการณ์กระทำโดย
+ActionsForUser=กิจกรรมสำหรับผู้ใช้
+ActionsForUsersGroup=กิจกรรมสำหรับผู้ใช้ทั้งหมดของกลุ่ม
+ActionAssignedTo=เหตุการณ์ได้รับมอบหมายให้
+AllMyActions= เหตุการณ์ทั้งหมดของฉัน / งาน
+AllActions= เหตุการณ์ทั้งหมด / งาน
+ViewList=มุมมองรายการ
+ViewCal=มุมมองรายเดือน
+ViewDay=มุมมองรายวัน
+ViewWeek=มุมมองสัปดาห์
+ViewPerUser=ต่อมุมมองของผู้ใช้
+ViewWithPredefinedFilters= ดูกับตัวกรองที่กำหนดไว้ล่วงหน้า
+AutoActions= บรรจุอัตโนมัติ
+AgendaAutoActionDesc= กำหนดเหตุการณ์ที่เกิดขึ้นที่นี่ที่คุณต้องการ Dolibarr การสร้างโดยอัตโนมัติในกรณีที่วาระการประชุม ถ้าไม่มีการตรวจสอบ (โดยเริ่มต้น), คู่มือการดำเนินการจะได้รับการรวมอยู่ในวาระการประชุม
+AgendaSetupOtherDesc= หน้านี้มีตัวเลือกที่จะช่วยให้การส่งออกของเหตุการณ์ Dolibarr ของคุณลงในปฏิทินภายนอก (Thunderbird ปฏิทิน google, ... )
+AgendaExtSitesDesc=หน้านี้จะช่วยให้การประกาศแหล่งภายนอกของปฏิทินเพื่อดูกิจกรรมของพวกเขาเข้าสู่วาระการประชุม Dolibarr
+ActionsEvents=กิจกรรมสำหรับ Dolibarr ซึ่งจะสร้างการดำเนินการในวาระการประชุมโดยอัตโนมัติ
+PropalValidatedInDolibarr=s% ข้อเสนอการตรวจสอบ
+InvoiceValidatedInDolibarr=ใบแจ้งหนี้% s ตรวจสอบ
+InvoiceValidatedInDolibarrFromPos=s% การตรวจสอบใบแจ้งหนี้จาก POS
+InvoiceBackToDraftInDolibarr=ใบแจ้งหนี้% s กลับไปที่ร่างสถานะ
+InvoiceDeleteDolibarr=ใบแจ้งหนี้% s ลบ
+OrderValidatedInDolibarr=สั่งซื้อ% s ตรวจสอบ
+OrderDeliveredInDolibarr=สั่งซื้อ% s แยกส่ง
+OrderCanceledInDolibarr=สั่งซื้อ% s ยกเลิก
+OrderBilledInDolibarr=สั่งซื้อ% s แยกการเรียกเก็บเงิน
+OrderApprovedInDolibarr=s% สั่งซื้อได้รับการอนุมัติ
+OrderRefusedInDolibarr=สั่งซื้อ% s ปฏิเสธ
+OrderBackToDraftInDolibarr=สั่งซื้อ% s กลับไปที่ร่างสถานะ
+ProposalSentByEMail=ข้อเสนอเชิงพาณิชย์% s ส่งทางอีเมล
+OrderSentByEMail=ลูกค้า% s เพื่อส่งทางอีเมล
+InvoiceSentByEMail=ใบแจ้งหนี้ของลูกค้า% ส่งทางอีเมล
+SupplierOrderSentByEMail=คำสั่งผู้ผลิต% ส่งทางอีเมล
+SupplierInvoiceSentByEMail=ใบแจ้งหนี้ของผู้ผลิต% ส่งทางอีเมล
+ShippingSentByEMail=การจัดส่ง% s ส่งทางอีเมล
+ShippingValidated= % s การตรวจสอบการจัดส่ง
+InterventionSentByEMail=การแทรกแซง% s ส่งทางอีเมล
+NewCompanyToDolibarr= บุคคลที่สามสร้าง
+DateActionPlannedStart= วันที่เริ่มต้นการวางแผน
+DateActionPlannedEnd= วันที่สิ้นสุดการวางแผน
+DateActionDoneStart= วันที่เริ่มต้นจริง
+DateActionDoneEnd= วันที่สิ้นสุดจริง
+DateActionStart= วันที่เริ่มต้น
+DateActionEnd= วันที่สิ้นสุด
+AgendaUrlOptions1=นอกจากนี้คุณยังสามารถเพิ่มพารามิเตอร์ต่อไปนี้เพื่อกรองเอาท์พุท:
+AgendaUrlOptions2=<b>เข้าสู่ระบบ =% s</b> ​​ที่จะ จำกัด <b>การส่งออกไปยังที่สร้างขึ้นโดยการกระทำหรือได้รับมอบหมายให้ผู้ใช้%</b> s
+AgendaUrlOptions3=<b>Logina =% s</b> ​​ที่จะ จำกัด <b>การส่งออกไปยังการดำเนินการที่เป็นเจ้าของโดยผู้ใช้%</b> s
+AgendaUrlOptions4=<b>logint =% s</b> ​​ที่จะ จำกัด <b>การส่งออกไปยังการดำเนินการกำหนดให้ผู้ใช้%</b> s
+AgendaUrlOptionsProject=<b>โครงการ = PROJECT_ID</b> ที่จะ จำกัด การส่งออกไปยังการดำเนินการที่เกี่ยวข้องกับโครงการ <b>PROJECT_ID</b>
+AgendaShowBirthdayEvents=แสดงรายชื่อวันเกิดของ
+AgendaHideBirthdayEvents=ซ่อนรายชื่อวันเกิดของ
+Busy=ไม่ว่าง
+ExportDataset_event1=รายการของเหตุการณ์วาระการประชุม
+DefaultWorkingDays=ในช่วงเริ่มต้นวันทำงานในสัปดาห์ (ตัวอย่าง: 1-5, 1-6)
+DefaultWorkingHours=ชั่วโมงการทำงานเริ่มต้นในวันที่ (ตัวอย่าง: 9-18)
 # External Sites ical
-ExportCal=Export calendar
-ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
-ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
-ExtSiteUrlAgenda=URL to access .ical file
-ExtSiteNoLabel=No Description
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=My availability
-ActionType=Event type
-DateActionBegin=Start event date
+ExportCal=ส่งออกปฏิทิน
+ExtSites=นำเข้าปฏิทินภายนอก
+ExtSitesEnableThisTool=แสดงปฏิทินภายนอก (เข้าสู่การตั้งค่าที่กำหนดไว้ทั่วโลก) เข้าสู่วาระการประชุม ไม่ส่งผลกระทบต่อปฏิทินภายนอกที่กำหนดโดยผู้ใช้
+ExtSitesNbOfAgenda=จำนวนปฏิทิน
+AgendaExtNb=ปฏิทิน nb% s
+ExtSiteUrlAgenda=URL ที่เข้าถึงไฟล์ .ical
+ExtSiteNoLabel=คำอธิบายไม่มี
+WorkingTimeRange=ช่วงเวลาการทำงาน
+WorkingDaysRange=ช่วงวันทำการ
+AddEvent=สร้างกิจกรรม
+MyAvailability=ความพร้อมใช้งานของฉัน
+ActionType=ประเภทเหตุการณ์
+DateActionBegin=วันที่เริ่มต้นเหตุการณ์
+CloneAction=เหตุการณ์โคลน
+ConfirmCloneEvent=<b>คุณแน่ใจหรือว่าต้องการโคลนเหตุการณ์% s?</b>
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 72639883e1a..76e1b31fbfa 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -1,167 +1,167 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-Banks=Banks
-MenuBankCash=Bank/Cash
-MenuSetupBank=Bank/Cash setup
-BankName=Bank name
-FinancialAccount=Account
-FinancialAccounts=Accounts
-BankAccount=Bank account
-BankAccounts=Bank accounts
-ShowAccount=Show Account
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-MainAccount=Main account
-CurrentAccount=Current account
-CurrentAccounts=Current accounts
-SavingAccount=Savings account
-SavingAccounts=Savings accounts
-ErrorBankLabelAlreadyExists=Financial account label already exists
-BankBalance=Balance
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=Minimum allowed balance
-BalanceMinimalDesired=Minimum desired balance
-InitialBankBalance=Initial balance
-EndBankBalance=End balance
-CurrentBalance=Current balance
-FutureBalance=Future balance
-ShowAllTimeBalance=Show balance from start
-AllTime=From start
-Reconciliation=Reconciliation
-RIB=Bank Account Number
-IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
-BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
-Withdrawals=Withdrawals
-Withdrawal=Withdrawal
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
+Bank=ธนาคาร
+Banks=ธนาคาร
+MenuBankCash=ธนาคาร / เงินสด
+MenuSetupBank=ธนาคาร / การตั้งค่าเงินสด
+BankName=ชื่อธนาคาร
+FinancialAccount=บัญชี
+FinancialAccounts=บัญชี
+BankAccount=บัญชีเงินฝาก
+BankAccounts=บัญชีเงินฝากธนาคาร
+ShowAccount=แสดงบัญชี
+AccountRef=อ้างอิงบัญชีการเงิน
+AccountLabel=ป้ายชื่อบัญชีการเงิน
+CashAccount=บัญชีเงินสด
+CashAccounts=บัญชีเงินสด
+MainAccount=บัญชีหลัก
+CurrentAccount=บัญชีกระแสรายวัน
+CurrentAccounts=บัญชีปัจจุบัน
+SavingAccount=บัญชีออมทรัพย์
+SavingAccounts=บัญชีออมทรัพย์
+ErrorBankLabelAlreadyExists=ป้ายชื่อบัญชีทางการเงินที่มีอยู่แล้ว
+BankBalance=สมดุล
+BankBalanceBefore=ความสมดุลก่อน
+BankBalanceAfter=หลังจากที่ยอดเงินคงเหลือ
+BalanceMinimalAllowed=ยอดเงินขั้นต่ำที่ได้รับอนุญาต
+BalanceMinimalDesired=ยอดเงินขั้นต่ำที่ต้องการ
+InitialBankBalance=ยอดเงินเริ่มต้น
+EndBankBalance=สมดุลสิ้นสุด
+CurrentBalance=ยอดเงินปัจจุบัน
+FutureBalance=ความสมดุลในอนาคต
+ShowAllTimeBalance=แสดงความสมดุลจากจุดเริ่มต้น
+AllTime=จากจุดเริ่มต้น
+Reconciliation=การประนีประนอม
+RIB=หมายเลขบัญชีธนาคาร
+IBAN=IBAN จำนวน
+IbanValid=IBAN เป็นที่ถูกต้อง
+IbanNotValid=IBAN ไม่สามารถใช้ได้
+BIC=BIC / จำนวน SWIFT
+SwiftValid=BIC / SWIFT เป็นที่ถูกต้อง
+SwiftNotValid=BIC / SWIFT ไม่สามารถใช้ได้
+StandingOrders=ยืนคำสั่งซื้อ
+StandingOrder=เพื่อยืน
+Withdrawals=การถอนเงิน
+Withdrawal=การถอนตัว
+AccountStatement=ใบแจ้งยอดบัญชี
+AccountStatementShort=คำแถลง
+AccountStatements=งบบัญชี
+LastAccountStatements=ใบแจ้งยอดบัญชีล่าสุด
 Rapprochement=Reconciliate
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
-CreateAccount=Create account
-NewAccount=New account
-NewBankAccount=New bank account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-NewCurrentAccount=New current account
-NewSavingAccount=New savings account
-NewCashAccount=New cash account
-EditFinancialAccount=Edit account
-AccountSetup=Financial accounts setup
-SearchBankMovement=Search bank movement
-Debts=Debts
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-IfBankAccount=If bank account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account ?
-Account=Account
-ByCategories=By categories
-ByRubriques=By categories
-BankTransactionByCategories=Bank transactions by categories
-BankTransactionForCategory=Bank transactions for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ?
-ListBankTransactions=List of bank transactions
-IdTransaction=Transaction ID
-BankTransactions=Bank transactions
-SearchTransaction=Search transaction
-ListTransactions=List transactions
-ListTransactionsByCategory=List transaction/category
-TransactionsToConciliate=Transactions to reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-ConciliationForAccount=Reconcile this account
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
-StatusAccountClosed=Closed
-AccountIdShort=Number
-EditBankRecord=Edit record
-LineRecord=Transaction
-AddBankRecord=Add transaction
-AddBankRecordLong=Add transaction manually
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Transaction reconciled
-CustomerInvoicePayment=Customer payment
-CustomerInvoicePaymentBack=Customer payment back
-SupplierInvoicePayment=Supplier payment
-WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
-FinancialAccountJournal=Financial account journal
-BankTransfer=Bank transfer
-BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
-TransferFrom=From
-TransferTo=To
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
-ValidateCheckReceipt=Validate this check receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this check receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks waiting for deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
-DeleteTransaction=Delete transaction
-ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions
-BankMovements=Movements
-CashBudget=Cash budget
-PlannedTransactions=Planned transactions
-Graph=Graphics
-ExportDataset_banque_1=Bank transactions and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-TransactionWithOtherAccount=Account transfer
-PaymentNumberUpdateSucceeded=Payment number updated succesfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date update succesfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank transaction
-AllAccounts=All bank/cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
-StartDate=Start date
-EndDate=End date
+IOMonthlyReporting=รายงานรายเดือน
+BankAccountDomiciliation=ที่อยู่บัญชี
+BankAccountCountry=ประเทศบัญชี
+BankAccountOwner=ชื่อเจ้าของบัญชี
+BankAccountOwnerAddress=ที่อยู่เจ้าของบัญชี
+RIBControlError=ตรวจสอบความสมบูรณ์ของค่าล้มเหลว ซึ่งหมายความว่าข้อมูลเลขที่บัญชีนี้จะไม่ได้สมบูรณ์หรือไม่ถูกต้อง (ตรวจสอบประเทศตัวเลขและ IBAN)
+CreateAccount=สร้างบัญชี
+NewAccount=บัญชีใหม่
+NewBankAccount=บัญชีธนาคารใหม่
+NewFinancialAccount=บัญชีทางการเงินใหม่
+MenuNewFinancialAccount=บัญชีทางการเงินใหม่
+NewCurrentAccount=บัญชีเงินฝากกระแสใหม่
+NewSavingAccount=บัญชีออมทรัพย์ใหม่
+NewCashAccount=บัญชีเงินสดใหม่
+EditFinancialAccount=แก้ไขบัญชี
+AccountSetup=บัญชีทางการเงินที่ติดตั้ง
+SearchBankMovement=ค้นหาการเคลื่อนไหวของธนาคาร
+Debts=หนี้สิน
+LabelBankCashAccount=ธนาคารหรือฉลากเงินสด
+AccountType=ประเภทบัญชี
+BankType0=บัญชีออมทรัพย์
+BankType1=บัญชีปัจจุบันหรือบัตรเครดิต
+BankType2=บัญชีเงินสด
+IfBankAccount=หากบัญชีธนาคาร
+AccountsArea=พื้นที่บัญชี
+AccountCard=บัตรบัญชี
+DeleteAccount=ลบบัญชี
+ConfirmDeleteAccount=คุณแน่ใจว่าคุณต้องการที่จะลบบัญชีนี้หรือไม่?
+Account=บัญชี
+ByCategories=ตามประเภท
+ByRubriques=ตามประเภท
+BankTransactionByCategories=การทำธุรกรรมที่ธนาคารตามประเภท
+BankTransactionForCategory=<b>การทำธุรกรรมธนาคารสำหรับประเภท% s</b>
+RemoveFromRubrique=ลบการเชื่อมโยงกับหมวดหมู่
+RemoveFromRubriqueConfirm=คุณแน่ใจหรือว่าต้องการลบความเชื่อมโยงระหว่างการทำธุรกรรมและประเภท?
+ListBankTransactions=รายชื่อของการทำธุรกรรมธนาคาร
+IdTransaction=รหัสธุรกรรม
+BankTransactions=การทำธุรกรรมที่ธนาคาร
+SearchTransaction=การทำธุรกรรมการค้นหา
+ListTransactions=การทำธุรกรรมรายการ
+ListTransactionsByCategory=การทำธุรกรรมรายการ / หมวดหมู่
+TransactionsToConciliate=การทำธุรกรรมที่จะคืนดี
+Conciliable=สามารถคืนดี
+Conciliate=คืนดี
+Conciliation=การประนีประนอม
+ConciliationForAccount=กระทบยอดบัญชีนี้
+IncludeClosedAccount=รวมบัญชีปิด
+OnlyOpenedAccount=เปิดเฉพาะบัญชี
+AccountToCredit=บัญชีเครดิต
+AccountToDebit=บัญชีเดบิต
+DisableConciliation=ปิดใช้งานคุณลักษณะการปรองดองสำหรับบัญชีนี้
+ConciliationDisabled=คุณลักษณะสมานฉันท์ปิดการใช้งาน
+StatusAccountOpened=เปิด
+StatusAccountClosed=ปิด
+AccountIdShort=จำนวน
+EditBankRecord=บันทึกการแก้ไข
+LineRecord=การซื้อขาย
+AddBankRecord=เพิ่มการทำธุรกรรม
+AddBankRecordLong=เพิ่มการทำธุรกรรมด้วยตนเอง
+ConciliatedBy=โดยคืนดี
+DateConciliating=วันที่ตกลงกัน
+BankLineConciliated=การทำธุรกรรมคืนดี
+CustomerInvoicePayment=การชำระเงินของลูกค้า
+CustomerInvoicePaymentBack=หลังชำระเงินของลูกค้า
+SupplierInvoicePayment=การชำระเงินผู้ผลิต
+WithdrawalPayment=การชำระเงินการถอนเงิน
+SocialContributionPayment=สังคม / ชำระภาษีการคลัง
+FinancialAccountJournal=วารสารบัญชีการเงิน
+BankTransfer=โอนเงินผ่านธนาคาร
+BankTransfers=ธนาคารโอน
+TransferDesc=โอนเงินจากบัญชีหนึ่งไปยังอีกที่หนึ่ง Dolibarr จะเขียนบันทึกสอง (เดบิตในบัญชีของแหล่งที่มาและเครดิตในบัญชีเป้าหมายของปริมาณที่เท่ากัน. ป้ายชื่อเดียวกันและวันที่จะใช้สำหรับการทำธุรกรรมนี้)
+TransferFrom=จาก
+TransferTo=ไปยัง
+TransferFromToDone=<b>การถ่ายโอนจาก% s% s% s%</b> s ได้รับการบันทึก
+CheckTransmitter=เครื่องส่ง
+ValidateCheckReceipt=ตรวจสอบได้รับการตรวจสอบนี้หรือไม่?
+ConfirmValidateCheckReceipt=คุณแน่ใจหรือว่าต้องการที่จะตรวจสอบได้รับการตรวจสอบนี้ไม่มีการเปลี่ยนแปลงจะเป็นไปได้ครั้งนี้จะทำ?
+DeleteCheckReceipt=ลบใบเสร็จรับเงินการตรวจสอบนี้หรือไม่?
+ConfirmDeleteCheckReceipt=คุณแน่ใจหรือว่าต้องการลบใบเสร็จรับเงินการตรวจสอบนี้หรือไม่?
+BankChecks=เช็คธนาคาร
+BankChecksToReceipt=การตรวจสอบการรอคอยสำหรับการฝากเงิน
+ShowCheckReceipt=แสดงการตรวจสอบการรับเงินฝาก
+NumberOfCheques=nb ของการตรวจสอบ
+DeleteTransaction=ลบการทำธุรกรรม
+ConfirmDeleteTransaction=คุณแน่ใจว่าคุณต้องการลบรายการนี​​้?
+ThisWillAlsoDeleteBankRecord=นอกจากนี้ยังจะลบการทำธุรกรรมของธนาคารที่เกิดขึ้น
+BankMovements=การเคลื่อนไหว
+CashBudget=งบประมาณเงินสด
+PlannedTransactions=การทำธุรกรรมที่วางแผนไว้
+Graph=กราฟิก
+ExportDataset_banque_1=การทำธุรกรรมธนาคารและงบบัญชี
+ExportDataset_banque_2=ใบนำฝากเงิน
+TransactionOnTheOtherAccount=การทำธุรกรรมในบัญชีอื่น ๆ
+TransactionWithOtherAccount=การถ่ายโอนบัญชี
+PaymentNumberUpdateSucceeded=จำนวนการชำระเงินการปรับปรุงประสบความสำเร็จ
+PaymentNumberUpdateFailed=จำนวนการชำระเงินไม่สามารถได้รับการปรับปรุง
+PaymentDateUpdateSucceeded=อัปเดตวันที่ชำระเงินเรียบร้อยแล้ว
+PaymentDateUpdateFailed=วันที่ชำระเงินไม่สามารถได้รับการปรับปรุง
+Transactions=การทำธุรกรรม
+BankTransactionLine=การทำธุรกรรมที่ธนาคาร
+AllAccounts=ธนาคารทั้งหมด / บัญชีเงินสด
+BackToAccount=กลับไปที่บัญชี
+ShowAllAccounts=แสดงสำหรับบัญชีทั้งหมด
+FutureTransaction=การทำธุรกรรมในอนาคต วิธีที่จะประนีประนอมไม่มี
+SelectChequeTransactionAndGenerate=เลือก / การตรวจสอบตัวกรองที่จะรวมเข้าไปในการรับฝากเช็คและคลิกที่ "สร้าง"
+InputReceiptNumber=เลือกบัญชีธนาคารที่เกี่ยวข้องกับการเจรจาต่อรอง ใช้ค่าตัวเลขจัดเรียง: YYYYMM หรือ YYYYMMDD
+EventualyAddCategory=ในที่สุดระบุหมวดหมู่ในการที่จะจำแนกบันทึก
+ToConciliate=ประนีประนอม?
+ThenCheckLinesAndConciliate=จากนั้นให้ตรวจสอบสายที่มีอยู่ในบัญชีเงินฝากธนาคารและคลิก
+BankDashboard=สรุปบัญชีเงินฝากธนาคาร
+DefaultRIB=เริ่มต้นบ้าน
+AllRIB=บ้านทั้งหมด
+LabelRIB=ป้ายบ้าน
+NoBANRecord=ไม่มีบันทึกบ้าน
+DeleteARib=ลบบันทึกบ้าน
+ConfirmDeleteRib=คุณแน่ใจหรือว่าต้องการลบระเบียนบ้านนี้หรือไม่?
+StartDate=วันที่เริ่มต้น
+EndDate=วันที่สิ้นสุด
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 014996eee65..d3210e7ef25 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -1,433 +1,434 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Invoice
-Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
-BillsLate=Late payments
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
-DisabledBecauseNotErasable=Disabled because can not be erased
-InvoiceStandard=Standard invoice
-InvoiceStandardAsk=Standard invoice
-InvoiceStandardDesc=This kind of invoice is the common invoice.
-InvoiceDeposit=Deposit invoice
-InvoiceDepositAsk=Deposit invoice
-InvoiceDepositDesc=This kind of invoice is done when a deposit has been received.
-InvoiceProForma=Proforma invoice
-InvoiceProFormaAsk=Proforma invoice
-InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
-InvoiceReplacement=Replacement invoice
-InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
-InvoiceAvoir=Credit note
-InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
-ReplaceInvoice=Replace invoice %s
-ReplacementInvoice=Replacement invoice
-ReplacedByInvoice=Replaced by invoice %s
-ReplacementByInvoice=Replaced by invoice
-CorrectInvoice=Correct invoice %s
-CorrectionInvoice=Correction invoice
-UsedByInvoice=Used to pay invoice %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
-NoReplacableInvoice=No replacable invoices
-NoInvoiceToCorrect=No invoice to correct
-InvoiceHasAvoir=Corrected by one or several invoices
-CardBill=Invoice card
-PredefinedInvoices=Predefined Invoices
-Invoice=Invoice
-Invoices=Invoices
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
-SupplierInvoice=Supplier invoice
-SuppliersInvoices=Suppliers invoices
-SupplierBill=Supplier invoice
-SupplierBills=suppliers invoices
-Payment=Payment
-PaymentBack=Payment back
-Payments=Payments
-PaymentsBack=Payments back
-PaidBack=Paid back
-DatePayment=Payment date
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment ?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-SupplierPayments=Suppliers payments
-ReceivedPayments=Received payments
-ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
-PaymentsBackAlreadyDone=Payments back already done
-PaymentRule=Payment rule
-PaymentMode=Payment type
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
-PaymentAmount=Payment amount
-ValidatePayment=Validate payment
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
-ClassifyPaid=Classify 'Paid'
-ClassifyPaidPartially=Classify 'Paid partially'
-ClassifyCanceled=Classify 'Abandoned'
-ClassifyClosed=Classify 'Closed'
-ClassifyUnBilled=Classify 'Unbilled'
-CreateBill=Create Invoice
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
-DeleteBill=Delete invoice
-SearchACustomerInvoice=Search for a customer invoice
-SearchASupplierInvoice=Search for a supplier invoice
-CancelBill=Cancel an invoice
-SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
-ConvertToReduc=Convert into future discount
-EnterPaymentReceivedFromCustomer=Enter payment received from customer
-EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-Amount=Amount
-PriceBase=Price base
-BillStatus=Invoice status
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
-BillStatusCanceled=Abandoned
-BillStatusValidated=Validated (needs to be paid)
-BillStatusStarted=Started
-BillStatusNotPaid=Not paid
-BillStatusClosedUnpaid=Closed (unpaid)
-BillStatusClosedPaidPartially=Paid (partially)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
-BillShortStatusConverted=Processed
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusClosedUnpaid=Closed
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
-ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-BillFrom=From
-BillTo=To
-ActionsOnBill=Actions on invoice
-NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
-AllBills=All invoices
-OtherBills=Other invoices
-DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
-Unpaid=Unpaid
-ConfirmDeleteBill=Are you sure you want to delete this invoice ?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b> ?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status ?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid ?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
-ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
-ConfirmClassifyAbandonReasonOther=Other
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s ?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
-ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated.
-ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
-AmountOfBills=Amount of invoices
-AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show deposit invoice
-ShowPayment=Show payment
-File=File
-AlreadyPaid=Already paid
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
-Abandoned=Abandoned
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-EscompteOffered=Discount offered (payment before term)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
-NoDraftBills=No draft invoices
-NoOtherDraftBills=No other draft invoices
-NoDraftInvoices=No draft invoices
-RefBill=Invoice ref
-ToBill=To bill
-RemainderToBill=Remainder to bill
-SendBillByMail=Send invoice by email
-SendReminderBillByMail=Send reminder by email
-RelatedCommercialProposals=Related commercial proposals
-MenuToValid=To valid
-DateMaxPayment=Payment due before
-DateEcheance=Due date limit
-DateInvoice=Invoice date
-NoInvoice=No invoice
-ClassifyBill=Classify invoice
-SupplierBillsToPay=Suppliers invoices to pay
-CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
-NonPercuRecuperable=Non-recoverable
-SetConditions=Set payment terms
-SetMode=Set payment mode
-Billed=Billed
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
-CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
-ExportDataset_invoice_2=Customer invoices and payments
-ProformaBill=Proforma Bill:
-Reduction=Reduction
-ReductionShort=Reduc.
-Reductions=Reductions
-ReductionsShort=Reduc.
-Discount=Discount
-Discounts=Discounts
-AddDiscount=Create discount
-AddRelativeDiscount=Create relative discount
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=Create absolute discount
-EditGlobalDiscounts=Edit absolute discounts
-AddCreditNote=Create credit note
-ShowDiscount=Show discount
-ShowReduc=Show the deduction
-RelativeDiscount=Relative discount
-GlobalDiscount=Global discount
-CreditNote=Credit note
-CreditNotes=Credit notes
-Deposit=Deposit
-Deposits=Deposits
-DiscountFromCreditNote=Discount from credit note %s
-DiscountFromDeposit=Payments from deposit invoice %s
-AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
-CreditNoteDepositUse=Invoice must be validated to use this king of credits
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
-NoteReason=Note/Reason
-ReasonDiscount=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
-BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
-PaymentId=Payment id
-InvoiceId=Invoice id
-InvoiceRef=Invoice ref.
-InvoiceDateCreation=Invoice creation date
-InvoiceStatus=Invoice status
-InvoiceNote=Invoice note
-InvoicePaid=Invoice paid
-PaymentNumber=Payment number
-RemoveDiscount=Remove discount
-WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
-InvoiceNotChecked=No invoice selected
-CloneInvoice=Clone invoice
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b> ?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
-SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts ?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
-RelatedBill=Related invoice
-RelatedBills=Related invoices
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+Bill=ใบกำกับสินค้า
+Bills=ใบแจ้งหนี้
+BillsCustomers=ใบแจ้งหนี้ลูกค้า
+BillsCustomer=ใบแจ้งหนี้ลูกค้า
+BillsSuppliers=ซัพพลายเออร์ใบแจ้งหนี้
+BillsCustomersUnpaid=ใบแจ้งหนี้ค้างชำระของลูกค้า
+BillsCustomersUnpaidForCompany=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระสำหรับ% s
+BillsSuppliersUnpaid=ใบแจ้งหนี้ค้างชำระของซัพพลายเออร์
+BillsSuppliersUnpaidForCompany=ใบแจ้งหนี้ค้างชำระของซัพพลายเออร์สำหรับ% s
+BillsLate=การชำระเงินล่าช้า
+BillsStatistics=สถิติใบแจ้งหนี้ลูกค้า
+BillsStatisticsSuppliers=สถิติใบแจ้งหนี้ซัพพลายเออร์
+DisabledBecauseNotErasable=ปิดใช้งานเนื่องจากไม่สามารถลบ
+InvoiceStandard=ใบแจ้งหนี้มาตรฐาน
+InvoiceStandardAsk=ใบแจ้งหนี้มาตรฐาน
+InvoiceStandardDesc=ชนิดของใบแจ้งหนี้นี้เป็นใบแจ้งหนี้ที่พบบ่อย
+InvoiceDeposit=ใบแจ้งหนี้เงินฝาก
+InvoiceDepositAsk=ใบแจ้งหนี้เงินฝาก
+InvoiceDepositDesc=ชนิดของใบแจ้งหนี้นี้จะกระทำเมื่อเงินฝากที่ได้รับ
+InvoiceProForma=ใบแจ้งหนี้ Proforma
+InvoiceProFormaAsk=ใบแจ้งหนี้ Proforma
+InvoiceProFormaDesc=<b>ใบแจ้งหนี้ Proforma</b> คือภาพของใบแจ้งหนี้ที่แท้จริง แต่มีค่าไม่มีบัญชี
+InvoiceReplacement=เปลี่ยนใบแจ้งหนี้
+InvoiceReplacementAsk=ใบแจ้งหนี้แทนใบแจ้งหนี้
+InvoiceReplacementDesc=<b>เปลี่ยนใบแจ้งหนี้จะใช้ในการยกเลิกและแทนที่สมบูรณ์ใบแจ้งหนี้ที่มีการชำระเงินไม่รับแล้ว</b> <br><br> หมายเหตุ: เฉพาะใบแจ้งหนี้ที่มีการชำระเงินไม่มีก็สามารถที่จะเข้ามาแทนที่ หากใบแจ้งหนี้ที่จะเปลี่ยนยังไม่ปิดก็จะถูกปิดโดยอัตโนมัติเพื่อให้ 'ละทิ้ง'
+InvoiceAvoir=ใบลดหนี้
+InvoiceAvoirAsk=ใบลดหนี้ใบแจ้งหนี้ที่ถูกต้อง
+InvoiceAvoirDesc=<b>ใบลดหนี้ใบแจ้งหนี้เป็นเชิงลบที่ใช้ในการแก้ปัญหาความจริงที่ว่าใบแจ้งหนี้ที่มีจำนวนเงินที่แตกต่างกว่าจำนวนเงินที่จ่ายจริง</b> (เพราะลูกค้าจ่ายเงินมากเกินไปจากข้อผิดพลาดหรือจะไม่ได้ชำระเงินสมบูรณ์ตั้งแต่เขากลับผลิตภัณฑ์บางอย่างเช่น)
+invoiceAvoirWithLines=สร้างหมายเหตุเครดิตที่มีเส้นใบแจ้งหนี้จากแหล่งกำเนิด
+invoiceAvoirWithPaymentRestAmount=สร้างหนี้ที่ค้างชำระที่เหลืออยู่กับใบแจ้งหนี้ต้นกำเนิด
+invoiceAvoirLineWithPaymentRestAmount=หมายเหตุเครดิตสำหรับจำนวนเงินที่เหลือยังไม่ได้ชำระ
+ReplaceInvoice=เปลี่ยนใบแจ้งหนี้% s
+ReplacementInvoice=เปลี่ยนใบแจ้งหนี้
+ReplacedByInvoice=ถูกแทนที่ด้วยใบแจ้งหนี้% s
+ReplacementByInvoice=ถูกแทนที่ด้วยใบแจ้งหนี้
+CorrectInvoice=ใบแจ้งหนี้% s ที่ถูกต้อง
+CorrectionInvoice=ใบแจ้งหนี้การแก้ไข
+UsedByInvoice=ใช้ในการจ่ายใบแจ้งหนี้% s
+ConsumedBy=บริโภคโดย
+NotConsumed=บริโภคไม่ได้
+NoReplacableInvoice=ไม่มีใบแจ้งหนี้ replacable
+NoInvoiceToCorrect=ใบแจ้งหนี้ที่ยังไม่ได้แก้ไข
+InvoiceHasAvoir=แก้ไขโดยการอย่างใดอย่างหนึ่งหรือหลายใบแจ้งหนี้
+CardBill=การ์ดใบแจ้งหนี้
+PredefinedInvoices=ใบแจ้งหนี้ที่กำหนดไว้ล่วงหน้า
+Invoice=ใบกำกับสินค้า
+Invoices=ใบแจ้งหนี้
+InvoiceLine=เส้นใบแจ้งหนี้
+InvoiceCustomer=ใบแจ้งหนี้ของลูกค้า
+CustomerInvoice=ใบแจ้งหนี้ของลูกค้า
+CustomersInvoices=ใบแจ้งหนี้ลูกค้า
+SupplierInvoice=ผู้ผลิตใบแจ้งหนี้
+SuppliersInvoices=ซัพพลายเออร์ใบแจ้งหนี้
+SupplierBill=ผู้ผลิตใบแจ้งหนี้
+SupplierBills=ซัพพลายเออร์ใบแจ้งหนี้
+Payment=การชำระเงิน
+PaymentBack=การชำระเงินกลับ
+Payments=วิธีการชำระเงิน
+PaymentsBack=การชำระเงินกลับ
+PaidBack=จ่ายคืน
+DatePayment=วันที่ชำระเงิน
+DeletePayment=ลบการชำระเงิน
+ConfirmDeletePayment=คุณแน่ใจหรือว่าต้องการลบการชำระเงินนี้?
+ConfirmConvertToReduc=คุณต้องการที่จะแปลงใบลดหนี้หรือเงินฝากนี้เป็นส่วนลดแน่นอน? <br> ดังนั้นจำนวนเงินที่จะถูกบันทึกไว้ในหมู่ส่วนลดและสามารถใช้เป็นส่วนลดสำหรับในปัจจุบันหรือในอนาคตใบแจ้งหนี้สำหรับลูกค้ารายนี้
+SupplierPayments=การชำระเงินที่ผู้ซื้อผู้ขาย
+ReceivedPayments=การชำระเงินที่ได้รับ
+ReceivedCustomersPayments=การชำระเงินที่ได้รับจากลูกค้า
+PayedSuppliersPayments=การชำระเงิน payed กับซัพพลายเออร์
+ReceivedCustomersPaymentsToValid=การชำระเงินของลูกค้าที่ได้รับการตรวจสอบ
+PaymentsReportsForYear=รายงานการชำระเงินสำหรับ% s
+PaymentsReports=รายงานการชำระเงิน
+PaymentsAlreadyDone=การชำระเงินที่ทำมาแล้ว
+PaymentsBackAlreadyDone=การชำระเงินกลับไปทำมาแล้ว
+PaymentRule=กฎการชำระเงิน
+PaymentMode=ประเภทการชำระเงิน
+PaymentTerm=เงื่อนไขการชำระเงิน
+PaymentConditions=เงื่อนไขการชำระเงิน
+PaymentConditionsShort=เงื่อนไขการชำระเงิน
+PaymentAmount=จำนวนเงินที่ชำระ
+ValidatePayment=ตรวจสอบการชำระเงิน
+PaymentHigherThanReminderToPay=การชำระเงินที่สูงกว่าการแจ้งเตือนที่จะต้องจ่าย
+HelpPaymentHigherThanReminderToPay=ความสนใจจำนวนเงินที่ชำระของหนึ่งหรือมากกว่าค่าใช้จ่ายที่สูงกว่าส่วนที่เหลือจะจ่าย <br> แก้ไขรายการของคุณมิฉะนั้นยืนยันและคิดเกี่ยวกับการสร้างใบลดหนี้ส่วนเกินที่ได้รับสำหรับแต่ละใบแจ้งหนี้ชำระเงินส่วนเกิน
+HelpPaymentHigherThanReminderToPaySupplier=ความสนใจจำนวนเงินที่ชำระของหนึ่งหรือมากกว่าค่าใช้จ่ายที่สูงกว่าส่วนที่เหลือจะจ่าย <br> แก้ไขรายการของคุณมิฉะนั้นยืนยัน
+ClassifyPaid=จำแนก 'ชำระเงิน'
+ClassifyPaidPartially=จำแนก 'ชำระบางส่วน'
+ClassifyCanceled=จำแนก 'Abandoned'
+ClassifyClosed=จำแนก 'ปิด'
+ClassifyUnBilled=จำแนก 'ยังไม่เรียกเก็บ'
+CreateBill=สร้างใบแจ้งหนี้
+AddBill=สร้างใบแจ้งหนี้หรือใบลดหนี้
+AddToDraftInvoices=เพิ่มลงในร่างใบแจ้งหนี้
+DeleteBill=ลบใบแจ้งหนี้
+SearchACustomerInvoice=ค้นหาใบแจ้งหนี้ลูกค้า
+SearchASupplierInvoice=ค้นหาผู้จัดจำหน่ายใบแจ้งหนี้
+CancelBill=ยกเลิกใบแจ้งหนี้
+SendRemindByMail=ส่งการแจ้งเตือนทางอีเมล
+DoPayment=การชำระเงินทำ
+DoPaymentBack=ทำการชำระเงินกลับ
+ConvertToReduc=แปลงเป็นส่วนลดในอนาคต
+EnterPaymentReceivedFromCustomer=ป้อนการชำระเงินที่ได้รับจากลูกค้า
+EnterPaymentDueToCustomer=ชำระเงินเนื่องจากลูกค้า
+DisabledBecauseRemainderToPayIsZero=ปิดใช้งานเนื่องจากค้างชำระที่เหลือเป็นศูนย์
+Amount=จำนวน
+PriceBase=ฐานราคา
+BillStatus=สถานะใบแจ้งหนี้
+BillStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
+BillStatusPaid=ต้องจ่าย
+BillStatusPaidBackOrConverted=การชำระเงินหรือแปลงเป็นส่วนลด
+BillStatusConverted=การชำระเงิน (พร้อมสำหรับใบแจ้งหนี้สุดท้าย)
+BillStatusCanceled=ถูกปล่อยปละละเลย
+BillStatusValidated=การตรวจสอบ (จะต้องมีการจ่าย)
+BillStatusStarted=เริ่มต้น
+BillStatusNotPaid=จ่ายเงินไม่ได้
+BillStatusClosedUnpaid=ปิดให้บริการ (ค้างชำระ)
+BillStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
+BillShortStatusDraft=ร่าง
+BillShortStatusPaid=ต้องจ่าย
+BillShortStatusPaidBackOrConverted=การประมวลผล
+BillShortStatusConverted=การประมวลผล
+BillShortStatusCanceled=ถูกปล่อยปละละเลย
+BillShortStatusValidated=ผ่านการตรวจสอบ
+BillShortStatusStarted=เริ่มต้น
+BillShortStatusNotPaid=จ่ายเงินไม่ได้
+BillShortStatusClosedUnpaid=ปิด
+BillShortStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
+PaymentStatusToValidShort=ในการตรวจสอบ
+ErrorVATIntraNotConfigured=หมายเลข VAT Intracommunautary ยังไม่ได้กำหนดไว้
+ErrorNoPaiementModeConfigured=ไม่มีโหมดการชำระเงินค่าเริ่มต้นที่กำหนดไว้ ไปที่ใบแจ้งหนี้การติดตั้งโมดูลการแก้ไขปัญหานี้
+ErrorCreateBankAccount=สร้างบัญชีธนาคารแล้วไปที่แผงติดตั้งโมดูลใบแจ้งหนี้ในการกำหนดรูปแบบการชำระเงิน
+ErrorBillNotFound=ใบแจ้งหนี้% s ไม่ได้อยู่
+ErrorInvoiceAlreadyReplaced=ข้อผิดพลาดที่คุณพยายามที่จะตรวจสอบใบแจ้งหนี้ที่จะเปลี่ยนใบแจ้งหนี้% s แต่คนนี้ได้ถูกแทนที่ด้วยใบแจ้งหนี้% s
+ErrorDiscountAlreadyUsed=ข้อผิดพลาดลดที่ใช้แล้ว
+ErrorInvoiceAvoirMustBeNegative=ข้อผิดพลาดในใบแจ้งหนี้ที่ถูกต้องจะต้องมีมูลค่าติดลบ
+ErrorInvoiceOfThisTypeMustBePositive=ข้อผิดพลาดประเภทของใบแจ้งหนี้นี้จะต้องมีจำนวนเงินที่เป็นบวก
+ErrorCantCancelIfReplacementInvoiceNotValidated=ข้อผิดพลาดที่ไม่สามารถยกเลิกใบแจ้งหนี้ที่ได้รับการแทนที่ด้วยใบแจ้งหนี้อื่นที่ยังคงอยู่ในสถานะร่าง
+BillFrom=จาก
+BillTo=ไปยัง
+ActionsOnBill=การดำเนินการในใบแจ้งหนี้
+NewBill=ใบแจ้งหนี้ใหม่
+LastBills=ใบแจ้งหนี้% s ล่าสุด
+LastCustomersBills=% ล่าสุดของใบแจ้งหนี้ลูกค้า
+LastSuppliersBills=% ล่าสุดของซัพพลายเออร์ใบแจ้งหนี้
+AllBills=ใบแจ้งหนี้ทั้งหมด
+OtherBills=ใบแจ้งหนี้อื่น ๆ
+DraftBills=ใบแจ้งหนี้ร่าง
+CustomersDraftInvoices=ลูกค้าร่างใบแจ้งหนี้
+SuppliersDraftInvoices=ซัพพลายเออร์ร่างใบแจ้งหนี้
+Unpaid=ยังไม่ได้ชำระ
+ConfirmDeleteBill=คุณแน่ใจหรือว่าต้องการลบใบแจ้งหนี้นี้?
+ConfirmValidateBill=คุณแน่ใจหรือว่าต้องการตรวจสอบใบแจ้งหนี้ที่มี <b>s%</b> อ้างอิงนี้หรือไม่?
+ConfirmUnvalidateBill=คุณแน่ใจหรือว่าต้องการเปลี่ยนใบแจ้งหนี้ <b>s%</b> ร่างสถานะ?
+ConfirmClassifyPaidBill=<b>คุณแน่ใจหรือว่าต้องการเปลี่ยนใบแจ้งหนี้% s</b> สถานะเงิน?
+ConfirmCancelBill=คุณแน่ใจหรือว่าต้องการยกเลิกใบแจ้งหนี้ <b>s%?</b>
+ConfirmCancelBillQuestion=ทำไมคุณต้องการที่จะแยกใบแจ้งหนี้นี้ 'ละทิ้ง'?
+ConfirmClassifyPaidPartially=<b>คุณแน่ใจหรือว่าต้องการเปลี่ยนใบแจ้งหนี้% s</b> สถานะเงิน?
+ConfirmClassifyPaidPartiallyQuestion=ใบแจ้งหนี้นี้ยังไม่ได้รับการชำระเงินอย่างสมบูรณ์ อะไรคือเหตุผลที่คุณจะปิดใบแจ้งหนี้นี้?
+ConfirmClassifyPaidPartiallyReasonAvoir=ที่เหลือยังไม่ได้ชำระ <b>(% s% s)</b> เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ผมระเบียบภาษีมูลค่าเพิ่มที่มีใบลดหนี้
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=ที่เหลือยังไม่ได้ชำระ <b>(% s% s)</b> เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ฉันยอมรับที่จะสูญเสียภาษีมูลค่าเพิ่มในส่วนลดนี้
+ConfirmClassifyPaidPartiallyReasonDiscountVat=ที่เหลือยังไม่ได้ชำระ <b>(% s% s)</b> เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ฉันกู้คืนภาษีมูลค่าเพิ่มส่วนลดนี้โดยไม่มีใบลดหนี้
+ConfirmClassifyPaidPartiallyReasonBadCustomer=ลูกค้าที่ไม่ดี
+ConfirmClassifyPaidPartiallyReasonProductReturned=ผลิตภัณฑ์กลับมาบางส่วน
+ConfirmClassifyPaidPartiallyReasonOther=จำนวนเงินที่ถูกทอดทิ้งด้วยเหตุผลอื่น ๆ
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=ทางเลือกนี้เป็นไปได้ถ้าใบแจ้งหนี้ของคุณได้รับการให้บริการที่มีความคิดเห็นที่เหมาะสม (ตัวอย่าง«เฉพาะภาษีที่สอดคล้องกับราคาที่ได้รับการชำระเงินจริงให้สิทธิในการหัก»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=ในบางประเทศทางเลือกนี้อาจเป็นไปได้เฉพาะในกรณีที่ใบแจ้งหนี้ของคุณมีบันทึกที่ถูกต้อง
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=ใช้ทางเลือกนี้ถ้าอื่น ๆ ไม่เหมาะกับ
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>ลูกค้าที่ร้ายก็คือลูกค้าที่ปฏิเสธที่จะจ่ายหนี้ของเขา</b>
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=ทางเลือกนี้จะใช้เมื่อการชำระเงินที่ไม่สมบูรณ์เพราะบางส่วนของผลิตภัณฑ์ที่ถูกส่งกลับ
+ConfirmClassifyPaidPartiallyReasonOtherDesc=ใช้ทางเลือกนี้ถ้าอื่น ๆ ทั้งหมดไม่เหมาะเช่นในสถานการณ์ต่อไปนี้: <br> - การชำระเงินไม่สมบูรณ์เพราะผลิตภัณฑ์บางคนถูกส่งกลับ <br> - จำนวนเงินที่อ้างว่าสำคัญมากเกินไปเพราะส่วนลดที่ถูกลืม <br> ในทุกกรณีจำนวนเงินที่มากกว่าที่อ้างว่าจะต้องได้รับการแก้ไขในระบบบัญชีโดยการสร้างใบลดหนี้
+ConfirmClassifyAbandonReasonOther=อื่น ๆ
+ConfirmClassifyAbandonReasonOtherDesc=ทางเลือกนี้จะถูกนำมาใช้ในกรณีอื่น ๆ ตัวอย่างเช่นเพราะคุณวางแผนที่จะสร้างใบแจ้งหนี้แทน
+ConfirmCustomerPayment=<b>คุณยืนยันการป้อนข้อมูลการชำระเงินนี้สำหรับ% s%</b> s?
+ConfirmSupplierPayment=<b>คุณยืนยันการป้อนข้อมูลการชำระเงินนี้สำหรับ% s%</b> s?
+ConfirmValidatePayment=คุณแน่ใจหรือว่าต้องการตรวจสอบการชำระเงินนี้? ไม่มีการเปลี่ยนแปลงสามารถทำได้ครั้งเดียวคือการตรวจสอบการชำระเงิน
+ValidateBill=ตรวจสอบใบแจ้งหนี้
+UnvalidateBill=ใบแจ้งหนี้ Unvalidate
+NumberOfBills=nb ของใบแจ้งหนี้
+NumberOfBillsByMonth=nb ของใบแจ้งหนี้เดือน
+AmountOfBills=จำนวนเงินของใบแจ้งหนี้
+AmountOfBillsByMonthHT=จำนวนเงินของใบแจ้งหนี้ตามเดือน (สุทธิจากภาษี)
+ShowSocialContribution=แสดงทางสังคม / ภาษีการคลัง
+ShowBill=แสดงใบแจ้งหนี้
+ShowInvoice=แสดงใบแจ้งหนี้
+ShowInvoiceReplace=แสดงการเปลี่ยนใบแจ้งหนี้
+ShowInvoiceAvoir=แสดงใบลดหนี้
+ShowInvoiceDeposit=แสดงใบแจ้งหนี้การฝากเงิน
+ShowPayment=แสดงการชำระเงิน
+File=ไฟล์
+AlreadyPaid=จ่ายเงินไปแล้ว
+AlreadyPaidBack=จ่ายเงินไปแล้วกลับมา
+AlreadyPaidNoCreditNotesNoDeposits=จ่ายเงินไปแล้ว (โดยไม่ต้องบันทึกสินเชื่อและเงินฝาก)
+Abandoned=ถูกปล่อยปละละเลย
+RemainderToPay=ที่เหลือยังไม่ได้ชำระ
+RemainderToTake=เงินส่วนที่เหลือจะใช้
+RemainderToPayBack=เงินส่วนที่เหลือจะจ่ายคืน
+Rest=ที่รอดำเนินการ
+AmountExpected=จำนวนเงินที่อ้างว่า
+ExcessReceived=ส่วนเกินที่ได้รับ
+EscompteOffered=ส่วนลดที่นำเสนอ (ชำระเงินก่อนที่จะยาว)
+SendBillRef=ส่งใบแจ้งหนี้% s
+SendReminderBillRef=การส่งใบแจ้งหนี้ s% (เตือน)
+StandingOrders=ยืนคำสั่งซื้อ
+StandingOrder=เพื่อยืน
+NoDraftBills=ไม่มีใบแจ้งหนี้ร่าง
+NoOtherDraftBills=ไม่มีใบแจ้งหนี้ร่างอื่น ๆ
+NoDraftInvoices=ไม่มีใบแจ้งหนี้ร่าง
+RefBill=อ้างอิงใบแจ้งหนี้
+ToBill=เพื่อเรียกเก็บเงิน
+RemainderToBill=เพื่อเรียกเก็บเงินส่วนที่เหลือ
+SendBillByMail=ส่งใบแจ้งหนี้ทางอีเมล
+SendReminderBillByMail=ส่งการแจ้งเตือนทางอีเมล
+RelatedCommercialProposals=ข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้อง
+MenuToValid=เพื่อให้ถูกต้อง
+DateMaxPayment=ก่อนที่จะถึงกำหนดชำระ
+DateEcheance=ขีด จำกัด วันที่ครบกำหนด
+DateInvoice=วันที่ใบแจ้งหนี้
+NoInvoice=ไม่มีใบแจ้งหนี้
+ClassifyBill=แยกประเภทใบแจ้งหนี้
+SupplierBillsToPay=ซัพพลายเออร์ใบแจ้งหนี้ที่จะต้องจ่าย
+CustomerBillsUnpaid=ใบแจ้งหนี้ค้างชำระของลูกค้า
+DispenseMontantLettres=ใบแจ้งหนี้ผ่านขั้นตอนการเขียน mecanographic จะจ่ายตามคำสั่งในตัวอักษร
+NonPercuRecuperable=ไม่รับคืน
+SetConditions=ตั้งเงื่อนไขการชำระเงิน
+SetMode=โหมดการชำระเงินชุด
+Billed=การเรียกเก็บเงิน
+RepeatableInvoice=แม่แบบใบแจ้งหนี้
+RepeatableInvoices=แม่แบบใบแจ้งหนี้
+Repeatable=แบบ
+Repeatables=แม่แบบ
+ChangeIntoRepeatableInvoice=แปลงเป็นแม่แบบใบแจ้งหนี้
+CreateRepeatableInvoice=สร้างแม่แบบใบแจ้งหนี้
+CreateFromRepeatableInvoice=สร้างจากแม่แบบใบแจ้งหนี้
+CustomersInvoicesAndInvoiceLines=ใบแจ้งหนี้ของลูกค้าและเส้นใบแจ้งหนี้ของ
+CustomersInvoicesAndPayments=ใบแจ้งหนี้ของลูกค้าและการชำระเงิน
+ExportDataset_invoice_1=รายการใบแจ้งหนี้ของลูกค้าและเส้นใบแจ้งหนี้ของ
+ExportDataset_invoice_2=ใบแจ้งหนี้ของลูกค้าและการชำระเงิน
+ProformaBill=Proforma บิล:
+Reduction=การลดลง
+ReductionShort=Reduc
+Reductions=ลด
+ReductionsShort=Reduc
+Discount=ส่วนลด
+Discounts=ส่วนลด
+AddDiscount=สร้างส่วนลด
+AddRelativeDiscount=สร้างส่วนลดญาติ
+EditRelativeDiscount=แก้ไขส่วนลดญาติ
+AddGlobalDiscount=สร้างส่วนลดแน่นอน
+EditGlobalDiscounts=แก้ไขส่วนลดแน่นอน
+AddCreditNote=สร้างบันทึกเครดิต
+ShowDiscount=แสดงส่วนลด
+ShowReduc=แสดงหัก
+RelativeDiscount=ส่วนลดญาติ
+GlobalDiscount=ลดราคาทั่วโลก
+CreditNote=ใบลดหนี้
+CreditNotes=บันทึกเครดิต
+Deposit=เงินฝาก
+Deposits=เงินฝาก
+DiscountFromCreditNote=ส่วนลดจากใบลดหนี้% s
+DiscountFromDeposit=การชำระเงินจากใบแจ้งหนี้เงินฝาก% s
+AbsoluteDiscountUse=ชนิดของเครดิตนี้สามารถใช้ในใบแจ้งหนี้ก่อนการตรวจสอบของ
+CreditNoteDepositUse=ใบแจ้งหนี้จะต้องมีการตรวจสอบการใช้กษัตริย์ของสินเชื่อนี้
+NewGlobalDiscount=ส่วนลดใหม่แน่นอน
+NewRelativeDiscount=ส่วนลดญาติใหม่
+NoteReason=หมายเหตุ / เหตุผล
+ReasonDiscount=เหตุผล
+DiscountOfferedBy=ที่ได้รับจาก
+DiscountStillRemaining=ส่วนลดที่ยังเหลืออยู่
+DiscountAlreadyCounted=นับส่วนลดแล้ว
+BillAddress=ที่อยู่บิล
+HelpEscompte=ส่วนลดนี้จะได้รับส่วนลดพิเศษให้กับลูกค้าเนื่องจากการชำระเงินที่ถูกสร้างขึ้นมาก่อนวาระ
+HelpAbandonBadCustomer=เงินจำนวนนี้ถูกทิ้งร้าง (ลูกค้าบอกว่าจะเป็นลูกค้าที่ไม่ดี) และถือเป็นหลวมพิเศษ
+HelpAbandonOther=เงินจำนวนนี้ถูกทิ้งร้างเพราะมันเป็นข้อผิดพลาด (ลูกค้าที่ไม่ถูกต้องหรือใบแจ้งหนี้แทนที่ด้วยอื่น ๆ เป็นต้น)
+IdSocialContribution=สังคม / รหัสชำระภาษีการคลัง
+PaymentId=รหัสการชำระเงิน
+InvoiceId=รหัสใบแจ้งหนี้
+InvoiceRef=อ้างอิงใบแจ้งหนี้
+InvoiceDateCreation=วันที่สร้างใบแจ้งหนี้
+InvoiceStatus=สถานะใบแจ้งหนี้
+InvoiceNote=บันทึกใบแจ้งหนี้
+InvoicePaid=ใบแจ้งหนี้การชำระเงิน
+PaymentNumber=จำนวนการชำระเงิน
+RemoveDiscount=ลบส่วนลด
+WatermarkOnDraftBill=ลายน้ำในใบแจ้งหนี้ร่าง (ไม่มีอะไรถ้าว่างเปล่า)
+InvoiceNotChecked=ใบแจ้งหนี้ไม่ได้เลือก
+CloneInvoice=ใบแจ้งหนี้โคลน
+ConfirmCloneInvoice=<b>คุณแน่ใจหรือว่าต้องการโคลนใบแจ้งหนี้% s</b> นี้หรือไม่?
+DisabledBecauseReplacedInvoice=การดำเนินการปิดใช้งานเนื่องจากใบแจ้งหนี้ที่ได้รับการแทนที่
+DescTaxAndDividendsArea=พื้นที่บริเวณนี้จะนำเสนอบทสรุปของการชำระเงินสำหรับค่าใช้จ่ายพิเศษ บันทึกเท่านั้นที่มีการชำระเงินในช่วงปีคงที่จะรวมอยู่ที่นี่
+NbOfPayments=nb ของการชำระเงิน
+SplitDiscount=ส่วนลดในสองแยก
+ConfirmSplitDiscount=<b>คุณแน่ใจหรือว่าต้องการแยกส่วนลด% s%</b> s นี้เป็น 2 ส่วนลดที่ลดลง?
+TypeAmountOfEachNewDiscount=ปริมาณการป้อนข้อมูลสำหรับแต่ละสองส่วน
+TotalOfTwoDiscountMustEqualsOriginal=รวมของทั้งสองส่วนลดใหม่จะต้องเท่ากับจำนวนส่วนลดเดิม
+ConfirmRemoveDiscount=คุณแน่ใจหรือว่าต้องการลบส่วนลดนี้?
+RelatedBill=ใบแจ้งหนี้ที่เกี่ยวข้อง
+RelatedBills=ใบแจ้งหนี้ที่เกี่ยวข้อง
+RelatedCustomerInvoices=ใบแจ้งหนี้ของลูกค้าที่เกี่ยวข้อง
+RelatedSupplierInvoices=ใบแจ้งหนี้ผู้จัดจำหน่ายที่เกี่ยวข้อง
+LatestRelatedBill=ใบแจ้งหนี้ที่เกี่ยวข้องล่าสุด
+WarningBillExist=คำเตือนหนึ่งหรือใบแจ้งหนี้มากขึ้นอยู่แล้ว
+MergingPDFTool=ผสานเครื่องมือรูปแบบไฟล์ PDF
 
 # PaymentConditions
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
-PaymentConditionShort30D=30 days
-PaymentCondition30D=30 days
-PaymentConditionShort30DENDMONTH=30 days end of month
-PaymentCondition30DENDMONTH=30 days end of month
-PaymentConditionShort60D=60 days
-PaymentCondition60D=60 days
-PaymentConditionShort60DENDMONTH=60 days end of month
-PaymentCondition60DENDMONTH=60 days end of month
-PaymentConditionShortPT_DELIVERY=Delivery
-PaymentConditionPT_DELIVERY=On delivery
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortRECEP=ทันทีทันใด
+PaymentConditionRECEP=ทันทีทันใด
+PaymentConditionShort30D=30 วัน
+PaymentCondition30D=30 วัน
+PaymentConditionShort30DENDMONTH=30 วันสิ้นเดือน
+PaymentCondition30DENDMONTH=30 วันสิ้นเดือน
+PaymentConditionShort60D=60 วัน
+PaymentCondition60D=60 วัน
+PaymentConditionShort60DENDMONTH=60 วันสิ้นเดือน
+PaymentCondition60DENDMONTH=60 วันสิ้นเดือน
+PaymentConditionShortPT_DELIVERY=การจัดส่งสินค้า
+PaymentConditionPT_DELIVERY=ในการจัดส่ง
+PaymentConditionShortPT_ORDER=ในการสั่งซื้อ
+PaymentConditionPT_ORDER=ในการสั่งซื้อ
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
+PaymentConditionPT_5050=50 %% ล่วงหน้า 50 %% ในการจัดส่ง
+FixAmount=จำนวนการแก้ไข
+VarAmount=ปริมาณ (ทีโอที %%.)
 # PaymentType
-PaymentTypeVIR=Bank deposit
-PaymentTypeShortVIR=Bank deposit
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Check
-PaymentTypeShortCHQ=Check
-PaymentTypeTIP=TIP
-PaymentTypeShortTIP=TIP
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
-PaymentTypeTRA=Bill payment
-PaymentTypeShortTRA=Bill
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Desk code
-BankAccountNumber=Account number
-BankAccountNumberKey=Key
+PaymentTypeVIR=เงินฝากธนาคาร
+PaymentTypeShortVIR=เงินฝากธนาคาร
+PaymentTypePRE=คำสั่งของธนาคาร
+PaymentTypeShortPRE=คำสั่งของธนาคาร
+PaymentTypeLIQ=เงินสด
+PaymentTypeShortLIQ=เงินสด
+PaymentTypeCB=เครดิตการ์ด
+PaymentTypeShortCB=เครดิตการ์ด
+PaymentTypeCHQ=ตรวจสอบ
+PaymentTypeShortCHQ=ตรวจสอบ
+PaymentTypeTIP=เคล็ดลับ
+PaymentTypeShortTIP=เคล็ดลับ
+PaymentTypeVAD=ในการชำระเงินสาย
+PaymentTypeShortVAD=ในการชำระเงินสาย
+PaymentTypeTRA=ชำระค่าสินค้า
+PaymentTypeShortTRA=บิล
+BankDetails=ธนาคารรายละเอียด
+BankCode=รหัสธนาคาร
+DeskCode=รหัสโต๊ะ
+BankAccountNumber=เลขที่บัญชี
+BankAccountNumberKey=สำคัญ
 Residence=Domiciliation
-IBANNumber=IBAN number
+IBANNumber=IBAN จำนวน
 IBAN=IBAN
-BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT number
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeMaker=Check transmitter
-ChequeBank=Bank of Check
-CheckBank=Check
-NetToBePaid=Net to be paid
-PhoneNumber=Tel
-FullPhoneNumber=Telephone
-TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-IntracommunityVATNumber=Intracommunity number of VAT
-PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to
-PaymentByChequeOrderedToShort=Check payment (including tax) are payable to
-SendTo=sent to
-PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
-LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
-LawApplicationPart4=their price.
-LimitedLiabilityCompanyCapital=SARL with Capital of
-UseLine=Apply
-UseDiscount=Use discount
-UseCredit=Use credit
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Checks deposits
-MenuCheques=Checks
-MenuChequesReceipts=Checks receipts
-NewChequeDeposit=New deposit
-ChequesReceipts=Checks receipts
-ChequesArea=Checks deposits area
-ChequeDeposits=Checks deposits
-Cheques=Checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
-ShowUnpaidAll=Show all unpaid invoices
-ShowUnpaidLateOnly=Show late unpaid invoices only
-PaymentInvoiceRef=Payment invoice %s
-ValidateInvoice=Validate invoice
-Cash=Cash
-Reported=Delayed
-DisabledBecausePayments=Not possible since there are some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
-ExpectedToPay=Expected payment
-PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
-ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+BIC=BIC / SWIFT
+BICNumber=BIC / จำนวน SWIFT
+ExtraInfos=ข่าวสารพิเศษ
+RegulatedOn=ในการควบคุม
+ChequeNumber=ตรวจสอบไม่มี°
+ChequeOrTransferNumber=ตรวจสอบ / โอนไม่มี°
+ChequeMaker=เครื่องส่งสัญญาณตรวจสอบ
+ChequeBank=ธนาคารแห่งตรวจสอบ
+CheckBank=ตรวจสอบ
+NetToBePaid=สุทธิที่จะต้องจ่าย
+PhoneNumber=โทร
+FullPhoneNumber=โทรศัพท์
+TeleFax=แฟกซ์
+PrettyLittleSentence=รับจำนวนเงินของการชำระเงินเนื่องจากโดยการตรวจสอบที่ออกในชื่อของฉันเป็นสมาชิกของสมาคมการบัญชีที่ได้รับการอนุมัติโดยการบริหารการคลัง
+IntracommunityVATNumber=จำนวน Intracommunity ภาษีมูลค่าเพิ่ม
+PaymentByChequeOrderedTo=ตรวจสอบการชำระเงิน (รวมภาษี) จะจ่ายให้กับ% s ส่งให้
+PaymentByChequeOrderedToShort=ตรวจสอบการชำระเงิน (รวมภาษี) จะจ่ายให้กับ
+SendTo=ส่งไปยัง
+PaymentByTransferOnThisBankAccount=การชำระเงินโดยการโอนเงินในบัญชีธนาคารดังต่อไปนี้
+VATIsNotUsedForInvoice=* ไม่รวมภาษีมูลค่าเพิ่มบังคับศิลปะ 293B ซีจี
+LawApplicationPart1=โดยการใช้กฎหมายของ 80.335 12/05/80
+LawApplicationPart2=สินค้าที่ยังคงเป็นทรัพย์สินของ
+LawApplicationPart3=ผู้ขายจนกว่า cashing สมบูรณ์ของ
+LawApplicationPart4=ราคาของพวกเขา
+LimitedLiabilityCompanyCapital=SARL กับเมืองหลวงของ
+UseLine=ใช้
+UseDiscount=ใช้ส่วนลด
+UseCredit=ใช้บัตรเครดิต
+UseCreditNoteInInvoicePayment=ลดปริมาณการชำระเงินด้วยบัตรเครดิตนี้
+MenuChequeDeposits=การตรวจสอบเงินฝาก
+MenuCheques=การตรวจสอบ
+MenuChequesReceipts=ใบเสร็จรับเงินการตรวจสอบ
+NewChequeDeposit=เงินฝากใหม่
+ChequesReceipts=ใบเสร็จรับเงินการตรวจสอบ
+ChequesArea=ตรวจสอบพื้นที่ที่เงินฝาก
+ChequeDeposits=การตรวจสอบเงินฝาก
+Cheques=การตรวจสอบ
+CreditNoteConvertedIntoDiscount=ใบลดหนี้ใบแจ้งหนี้หรือเงินฝากที่ได้รับการแปลงเป็น% s
+UsBillingContactAsIncoiveRecipientIfExist=ใช้ที่อยู่ติดต่อการเรียกเก็บเงินลูกค้าแทนการอยู่ของบุคคลที่สามในฐานะผู้รับใบแจ้งหนี้
+ShowUnpaidAll=แสดงใบแจ้งหนี้ที่ค้างชำระทั้งหมด
+ShowUnpaidLateOnly=แสดงใบแจ้งหนี้ที่ค้างชำระปลายเท่านั้น
+PaymentInvoiceRef=ใบแจ้งหนี้การชำระเงิน% s
+ValidateInvoice=ตรวจสอบใบแจ้งหนี้
+Cash=เงินสด
+Reported=ล่าช้า
+DisabledBecausePayments=เป็นไปไม่ได้เนื่องจากมีการชำระเงินบางส่วน
+CantRemovePaymentWithOneInvoicePaid=ไม่สามารถลบการชำระเงินเนื่องจากมีอย่างน้อยหนึ่งใบแจ้งหนี้แยกจ่าย
+ExpectedToPay=การชำระเงินที่คาดว่าจะ
+PayedByThisPayment=การชำระเงินโดยการชำระเงินนี้
+ClosePaidInvoicesAutomatically=จำแนก "ชำระเงิน" ทุกมาตรฐานสถานการณ์หรือการเปลี่ยนใบแจ้งหนี้การชำระเงินทั้งหมด
+ClosePaidCreditNotesAutomatically=จำแนก "ชำระเงิน" ทั้งหมดบันทึกเครดิตการชำระเงินทั้งหมดกลับ
+AllCompletelyPayedInvoiceWillBeClosed=ใบแจ้งหนี้ทั้งหมดที่มียังคงไม่มีที่จะจ่ายจะปิดโดยอัตโนมัติเพื่อให้สถานะ "ชำระเงิน"
+ToMakePayment=จ่ายเงิน
+ToMakePaymentBack=คืนทุน
+ListOfYourUnpaidInvoices=รายการของใบแจ้งหนี้ที่ค้างชำระ
+NoteListOfYourUnpaidInvoices=หมายเหตุ: รายการนี​​้จะมีใบแจ้งหนี้เฉพาะบุคคลที่สามคุณจะเชื่อมโยงกับการเป็นตัวแทนขาย
+RevenueStamp=อากรแสตมป์
+YouMustCreateInvoiceFromThird=ตัวเลือกนี้จะใช้ได้เฉพาะเมื่อมีการสร้างใบแจ้งหนี้จากแท็บ "ลูกค้า" ของ thirdparty
+PDFCrabeDescription=ใบแจ้งหนี้แม่แบบ PDF Crabe แม่แบบใบแจ้งหนี้ฉบับสมบูรณ์ (แนะนำ Template)
+TerreNumRefModelDesc1=จำนวนกลับมาพร้อมกับรูปแบบ% syymm-nnnn สำหรับใบแจ้งหนี้และมาตรฐาน% syymm-nnnn สำหรับการบันทึกเครดิตที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
+MarsNumRefModelDesc1=จำนวนกลับมาพร้อมกับรูปแบบ% syymm-nnnn สำหรับใบแจ้งหนี้มาตรฐาน% syymm-nnnn สำหรับใบแจ้งหนี้แทน% syymm-nnnn สำหรับการบันทึกเครดิตและ% syymm-nnnn สำหรับการบันทึกเครดิตที่ yy เป็นปีเป็นเดือนมม nnnn และเป็นลำดับที่ไม่มี ทำลายและกลับไปที่ 0 ไม่มี
+TerreNumRefModelError=เริ่มต้นด้วยการเรียกเก็บเงิน $ syymm มีอยู่แล้วและไม่ได้เข้ากันได้กับรูปแบบของลำดับนี้ ลบหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
-TypeContact_facture_external_SHIPPING=Customer shipping contact
-TypeContact_facture_external_SERVICE=Customer service contact
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice
-TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
+TypeContact_facture_internal_SALESREPFOLL=แทนใบแจ้งหนี้ของลูกค้าต่อไปนี้ขึ้น
+TypeContact_facture_external_BILLING=ติดต่อใบแจ้งหนี้ของลูกค้า
+TypeContact_facture_external_SHIPPING=ติดต่อลูกค้าการจัดส่งสินค้า
+TypeContact_facture_external_SERVICE=ติดต่อบริการลูกค้า
+TypeContact_invoice_supplier_internal_SALESREPFOLL=ผู้แทนติดตามใบแจ้งหนี้จัดจำหน่าย
+TypeContact_invoice_supplier_external_BILLING=ติดต่อผู้ผลิตใบแจ้งหนี้
+TypeContact_invoice_supplier_external_SHIPPING=ติดต่อผู้ผลิตจัดส่งสินค้า
+TypeContact_invoice_supplier_external_SERVICE=ผู้ผลิตติดต่อบริการ
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceFirstSituationAsk=ใบแจ้งหนี้สถานการณ์แรก
+InvoiceFirstSituationDesc=<b>ใบแจ้งหนี้สถานการณ์จะเชื่อมโยงกับสถานการณ์ที่เกี่ยวข้องกับความก้าวหน้าเช่นความก้าวหน้าของการก่อสร้าง</b> สถานการณ์แต่ละครั้งจะถูกผูกติดอยู่กับใบแจ้งหนี้
+InvoiceSituation=ใบแจ้งหนี้สถานการณ์
+InvoiceSituationAsk=ใบแจ้งหนี้ดังต่อไปนี้สถานการณ์
+InvoiceSituationDesc=สร้างสถานการณ์ใหม่ดังต่อไปนี้อย่างใดอย่างหนึ่งที่มีอยู่แล้ว
+SituationAmount=จำนวนใบแจ้งหนี้สถานการณ์ (สุทธิ)
+SituationDeduction=ลบสถานการณ์
+Progress=ความคืบหน้า
+ModifyAllLines=การปรับเปลี่ยนสายทั้งหมด
+CreateNextSituationInvoice=สร้างสถานการณ์ต่อไป
+NotLastInCycle=ใบแจ้งหนี้ในครั้งนี้ไม่ใช่ครั้งสุดท้ายในวงจรและจะต้องไม่ได้รับการแก้ไข
+DisabledBecauseNotLastInCycle=สถานการณ์ต่อไปอยู่แล้ว
+DisabledBecauseFinal=สถานการณ์เช่นนี้ถือเป็นที่สิ้นสุด
+CantBeLessThanMinPercent=ความคืบหน้าไม่สามารถที่จะมีขนาดเล็กกว่าค่าของมันอยู่ในสถานการณ์ที่ผ่านมา
+NoSituations=ไม่มีสถานการณ์ที่เปิด
+InvoiceSituationLast=รอบชิงชนะเลิศและใบแจ้งหนี้ทั่วไป
diff --git a/htdocs/langs/th_TH/bookmarks.lang b/htdocs/langs/th_TH/bookmarks.lang
index 7acb946bb62..398fb1a9693 100644
--- a/htdocs/langs/th_TH/bookmarks.lang
+++ b/htdocs/langs/th_TH/bookmarks.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add this page to bookmarks
-Bookmark=Bookmark
-Bookmarks=Bookmarks
-NewBookmark=New bookmark
-ShowBookmark=Show bookmark
-OpenANewWindow=Open a new window
-ReplaceWindow=Replace current window
-BookmarkTargetNewWindowShort=New window
-BookmarkTargetReplaceWindowShort=Current window
-BookmarkTitle=Bookmark title
+AddThisPageToBookmarks=เพิ่มหน้านี้ในที่คั่นหน้า
+Bookmark=ที่คั่นหนังสือ
+Bookmarks=ที่คั่นหน้า
+NewBookmark=ที่คั่นหน้าใหม่
+ShowBookmark=แสดงที่คั่นหน้า
+OpenANewWindow=เปิดหน้าต่างใหม่
+ReplaceWindow=เปลี่ยนหน้าต่างปัจจุบัน
+BookmarkTargetNewWindowShort=หน้าต่างใหม่
+BookmarkTargetReplaceWindowShort=หน้าต่างปัจจุบัน
+BookmarkTitle=ชื่อ Bookmark
 UrlOrLink=URL
-BehaviourOnClick=Behaviour when a URL is clicked
-CreateBookmark=Create bookmark
-SetHereATitleForLink=Set a title for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
-BookmarksManagement=Bookmarks management
-ListOfBookmarks=List of bookmarks
+BehaviourOnClick=พฤติกรรมเมื่อมีการคลิก URL
+CreateBookmark=สร้างที่คั่นหน้า
+SetHereATitleForLink=ตั้งชื่อสำหรับบุ๊คมาร์ค
+UseAnExternalHttpLinkOrRelativeDolibarrLink=ใช้ URL ที่ http ภายนอกหรือ URL Dolibarr ญาติ
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=เลือกถ้าหน้าเปิดโดยการเชื่อมโยงจะต้องปรากฏบนหน้าต่างปัจจุบันหรือใหม่
+BookmarksManagement=การจัดการที่คั่นหน้า
+ListOfBookmarks=รายการบุ๊คมาร์ค
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index c0180bebdaa..b4c9877c736 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -1,97 +1,97 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Rss information
-BoxLastProducts=Last %s products/services
-BoxProductsAlertStock=Products in stock alert
-BoxLastProductsInContract=Last %s contracted products/services
-BoxLastSupplierBills=Last supplier's invoices
-BoxLastCustomerBills=Last customer's invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
-BoxLastProposals=Last commercial proposals
-BoxLastProspects=Last modified prospects
-BoxLastCustomers=Last modified customers
-BoxLastSuppliers=Last modified suppliers
-BoxLastCustomerOrders=Last customer orders
-BoxLastValidatedCustomerOrders=Last validated customer orders
-BoxLastBooks=Last books
-BoxLastActions=Last actions
-BoxLastContracts=Last contracts
-BoxLastContacts=Last contacts/addresses
-BoxLastMembers=Last members
-BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
-BoxSalesTurnover=Sales turnover
-BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
-BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
-BoxTitleLastBooks=Last %s recorded books
-BoxTitleNbOfCustomers=Number of clients
-BoxTitleLastRssInfos=Last %s news from %s
-BoxTitleLastProducts=Last %s modified products/services
-BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Last %s customer orders
-BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
-BoxTitleLastSuppliers=Last %s recorded suppliers
-BoxTitleLastCustomers=Last %s recorded customers
-BoxTitleLastModifiedSuppliers=Last %s modified suppliers
-BoxTitleLastModifiedCustomers=Last %s modified customers
-BoxTitleLastCustomersOrProspects=Last %s customers or prospects
-BoxTitleLastPropals=Last %s proposals
-BoxTitleLastModifiedPropals=Last %s modified proposals
-BoxTitleLastCustomerBills=Last %s customer's invoices
-BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
-BoxTitleLastSupplierBills=Last %s supplier's invoices
-BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
-BoxTitleLastModifiedProspects=Last %s modified prospects
-BoxTitleLastProductsInContract=Last %s products/services in a contract
-BoxTitleLastModifiedMembers=Last %s members
-BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
-BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
-BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
-BoxMyLastBookmarks=My last %s bookmarks
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Last %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Last %s actions to do
-BoxTitleLastContracts=Last %s contracts
-BoxTitleLastModifiedDonations=Last %s modified donations
-BoxTitleLastModifiedExpenses=Last %s modified expenses
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
-LastRefreshDate=Last refresh date
-NoRecordedBookmarks=No bookmarks defined.
-ClickToAdd=Click here to add.
-NoRecordedCustomers=No recorded customers
-NoRecordedContacts=No recorded contacts
-NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoRecordedSupplierInvoices=No recorded supplier's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
-NoRecordedProducts=No recorded products/services
-NoRecordedProspects=No recorded prospects
-NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
-NoRecordedInterventions=No recorded interventions
-BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=Last %s supplier orders
-BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
-NoSupplierOrder=No recorded supplier order
-BoxCustomersInvoicesPerMonth=Customer invoices per month
-BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-BoxCustomersOrdersPerMonth=Customer orders per month
-BoxSuppliersOrdersPerMonth=Supplier orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No product under the low stock limit
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
-LastXMonthRolling=The last %s month rolling
+BoxLastRssInfos=ข้อมูล Rss
+BoxLastProducts=% ล่าสุดของผลิตภัณฑ์ / บริการ
+BoxProductsAlertStock=ผลิตภัณฑ์ในการแจ้งเตือนหุ้น
+BoxLastProductsInContract=% s ล่าสุดหดตัวผลิตภัณฑ์ / บริการ
+BoxLastSupplierBills=ใบแจ้งหนี้ผู้จัดจำหน่ายที่แล้ว
+BoxLastCustomerBills=ใบแจ้งหนี้ของลูกค้าที่ผ่านมา
+BoxOldestUnpaidCustomerBills=ที่เก่าแก่ที่สุดใบแจ้งหนี้ที่ค้างชำระของลูกค้า
+BoxOldestUnpaidSupplierBills=ที่เก่าแก่ที่สุดใบแจ้งหนี้ที่ค้างชำระของผู้จัดจำหน่าย
+BoxLastProposals=ข้อเสนอในเชิงพาณิชย์ล่าสุด
+BoxLastProspects=แนวโน้มการปรับเปลี่ยนครั้งล่าสุด
+BoxLastCustomers=ลูกค้าที่แก้ไขล่าสุด
+BoxLastSuppliers=ซัพพลายเออร์ที่แก้ไขล่าสุด
+BoxLastCustomerOrders=สั่งซื้อของลูกค้าที่ผ่านมา
+BoxLastValidatedCustomerOrders=การตรวจสอบล่าสุดสั่งซื้อของลูกค้า
+BoxLastBooks=หนังสือล่าสุด
+BoxLastActions=การกระทำที่ผ่านมา
+BoxLastContracts=สัญญาล่าสุด
+BoxLastContacts=รายชื่อนามสกุล / ที่อยู่
+BoxLastMembers=สมาชิกล่าสุด
+BoxFicheInter=การแทรกแซงล่าสุด
+BoxCurrentAccounts=ยอดเงินเปิดบัญชี
+BoxSalesTurnover=ยอดขาย
+BoxTotalUnpaidCustomerBills=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระทั้งหมดของ
+BoxTotalUnpaidSuppliersBills=ใบแจ้งหนี้ที่ค้างชำระทั้งหมดของผู้จัดจำหน่าย
+BoxTitleLastBooks=% ล่าสุดหนังสือที่บันทึกไว้
+BoxTitleNbOfCustomers=จำนวนของลูกค้า
+BoxTitleLastRssInfos=ข่าวล่าสุด% s จาก% s
+BoxTitleLastProducts=% ล่าสุดของการปรับเปลี่ยนผลิตภัณฑ์ / บริการ
+BoxTitleProductsAlertStock=ผลิตภัณฑ์ในการแจ้งเตือนหุ้น
+BoxTitleLastCustomerOrders=% s ล่าสุดสั่งซื้อของลูกค้า
+BoxTitleLastModifiedCustomerOrders=% s ล่าสุดสั่งซื้อของลูกค้ามีการปรับเปลี่ยน
+BoxTitleLastSuppliers=% ล่าสุดของซัพพลายเออร์ที่บันทึกไว้
+BoxTitleLastCustomers=% s ล่าสุดบันทึกลูกค้า
+BoxTitleLastModifiedSuppliers=% ล่าสุดของซัพพลายเออร์ที่มีการปรับเปลี่ยน
+BoxTitleLastModifiedCustomers=% ล่าสุดลูกค้าปรับเปลี่ยน
+BoxTitleLastCustomersOrProspects=ลูกค้า% ล่าสุดหรือกลุ่มเป้าหมาย
+BoxTitleLastPropals=ข้อเสนอล่าสุดของ%
+BoxTitleLastModifiedPropals=% ล่าสุดของข้อเสนอการปรับเปลี่ยน
+BoxTitleLastCustomerBills=ใบแจ้งหนี้ของลูกค้า s% ล่าสุดของ
+BoxTitleLastModifiedCustomerBills=% ล่าสุดของใบแจ้งหนี้ของลูกค้ามีการปรับเปลี่ยน
+BoxTitleLastSupplierBills=ใบแจ้งหนี้จัดจำหน่าย% s ล่าสุดของ
+BoxTitleLastModifiedSupplierBills=% ล่าสุดของการแก้ไขใบแจ้งหนี้จัดจำหน่าย
+BoxTitleLastModifiedProspects=% s ล่าสุดแนวโน้มการปรับเปลี่ยน
+BoxTitleLastProductsInContract=% ล่าสุดของผลิตภัณฑ์ / บริการในการทำสัญญา
+BoxTitleLastModifiedMembers=ล่าสุดสมาชิก% s
+BoxTitleLastFicheInter=% ล่าสุดของการแทรกแซงการแก้ไข
+BoxTitleOldestUnpaidCustomerBills=ที่เก่าแก่ที่สุด% s ใบแจ้งหนี้ที่ค้างชำระของลูกค้า
+BoxTitleOldestUnpaidSupplierBills=ที่เก่าแก่ที่สุด% s ใบแจ้งหนี้ที่ค้างชำระผู้จัดจำหน่าย
+BoxTitleCurrentAccounts=ยอดบัญชีเปิด
+BoxTitleSalesTurnover=ยอดขาย
+BoxTitleTotalUnpaidCustomerBills=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระ
+BoxTitleTotalUnpaidSuppliersBills=ใบแจ้งหนี้ที่ค้างชำระผู้จัดจำหน่าย
+BoxTitleLastModifiedContacts=% ล่าสุดของการปรับเปลี่ยนรายชื่อ / ที่อยู่
+BoxMyLastBookmarks=% ครั้งล่าสุดของฉัน s บุ๊คมาร์ค
+BoxOldestExpiredServices=ที่เก่าแก่ที่สุดที่หมดอายุการใช้งานบริการ
+BoxLastExpiredServices=% s รายชื่อล่าสุดที่เก่าแก่ที่สุดที่มีบริการที่หมดอายุการใช้งาน
+BoxTitleLastActionsToDo=การกระทำ% ล่าสุดที่จะทำ
+BoxTitleLastContracts=สัญญา% s ล่าสุด
+BoxTitleLastModifiedDonations=% ของเงินบริจาคล่าสุดมีการปรับเปลี่ยน
+BoxTitleLastModifiedExpenses=% ของค่าใช้จ่ายที่ผ่านมามีการปรับเปลี่ยน
+BoxGlobalActivity=กิจกรรมทั่วโลก (ใบแจ้งหนี้, ข้อเสนอ, การสั่งซื้อ)
+FailedToRefreshDataInfoNotUpToDate=ล้มเหลวในการฟื้นฟูการไหลของ RSS วันรีเฟรชประสบความสำเร็จล่าสุด:% s
+LastRefreshDate=วันรีเฟรชล่าสุด
+NoRecordedBookmarks=บุ๊คมาร์คไม่มีกำหนด
+ClickToAdd=คลิกที่นี่เพื่อเพิ่ม
+NoRecordedCustomers=ไม่มีลูกค้าที่บันทึกไว้
+NoRecordedContacts=ไม่มีรายชื่อที่บันทึกไว้
+NoActionsToDo=ไม่มีการดำเนินการที่จะทำ
+NoRecordedOrders=ไม่มีการสั่งซื้อของลูกค้าที่บันทึกไว้ของ
+NoRecordedProposals=ไม่มีข้อเสนอที่บันทึกไว้
+NoRecordedInvoices=ไม่มีใบแจ้งหนี้ของลูกค้าที่บันทึกไว้
+NoUnpaidCustomerBills=ไม่มีใบแจ้งหนี้ที่ค้างชำระของลูกค้า
+NoRecordedSupplierInvoices=ไม่มีใบแจ้งหนี้ของผู้จัดจำหน่ายที่บันทึกไว้
+NoUnpaidSupplierBills=ใบแจ้งหนี้ที่ค้างชำระไม่มีผู้จัดจำหน่ายของ
+NoModifiedSupplierBills=ไม่มีใบแจ้งหนี้ของผู้จัดจำหน่ายที่บันทึกไว้
+NoRecordedProducts=ไม่มีสินค้าบันทึก / บริการ
+NoRecordedProspects=ไม่มีโอกาสที่บันทึกไว้
+NoContractedProducts=ผลิตภัณฑ์ / บริการไม่มีการทำสัญญา
+NoRecordedContracts=ไม่มีสัญญาบันทึก
+NoRecordedInterventions=ไม่มีการแทรกแซงที่บันทึกไว้
+BoxLatestSupplierOrders=ล่าสุดคำสั่งผู้จัดจำหน่าย
+BoxTitleLatestSupplierOrders=% s ล่าสุดคำสั่งผู้จัดจำหน่าย
+BoxTitleLatestModifiedSupplierOrders=% ล่าสุดของคำสั่งการปรับเปลี่ยนผู้จัดจำหน่าย
+NoSupplierOrder=ไม่มีบันทึกเพื่อจัดจำหน่าย
+BoxCustomersInvoicesPerMonth=ใบแจ้งหนี้ของลูกค้าต่อเดือน
+BoxSuppliersInvoicesPerMonth=ใบแจ้งหนี้ผู้ผลิตต่อเดือน
+BoxCustomersOrdersPerMonth=สั่งซื้อของลูกค้าต่อเดือน
+BoxSuppliersOrdersPerMonth=คำสั่งผู้ผลิตต่อเดือน
+BoxProposalsPerMonth=ข้อเสนอต่อเดือน
+NoTooLowStockProducts=ไม่มีสินค้าภายใต้ขีด จำกัด ของหุ้นต่ำ
+BoxProductDistribution=สินค้า / บริการกระจาย
+BoxProductDistributionFor=การแพร่กระจายของ% s% s
+ForCustomersInvoices=ใบแจ้งหนี้ลูกค้า
+ForCustomersOrders=คำสั่งซื้อของลูกค้า
+ForProposals=ข้อเสนอ
+LastXMonthRolling=สุดท้าย% s กลิ้งเดือน
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index d3dcfb68e64..7e03af6a178 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -1,40 +1,40 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDesks=Point of sales
-CashDeskBank=Bank account
-CashDeskBankCash=Bank account (cash)
-CashDeskBankCB=Bank account (card)
-CashDeskBankCheque=Bank account (cheque)
-CashDeskWarehouse=Warehouse
-CashdeskShowServices=Selling services
-CashDeskProducts=Products
-CashDeskStock=Stock
-CashDeskOn=on
-CashDeskThirdParty=Third party
-CashdeskDashboard=Point of sale access
-ShoppingCart=Shopping cart
-NewSell=New sell
-BackOffice=Back office
-AddThisArticle=Add this article
-RestartSelling=Go back on sell
-SellFinished=Sell finished
-PrintTicket=Print ticket
-NoProductFound=No article found
-ProductFound=product found
-ProductsFound=products found
-NoArticle=No article
-Identification=Identification
-Article=Article
-Difference=Difference
-TotalTicket=Total ticket
-NoVAT=No VAT for this sale
-Change=Excess received
-CalTip=Click to view the calendar
-CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
-BankToPay=Charge Account
-ShowCompany=Show company
-ShowStock=Show warehouse
-DeleteArticle=Click to remove this article
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+CashDeskMenu=จุดขาย
+CashDesk=จุดขาย
+CashDesks=จุดขาย
+CashDeskBank=บัญชีเงินฝาก
+CashDeskBankCash=บัญชีเงินฝากธนาคาร (เงินสด)
+CashDeskBankCB=บัญชีเงินฝากธนาคาร (บัตร)
+CashDeskBankCheque=บัญชีเงินฝากธนาคาร (ตรวจสอบ)
+CashDeskWarehouse=คลังสินค้า
+CashdeskShowServices=ขายบริการ
+CashDeskProducts=ผลิตภัณฑ์
+CashDeskStock=สต็อกสินค้า
+CashDeskOn=บน
+CashDeskThirdParty=บุคคลที่สาม
+CashdeskDashboard=จุดขายของการเข้าถึง
+ShoppingCart=รถเข็น
+NewSell=ขายใหม่
+BackOffice=สำนักงานกลับ
+AddThisArticle=เพิ่มบทความนี้
+RestartSelling=กลับไปขาย
+SellFinished=ขายเสร็จแล้ว
+PrintTicket=ตั๋วพิมพ์
+NoProductFound=บทความไม่พบ
+ProductFound=สินค้าที่พบ
+ProductsFound=พบผลิตภัณฑ์
+NoArticle=บทความไม่มี
+Identification=การวินิจฉัย
+Article=บทความ
+Difference=ข้อแตกต่าง
+TotalTicket=ตั๋วทั้งหมด
+NoVAT=ภาษีมูลค่าเพิ่มสำหรับการขายนี้ไม่มี
+Change=ส่วนเกินที่ได้รับ
+CalTip=คลิ๊กเพื่อดูปฏิทิน
+CashDeskSetupStock=คุณถามว่าจะลดลงหุ้นในการสร้างใบแจ้งหนี้ แต่สำหรับคลังสินค้านี้จะไม่ได้กำหนดไว้ <br> เปลี่ยนการตั้งค่าหุ้นโมดูลหรือเลือกคลังสินค้า
+BankToPay=บัญชีค่าใช้จ่าย
+ShowCompany=แสดง บริษัท
+ShowStock=แสดงคลังสินค้า
+DeleteArticle=คลิกเพื่อลบบทความนี้
+FilterRefOrLabelOrBC=ค้นหา (Ref / ป้าย)
+UserNeedPermissionToEditStockToUsePos=คุณถามว่าจะลดลงหุ้นในการสร้างใบแจ้งหนี้เพื่อให้ผู้ใช้ที่ใช้ POS จำเป็นต้องได้รับอนุญาตให้แก้ไขหุ้น
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 7c293065433..9e6cf2f3d50 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -1,110 +1,110 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-NoCategoryYet=No tag/category of this type created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
-SubCats=Subcategories
-CatStatistics=Statistics
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-ValidateFields=Validate the fields
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
-ErrForgotField=You forgot to inform the fields
-ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
-NoneCategory=None
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ReturnInProduct=Back to product/service card
-ReturnInSupplier=Back to supplier card
-ReturnInCompany=Back to customer/prospect card
-ContentsVisibleByAll=The contents will be visible by all
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
-CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-ThisCategoryHasNoProduct=This category does not contain any product.
-ThisCategoryHasNoSupplier=This category does not contain any supplier.
-ThisCategoryHasNoCustomer=This category does not contain any customer.
-ThisCategoryHasNoMember=This category does not contain any member.
-ThisCategoryHasNoContact=This category does not contain any contact.
-AssignedToCustomer=Assigned to a customer
-AssignedToTheCustomer=Assigned to the customer
-InternalCategory=Internal category
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show tag/category
+Rubrique=Tag / หมวดหมู่
+Rubriques=แท็ก / หมวดหมู่
+categories=แท็ก / ประเภท
+TheCategorie=แท็ก / หมวดหมู่
+NoCategoryYet=ไม่มีแท็ก / หมวดหมู่ของประเภทนี้สร้างขึ้น
+In=ใน
+AddIn=เพิ่มใน
+modify=แก้ไข
+Classify=แยกประเภท
+CategoriesArea=แท็ก / พื้นที่หมวดหมู่
+ProductsCategoriesArea=สินค้า / บริการแท็ก / พื้นที่ประเภท
+SuppliersCategoriesArea=ซัพพลายเออร์แท็ก / พื้นที่ประเภท
+CustomersCategoriesArea=ลูกค้าแท็ก / พื้นที่ประเภท
+ThirdPartyCategoriesArea=บุคคลที่สามแท็ก / พื้นที่ประเภท
+MembersCategoriesArea=แท็กสมาชิก / พื้นที่ประเภท
+ContactsCategoriesArea=แท็กติดต่อ / พื้นที่ประเภท
+MainCats=แท็กหลัก / ประเภท
+SubCats=หมวดหมู่ย่อย
+CatStatistics=สถิติ
+CatList=รายการของแท็ก / ประเภท
+AllCats=แท็กทั้งหมด / ประเภท
+ViewCat=แท็กดู / หมวดหมู่
+NewCat=เพิ่มแท็ก / หมวดหมู่
+NewCategory=แท็กใหม่ / หมวดหมู่
+ModifCat=ปรับเปลี่ยนแท็ก / หมวดหมู่
+CatCreated=Tag / สร้างหมวดหมู่
+CreateCat=สร้างแท็ก / หมวดหมู่
+CreateThisCat=สร้างแท็กนี้ / หมวดหมู่
+ValidateFields=ตรวจสอบสาขา
+NoSubCat=ไม่มีหมวดหมู่
+SubCatOf=ประเภทย่อย
+FoundCats=พบแท็ก / ประเภท
+FoundCatsForName=แท็ก / ประเภทพบชื่อ:
+FoundSubCatsIn=หมวดหมู่ย่อยที่พบในแท็ก / หมวดหมู่
+ErrSameCatSelected=คุณเลือกแท็กเดียวกัน / หมวดหมู่หลายครั้ง
+ErrForgotCat=คุณลืมที่จะเลือกแท็ก / หมวดหมู่
+ErrForgotField=คุณลืมที่จะแจ้งให้สาขา
+ErrCatAlreadyExists=ชื่อนี้ถูกใช้ไปแล้ว
+AddProductToCat=เพิ่มสินค้านี้กับแท็ก / หมวดหมู่?
+ImpossibleAddCat=เป็นไปไม่ได้ที่จะเพิ่มแท็ก / หมวดหมู่
+ImpossibleAssociateCategory=เป็นไปไม่ได้ที่จะเชื่อมโยงแท็ก / หมวดหมู่เพื่อ
+WasAddedSuccessfully=<b>% s</b> ถูกเพิ่มเรียบร้อยแล้ว
+ObjectAlreadyLinkedToCategory=องค์ประกอบที่มีการเชื่อมโยงกับแท็กนี้ / หมวดหมู่
+CategorySuccessfullyCreated=แท็ก / หมวดหมู่% s นี้ได้รับการเพิ่มเรียบร้อยแล้ว
+ProductIsInCategories=สินค้า / บริการที่มีการเชื่อมโยงต่อไปนี้แท็ก / ประเภท
+SupplierIsInCategories=บุคคลที่สามมีการเชื่อมโยงต่อไปนี้ซัพพลายเออร์แท็ก / ประเภท
+CompanyIsInCustomersCategories=นี้บุคคลที่สามมีการเชื่อมโยงต่อไปนี้ลูกค้าเป้าหมาย / แท็ก / ประเภท
+CompanyIsInSuppliersCategories=นี้บุคคลที่สามมีการเชื่อมโยงต่อไปนี้ซัพพลายเออร์แท็ก / ประเภท
+MemberIsInCategories=สมาชิกนี้จะถูกเชื่อมโยงกับสมาชิกต่อไปนี้แท็ก / ประเภท
+ContactIsInCategories=ติดต่อนี้มีการเชื่อมโยงต่อไปนี้แท็กรายชื่อ / ประเภท
+ProductHasNoCategory=สินค้า / บริการนี​​้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
+SupplierHasNoCategory=ผู้จัดหาสินค้านี้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
+CompanyHasNoCategory=thirdparty นี้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
+MemberHasNoCategory=สมาชิกท่านนี้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
+ContactHasNoCategory=ติดต่อนี้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
+ClassifyInCategory=เพิ่มแท็ก / หมวดหมู่
+NoneCategory=ไม่
+NotCategorized=โดยไม่ต้องแท็ก / หมวดหมู่
+CategoryExistsAtSameLevel=ประเภทนี้มีอยู่แล้วที่มีการอ้างอิงนี้
+ReturnInProduct=กลับไปยังสินค้า / บริการบัตร
+ReturnInSupplier=กลับไปที่รหัสผู้จัดจำหน่าย
+ReturnInCompany=กลับไปยังลูกค้า / บัตรโอกาส
+ContentsVisibleByAll=เนื้อหาจะมองเห็นได้โดยทั้งหมด
+ContentsVisibleByAllShort=เนื้อหาที่มองเห็นได้โดยทั้งหมด
+ContentsNotVisibleByAllShort=ไม่สามารถมองเห็นเนื้อหาโดยทั้งหมด
+CategoriesTree=แท็ก / ประเภทต้นไม้
+DeleteCategory=ลบแท็ก / หมวดหมู่
+ConfirmDeleteCategory=คุณแน่ใจหรือว่าต้องการลบแท็กนี้ / หมวดหมู่
+RemoveFromCategory=ลบการเชื่อมโยงที่มีแท็ก / หมวดหมู่
+RemoveFromCategoryConfirm=คุณแน่ใจหรือว่าต้องการที่จะยกเลิกการเชื่อมโยงการทำธุรกรรมจากแท็ก / หมวดหมู่
+NoCategoriesDefined=ไม่มีแท็ก / หมวดหมู่ที่กำหนดไว้
+SuppliersCategoryShort=แท็กผู้จัดจำหน่าย / หมวดหมู่
+CustomersCategoryShort=ลูกค้าแท็ก / หมวดหมู่
+ProductsCategoryShort=แท็กสินค้า / หมวดหมู่
+MembersCategoryShort=แท็กสมาชิก / หมวดหมู่
+SuppliersCategoriesShort=ซัพพลายเออร์แท็ก / ประเภท
+CustomersCategoriesShort=ลูกค้าแท็ก / ประเภท
+CustomersProspectsCategoriesShort=custo. / Prosp ประเภท
+ProductsCategoriesShort=แท็กสินค้า / ประเภท
+MembersCategoriesShort=แท็กสมาชิก / ประเภท
+ContactCategoriesShort=แท็กติดต่อ / ประเภท
+ThisCategoryHasNoProduct=ประเภทนี้ไม่ได้มีผลิตภัณฑ์ใด ๆ
+ThisCategoryHasNoSupplier=ประเภทนี้ไม่ได้มีผู้จัดจำหน่ายใด ๆ
+ThisCategoryHasNoCustomer=ประเภทนี้ไม่ได้มีลูกค้า
+ThisCategoryHasNoMember=ประเภทนี้ไม่ได้มีสมาชิกใด ๆ
+ThisCategoryHasNoContact=ประเภทนี้จะไม่ได้มีการติดต่อใด ๆ
+AssignedToCustomer=ที่ได้รับมอบหมายให้กับลูกค้า
+AssignedToTheCustomer=ที่ได้รับมอบหมายให้กับลูกค้า
+InternalCategory=หมวดหมู่ภายใน
+CategoryContents=Tag / หมวดหมู่เนื้อหา
+CategId=Tag / รหัสหมวดหมู่
+CatSupList=รายการของแท็กผู้จัดจำหน่าย / ประเภท
+CatCusList=รายชื่อลูกค้า / โอกาสแท็ก / ประเภท
+CatProdList=รายการของแท็ก / ผลิตภัณฑ์ประเภท
+CatMemberList=รายชื่อสมาชิกแท็ก / ประเภท
+CatContactList=รายการของแท็กติดต่อ / ประเภท
+CatSupLinks=การเชื่อมโยงระหว่างซัพพลายเออร์และแท็ก / ประเภท
+CatCusLinks=การเชื่อมโยงระหว่างลูกค้า / ลูกค้าและแท็ก / ประเภท
+CatProdLinks=การเชื่อมโยงระหว่างผลิตภัณฑ์ / บริการและแท็ก / ประเภท
+CatMemberLinks=การเชื่อมโยงระหว่างสมาชิกและแท็ก / ประเภท
+DeleteFromCat=ลบออกจากแท็ก / หมวดหมู่
+DeletePicture=รูปภาพลบ
+ConfirmDeletePicture=ลบภาพยืนยัน?
+ExtraFieldsCategories=คุณลักษณะที่สมบูรณ์
+CategoriesSetup=แท็ก / ประเภทการติดตั้ง
+CategorieRecursiv=การเชื่อมโยงที่มีแท็กแม่ / หมวดหมู่โดยอัตโนมัติ
+CategorieRecursivHelp=หากเปิดใช้งานผลิตภัณฑ์นี้ยังจะเชื่อมโยงกับประเภทหลักเมื่อมีการเพิ่มเข้าไปในหมวดหมู่
+AddProductServiceIntoCategory=เพิ่มสินค้า / บริการดังต่อไปนี้
+ShowCategory=แสดงแท็ก / หมวดหมู่
diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
index 7acdc7bd7e6..227ed908264 100644
--- a/htdocs/langs/th_TH/commercial.lang
+++ b/htdocs/langs/th_TH/commercial.lang
@@ -1,96 +1,96 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commercial
-CommercialArea=Commercial area
-CommercialCard=Commercial card
-CustomerArea=Customers area
-Customer=Customer
-Customers=Customers
-Prospect=Prospect
-Prospects=Prospects
-DeleteAction=Delete an event/task
-NewAction=New event/task
-AddAction=Create event/task
-AddAnAction=Create an event/task
-AddActionRendezVous=Create a Rendez-vous event
-Rendez-Vous=Rendezvous
-ConfirmDeleteAction=Are you sure you want to delete this event/task ?
-CardAction=Event card
-PercentDone=Percentage complete
-ActionOnCompany=Task about company
-ActionOnContact=Task about contact
-TaskRDV=Meetings
-TaskRDVWith=Meeting with %s
-ShowTask=Show task
-ShowAction=Show event
-ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative
-SalesRepresentative=Sales representative
-SalesRepresentatives=Sales representatives
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-CommercialInterlocutor=Commercial interlocutor
-ErrorWrongCode=Wrong code
-NoSalesRepresentativeAffected=No particular sales representative assigned
-ShowCustomer=Show customer
-ShowProspect=Show prospect
-ListOfProspects=List of prospects
-ListOfCustomers=List of customers
-LastDoneTasks=Last %s completed tasks
-LastRecordedTasks=Last recorded tasks
-LastActionsToDo=Last %s oldest actions not completed
-DoneAndToDoActionsFor=Completed and To do events for %s
-DoneAndToDoActions=Completed and To do events
-DoneActions=Completed events
-DoneActionsFor=Completed events for %s
-ToDoActions=Incomplete events
-ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
-StatusActionDone=Complete
-MyActionsAsked=Events I have recorded
-MyActionsToDo=Events I have to do
-MyActionsDone=Events assigned to me
-StatusActionInProcess=In process
-TasksHistoryForThisContact=Events for this contact
-LastProspectDoNotContact=Do not contact
-LastProspectNeverContacted=Never contacted
-LastProspectToContact=To contact
-LastProspectContactInProcess=Contact in process
-LastProspectContactDone=Contact done
-DateActionPlanned=Date event planned for
-DateActionDone=Date event done
-ActionAskedBy=Event reported by
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
-ActionUserAsk=Reported by
-ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
-ActionAC_TEL=Phone call
-ActionAC_FAX=Send fax
-ActionAC_PROP=Send proposal by mail
-ActionAC_EMAIL=Send Email
-ActionAC_RDV=Meetings
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Send customer invoice by mail
-ActionAC_REL=Send customer invoice by mail (reminder)
-ActionAC_CLO=Close
-ActionAC_EMAILING=Send mass email
-ActionAC_COM=Send customer order by mail
-ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
-ActionAC_OTH=Other
-ActionAC_OTH_AUTO=Other (automatically inserted events)
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-Stats=Sales statistics
-CAOrder=Sales volume (validated orders)
-FromTo=from %s to %s
-MargeOrder=Margins (validated orders)
-RecapAnnee=Summary of the year
-NoData=There is no data
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-SearchPropal=Search a commercial proposal
-CommercialDashboard=Commercial summary
+Commercial=เชิงพาณิชย์
+CommercialArea=พื้นที่เชิงพาณิชย์
+CommercialCard=บัตรพาณิชย์
+CustomerArea=พื้นที่ลูกค้า
+Customer=ลูกค้า
+Customers=ลูกค้า
+Prospect=โอกาส
+Prospects=อนาคต
+DeleteAction=ลบเหตุการณ์ / งาน
+NewAction=เหตุการณ์ใหม่ / งาน
+AddAction=สร้างกิจกรรม / งาน
+AddAnAction=สร้างเหตุการณ์ / งาน
+AddActionRendezVous=สร้างเหตุการณ์ Rendez-vous
+Rendez-Vous=การนัดพบ
+ConfirmDeleteAction=คุณแน่ใจหรือว่าต้องการลบเหตุการณ์ / งานนี้?
+CardAction=บัตรเหตุการณ์
+PercentDone=ร้อยละสมบูรณ์
+ActionOnCompany=งานเกี่ยวกับ บริษัท
+ActionOnContact=งานเกี่ยวกับการติดต่อ
+TaskRDV=การประชุม
+TaskRDVWith=การประชุมกับ% s
+ShowTask=แสดงงาน
+ShowAction=เหตุการณ์ที่แสดง
+ActionsReport=รายงานเหตุการณ์
+ThirdPartiesOfSaleRepresentative=Thirdparties ตัวแทนจำหน่าย
+SalesRepresentative=ตัวแทนขาย
+SalesRepresentatives=พนักงานขาย
+SalesRepresentativeFollowUp=ตัวแทนขาย (ติดตาม)
+SalesRepresentativeSignature=ตัวแทนขาย (ลายเซ็น)
+CommercialInterlocutor=คู่สนทนาในเชิงพาณิชย์
+ErrorWrongCode=รหัสผิด
+NoSalesRepresentativeAffected=ไม่มีตัวแทนขายโดยเฉพาะอย่างยิ่งที่ได้รับมอบหมาย
+ShowCustomer=แสดงลูกค้า
+ShowProspect=แสดงความคาดหวัง
+ListOfProspects=รายชื่อของลูกค้า
+ListOfCustomers=รายชื่อของลูกค้า
+LastDoneTasks=% ล่าสุดของงานที่เสร็จสมบูรณ์
+LastRecordedTasks=งานที่บันทึกไว้ล่าสุด
+LastActionsToDo=% ล่าสุดที่เก่าแก่ที่สุดของการดำเนินการไม่แล้วเสร็จ
+DoneAndToDoActionsFor=เสร็จสมบูรณ์และการทำกิจกรรมสำหรับ% s
+DoneAndToDoActions=เสร็จสมบูรณ์และการทำเช่นเหตุการณ์ที่เกิดขึ้น
+DoneActions=เหตุการณ์ที่เสร็จสมบูรณ์
+DoneActionsFor=เหตุการณ์ที่เสร็จสมบูรณ์สำหรับ% s
+ToDoActions=เหตุการณ์ที่ไม่สมบูรณ์
+ToDoActionsFor=เหตุการณ์ที่เกิดขึ้นไม่สมบูรณ์สำหรับ% s
+SendPropalRef=ส่งข้อเสนอของ% s เชิงพาณิชย์
+SendOrderRef=การส่งคำสั่ง% s
+StatusNotApplicable=ไม่สามารถใช้งาน
+StatusActionToDo=ที่จะทำ
+StatusActionDone=สมบูรณ์
+MyActionsAsked=เหตุการณ์ที่ผมได้รับการบันทึก
+MyActionsToDo=เหตุการณ์ที่ฉันต้องทำ
+MyActionsDone=เหตุการณ์ที่ได้รับมอบหมายมาให้ฉัน
+StatusActionInProcess=ในกระบวนการ
+TasksHistoryForThisContact=กิจกรรมสำหรับการติดต่อนี้
+LastProspectDoNotContact=อย่าติดต่อ
+LastProspectNeverContacted=ไม่เคยได้รับการติดต่อ
+LastProspectToContact=หากต้องการติดต่อ
+LastProspectContactInProcess=ในขั้นตอนการติดต่อ
+LastProspectContactDone=ติดต่อทำ
+DateActionPlanned=เหตุการณ์วันที่วางแผนไว้สำหรับ
+DateActionDone=เหตุการณ์วันที่ทำ
+ActionAskedBy=เหตุการณ์รายงานโดย
+ActionAffectedTo=เหตุการณ์ได้รับมอบหมายให้
+ActionDoneBy=เหตุการณ์กระทำโดย
+ActionUserAsk=รายงานโดย
+ErrorStatusCantBeZeroIfStarted=ถ้าเขตข้อมูล <b>'วันที่ทำ'</b> จะเต็มไปด้วยการกระทำที่จะเริ่มต้น (หรือเสร็จ) ดังนั้นสนาม <b>"สถานะ"</b> ไม่สามารถเป็น 0 %%
+ActionAC_TEL=โทรศัพท์
+ActionAC_FAX=ส่งแฟ็กซ์
+ActionAC_PROP=ส่งข้อเสนอทางไปรษณีย์
+ActionAC_EMAIL=ส่งอีเมล์
+ActionAC_RDV=การประชุม
+ActionAC_INT=การแทรกแซงในเว็บไซต์
+ActionAC_FAC=ส่งใบแจ้งหนี้ลูกค้าทางไปรษณีย์
+ActionAC_REL=ส่งใบแจ้งหนี้ลูกค้าโดยทางไปรษณีย์ (เตือน)
+ActionAC_CLO=ใกล้
+ActionAC_EMAILING=ส่งอีเมลมวล
+ActionAC_COM=ส่งคำสั่งซื้อของลูกค้าโดยทางไปรษณีย์
+ActionAC_SHIP=ส่งจัดส่งทางไปรษณีย์
+ActionAC_SUP_ORD=ส่งคำสั่งผู้จัดจำหน่ายทางไปรษณีย์
+ActionAC_SUP_INV=ส่งใบแจ้งหนี้จัดจำหน่ายทางไปรษณีย์
+ActionAC_OTH=อื่น ๆ
+ActionAC_OTH_AUTO=อื่น ๆ (เหตุการณ์แทรกโดยอัตโนมัติ)
+ActionAC_MANUAL=เหตุการณ์แทรกด้วยตนเอง
+ActionAC_AUTO=เหตุการณ์แทรกโดยอัตโนมัติ
+Stats=สถิติการขาย
+CAOrder=ปริมาณการขาย (คำสั่งการตรวจสอบ)
+FromTo=จาก% s% s
+MargeOrder=อัตรากำไรขั้นต้น (คำสั่งการตรวจสอบ)
+RecapAnnee=บทสรุปของปี
+NoData=มีข้อมูลที่ไม่เป็น
+StatusProsp=สถานะ Prospect
+DraftPropals=ข้อเสนอในเชิงพาณิชย์ร่าง
+SearchPropal=ค้นหาข้อเสนอในเชิงพาณิชย์
+CommercialDashboard=สรุปพาณิชย์
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 5580d87b517..5023c005c60 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -1,131 +1,132 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
-ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
-ErrorSetACountryFirst=Set the country first
-SelectThirdParty=Select a third party
-DeleteThirdParty=Delete a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ?
-MenuNewThirdParty=New third party
-MenuNewCompany=New company
-MenuNewCustomer=New customer
-MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
-MenuNewPrivateIndividual=New private individual
-MenuSocGroup=Groups
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-NewSocGroup=New company group
-NewPrivateIndividual=New private individual (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
-ProspectionArea=Prospection area
-SocGroup=Group of companies
-IdThirdParty=Id third party
-IdCompany=Company Id
-IdContact=Contact Id
-Contacts=Contacts/Addresses
-ThirdPartyContacts=Third party contacts
-ThirdPartyContact=Third party contact/address
-StatusContactValidated=Status of contact/address
-Company=Company
-CompanyName=Company name
-Companies=Companies
-CountryIsInEEC=Country is inside European Economic Community
-ThirdPartyName=Third party name
-ThirdParty=Third party
-ThirdParties=Third parties
-ThirdPartyAll=Third parties (all)
-ThirdPartyProspects=Prospects
-ThirdPartyProspectsStats=Prospects
-ThirdPartyCustomers=Customers
-ThirdPartyCustomersStats=Customers
-ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
-ThirdPartyType=Third party type
-Company/Fundation=Company/Foundation
-Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
-ParentCompany=Parent company
-Subsidiary=Subsidiary
-Subsidiaries=Subsidiaries
-NoSubsidiary=No subsidiary
-ReportByCustomers=Report by customers
-ReportByQuarter=Report by rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
-Name=Name
-Lastname=Last name
-Firstname=First name
-PostOrFunction=Post/Function
-UserTitle=Title
-Surname=Surname/Pseudo
-Address=Address
-State=State/Province
-Region=Region
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Phone
+ErrorCompanyNameAlreadyExists=ชื่อ% s บริษัท มีอยู่แล้ว ให้เลือกอีกหนึ่ง
+ErrorPrefixAlreadyExists=คำนำหน้า% s อยู่แล้ว ให้เลือกอีกหนึ่ง
+ErrorSetACountryFirst=ตั้งประเทศเป็นครั้งแรก
+SelectThirdParty=เลือกบุคคลที่สาม
+DeleteThirdParty=ลบของบุคคลที่สาม
+ConfirmDeleteCompany=คุณแน่ใจหรือว่าต้องการลบ บริษัท นี้และได้รับการถ่ายทอดข้อมูลทั้งหมดหรือไม่
+DeleteContact=ลบรายชื่อ / ที่อยู่
+ConfirmDeleteContact=คุณแน่ใจหรือว่าต้องการลบข้อมูลการติดต่อและได้รับมรดกทั้งหมดนี้หรือไม่?
+MenuNewThirdParty=บุคคลที่สามใหม่
+MenuNewCompany=บริษัท ใหม่
+MenuNewCustomer=ลูกค้าใหม่
+MenuNewProspect=โอกาสใหม่
+MenuNewSupplier=ผู้จัดจำหน่ายใหม่
+MenuNewPrivateIndividual=ใหม่เอกชน
+MenuSocGroup=กลุ่ม
+NewCompany=บริษัท ใหม่ (โอกาสลูกค้าซัพพลายเออร์)
+NewThirdParty=บุคคลที่สามใหม่ (โอกาสลูกค้าซัพพลายเออร์)
+NewSocGroup=กลุ่ม บริษัท ใหม่
+NewPrivateIndividual=เอกชนใหม่ (โอกาสลูกค้าซัพพลายเออร์)
+CreateDolibarrThirdPartySupplier=สร้างบุคคลที่สาม (ซัพพลายเออร์)
+ProspectionArea=พื้นที่ prospection
+SocGroup=กลุ่ม บริษัท
+IdThirdParty=Id ของบุคคลที่สาม
+IdCompany=Id บริษัท
+IdContact=รหัสที่ติดต่อ
+Contacts=รายชื่อ / ที่อยู่
+ThirdPartyContacts=รายชื่อของบุคคลที่สาม
+ThirdPartyContact=ติดต่อบุคคลที่สาม / ที่อยู่
+StatusContactValidated=สถานะของการติดต่อ / ที่อยู่
+Company=บริษัท
+CompanyName=ชื่อ บริษัท
+AliasNames=ชื่อนามแฝง (เชิงพาณิชย์, เครื่องหมายการค้า, ... )
+Companies=บริษัท
+CountryIsInEEC=ประเทศที่อยู่ภายในประชาคมเศรษฐกิจยุโรป
+ThirdPartyName=ชื่อของบุคคลที่สาม
+ThirdParty=บุคคลที่สาม
+ThirdParties=บุคคลที่สาม
+ThirdPartyAll=บุคคลที่สาม (ทั้งหมด)
+ThirdPartyProspects=อนาคต
+ThirdPartyProspectsStats=อนาคต
+ThirdPartyCustomers=ลูกค้า
+ThirdPartyCustomersStats=ลูกค้า
+ThirdPartyCustomersWithIdProf12=ลูกค้าที่มี% s% s หรือ
+ThirdPartySuppliers=ซัพพลายเออร์
+ThirdPartyType=ประเภทของบุคคลที่สาม
+Company/Fundation=บริษัท / มูลนิธิ
+Individual=เอกชน
+ToCreateContactWithSameName=โดยอัตโนมัติจะสร้างการติดต่อทางกายภาพที่มีข้อมูลเดียวกัน
+ParentCompany=บริษัท แม่
+Subsidiary=บริษัท สาขา
+Subsidiaries=บริษัท ย่อย
+NoSubsidiary=บริษัท ย่อยไม่มี
+ReportByCustomers=รายงานจากลูกค้า
+ReportByQuarter=รายงานอัตรา
+CivilityCode=รหัสสุภาพ
+RegisteredOffice=สำนักงานที่สมัครสมาชิก
+Name=ชื่อ
+Lastname=นามสกุล
+Firstname=ชื่อแรก
+PostOrFunction=โพสต์ / ฟังก์ชั่น
+UserTitle=ชื่อเรื่อง
+Surname=สกุล / Pseudo
+Address=ที่อยู่
+State=รัฐ / จังหวัด
+Region=ภูมิภาค
+Country=ประเทศ
+CountryCode=รหัสประเทศ
+CountryId=รหัสประเทศ
+Phone=โทรศัพท์
 Skype=Skype
-Call=Call
-Chat=Chat
-PhonePro=Prof. phone
-PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
-Fax=Fax
-Zip=Zip Code
-Town=City
-Web=Web
-Poste= Position
-DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
-NoEmailDefined=There is no email defined
+Call=โทรศัพท์
+Chat=พูดคุย
+PhonePro=โทรศัพท์ศ.
+PhonePerso=Pers โทรศัพท์
+PhoneMobile=มือถือ
+No_Email=อย่าส่งจดหมายอิเล็กทรอนิกส์มวล
+Fax=แฟกซ์
+Zip=รหัสไปรษณีย์
+Town=เมือง
+Web=เว็บ
+Poste= ตำแหน่ง
+DefaultLang=ภาษาโดยปริยาย
+VATIsUsed=ภาษีมูลค่าเพิ่มถูกนำมาใช้
+VATIsNotUsed=ภาษีมูลค่าเพิ่มที่ไม่ได้ใช้
+CopyAddressFromSoc=กรอกที่อยู่ที่อยู่ thirdparty
+NoEmailDefined=มีอีเมลที่กำหนดไว้ไม่เป็น
 ##### Local Taxes #####
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
+LocalTax1IsUsedES= RE ถูกนำมาใช้
+LocalTax1IsNotUsedES= RE ไม่ได้ใช้
+LocalTax2IsUsedES= IRPF ถูกนำมาใช้
+LocalTax2IsNotUsedES= IRPF ไม่ได้ใช้
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
-ThirdPartyEMail=%s
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
-Gencod=Bar code
+TypeLocaltax1ES=RE ประเภท
+TypeLocaltax2ES=IRPF ประเภท
+TypeES=ชนิด
+ThirdPartyEMail=% s
+WrongCustomerCode=รหัสลูกค้าที่ไม่ถูกต้อง
+WrongSupplierCode=รหัสผู้จำหน่ายที่ไม่ถูกต้อง
+CustomerCodeModel=รหัสรูปแบบของลูกค้า
+SupplierCodeModel=รูปแบบรหัสผู้จำหน่าย
+Gencod=บาร์โค้ด
 ##### Professional ID #####
-ProfId1Short=Prof. id 1
-ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
-ProfId4Short=Prof. id 4
-ProfId5Short=Prof. id 5
-ProfId6Short=Prof. id 5
-ProfId1=Professional ID 1
-ProfId2=Professional ID 2
-ProfId3=Professional ID 3
-ProfId4=Professional ID 4
-ProfId5=Professional ID 5
-ProfId6=Professional ID 6
-ProfId1AR=Prof Id 1 (CUIT/CUIL)
-ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId1Short=ศ. รหัส 1
+ProfId2Short=ศ. รหัส 2
+ProfId3Short=ศ. รหัส 3
+ProfId4Short=ศ. รหัส 4
+ProfId5Short=ศ. 5 รหัส
+ProfId6Short=ศ. 5 รหัส
+ProfId1=ID มืออาชีพ 1
+ProfId2=ID มืออาชีพ 2
+ProfId3=ID มืออาชีพ 3
+ProfId4=ID มืออาชีพ 4
+ProfId5=ID มืออาชีพ 5
+ProfId6=ID มืออาชีพ 6
+ProfId1AR=ศหมายเลข 1 (CUIT / Cuil)
+ProfId2AR=ศหมายเลข 2 (revenu สัตว์)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=ศหมายเลข 1 (เอบี)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=ศหมายเลข 1 (หมายเลขมืออาชีพ)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
@@ -133,86 +134,86 @@ ProfId5BE=-
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
-ProfId4BR=CPF
+ProfId3BR=IM (Inscricao เทศบาล)
+ProfId4BR=ซีพีเอฟ
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId3CH=ศหมายเลข 1 (หมายเลขของรัฐบาลกลาง)
+ProfId4CH=ศหมายเลข 2 (Record พาณิชย์จำนวน)
 ProfId5CH=-
 ProfId6CH=-
-ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId1CL=ศหมายเลข 1 (RUT)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId1CO=ศหมายเลข 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId1DE=ศหมายเลข 1 (USt. -IdNr)
+ProfId2DE=ศหมายเลข 2 (USt. -Nr)
+ProfId3DE=ศหมายเลข 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
-ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
-ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId1ES=ศหมายเลข 1 (CIF / NIF)
+ProfId2ES=ศหมายเลข 2 (หมายเลขประกันสังคม)
+ProfId3ES=ศหมายเลข 3 (CNAE)
+ProfId4ES=ศหมายเลข 4 (วิทยาลัยจำนวน)
 ProfId5ES=-
 ProfId6ES=-
-ProfId1FR=Prof Id 1 (SIREN)
-ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId1FR=ศหมายเลข 1 (ไซเรน)
+ProfId2FR=ศหมายเลข 2 (SIRET)
+ProfId3FR=ศหมายเลข 3 (NAF, APE เก่า)
+ProfId4FR=ศหมายเลข 4 (RCS / RM)
 ProfId5FR=-
 ProfId6FR=-
-ProfId1GB=Registration Number
+ProfId1GB=ทะเบียนเลขที่
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
+ProfId1HN=ศ Id 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Prof Id 1 (TIN)
-ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
-ProfId4IN=Prof Id 4
-ProfId5IN=Prof Id 5
+ProfId1IN=Id ศที่ 1 (TIN)
+ProfId2IN=ศหมายเลข 2 (PAN)
+ProfId3IN=ศหมายเลข 3 (SRVC ภาษี)
+ProfId4IN=ศหมายเลข 4
+ProfId5IN=Id ศ 5
 ProfId6IN=-
-ProfId1MA=Id prof. 1 (R.C.)
-ProfId2MA=Id prof. 2 (Patente)
-ProfId3MA=Id prof. 3 (I.F.)
-ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId1MA=ศ Id 1 (RC)
+ProfId2MA=ศ Id 2 (Patente)
+ProfId3MA=ศ Id 3 (IF)
+ProfId4MA=ศ Id 4 (CNSS)
 ProfId5MA=-
 ProfId6MA=-
-ProfId1MX=Prof Id 1 (R.F.C).
-ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId1MX=Id ศที่ 1 (RFC)
+ProfId2MX=ศหมายเลข 2 (R..P. IMSS)
+ProfId3MX=ศหมายเลข 3 (Profesional กฎบัตร)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
 ProfId5NL=-
 ProfId6NL=-
-ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
-ProfId3PT=Prof Id 3 (Commercial Record number)
-ProfId4PT=Prof Id 4 (Conservatory)
+ProfId1PT=ศหมายเลข 1 (NIPC)
+ProfId2PT=ศหมายเลข 2 (หมายเลขประกันสังคม)
+ProfId3PT=ศหมายเลข 3 (Record พาณิชย์จำนวน)
+ProfId4PT=ศหมายเลข 4 (เรือน)
 ProfId5PT=-
 ProfId6PT=-
 ProfId1SN=RC
@@ -221,194 +222,199 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane code)
-ProfId4TN=Prof Id 4 (BAN)
+ProfId1TN=Id ศที่ 1 (RC)
+ProfId2TN=ศหมายเลข 2 (matricule การคลัง)
+ProfId3TN=ศหมายเลข 3 (รหัส Douane)
+ProfId4TN=ศหมายเลข 4 (บ้าน)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1RU=Prof Id 1 (OGRN)
-ProfId2RU=Prof Id 2 (INN)
-ProfId3RU=Prof Id 3 (KPP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=ศหมายเลข 1 (OGRN)
+ProfId2RU=ศหมายเลข 2 (INN)
+ProfId3RU=ศหมายเลข 3 (KPP)
+ProfId4RU=ศหมายเลข 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-VATIntra=VAT number
-VATIntraShort=VAT number
-VATIntraVeryShort=VAT
-VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
-ProspectCustomer=Prospect / Customer
-Prospect=Prospect
-CustomerCard=Customer Card
-Customer=Customer
-CustomerDiscount=Customer Discount
-CustomerRelativeDiscount=Relative customer discount
-CustomerAbsoluteDiscount=Absolute customer discount
-CustomerRelativeDiscountShort=Relative discount
-CustomerAbsoluteDiscountShort=Absolute discount
-CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
-CompanyHasNoRelativeDiscount=This customer has no relative discount by default
-CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for <b>%s</b> %s
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
-DefaultDiscount=Default discount
-AvailableGlobalDiscounts=Absolute discounts available
-DiscountNone=None
-Supplier=Supplier
-CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
-EditContact=Edit contact
-EditContactAddress=Edit contact/address
-Contact=Contact
-ContactsAddresses=Contacts/Addresses
-NoContactDefinedForThirdParty=No contact defined for this third party
-NoContactDefined=No contact defined
-DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
-DeleteACompany=Delete a company
-PersonalInformations=Personal data
-AccountancyCode=Accountancy code
-CustomerCode=Customer code
-SupplierCode=Supplier code
-CustomerAccount=Customer account
-SupplierAccount=Supplier account
-CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
-RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
-ValidityControledByModule=Validity controled by module
-ThisIsModuleRules=This is rules for this module
-LastProspect=Last
-ProspectToContact=Prospect to contact
-CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contacts/addresses
-ListOfContactsAddresses=List of contacts/adresses
-ListOfProspectsContacts=List of prospect contacts
-ListOfCustomersContacts=List of customer contacts
-ListOfSuppliersContacts=List of supplier contacts
-ListOfCompanies=List of companies
-ListOfThirdParties=List of third parties
-ShowCompany=Show company
-ShowContact=Show contact
-ContactsAllShort=All (No filter)
-ContactType=Contact type
-ContactForOrders=Order's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New contact/address
-LastContacts=Last contacts
-MyContacts=My contacts
-Phones=Phones
-Capital=Capital
-CapitalOf=Capital of %s
-EditCompany=Edit company
-EditDeliveryAddress=Edit delivery address
-ThisUserIsNot=This user is not a prospect, customer nor supplier
-VATIntraCheck=Check
-VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
+VATIntra=ภาษีมูลค่าเพิ่มจำนวน
+VATIntraShort=ภาษีมูลค่าเพิ่มจำนวน
+VATIntraVeryShort=ภาษีมูลค่าเพิ่ม
+VATIntraSyntaxIsValid=ไวยากรณ์ที่ถูกต้อง
+VATIntraValueIsValid=ค่าที่ถูกต้อง
+ProspectCustomer=Prospect / ลูกค้า
+Prospect=โอกาส
+CustomerCard=บัตรของลูกค้า
+Customer=ลูกค้า
+CustomerDiscount=ส่วนลดลูกค้า
+CustomerRelativeDiscount=ส่วนลดลูกค้าญาติ
+CustomerAbsoluteDiscount=ส่วนลดลูกค้าแอบโซลูท
+CustomerRelativeDiscountShort=ส่วนลดญาติ
+CustomerAbsoluteDiscountShort=ส่วนลดแอบโซลูท
+CompanyHasRelativeDiscount=<b>ลูกค้ารายนี้มีส่วนลดเริ่มต้นของ% s %%</b>
+CompanyHasNoRelativeDiscount=ลูกค้ารายนี้ไม่เคยมีใครส่วนลดญาติโดยค่าเริ่มต้น
+CompanyHasAbsoluteDiscount=<b>ลูกค้ารายนี้ยังคงมีเครดิตส่วนลดหรือเงินฝากสำหรับ% s%</b> s
+CompanyHasCreditNote=<b>ลูกค้ารายนี้ยังคงมีการบันทึกเครดิตสำหรับ% s%</b> s
+CompanyHasNoAbsoluteDiscount=ลูกค้ารายนี้มีเครดิตส่วนลดไม่มี
+CustomerAbsoluteDiscountAllUsers=ส่วนลดแอบโซลูท (ที่ได้รับจากผู้ใช้ทั้งหมด)
+CustomerAbsoluteDiscountMy=ส่วนลดแอบโซลูท (ที่ได้รับจากตัวเอง)
+DefaultDiscount=เริ่มต้นส่วนลด
+AvailableGlobalDiscounts=ส่วนลดแอบโซลูทที่มีอยู่
+DiscountNone=ไม่
+Supplier=ผู้ผลิต
+CompanyList=รายการของ บริษัท ฯ
+AddContact=สร้างรายชื่อผู้ติดต่อ
+AddContactAddress=สร้างการติดต่อ / ที่อยู่
+EditContact=ติดต่อแก้ไข
+EditContactAddress=ติดต่อแก้ไข / ที่อยู่
+Contact=ติดต่อ
+ContactsAddresses=รายชื่อ / ที่อยู่
+NoContactDefinedForThirdParty=ติดต่อไม่มีกำหนดไว้สำหรับบุคคลที่สามนี้
+NoContactDefined=ติดต่อไม่มีกำหนด
+DefaultContact=ติดต่อเริ่มต้น / ที่อยู่
+AddCompany=สร้าง บริษัท
+AddThirdParty=สร้างของบุคคลที่สาม
+DeleteACompany=ลบ บริษัท
+PersonalInformations=ข้อมูลส่วนบุคคล
+AccountancyCode=รหัสบัญชี
+CustomerCode=รหัสลูกค้า
+SupplierCode=รหัสผู้จำหน่าย
+CustomerAccount=บัญชีของลูกค้า
+SupplierAccount=บัญชีของผู้ผลิต
+CustomerCodeDesc=รหัสลูกค้าไม่ซ้ำกันสำหรับลูกค้าทุกท่าน
+SupplierCodeDesc=รหัสผู้จำหน่ายที่ไม่ซ้ำกันสำหรับซัพพลายเออร์ทั้งหมด
+RequiredIfCustomer=จำเป็นต้องใช้ถ้าบุคคลที่สามเป็นลูกค้าหรือโอกาส
+RequiredIfSupplier=จำเป็นต้องใช้ถ้าบุคคลที่สามเป็นผู้จัดจำหน่าย
+ValidityControledByModule=ตั้งแต่วันที่ควบคุมโดยโมดูล
+ThisIsModuleRules=นี่คือกฎระเบียบสำหรับโมดูลนี้
+LastProspect=ล่าสุด
+ProspectToContact=Prospect ที่จะติดต่อ
+CompanyDeleted=บริษัท "% s" ลบออกจากฐานข้อมูล
+ListOfContacts=รายชื่อผู้ติดต่อ / ที่อยู่
+ListOfContactsAddresses=รายชื่อผู้ติดต่อ / adresses
+ListOfProspectsContacts=รายการของโอกาส
+ListOfCustomersContacts=รายชื่อผู้ติดต่อของลูกค้า
+ListOfSuppliersContacts=รายการของผู้จัดจำหน่าย
+ListOfCompanies=รายการของ
+ListOfThirdParties=รายชื่อของบุคคลที่สาม
+ShowCompany=แสดง บริษัท
+ShowContact=แสดงรายชื่อผู้ติดต่อ
+ContactsAllShort=ทั้งหมด (ไม่กรอง)
+ContactType=ประเภทติดต่อ
+ContactForOrders=ติดต่อสั่งซื้อของ
+ContactForProposals=ติดต่อข้อเสนอของ
+ContactForContracts=ติดต่อสัญญา
+ContactForInvoices=การติดต่อของใบแจ้งหนี้
+NoContactForAnyOrder=การติดต่อที่ไม่สามารถติดต่อสำหรับการสั่งซื้อใด ๆ
+NoContactForAnyProposal=ติดต่อนี้ไม่ได้ติดต่อสำหรับข้อเสนอการค้าใด ๆ
+NoContactForAnyContract=การติดต่อที่ไม่สามารถติดต่อสำหรับการทำสัญญาใด ๆ
+NoContactForAnyInvoice=ติดต่อนี้ไม่ได้ติดต่อสำหรับใบแจ้งหนี้ใด ๆ
+NewContact=รายชื่อใหม่
+NewContactAddress=ติดต่อใหม่ / ที่อยู่
+LastContacts=รายชื่อล่าสุด
+MyContacts=รายชื่อของฉัน
+Phones=โทรศัพท์
+Capital=เมืองหลวง
+CapitalOf=เมืองหลวงของ% s
+EditCompany=แก้ไข บริษัท
+EditDeliveryAddress=แก้ไขที่อยู่จัดส่ง
+ThisUserIsNot=ผู้ใช้นี้ไม่ได้เป็นความคาดหวังของลูกค้าหรือผู้จัดจำหน่าย
+VATIntraCheck=ตรวจสอบ
+VATIntraCheckDesc=<b>การเชื่อมโยง% s</b> ช่วยให้การขอให้ตรวจสอบการให้บริการภาษีมูลค่าเพิ่มยุโรป อินเทอร์เน็ตจากเซิร์ฟเวอร์ภายนอกเป็นสิ่งจำเป็นสำหรับบริการนี​​้ในการทำงาน
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site
-VATIntraManualCheck=You can also check manually from european web site <a href="%s" target="_blank">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Nor prospect, nor customer
-JuridicalStatus=Juridical status
-Staff=Staff
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potential
-ContactPrivate=Private
-ContactPublic=Shared
-ContactVisibility=Visibility
-OthersNotLinkedToThirdParty=Others, not linked to a third party
-ProspectStatus=Prospect status
-PL_NONE=None
-PL_UNKNOWN=Unknown
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+VATIntraCheckableOnEUSite=ตรวจสอบ Intracomunnautary ภาษีมูลค่าเพิ่มในเว็บไซต์ของคณะกรรมการยุโรป
+VATIntraManualCheck=นอกจากนี้คุณยังสามารถตรวจสอบด้วยตนเองจากเว็บไซต์ยุโรป <a href="%s" target="_blank">% s</a>
+ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s)
+NorProspectNorCustomer=หรือโอกาสหรือลูกค้า
+JuridicalStatus=สถานะการพิจารณาคดี
+Staff=บุคลากร
+ProspectLevelShort=ที่อาจเกิดขึ้น
+ProspectLevel=Prospect ที่มีศักยภาพ
+ContactPrivate=ส่วนตัว
+ContactPublic=ที่ใช้ร่วมกัน
+ContactVisibility=ความชัดเจน
+OthersNotLinkedToThirdParty=อื่น ๆ , ไม่เชื่อมโยงกับบุคคลที่สาม
+ProspectStatus=สถานะ Prospect
+PL_NONE=ไม่
+PL_UNKNOWN=ไม่ทราบ
+PL_LOW=ต่ำ
+PL_MEDIUM=กลาง
+PL_HIGH=สูง
 TE_UNKNOWN=-
-TE_STARTUP=Startup
-TE_GROUP=Large company
-TE_MEDIUM=Medium company
-TE_ADMIN=Governmental
-TE_SMALL=Small company
-TE_RETAIL=Retailer
+TE_STARTUP=การเริ่มต้น
+TE_GROUP=บริษัท ขนาดใหญ่
+TE_MEDIUM=บริษัท ขนาดกลาง
+TE_ADMIN=ของรัฐบาล
+TE_SMALL=บริษัท ขนาดเล็ก
+TE_RETAIL=ร้านค้าปลีก
 TE_WHOLE=Wholetailer
-TE_PRIVATE=Private individual
-TE_OTHER=Other
-StatusProspect-1=Do not contact
-StatusProspect0=Never contacted
-StatusProspect1=To contact
-StatusProspect2=Contact in process
-StatusProspect3=Contact done
-ChangeDoNotContact=Change status to 'Do not contact'
-ChangeNeverContacted=Change status to 'Never contacted'
-ChangeToContact=Change status to 'To contact'
-ChangeContactInProcess=Change status to 'Contact in process'
-ChangeContactDone=Change status to 'Contact done'
-ProspectsByStatus=Prospects by status
-BillingContact=Billing contact
-NbOfAttachedFiles=Number of attached files
-AttachANewFile=Attach a new file
-NoRIB=No BAN defined
-NoParentCompany=None
-ExportImport=Import-Export
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Contact not linked to any third party
-DolibarrLogin=Dolibarr login
-NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-PriceLevel=Price level
-DeliveriesAddress=Delivery addresses
-DeliveryAddress=Delivery address
-DeliveryAddressLabel=Delivery address label
-DeleteDeliveryAddress=Delete a delivery address
-ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
-NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
-NoOtherDeliveryAddress=No alternative delivery address defined
-SupplierCategory=Supplier category
-JuridicalStatus200=Independant
-DeleteFile=Delete file
-ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Assigned to sale representative
-SelectCountry=Select a country
-SelectCompany=Select a third party
-Organization=Organization
-AutomaticallyGenerated=Automatically generated
-FiscalYearInformation=Information on the fiscal year
-FiscalMonthStart=Starting month of the fiscal year
-YouMustCreateContactFirst=You must create emails contacts for third party first to be able to add emails notifications.
-ListSuppliersShort=List of suppliers
-ListProspectsShort=List of prospects
-ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Last %s modified third parties
-UniqueThirdParties=Total of unique third parties
-InActivity=Open
-ActivityCeased=Closed
-ActivityStateFilter=Activity status
-ProductsIntoElements=List of products into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Reached max. for outstanding bill
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
-LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+TE_PRIVATE=เอกชน
+TE_OTHER=อื่น ๆ
+StatusProspect-1=อย่าติดต่อ
+StatusProspect0=ไม่เคยได้รับการติดต่อ
+StatusProspect1=หากต้องการติดต่อ
+StatusProspect2=ในขั้นตอนการติดต่อ
+StatusProspect3=ติดต่อทำ
+ChangeDoNotContact=เปลี่ยนสถานะเป็น 'อย่าติดต่อ'
+ChangeNeverContacted=สถานะเปลี่ยนไปไม่เคยติดต่อ '
+ChangeToContact=เปลี่ยนสถานะเป็น 'ติดต่อ'
+ChangeContactInProcess=เปลี่ยนสถานะเป็น 'ติดต่อในกระบวนการ'
+ChangeContactDone=สถานะเปลี่ยนไปติดต่อทำ '
+ProspectsByStatus=อนาคตตามสถานะ
+BillingContact=ติดต่อการเรียกเก็บเงิน
+NbOfAttachedFiles=จำนวนไฟล์ที่แนบมา
+AttachANewFile=แนบไฟล์ใหม่
+NoRIB=ไม่มีบ้านที่กำหนดไว้
+NoParentCompany=ไม่
+ExportImport=นำเข้าส่งออก
+ExportCardToFormat=การ์ดส่งออกไปยังรูปแบบ
+ContactNotLinkedToCompany=ติดต่อไม่ได้เชื่อมโยงกับบุคคลที่สาม
+DolibarrLogin=เข้าสู่ระบบ Dolibarr
+NoDolibarrAccess=ไม่สามารถเข้าถึง Dolibarr
+ExportDataset_company_1=บุคคลที่สาม (บริษัท / มูลนิธิ / คนทางกายภาพ) และคุณสมบัติ
+ExportDataset_company_2=รายชื่อและคุณสมบัติ
+ImportDataset_company_1=บุคคลที่สาม (บริษัท / มูลนิธิ / คนทางกายภาพ) และคุณสมบัติ
+ImportDataset_company_2=รายชื่อ / ที่อยู่ (จาก thirdparties หรือไม่) และคุณลักษณะ
+ImportDataset_company_3=ธนาคารรายละเอียด
+PriceLevel=ระดับราคา
+DeliveriesAddress=ที่อยู่จัดส่ง
+DeliveryAddress=ที่อยู่จัดส่ง
+DeliveryAddressLabel=ป้ายชื่อที่อยู่จัดส่ง
+DeleteDeliveryAddress=ลบที่อยู่จัดส่ง
+ConfirmDeleteDeliveryAddress=คุณแน่ใจว่าคุณต้องการลบที่อยู่จัดส่งนี้หรือไม่?
+NewDeliveryAddress=ที่อยู่จัดส่งใหม่
+AddDeliveryAddress=สร้างที่อยู่
+AddAddress=สร้างที่อยู่
+NoOtherDeliveryAddress=ไม่มีที่อยู่จัดส่งทางเลือกที่กำหนดไว้
+SupplierCategory=ประเภทผู้ผลิต
+JuridicalStatus200=อิสระ
+DeleteFile=ลบไฟล์
+ConfirmDeleteFile=คุณแน่ใจว่าคุณต้องการที่จะลบไฟล์นี้หรือไม่?
+AllocateCommercial=ได้รับมอบหมายให้เป็นตัวแทนขาย
+SelectCountry=เลือกประเทศ
+SelectCompany=เลือกบุคคลที่สาม
+Organization=องค์กร
+AutomaticallyGenerated=สร้างขึ้นโดยอัตโนมัติ
+FiscalYearInformation=ข้อมูลเกี่ยวกับปีงบประมาณ
+FiscalMonthStart=เริ่มต้นเดือนของปีงบประมาณ
+YouMustCreateContactFirst=คุณต้องสร้างรายชื่ออีเมลของบุคคลที่สามเป็นครั้งแรกที่จะสามารถเพิ่มการแจ้งเตือนอีเมล
+ListSuppliersShort=รายชื่อของซัพพลายเออร์
+ListProspectsShort=รายชื่อของลูกค้า
+ListCustomersShort=รายชื่อของลูกค้า
+ThirdPartiesArea=บุคคลที่สามและพื้นที่ติดต่อ
+LastModifiedThirdParties=% ล่าสุดของบุคคลที่สามมีการปรับเปลี่ยน
+UniqueThirdParties=รวมของบุคคลที่สามที่ไม่ซ้ำกัน
+InActivity=เปิด
+ActivityCeased=ปิด
+ActivityStateFilter=สถานะกิจกรรม
+ProductsIntoElements=รายการของผลิตภัณฑ์ลงใน% s
+CurrentOutstandingBill=การเรียกเก็บเงินในปัจจุบันที่โดดเด่น
+OutstandingBill=แม็กซ์ สำหรับการเรียกเก็บเงินที่โดดเด่น
+OutstandingBillReached=ถึงสูงสุด สำหรับการเรียกเก็บเงินที่โดดเด่น
+MonkeyNumRefModelDesc=กลับ Numero ที่มีรูปแบบ% syymm-nnnn รหัสลูกค้าและ% syymm-nnnn รหัสผู้จัดจำหน่ายที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
+LeopardNumRefModelDesc=รหัสที่เป็นอิสระ รหัสนี้สามารถแก้ไขได้ในเวลาใดก็ได้
+ManagingDirectors=ผู้จัดการ (s) ชื่อ (ซีอีโอผู้อำนวยการประธาน ... )
+SearchThirdparty=ค้นหาบุคคลที่สาม
+SearchContact=ติดต่อค้นหา
+MergeOriginThirdparty=ซ้ำของบุคคลที่สาม (บุคคลที่สามต้องการลบ)
+MergeThirdparties=ผสานบุคคลที่สาม
+ConfirmMergeThirdparties=คุณแน่ใจหรือว่าต้องการผสานบุคคลที่สามนี้ในปัจจุบัน? วัตถุที่เชื่อมโยงทุกชนิด (ใบแจ้งหนี้การสั่งซื้อ, ... ) จะถูกย้ายไปยังบุคคลที่สามในปัจจุบันดังนั้นคุณจะสามารถลบที่ซ้ำกันอย่างใดอย่างหนึ่ง
+ThirdpartiesMergeSuccess=Thirdparties ได้รับการรวม
+ErrorThirdpartiesMerge=มีข้อผิดพลาดเมื่อมีการลบ thirdparties กรุณาตรวจสอบการเข้าสู่ระบบ เปลี่ยนแปลงได้รับการหวนกลับ
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 0d579a06ff1..a62f2acb748 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -1,207 +1,207 @@
 # Dolibarr language file - Source file is en_US - compta
-Accountancy=Accountancy
-AccountancyCard=Accountancy card
-Treasury=Treasury
-MenuFinancial=Financial
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
-VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Setup
-RemainingAmountPayment=Amount payment remaining :
-AmountToBeCharged=Total amount to pay :
-AccountsGeneral=Accounts
-Account=Account
-Accounts=Accounts
-Accountparent=Account parent
-Accountsparent=Accounts parent
-BillsForSuppliers=Bills for suppliers
-Income=Income
-Outcome=Expense
-ReportInOut=Income / Expense
-ReportTurnover=Turnover
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
-Profit=Profit
-AccountingResult=Accounting result
-Balance=Balance
-Debit=Debit
-Credit=Credit
-Piece=Accounting Doc.
-Withdrawal=Withdrawal
-Withdrawals=Withdrawals
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
-VATReceived=VAT received
-VATToCollect=VAT purchases
-VATSummary=VAT Balance
-LT2SummaryES=IRPF Balance
-LT1SummaryES=RE Balance
-VATPaid=VAT paid
-SalaryPaid=Salary paid
-LT2PaidES=IRPF Paid
-LT1PaidES=RE Paid
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-VATCollected=VAT collected
-ToPay=To pay
-ToGet=To get back
-SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
-MenuSpecialExpenses=Special expenses
-MenuTaxAndDividends=Taxes and dividends
-MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
-AccountancyTreasuryArea=Accountancy/Treasury area
-AccountancySetup=Accountancy setup
-NewPayment=New payment
-Payments=Payments
-PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
-PaymentVat=VAT payment
-PaymentSalary=Salary payment
-ListPayment=List of payments
-ListOfPayments=List of payments
-ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
-DatePayment=Payment date
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-NewVATPayment=New VAT payment
-newLT2PaymentES=New IRPF payment
-newLT1PaymentES=New RE payment
-LT2PaymentES=IRPF Payment
-LT2PaymentsES=IRPF Payments
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-VATPayment=VAT Payment
-VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
-ShowVatPayment=Show VAT payment
-TotalToPay=Total to pay
-TotalVATReceived=Total VAT received
-CustomerAccountancyCode=Customer accountancy code
-SupplierAccountancyCode=Supplier accountancy code
-AccountNumberShort=Account number
-AccountNumber=Account number
-NewAccount=New account
-SalesTurnover=Sales turnover
-SalesTurnoverMinimum=Minimum sales turnover
-ByThirdParties=By third parties
-ByUserAuthorOfInvoice=By invoice author
-AccountancyExport=Accountancy export
-ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
-SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
-CheckReceipt=Check deposit
-CheckReceiptShort=Check deposit
-LastCheckReceiptShort=Last %s check receipts
-NewCheckReceipt=New discount
-NewCheckDeposit=New check deposit
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=No checks waiting for deposit.
-DateChequeReceived=Check reception date
-NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See report <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b> for a calculation on actual payments made
-SeeReportInDueDebtMode=See report <b>%sClaims-Debts%s</b> said <b>commitment accounting</b> for a calculation on issued invoices
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not. <br>- It is based on the validation date of invoices and VAT and on the due date for expenses.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
-RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices. <br>
-RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
-SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
-PercentOfInvoice=%%/invoice
-NotUsedForGoods=Not used on goods
-ProposalStats=Statistics on proposals
-OrderStats=Statistics on orders
-InvoiceStats=Statistics on bills
-Dispatch=Dispatching
-Dispatched=Dispatched
-ToDispatch=To dispatch
-ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
-SellsJournal=Sales Journal
-PurchasesJournal=Purchases Journal
-DescSellsJournal=Sales Journal
-DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
-CodeNotDef=Not defined
-AddRemind=Dispatch available amount
-RemainToDivide= Remain to dispatch :
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+Accountancy=การบัญชี
+AccountancyCard=บัตรบัญชี
+Treasury=คลัง
+MenuFinancial=การเงิน
+TaxModuleSetupToModifyRules=ไปที่ <a href="%s">การตั้งค่าภาษีโมดูล</a> การปรับเปลี่ยนกฎระเบียบสำหรับการคำนวณ
+TaxModuleSetupToModifyRulesLT=ไปที่ <a href="%s">การตั้งค่า บริษัท</a> ที่จะปรับเปลี่ยนกฎระเบียบสำหรับการคำนวณ
+OptionMode=ตัวเลือกสำหรับการบัญชี
+OptionModeTrue=ตัวเลือกที่รายได้ค่าใช้จ่าย-
+OptionModeVirtual=ตัวเลือกการเรียกร้องหนี้-
+OptionModeTrueDesc=ในบริบทนี้ผลประกอบการที่มีการคำนวณการชำระเงิน (วันที่ของการชำระเงิน) ความถูกต้องของตัวเลขที่จะมั่นใจได้เฉพาะในกรณีที่เก็บหนังสือที่มีการพิจารณาผ่านเข้า / ส่งออกในบัญชีผ่านใบแจ้งหนี้
+OptionModeVirtualDesc=ในบริบทนี้ผลประกอบการที่มีการคำนวณมากกว่าใบแจ้งหนี้ (วันที่ของการตรวจสอบ) เมื่อใบแจ้งหนี้เหล่านี้เนื่องจากไม่ว่าพวกเขาได้รับการชำระเงินหรือไม่ก็มีการระบุไว้ในการส่งออกมูลค่าการซื้อขาย
+FeatureIsSupportedInInOutModeOnly=คุณลักษณะเฉพาะในโหมดบัญชีเครดิต-หนี้ (ดูที่การกำหนดค่าโมดูลการบัญชี)
+VATReportBuildWithOptionDefinedInModule=จํานวนเงินที่แสดงที่นี่มีการคำนวณโดยใช้กฎที่กำหนดโดยการติดตั้งโมดูลภาษี
+LTReportBuildWithOptionDefinedInModule=จํานวนเงินที่แสดงที่นี่มีการคำนวณโดยใช้กฎที่กำหนดโดยการติดตั้ง บริษัท
+Param=การติดตั้ง
+RemainingAmountPayment=การชำระเงินจำนวนเงินที่เหลือ:
+AmountToBeCharged=จำนวนเงินที่จะต้องจ่าย:
+AccountsGeneral=บัญชี
+Account=บัญชี
+Accounts=บัญชี
+Accountparent=บัญชีผู้ปกครอง
+Accountsparent=บัญชีผู้ปกครอง
+BillsForSuppliers=ค่าใช้จ่ายสำหรับซัพพลายเออร์
+Income=เงินได้
+Outcome=ค่าใช้จ่าย
+ReportInOut=รายได้ / ค่าใช้จ่าย
+ReportTurnover=ผลประกอบการ
+PaymentsNotLinkedToInvoice=การชำระเงินไม่ได้เชื่อมโยงกับใบแจ้งหนี้ใด ๆ ดังนั้นไม่เชื่อมโยงกับบุคคลที่สาม
+PaymentsNotLinkedToUser=การชำระเงินที่ไม่เชื่อมโยงกับผู้ใช้ใด ๆ
+Profit=กำไร
+AccountingResult=ผลการบัญชี
+Balance=สมดุล
+Debit=หักบัญชี
+Credit=เครดิต
+Piece=บัญชีหมอ
+Withdrawal=การถอนตัว
+Withdrawals=การถอนเงิน
+AmountHTVATRealReceived=สุทธิเก็บรวบรวม
+AmountHTVATRealPaid=จ่ายสุทธิ
+VATToPay=ภาษีมูลค่าเพิ่มขาย
+VATReceived=ภาษีมูลค่าเพิ่มที่ได้รับ
+VATToCollect=การซื้อภาษีมูลค่าเพิ่ม
+VATSummary=คงเหลือภาษีมูลค่าเพิ่ม
+LT2SummaryES=IRPF สมดุล
+LT1SummaryES=RE สมดุล
+VATPaid=ภาษีมูลค่าเพิ่มจ่าย
+SalaryPaid=เงินเดือนที่ต้องการชำระเงิน
+LT2PaidES=IRPF การชำระเงิน
+LT1PaidES=RE ชำระ
+LT2CustomerES=IRPF ขาย
+LT2SupplierES=การซื้อสินค้า IRPF
+LT1CustomerES=RE ขาย
+LT1SupplierES=เรื่องการซื้อสินค้า
+VATCollected=ภาษีมูลค่าเพิ่มที่จัดเก็บ
+ToPay=ที่จะต้องจ่าย
+ToGet=ที่จะได้รับกลับมา
+SpecialExpensesArea=พื้นที่สำหรับการชำระเงินพิเศษทั้งหมด
+TaxAndDividendsArea=ภาษีขาย, สังคม / ผลงานทางการคลังและภาษีเงินปันผลในพื้นที่
+SocialContribution=ภาษีทางสังคมหรือทางการคลัง
+SocialContributions=ภาษีทางสังคมหรือทางการคลัง
+MenuSpecialExpenses=ค่าใช้จ่ายพิเศษ
+MenuTaxAndDividends=ภาษีและเงินปันผล
+MenuSalaries=เงินเดือน
+MenuSocialContributions=สังคม / ภาษีการคลัง
+MenuNewSocialContribution=ชำระภาษีใหม่
+NewSocialContribution=ใหม่สังคม / ภาษีการคลัง
+ContributionsToPay=สังคม / ภาษีการคลังที่จะต้องจ่าย
+AccountancyTreasuryArea=การบัญชี / ธนารักษ์พื้นที่
+AccountancySetup=การตั้งค่าบัญชี
+NewPayment=การชำระเงินใหม่
+Payments=วิธีการชำระเงิน
+PaymentCustomerInvoice=การชำระเงินตามใบแจ้งหนี้ของลูกค้า
+PaymentSupplierInvoice=ใบแจ้งหนี้การชำระเงินผู้ผลิต
+PaymentSocialContribution=สังคม / ชำระภาษีการคลัง
+PaymentVat=การชำระเงินภาษีมูลค่าเพิ่ม
+PaymentSalary=การชำระเงินเงินเดือน
+ListPayment=รายชื่อของการชำระเงิน
+ListOfPayments=รายชื่อของการชำระเงิน
+ListOfCustomerPayments=รายการชำระเงินของลูกค้า
+ListOfSupplierPayments=รายชื่อผู้จัดจำหน่ายของการชำระเงิน
+DatePayment=วันที่ชำระเงิน
+DateStartPeriod=ระยะเวลาที่เริ่มต้นวันที่
+DateEndPeriod=วันสิ้นงวดวันที่
+NewVATPayment=ใหม่การชำระเงินภาษีมูลค่าเพิ่ม
+newLT2PaymentES=ใหม่การชำระเงิน IRPF
+newLT1PaymentES=ใหม่การชำระเงิน RE
+LT2PaymentES=IRPF การชำระเงิน
+LT2PaymentsES=IRPF การชำระเงิน
+LT1PaymentES=เรื่องการชำระเงิน
+LT1PaymentsES=เรื่องการชำระเงิน
+VATPayment=การชำระเงินภาษีมูลค่าเพิ่ม
+VATPayments=การชำระเงินภาษีมูลค่าเพิ่ม
+SocialContributionsPayments=สังคม / การชำระเงินภาษีการคลัง
+ShowVatPayment=แสดงการชำระเงินภาษีมูลค่าเพิ่ม
+TotalToPay=ทั้งหมดที่จะต้องจ่าย
+TotalVATReceived=ภาษีมูลค่าเพิ่มทั้งหมดที่ได้รับ
+CustomerAccountancyCode=รหัสบัญชีของลูกค้า
+SupplierAccountancyCode=ผู้ผลิตรหัสบัญชี
+AccountNumberShort=เลขที่บัญชี
+AccountNumber=เลขที่บัญชี
+NewAccount=บัญชีใหม่
+SalesTurnover=ยอดขาย
+SalesTurnoverMinimum=ยอดขายขั้นต่ำ
+ByThirdParties=โดยบุคคลที่สาม
+ByUserAuthorOfInvoice=โดยผู้เขียนใบแจ้งหนี้
+AccountancyExport=การส่งออกการบัญชี
+ErrorWrongAccountancyCodeForCompany=รหัสบัญชีลูกค้าที่ไม่ดีสำหรับ% s
+SuppliersProductsSellSalesTurnover=ผลประกอบการที่เกิดจากการขายสินค้าของซัพพลายเออร์
+CheckReceipt=ตรวจสอบการฝากเงิน
+CheckReceiptShort=ตรวจสอบการฝากเงิน
+LastCheckReceiptShort=% ล่าสุดของใบเสร็จรับเงินการตรวจสอบ
+NewCheckReceipt=ใหม่ส่วนลด
+NewCheckDeposit=ฝากเช็คใหม่
+NewCheckDepositOn=สร้างใบเสร็จรับเงินสำหรับการฝากเงินในบัญชี:% s
+NoWaitingChecks=การตรวจสอบไม่มีการรอคอยสำหรับการฝากเงิน
+DateChequeReceived=ตรวจสอบวันที่แผนกต้อนรับส่วนหน้า
+NbOfCheques=nb ของการตรวจสอบ
+PaySocialContribution=จ่ายทางสังคม / ภาษีการคลัง
+ConfirmPaySocialContribution=คุณแน่ใจหรือว่าต้องการที่จะจัดนี้ภาษีทางสังคมหรือทางการคลังเป็นเงิน?
+DeleteSocialContribution=ลบชำระภาษีทางสังคมหรือทางการคลัง
+ConfirmDeleteSocialContribution=คุณแน่ใจหรือว่าต้องการลบนี้สังคม / ชำระภาษีการคลัง?
+ExportDataset_tax_1=ภาษีสังคมและการคลังและการชำระเงิน
+CalcModeVATDebt=<b>โหมด% sVAT ความมุ่งมั่นบัญชี%</b> s
+CalcModeVATEngagement=โหมด <b>sVAT% รายได้ค่าใช้จ่าย-%</b> s
+CalcModeDebt=<b>โหมด% sClaims-หนี้% s บัญชีกล่าวว่าความมุ่งมั่น</b>
+CalcModeEngagement=โหมด <b>sIncomes-% ค่าใช้จ่ายใน% s กล่าวว่าบัญชีเงินสด</b>
+CalcModeLT1= <b>โหมด% Sre ในใบแจ้งหนี้ของลูกค้า - ซัพพลายเออร์ใบแจ้งหนี้% s</b>
+CalcModeLT1Debt=<b>โหมด% Sre ในใบแจ้งหนี้ของลูกค้า% s</b>
+CalcModeLT1Rec= <b>โหมด% Sre ซัพพลายเออร์ในใบแจ้งหนี้% s</b>
+CalcModeLT2= <b>โหมด% sIRPF ในใบแจ้งหนี้ของลูกค้า - ใบแจ้งหนี้ซัพพลายเออร์% s</b>
+CalcModeLT2Debt=<b>โหมด% sIRPF ในใบแจ้งหนี้ของลูกค้า% s</b>
+CalcModeLT2Rec= <b>โหมด% sIRPF ในใบแจ้งหนี้ซัพพลายเออร์% s</b>
+AnnualSummaryDueDebtMode=ความสมดุลของรายได้และค่าใช้จ่ายประจำปีสรุป
+AnnualSummaryInputOutputMode=ความสมดุลของรายได้และค่าใช้จ่ายประจำปีสรุป
+AnnualByCompaniesDueDebtMode=<b>ความสมดุลของรายได้และค่าใช้จ่ายรายละเอียดโดยบุคคลที่สามโหมด% sClaims-หนี้% s บัญชีกล่าวว่าความมุ่งมั่น</b>
+AnnualByCompaniesInputOutputMode=ความสมดุลของรายได้และค่าใช้จ่ายรายละเอียดโดยบุคคลที่สามโหมด <b>sIncomes-% ค่าใช้จ่ายใน% s กล่าวว่าบัญชีเงินสด</b>
+SeeReportInInputOutputMode=ดูรายงาน <b>sIncomes-% ค่าใช้จ่ายใน% s กล่าวว่าเงินสดบัญชีสำหรับการคำนวณในการชำระเงินที่เกิดขึ้นจริงที่ทำ</b>
+SeeReportInDueDebtMode=<b>ดูรายงาน% sClaims-หนี้% s กล่าวว่าความมุ่งมั่นในการบัญชีสำหรับการคำนวณในใบแจ้งหนี้ที่ออก</b>
+RulesAmountWithTaxIncluded=- จํานวนเงินที่แสดงเป็นกับภาษีรวมทั้งหมด
+RulesResultDue=- ซึ่งจะรวมถึงใบแจ้งหนี้ค้างค่าใช้จ่ายและภาษีมูลค่าเพิ่มไม่ว่าพวกเขาจะได้รับเงินหรือไม่ <br> - มันขึ้นอยู่กับการตรวจสอบวันที่ของใบแจ้งหนี้และภาษีมูลค่าเพิ่มและวันที่ครบกำหนดสำหรับค่าใช้จ่าย
+RulesResultInOut=- ซึ่งจะรวมถึงการชำระเงินจริงทำในใบแจ้งหนี้ค่าใช้จ่ายและภาษีมูลค่าเพิ่ม <br> - มันขึ้นอยู่กับวันที่ชำระเงินของใบแจ้งหนี้ค่าใช้จ่ายและภาษีมูลค่าเพิ่ม
+RulesCADue=- ซึ่งจะรวมถึงใบแจ้งหนี้ที่ครบกำหนดของลูกค้าไม่ว่าพวกเขาจะได้รับเงินหรือไม่ <br> - มันขึ้นอยู่กับการตรวจสอบวันที่ของใบแจ้งหนี้เหล่านี้ <br>
+RulesCAIn=- ซึ่งจะรวมถึงทุกการชำระเงินที่มีประสิทธิภาพของใบแจ้งหนี้ที่ได้รับจากลูกค้า <br> - มันขึ้นอยู่กับวันที่ชำระเงินของใบแจ้งหนี้เหล่านี้ <br>
+DepositsAreNotIncluded=- ใบแจ้งหนี้หรือเงินฝากจะรวม
+DepositsAreIncluded=- ใบแจ้งหนี้เงินฝากที่จะถูกรวม
+LT2ReportByCustomersInInputOutputModeES=รายงานโดยบุคคลที่สาม IRPF
+LT1ReportByCustomersInInputOutputModeES=รายงานโดยเรื่องของบุคคลที่สาม
+VATReportByCustomersInInputOutputMode=รายงานโดยลูกค้าภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
+VATReportByCustomersInDueDebtMode=รายงานโดยลูกค้าภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
+VATReportByQuartersInInputOutputMode=รายงานโดยอัตราภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
+LT1ReportByQuartersInInputOutputMode=รายงานโดยอัตรา RE
+LT2ReportByQuartersInInputOutputMode=รายงานโดยอัตรา IRPF
+VATReportByQuartersInDueDebtMode=รายงานโดยอัตราภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
+LT1ReportByQuartersInDueDebtMode=รายงานโดยอัตรา RE
+LT2ReportByQuartersInDueDebtMode=รายงานโดยอัตรา IRPF
+SeeVATReportInInputOutputMode=<b>ดูรายงาน% sVAT encasement% สำหรับการคำนวณมาตรฐาน</b>
+SeeVATReportInDueDebtMode=ดูรายงาน <b>sVAT% ในกระแส%</b> สำหรับการคำนวณที่มีตัวเลือกในการไหล
+RulesVATInServices=- สำหรับการให้บริการรายงานรวมถึงกฎระเบียบของภาษีมูลค่าเพิ่มที่ได้รับจริงหรือออกบนพื้นฐานของวันที่ชำระเงิน
+RulesVATInProducts=- สินทรัพย์วัสดุจะมีใบแจ้งหนี้ภาษีมูลค่าเพิ่มบนพื้นฐานของวันที่ใบแจ้งหนี้
+RulesVATDueServices=- สำหรับการให้บริการรายงานใบแจ้งหนี้รวมภาษีมูลค่าเพิ่มเนื่องจากค่าใช้จ่ายหรือไม่ขึ้นอยู่กับวันที่ใบแจ้งหนี้
+RulesVATDueProducts=- สินทรัพย์วัสดุจะมีใบแจ้งหนี้ภาษีมูลค่าเพิ่มตามวันที่ใบแจ้งหนี้
+OptionVatInfoModuleComptabilite=หมายเหตุ: สำหรับสินทรัพย์ก็ควรใช้วันที่ส่งมอบจะเป็นธรรมมากขึ้น
+PercentOfInvoice=%% / ใบแจ้งหนี้
+NotUsedForGoods=ไม่ใช้สินค้า
+ProposalStats=สถิติเกี่ยวกับข้อเสนอ
+OrderStats=สถิติในการสั่งซื้อ
+InvoiceStats=สถิติเกี่ยวกับค่าใช้จ่าย
+Dispatch=การฝึกอบรม
+Dispatched=ส่ง
+ToDispatch=ที่จะส่ง
+ThirdPartyMustBeEditAsCustomer=บุคคลที่สามจะต้องกำหนดเป็นลูกค้า
+SellsJournal=วารสารการขาย
+PurchasesJournal=วารสารการสั่งซื้อสินค้า
+DescSellsJournal=วารสารการขาย
+DescPurchasesJournal=วารสารการสั่งซื้อสินค้า
+InvoiceRef=อ้างอิงใบแจ้งหนี้
+CodeNotDef=ไม่กำหนด
+AddRemind=จำนวนเงินที่มีการจัดส่ง
+RemainToDivide= ยังคงอยู่ในการจัดส่ง:
+WarningDepositsNotIncluded=ใบแจ้งหนี้เงินฝากไม่รวมอยู่ในรุ่นที่มีโมดูลบัญชีนี้
+DatePaymentTermCantBeLowerThanObjectDate=ในระยะวันที่ชำระเงินไม่สามารถจะต่ำกว่าวันที่วัตถุ
+Pcg_version=รุ่น PCG
+Pcg_type=ประเภท PCG
+Pcg_subtype=ชนิดย่อย PCG
+InvoiceLinesToDispatch=เส้นที่จะส่งใบแจ้งหนี้
+InvoiceDispatched=ส่งใบแจ้งหนี้
+AccountancyDashboard=สรุปการบัญชี
+ByProductsAndServices=โดยสินค้าและบริการ
+RefExt=อ้างอิงภายนอก
+ToCreateAPredefinedInvoice=การสร้างใบแจ้งหนี้ที่กำหนดไว้ล่วงหน้าสร้างมาตรฐานใบแจ้งหนี้แล้วโดยไม่ต้องตรวจสอบให้คลิกบนปุ่ม "แปลงเป็นใบแจ้งหนี้ที่กำหนดไว้ล่วงหน้า"
+LinkedOrder=เชื่อมโยงการสั่งซื้อ
+ReCalculate=คำนวณ
+Mode1=วิธีที่ 1
+Mode2=วิธีที่ 2
+CalculationRuleDesc=ในการคำนวณภาษีมูลค่าเพิ่มรวมมีสองวิธี: <br> วิธีที่ 1 มีการปัดเศษถังในแต่ละบรรทัดแล้วข้อสรุปพวกเขา <br> วิธีที่ 2 คือข้อสรุปถังทั้งหมดในแต่ละบรรทัดแล้วผลการปัดเศษ <br> ผลสุดท้ายอาจจะแตกต่างจากไม่กี่เซ็นต์ <b>โหมดเริ่มต้นคือโหมด%</b> s
+CalculationRuleDescSupplier=ตามที่ผู้ผลิตเลือกวิธีการที่เหมาะสมในการใช้กฎการคำนวณเดียวกันและได้รับผลเดียวกันโดยคาดว่าผู้จำหน่ายของคุณ
+TurnoverPerProductInCommitmentAccountingNotRelevant=<b>รายงานผลประกอบการต่อผลิตภัณฑ์เมื่อใช้โหมดการบัญชีเงินสดไม่เกี่ยวข้อง รายงานนี้จะใช้ได้เฉพาะเมื่อใช้โหมดการบัญชีการสู้รบ</b> (ดูการตั้งค่าของโมดูลการบัญชี)
+CalculationMode=โหมดการคำนวณ
+AccountancyJournal=วารสารการบัญชีรหัส
+ACCOUNTING_VAT_SOLD_ACCOUNT=รหัสบัญชีเริ่มต้นสำหรับการจัดเก็บภาษีภาษีมูลค่าเพิ่ม
+ACCOUNTING_VAT_BUY_ACCOUNT=รหัสบัญชีเริ่มต้นสำหรับการจ่ายเงินภาษีมูลค่าเพิ่ม
+ACCOUNTING_ACCOUNT_CUSTOMER=รหัสบัญชีโดยเริ่มต้นสำหรับ thirdparties ลูกค้า
+ACCOUNTING_ACCOUNT_SUPPLIER=รหัสบัญชีโดยเริ่มต้นสำหรับ thirdparties ผู้จัดจำหน่าย
+CloneTax=โคลนสังคม / ภาษีการคลัง
+ConfirmCloneTax=ยืนยันโคลนของสังคม / ชำระภาษีการคลัง
+CloneTaxForNextMonth=โคลนมันสำหรับเดือนถัดไป
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index d1be0e6513f..a484f345867 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -1,103 +1,103 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Contracts area
-ListOfContracts=List of contracts
-LastModifiedContracts=Last %s modified contracts
-AllContracts=All contracts
-ContractCard=Contract card
-ContractStatus=Contract status
-ContractStatusNotRunning=Not running
-ContractStatusRunning=Running
-ContractStatusDraft=Draft
-ContractStatusValidated=Validated
-ContractStatusClosed=Closed
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
-ServiceStatusClosed=Closed
-ServicesLegend=Services legend
-Contracts=Contracts
-ContractsAndLine=Contracts and line of contracts
-Contract=Contract
-NoContracts=No contracts
-MenuServices=Services
-MenuInactiveServices=Services not active
-MenuRunningServices=Running services
-MenuExpiredServices=Expired services
-MenuClosedServices=Closed services
-NewContract=New contract
-AddContract=Create contract
-SearchAContract=Search a contract
-DeleteAContract=Delete a contract
-CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b> ?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b> ?
-ValidateAContract=Validate a contract
-ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b> ?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
-DateServiceUnactivate=Service deactivation date
-DateServiceStart=Date for beginning of service
-DateServiceEnd=Date for end of service
-ShowContract=Show contract
-ListOfServices=List of services
-ListOfInactiveServices=List of not active services
-ListOfExpiredServices=List of expired active services
-ListOfClosedServices=List of closed services
-ListOfRunningContractsLines=List of running contract lines
-ListOfRunningServices=List of running services
-NotActivatedServices=Inactive services (among validated contracts)
-BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s contracts
-LastActivatedServices=Last %s activated services
-LastModifiedServices=Last %s modified services
-EditServiceLine=Edit service line
-ContractStartDate=Start date
-ContractEndDate=End date
-DateStartPlanned=Planned start date
-DateStartPlannedShort=Planned start date
-DateEndPlanned=Planned end date
-DateEndPlannedShort=Planned end date
-DateStartReal=Real start date
-DateStartRealShort=Real start date
-DateEndReal=Real end date
-DateEndRealShort=Real end date
-NbOfServices=Nb of services
-CloseService=Close service
-ServicesNomberShort=%s service(s)
-RunningServices=Running services
-BoardRunningServices=Expired running services
-ServiceStatus=Status of service
-DraftContracts=Drafts contracts
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it
-CloseAllContracts=Close all contract lines
-DeleteContractLine=Delete a contract line
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line ?
-MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ?
-PaymentRenewContractId=Renew contract line (number %s)
-ExpiredSince=Expiration date
-RelatedContracts=Related contracts
-NoExpiredServices=No expired active services
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ContractsArea=พื้นที่สัญญา
+ListOfContracts=รายชื่อของสัญญา
+LastModifiedContracts=% ล่าสุดของการแก้ไขสัญญา
+AllContracts=สัญญาทั้งหมด
+ContractCard=บัตรสัญญา
+ContractStatus=สถานะสัญญา
+ContractStatusNotRunning=ไม่ได้ทำงาน
+ContractStatusRunning=วิ่ง
+ContractStatusDraft=ร่าง
+ContractStatusValidated=ผ่านการตรวจสอบ
+ContractStatusClosed=ปิด
+ServiceStatusInitial=ไม่ได้ทำงาน
+ServiceStatusRunning=วิ่ง
+ServiceStatusNotLate=ทำงานไม่หมดอายุ
+ServiceStatusNotLateShort=ไม่หมดอายุ
+ServiceStatusLate=ทำงานหมดอายุ
+ServiceStatusLateShort=หมดอายุ
+ServiceStatusClosed=ปิด
+ServicesLegend=ตำนานบริการ
+Contracts=สัญญา
+ContractsAndLine=สัญญาและสายของสัญญา
+Contract=สัญญา
+NoContracts=ไม่มีสัญญา
+MenuServices=บริการ
+MenuInactiveServices=บริการไม่ได้ใช้งาน
+MenuRunningServices=วิ่งบริการ
+MenuExpiredServices=บริการหมดอายุ
+MenuClosedServices=ปิดบริการ
+NewContract=สัญญาฉบับใหม่
+AddContract=สร้างสัญญา
+SearchAContract=ค้นหาสัญญา
+DeleteAContract=ลบสัญญา
+CloseAContract=ปิดสัญญา
+ConfirmDeleteAContract=คุณแน่ใจหรือว่าต้องการลบสัญญานี้และบริการของตนหรือไม่
+ConfirmValidateContract=<b>คุณแน่ใจหรือว่าต้องการตรวจสอบสัญญานี้ภายใต้ชื่อ% s?</b>
+ConfirmCloseContract=นี้จะปิดบริการทั้งหมด (ที่ใช้งานหรือไม่) คุณแน่ใจว่าคุณต้องการที่จะปิดสัญญานี้หรือไม่?
+ConfirmCloseService=คุณแน่ใจหรือว่าต้องการปิดบริการนี้มี <b>s%</b> วันที่?
+ValidateAContract=ตรวจสอบสัญญา
+ActivateService=เปิดใช้งานบริการ
+ConfirmActivateService=คุณแน่ใจหรือว่าต้องการที่จะเปิดใช้งานบริการนี้กับวันที่ <b>s%?</b>
+RefContract=อ้างอิงตามสัญญา
+DateContract=วันทำสัญญา
+DateServiceActivate=บริการวันที่เปิดใช้งาน
+DateServiceUnactivate=บริการวันเสื่อม
+DateServiceStart=วันที่สำหรับการเริ่มต้นของการให้บริการ
+DateServiceEnd=วันที่สำหรับการสิ้นสุดของการบริการ
+ShowContract=แสดงสัญญา
+ListOfServices=รายการของการบริการ
+ListOfInactiveServices=รายชื่อของบริการที่ใช้งานไม่ได้
+ListOfExpiredServices=รายชื่อของบริการที่ใช้งานหมดอายุ
+ListOfClosedServices=รายการของการบริการปิด
+ListOfRunningContractsLines=รายชื่อของการทำงานสายสัญญา
+ListOfRunningServices=รายการของการทำงาน
+NotActivatedServices=บริการไม่ได้ใช้งาน (ในสัญญาการตรวจสอบ)
+BoardNotActivatedServices=บริการเพื่อเปิดใช้งานในกลุ่มการตรวจสอบสัญญา
+LastContracts=สัญญา% s ล่าสุด
+LastActivatedServices=% s ล่าสุดเปิดใช้บริการ
+LastModifiedServices=% ล่าสุดของการปรับเปลี่ยนการให้บริการ
+EditServiceLine=แก้ไขสายบริการ
+ContractStartDate=วันที่เริ่มต้น
+ContractEndDate=วันที่สิ้นสุด
+DateStartPlanned=วันที่เริ่มต้นการวางแผน
+DateStartPlannedShort=วันที่เริ่มต้นการวางแผน
+DateEndPlanned=วันที่สิ้นสุดการวางแผน
+DateEndPlannedShort=วันที่สิ้นสุดการวางแผน
+DateStartReal=วันที่เริ่มต้นจริง
+DateStartRealShort=วันที่เริ่มต้นจริง
+DateEndReal=วันที่สิ้นสุดจริง
+DateEndRealShort=วันที่สิ้นสุดจริง
+NbOfServices=nb ของการบริการ
+CloseService=ปิดบริการ
+ServicesNomberShort=% s บริการ (s)
+RunningServices=วิ่งบริการ
+BoardRunningServices=บริการทำงานหมดอายุ
+ServiceStatus=สถานะของการบริการ
+DraftContracts=ร่างสัญญา
+CloseRefusedBecauseOneServiceActive=สัญญาจะไม่สามารถปิดเป็นบิดาอย่างน้อยหนึ่งบริการที่เปิดอยู่บนมัน
+CloseAllContracts=ปิดทุกสายสัญญา
+DeleteContractLine=ลบบรรทัดสัญญา
+ConfirmDeleteContractLine=คุณแน่ใจหรือว่าต้องการลบบรรทัดสัญญานี้หรือไม่?
+MoveToAnotherContract=ย้ายบริการทำสัญญาอีก
+ConfirmMoveToAnotherContract=ฉันเลือกสัญญาเป้าหมายใหม่และยืนยันที่ฉันต้องการที่จะย้ายบริการนี​​้ในสัญญานี้
+ConfirmMoveToAnotherContractQuestion=เลือกในการทำสัญญาที่มีอยู่ (จากบุคคลที่สามที่เดียวกัน), คุณต้องการที่จะย้ายบริการนี​​้เพื่อ?
+PaymentRenewContractId=ต่ออายุสัญญาสาย (หมายเลข% s)
+ExpiredSince=วันหมดอายุ
+RelatedContracts=สัญญาที่เกี่ยวข้อง
+NoExpiredServices=ไม่มีบริการที่ใช้งานหมดอายุ
+ListOfServicesToExpireWithDuration=รายชื่อของบริการที่จะหมดอายุในวันที่% s
+ListOfServicesToExpireWithDurationNeg=รายชื่อบริการหมดอายุจากกว่า% s วัน
+ListOfServicesToExpire=รายชื่อของบริการจะหมดอายุ
+NoteListOfYourExpiredServices=รายการนี​​้มีเฉพาะบริการของสัญญาสำหรับบุคคลที่สามคุณจะเชื่อมโยงกับการเป็นตัวแทนขาย
+StandardContractsTemplate=แม่แบบสัญญามาตรฐาน
+ContactNameAndSignature=สำหรับ% s, ชื่อและลายเซ็น:
+OnlyLinesWithTypeServiceAreUsed=สายเท่านั้นที่มีประเภท "บริการ" จะถูกโคลน
 
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
-TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
-TypeContact_contrat_external_BILLING=Billing customer contact
-TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
-TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
-Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined
+TypeContact_contrat_internal_SALESREPSIGN=ขายสัญญาลงนามตัวแทน
+TypeContact_contrat_internal_SALESREPFOLL=ตัวแทนขายสัญญาต่อไปนี้ขึ้น
+TypeContact_contrat_external_BILLING=การเรียกเก็บเงินการติดต่อกับลูกค้า
+TypeContact_contrat_external_CUSTOMER=ติดตามการติดต่อกับลูกค้า
+TypeContact_contrat_external_SALESREPSIGN=ลงนามในสัญญาการติดต่อกับลูกค้า
+Error_CONTRACT_ADDON_NotDefined=CONTRACT_ADDON คงที่ไม่ได้กำหนดไว้
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 5adc428b628..27974df0035 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -1,88 +1,89 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
-About = About
-CronAbout = About Cron
-CronAboutPage = Cron about page
+About = เกี่ยวกับ
+CronAbout = เกี่ยวกับ Cron
+CronAboutPage = Cron เกี่ยวกับหน้า
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = อ่านงานที่กำหนดเวลาไว้
+Permission23102 = สร้าง / การปรับปรุงกำหนดเวลางาน
+Permission23103 = ลบงานที่กำหนด
+Permission23104 = การดำเนินงานที่กำหนด
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronSetup= กำหนดเวลาการตั้งค่าการจัดการงาน
+URLToLaunchCronJobs=URL ที่จะตรวจสอบและเปิดงาน cron ถ้าจำเป็น
+OrToLaunchASpecificJob=หรือเพื่อตรวจสอบและการเปิดตัวงานที่เฉพาะเจาะจง
+KeyForCronAccess=กุญแจสำคัญในการรักษาความปลอดภัยสำหรับ URL ที่จะเปิดตัวงาน cron
+FileToLaunchCronJobs=บรรทัดคำสั่งที่จะเปิดตัวงาน cron
+CronExplainHowToRunUnix=ในสภาพแวดล้อมระบบปฏิบัติการยูนิกซ์ที่คุณควรใช้ crontab รายการต่อไปนี้เพื่อเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
+CronExplainHowToRunWin=ไมโครซอฟท์ (TM) ของ Windows environement คุณสามารถใช้เครื่องมือการจัดตารางงานที่จะเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
 # Menu
-CronJobs=Scheduled jobs
-CronListActive=List of active/scheduled jobs
-CronListInactive=List of disabled jobs
+CronJobs=งานที่กำหนดเวลาไว้
+CronListActive=รายการงาน / งานที่กำหนดไว้
+CronListInactive=รายการของงานคนพิการ
 # Page list
-CronDateLastRun=Last run
-CronLastOutput=Last run output
-CronLastResult=Last result code
-CronListOfCronJobs=List of scheduled jobs
-CronCommand=Command
-CronList=Scheduled job
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
-CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
-CronInfo=Scheduled job module allow to execute job that have been planned
-CronWaitingJobs=Waiting jobs
-CronTask=Job
-CronNone=None
-CronDtStart=Start date
-CronDtEnd=End date
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
-CronMethod=Method
-CronModule=Module
-CronAction=Action
-CronStatus=Status
-CronStatusActive=Enabled
-CronStatusInactive=Disabled
-CronNoJobs=No jobs registered
-CronPriority=Priority
-CronLabel=Description
-CronNbRun=Nb. launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronDateLastRun=การทำงานที่ผ่านมา
+CronLastOutput=การทำงานที่ผ่านมาการส่งออก
+CronLastResult=รหัสผลล่าสุด
+CronListOfCronJobs=รายการของงานที่กำหนดไว้
+CronCommand=คำสั่ง
+CronList=งานที่กำหนดเวลาไว้
+CronDelete=ลบงานที่กำหนดไว้
+CronConfirmDelete=คุณแน่ใจหรือว่าต้องการลบงานที่กำหนดไว้เหล่านี้หรือไม่
+CronExecute=งานเปิดตัวที่กำหนดไว้
+CronConfirmExecute=คุณแน่ใจหรือว่าต้องการที่จะดำเนินงานที่กำหนดไว้เหล่านี้ตอนนี้หรือไม่
+CronInfo=โมดูลงานตามกำหนดการอนุญาตให้มีการดำเนินงานที่ได้รับการวางแผน
+CronWaitingJobs=รองาน
+CronTask=งาน
+CronNone=ไม่
+CronDtStart=วันที่เริ่มต้น
+CronDtEnd=วันที่สิ้นสุด
+CronDtNextLaunch=การดำเนินการต่อไป
+CronDtLastLaunch=การดำเนินการที่ผ่านมา
+CronFrequency=ความถี่
+CronClass=ชั้น
+CronMethod=วิธี
+CronModule=โมดูล
+CronAction=การกระทำ
+CronStatus=สถานะ
+CronStatusActive=ที่เปิดใช้งาน
+CronStatusInactive=พิการ
+CronNoJobs=ไม่มีงานที่ลงทะเบียน
+CronPriority=ลำดับความสำคัญ
+CronLabel=ลักษณะ
+CronNbRun=nb ยิง
+CronEach=ทุกๆ
+JobFinished=งานเปิดตัวและจบ
 #Page card
-CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
-CronArgs=Parameters
-CronSaveSucess=Save succesfully
-CronNote=Comment
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-CronStatusActiveBtn=Enable
-CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
+CronAdd= เพิ่มงาน
+CronHourStart= เริ่มต้นชั่วโมงและวันที่ของงาน
+CronEvery=ดำเนินงานแต่ละงาน
+CronObject=อินสแตนซ์ / วัตถุที่จะสร้าง
+CronArgs=พารามิเตอร์
+CronSaveSucess=ประหยัดประสบความสำเร็จ
+CronNote=ความเห็น
+CronFieldMandatory=ทุ่ง% s มีผลบังคับใช้
+CronErrEndDateStartDt=วันที่สิ้นสุดไม่สามารถก่อนวันเริ่มต้น
+CronStatusActiveBtn=เปิดใช้งาน
+CronStatusInactiveBtn=ปิดการใช้งาน
+CronTaskInactive=งานนี้ถูกปิดใช้งาน
+CronDtLastResult=วันที่ผลล่าสุด
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
+CronClassFile=การเรียนการสอน (filename.class.php)
+CronModuleHelp=ชื่อของไดเรกทอรีโมดูล Dolibarr (ยังทำงานร่วมกับโมดูล Dolibarr ภายนอก) <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า / htdocs / <u>ผลิตภัณฑ์</u> /class/product.class.php <i>ค่าของโมดูลเป็นผลิตภัณฑ์</i>
+CronClassFileHelp=ชื่อไฟล์ที่จะโหลด <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า / htdocs / สินค้า / ระดับ / <u>product.class.php</u> ค่าของชื่อไฟล์ระดับคือ <i>product.class.php</i>
+CronObjectHelp=ชื่อวัตถุที่จะโหลด <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า /htdocs/product/class/product.class.php <i>ค่าของชื่อไฟล์ระดับเป็นสินค้า</i>
+CronMethodHelp=วิธีวัตถุที่จะเปิดตัว <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า /htdocs/product/class/product.class.php ค่าของวิธีการที่เป็น <i>fecth</i>
+CronArgsHelp=วิธีการขัดแย้ง <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า /htdocs/product/class/product.class.php ค่าของพารามิเตอร์สามารถ <i>0, ProductRef</i>
+CronCommandHelp=บรรทัดคำสั่งระบบที่จะดำเนินการ
+CronCreateJob=สร้างงานใหม่กำหนด
+CronFrom=จาก
 # Info
-CronInfoPage=Information
+CronInfoPage=ข้อมูล
 # Common
-CronType=Task type
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType=หมวดงาน
+CronType_method=วิธีการเรียกร้องของชั้น Dolibarr
+CronType_command=คำสั่งเชลล์
 CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+CronCannotLoadClass=ไม่สามารถโหลดระดับ s% หรือวัตถุ% s
+UseMenuModuleToolsToAddCronJobs=ไปลงในเมนู "หน้าหลัก - เครื่องมือ Modules - รายชื่องาน" เพื่อดูและแก้ไขงานที่กำหนดไว้
+TaskDisabled=ปิดการใช้งาน
diff --git a/htdocs/langs/th_TH/deliveries.lang b/htdocs/langs/th_TH/deliveries.lang
index bb78c5ac7c2..452f05e4373 100644
--- a/htdocs/langs/th_TH/deliveries.lang
+++ b/htdocs/langs/th_TH/deliveries.lang
@@ -1,26 +1,28 @@
 # Dolibarr language file - Source file is en_US - deliveries
-Delivery=Delivery
-Deliveries=Deliveries
-DeliveryCard=Delivery card
-DeliveryOrder=Delivery order
-DeliveryOrders=Delivery orders
-DeliveryDate=Delivery date
-DeliveryDateShort=Deliv. date
-CreateDeliveryOrder=Generate delivery order
-QtyDelivered=Qty delivered
-SetDeliveryDate=Set shipping date
-ValidateDeliveryReceipt=Validate delivery receipt
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ?
-DeleteDeliveryReceipt=Delete delivery receipt
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b> ?
-DeliveryMethod=Delivery method
-TrackingNumber=Tracking number
-DeliveryNotValidated=Delivery not validated
+Delivery=การจัดส่งสินค้า
+Deliveries=การส่งมอบ
+DeliveryCard=การ์ดจัดส่งสินค้า
+DeliveryOrder=ใบตราส่ง
+DeliveryOrders=การสั่งซื้อการจัดส่งสินค้า
+DeliveryDate=วันที่ส่งมอบ
+DeliveryDateShort=deliv วันที่
+CreateDeliveryOrder=เพื่อสร้างการส่งมอบ
+QtyDelivered=จำนวนการจัดส่ง
+SetDeliveryDate=ตั้งวันที่จัดส่ง
+ValidateDeliveryReceipt=ตรวจสอบการจัดส่งใบเสร็จรับเงิน
+ValidateDeliveryReceiptConfirm=คุณแน่ใจหรือว่าต้องการตรวจสอบการจัดส่งใบเสร็จรับเงินนี้หรือไม่?
+DeleteDeliveryReceipt=ลบใบเสร็จรับเงินการจัดส่ง
+DeleteDeliveryReceiptConfirm=คุณแน่ใจหรือว่าต้องการลบ <b>s ได้รับการส่งมอบ%?</b>
+DeliveryMethod=วิธีการจัดส่ง
+TrackingNumber=ติดตามจำนวน
+DeliveryNotValidated=การจัดส่งสินค้าไม่ได้ผ่านการตรวจสอบ
 # merou PDF model
-NameAndSignature=Name and Signature :
-ToAndDate=To___________________________________ on ____/_____/__________
-GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer :
-Sender=Sender
-Recipient=Recipient
-ErrorStockIsNotEnough=There's not enough stock
+NameAndSignature=ชื่อและลายเซ็น:
+ToAndDate=To___________________________________ บน ____ / _____ / __________
+GoodStatusDeclaration=ได้รับสินค้าดังกล่าวข้างต้นอยู่ในสภาพดี
+Deliverer=ช่วยให้พ้น:
+Sender=ผู้ส่ง
+Recipient=ผู้รับ
+ErrorStockIsNotEnough=มีไม่มากพอที่หุ้น
+Shippable=shippable
+NonShippable=ไม่ shippable
diff --git a/htdocs/langs/th_TH/dict.lang b/htdocs/langs/th_TH/dict.lang
index 4b724056147..e09f8c02142 100644
--- a/htdocs/langs/th_TH/dict.lang
+++ b/htdocs/langs/th_TH/dict.lang
@@ -1,325 +1,327 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryFR=France
-CountryBE=Belgium
-CountryIT=Italy
-CountryES=Spain
-CountryDE=Germany
-CountryCH=Switzerland
-CountryGB=Great Britain
-CountryUK=United Kingdom
-CountryIE=Ireland
-CountryCN=China
-CountryTN=Tunisia
-CountryUS=United States
-CountryMA=Morocco
-CountryDZ=Algeria
-CountryCA=Canada
-CountryTG=Togo
-CountryGA=Gabon
-CountryNL=Netherlands
-CountryHU=Hungary
-CountryRU=Russia
-CountrySE=Sweden
-CountryCI=Ivoiry Coast
-CountrySN=Senegal
-CountryAR=Argentina
-CountryCM=Cameroon
-CountryPT=Portugal
-CountrySA=Saudi Arabia
-CountryMC=Monaco
-CountryAU=Australia
-CountrySG=Singapore
-CountryAF=Afghanistan
-CountryAX=Åland Islands
-CountryAL=Albania
-CountryAS=American Samoa
-CountryAD=Andorra
-CountryAO=Angola
-CountryAI=Anguilla
-CountryAQ=Antarctica
-CountryAG=Antigua and Barbuda
-CountryAM=Armenia
-CountryAW=Aruba
-CountryAT=Austria
-CountryAZ=Azerbaijan
-CountryBS=Bahamas
-CountryBH=Bahrain
-CountryBD=Bangladesh
-CountryBB=Barbados
-CountryBY=Belarus
-CountryBZ=Belize
-CountryBJ=Benin
-CountryBM=Bermuda
-CountryBT=Bhutan
-CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
-CountryBW=Botswana
-CountryBV=Bouvet Island
-CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
-CountryBN=Brunei Darussalam
-CountryBG=Bulgaria
-CountryBF=Burkina Faso
-CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
-CountryTD=Chad
-CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
-CountryCO=Colombia
-CountryKM=Comoros
-CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
-CountryCR=Costa Rica
-CountryHR=Croatia
-CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
-CountryDK=Denmark
-CountryDJ=Djibouti
-CountryDM=Dominica
-CountryDO=Dominican Republic
-CountryEC=Ecuador
-CountryEG=Egypt
-CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
-CountryER=Eritrea
-CountryEE=Estonia
-CountryET=Ethiopia
-CountryFK=Falkland Islands
-CountryFO=Faroe Islands
-CountryFJ=Fiji Islands
-CountryFI=Finland
-CountryGF=French Guiana
-CountryPF=French Polynesia
-CountryTF=French Southern Territories
-CountryGM=Gambia
-CountryGE=Georgia
-CountryGH=Ghana
-CountryGI=Gibraltar
-CountryGR=Greece
-CountryGL=Greenland
-CountryGD=Grenada
-CountryGP=Guadeloupe
-CountryGU=Guam
-CountryGT=Guatemala
-CountryGN=Guinea
-CountryGW=Guinea-Bissau
-CountryGY=Guyana
+CountryFR=ฝรั่งเศส
+CountryBE=ประเทศเบลเยียม
+CountryIT=อิตาลี
+CountryES=สเปน
+CountryDE=ประเทศเยอรมัน
+CountryCH=ประเทศสวิสเซอร์แลนด์
+CountryGB=บริเตนใหญ่
+CountryUK=สหราชอาณาจักร
+CountryIE=ไอร์แลนด์
+CountryCN=ประเทศจีน
+CountryTN=ตูนิเซีย
+CountryUS=ประเทศสหรัฐอเมริกา
+CountryMA=โมร็อกโก
+CountryDZ=ประเทศแอลจีเรีย
+CountryCA=แคนาดา
+CountryTG=โตโก
+CountryGA=กาบอง
+CountryNL=เนเธอร์แลนด์
+CountryHU=ฮังการี
+CountryRU=รัสเซีย
+CountrySE=สวีเดน
+CountryCI=Ivoiry ชายฝั่ง
+CountrySN=ประเทศเซเนกัล
+CountryAR=อาร์เจนตินา
+CountryCM=แคเมอรูน
+CountryPT=โปรตุเกส
+CountrySA=ประเทศซาอุดีอาระเบีย
+CountryMC=โมนาโก
+CountryAU=ออสเตรเลีย
+CountrySG=สิงคโปร์
+CountryAF=อัฟกานิสถาน
+CountryAX=หมู่เกาะโอลันด์
+CountryAL=แอลเบเนีย
+CountryAS=อเมริกันซามัว
+CountryAD=อันดอร์รา
+CountryAO=แองโกลา
+CountryAI=แองกวิลลา
+CountryAQ=ทวิปแอนตาร์กติกา
+CountryAG=แอนติกาและบาร์บูดา
+CountryAM=อาร์เมเนีย
+CountryAW=อารูบา
+CountryAT=ออสเตรีย
+CountryAZ=อาเซอร์ไบจาน
+CountryBS=บาฮามาส
+CountryBH=บาห์เรน
+CountryBD=บังคลาเทศ
+CountryBB=บาร์เบโดส
+CountryBY=เบลารุส
+CountryBZ=เบลีซ
+CountryBJ=ประเทศเบนิน
+CountryBM=เบอร์มิวดา
+CountryBT=ภูฏาน
+CountryBO=ประเทศโบลิเวีย
+CountryBA=บอสเนียและเฮอร์เซโก
+CountryBW=บอตสวานา
+CountryBV=เกาะบูเวต
+CountryBR=บราซิล
+CountryIO=มณฑลบริติชมหาสมุทรอินเดีย
+CountryBN=บรูไนดารุสซาลาม
+CountryBG=บัลแกเรีย
+CountryBF=บูร์กินาฟาโซ
+CountryBI=บุรุนดี
+CountryKH=ประเทศกัมพูชา
+CountryCV=เคปเวิร์ด
+CountryKY=หมู่เกาะเคย์แมน
+CountryCF=สาธารณรัฐแอฟริกากลาง
+CountryTD=ชาด
+CountryCL=ชิลี
+CountryCX=เกาะคริสต์มาส
+CountryCC=โคโคส (คีลิง) หมู่เกาะ
+CountryCO=โคลอมเบีย
+CountryKM=คอโมโรส
+CountryCG=ประเทศคองโก
+CountryCD=คองโกสาธารณรัฐประชาธิปไตย
+CountryCK=หมู่เกาะคุก
+CountryCR=คอสตาริกา
+CountryHR=โครเอเชีย
+CountryCU=คิวบา
+CountryCY=ไซปรัส
+CountryCZ=สาธารณรัฐเช็ก
+CountryDK=เดนมาร์ก
+CountryDJ=จิบูตี
+CountryDM=โดมินิกา
+CountryDO=สาธารณรัฐโดมินิกัน
+CountryEC=เอกวาดอร์
+CountryEG=อียิปต์
+CountrySV=เอลซัลวาดอร์
+CountryGQ=ทอเรียลกินี
+CountryER=เอริเทรี
+CountryEE=เอสโตเนีย
+CountryET=สาธารณรัฐเอธิโอเปีย
+CountryFK=หมู่เกาะฟอล์คแลนด์
+CountryFO=หมู่เกาะแฟโร
+CountryFJ=หมู่เกาะฟิจิ
+CountryFI=ฟินแลนด์
+CountryGF=เฟรนช์เกีย
+CountryPF=โปลินีเซีฝรั่งเศส
+CountryTF=ดินแดนทางใต้ของฝรั่งเศส
+CountryGM=แกมเบีย
+CountryGE=จอร์เจีย
+CountryGH=กานา
+CountryGI=ยิบรอลตา
+CountryGR=กรีก
+CountryGL=เกาะกรีนแลนด์
+CountryGD=เกรเนดา
+CountryGP=ลุป
+CountryGU=กวม
+CountryGT=กัวเตมาลา
+CountryGN=กินี
+CountryGW=กินีบิสเซา
+CountryGY=กายอานา
 CountryHT=Haïti
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
-CountryHN=Honduras
-CountryHK=Hong Kong
+CountryHM=ได้ยินและเกาะ McDonald
+CountryVA=พระเห็น (นครรัฐวาติกัน)
+CountryHN=ฮอนดูรัส
+CountryHK=ฮ่องกง
 CountryIS=Icelande
-CountryIN=India
-CountryID=Indonesia
-CountryIR=Iran
-CountryIQ=Iraq
-CountryIL=Israel
-CountryJM=Jamaica
-CountryJP=Japan
-CountryJO=Jordan
-CountryKZ=Kazakhstan
-CountryKE=Kenya
-CountryKI=Kiribati
-CountryKP=North Korea
-CountryKR=South Korea
-CountryKW=Kuwait
+CountryIN=อินเดีย
+CountryID=อินโดนีเซีย
+CountryIR=อิหร่าน
+CountryIQ=อิรัก
+CountryIL=อิสราเอล
+CountryJM=เกาะจาเมกา
+CountryJP=ประเทศญี่ปุ่น
+CountryJO=จอร์แดน
+CountryKZ=คาซัคสถาน
+CountryKE=ประเทศเคนย่า
+CountryKI=ประเทศคิริบาส
+CountryKP=เกาหลีเหนือ
+CountryKR=เกาหลีใต้
+CountryKW=คูเวต
 CountryKG=Kyrghyztan
-CountryLA=Lao
-CountryLV=Latvia
-CountryLB=Lebanon
-CountryLS=Lesotho
-CountryLR=Liberia
-CountryLY=Libyan
+CountryLA=ลาว
+CountryLV=ลัตเวีย
+CountryLB=ประเทศเลบานอน
+CountryLS=เลโซโท
+CountryLR=ประเทศไลบีเรีย
+CountryLY=เกี่ยวกับลิบยา
 CountryLI=Liechtenstein
-CountryLT=Lituania
-CountryLU=Luxembourg
-CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
-CountryMG=Madagascar
-CountryMW=Malawi
-CountryMY=Malaysia
-CountryMV=Maldives
-CountryML=Mali
-CountryMT=Malta
-CountryMH=Marshall Islands
-CountryMQ=Martinique
-CountryMR=Mauritania
-CountryMU=Mauritius
-CountryYT=Mayotte
-CountryMX=Mexico
-CountryFM=Micronesia
-CountryMD=Moldova
-CountryMN=Mongolia
+CountryLT=ลิทัวเนีย
+CountryLU=ลักเซมเบิร์ก
+CountryMO=มาเก๊า
+CountryMK=มาซิโดเนียอ​​ดีตยูโกสลาเวีย
+CountryMG=มาดากัสการ์
+CountryMW=มาลาวี
+CountryMY=มาเลเซีย
+CountryMV=มัลดีฟส์
+CountryML=มาลี
+CountryMT=เกาะมอลตา
+CountryMH=หมู่เกาะมาร์แชลล์
+CountryMQ=มาร์ตินีก
+CountryMR=มอริเตเนีย
+CountryMU=มอริเชียส
+CountryYT=มายอต
+CountryMX=เม็กซิโก
+CountryFM=ไมโครนีเซีย
+CountryMD=มอลโดวา
+CountryMN=ประเทศมองโกเลีย
 CountryMS=Monserrat
-CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
-CountryNA=Namibia
-CountryNR=Nauru
-CountryNP=Nepal
-CountryAN=Netherlands Antilles
-CountryNC=New Caledonia
-CountryNZ=New Zealand
-CountryNI=Nicaragua
-CountryNE=Niger
-CountryNG=Nigeria
-CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
-CountryNO=Norway
-CountryOM=Oman
-CountryPK=Pakistan
-CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
-CountryPA=Panama
-CountryPG=Papua New Guinea
-CountryPY=Paraguay
-CountryPE=Peru
-CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poland
-CountryPR=Puerto Rico
-CountryQA=Qatar
-CountryRE=Reunion
-CountryRO=Romania
-CountryRW=Rwanda
-CountrySH=Saint Helena
-CountryKN=Saint Kitts and Nevis
-CountryLC=Saint Lucia
-CountryPM=Saint Pierre and Miquelon
-CountryVC=Saint Vincent and Grenadines
-CountryWS=Samoa
-CountrySM=San Marino
-CountryST=Sao Tome and Principe
-CountryRS=Serbia
-CountrySC=Seychelles
-CountrySL=Sierra Leone
-CountrySK=Slovakia
-CountrySI=Slovenia
-CountrySB=Solomon Islands
-CountrySO=Somalia
-CountryZA=South Africa
-CountryGS=South Georgia and the South Sandwich Islands
-CountryLK=Sri Lanka
-CountrySD=Sudan
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
-CountrySZ=Swaziland
-CountrySY=Syrian
-CountryTW=Taiwan
-CountryTJ=Tajikistan
-CountryTZ=Tanzania
-CountryTH=Thailand
-CountryTL=Timor-Leste
-CountryTK=Tokelau
-CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turkey
-CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
-CountryTV=Tuvalu
-CountryUG=Uganda
-CountryUA=Ukraine
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
-CountryUY=Uruguay
-CountryUZ=Uzbekistan
-CountryVU=Vanuatu
-CountryVE=Venezuela
-CountryVN=Viet Nam
-CountryVG=Virgin Islands, British
-CountryVI=Virgin Islands, U.S.
-CountryWF=Wallis and Futuna
-CountryEH=Western Sahara
-CountryYE=Yemen
-CountryZM=Zambia
-CountryZW=Zimbabwe
-CountryGG=Guernsey
-CountryIM=Isle of Man
-CountryJE=Jersey
-CountryME=Montenegro
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
+CountryMZ=โมซัมบิก
+CountryMM=Birmania (พม่า)
+CountryNA=นามิเบีย
+CountryNR=นาอูรู
+CountryNP=เนปาล
+CountryAN=เนเธอร์แลนด์
+CountryNC=แคลิโดเนียใหม่
+CountryNZ=นิวซีแลนด์
+CountryNI=ประเทศนิการากัว
+CountryNE=ประเทศไนเธอร์
+CountryNG=ประเทศไนจีเรีย
+CountryNU=นีอูเอ
+CountryNF=เกาะนอร์โฟล์ค
+CountryMP=หมู่เกาะมาเรียนาเหนือ
+CountryNO=นอร์เวย์
+CountryOM=โอมาน
+CountryPK=ประเทศปากีสถาน
+CountryPW=ปาเลา
+CountryPS=ดินแดนปาเลสไตน์ครอบครอง
+CountryPA=ปานามา
+CountryPG=ปาปัวนิวกินี
+CountryPY=ประเทศแพรากเว
+CountryPE=เปรู
+CountryPH=ฟิลิปปินส์
+CountryPN=หมู่เกาะพิตแคร์น
+CountryPL=โปแลนด์
+CountryPR=เปอร์โตริโก
+CountryQA=กาตาร์
+CountryRE=การรวมตัวใหม่
+CountryRO=โรมาเนีย
+CountryRW=รวันดา
+CountrySH=เซนต์เฮเลนา
+CountryKN=เซนต์คิตส์และเนวิส
+CountryLC=เซนต์ลูเซีย
+CountryPM=เซนต์ปิแอร์และมีเกอลง
+CountryVC=เซนต์วินเซนต์และเกรนาดีน
+CountryWS=ซามัว
+CountrySM=ซานมารีโน
+CountryST=Sao Tome Principe และ
+CountryRS=เซอร์เบีย
+CountrySC=เซเชลส์
+CountrySL=เซียร์ราลีโอน
+CountrySK=สโลวะเกีย
+CountrySI=สโลวีเนีย
+CountrySB=หมู่เกาะโซโลมอน
+CountrySO=โซมาเลีย
+CountryZA=แอฟริกาใต้
+CountryGS=เซาท์จอร์เจียและหมู่เกาะเซาท์แซนด์วิช
+CountryLK=ศรีลังกา
+CountrySD=ซูดาน
+CountrySR=ซูรินาเม
+CountrySJ=ฟาลบาร์และแจน
+CountrySZ=สวาซิแลนด์
+CountrySY=เกี่ยวกับประเทศซีเรีย
+CountryTW=ไต้หวัน
+CountryTJ=ทาจิกิสถาน
+CountryTZ=ประเทศแทนซาเนีย
+CountryTH=ประเทศไทย
+CountryTL=ติมอร์เลสเต
+CountryTK=โตเกเลา
+CountryTO=ตองกา
+CountryTT=ตรินิแดดและโตเบโก
+CountryTR=ตุรกี
+CountryTM=เติร์กเมนิสถาน
+CountryTC=เติกส์และหมู่เกาะ Cailos
+CountryTV=ตูวาลู
+CountryUG=ยูกันดา
+CountryUA=ยูเครน
+CountryAE=สหรัฐอาหรับเอมิ
+CountryUM=สหรัฐอเมริกาหมู่เกาะรอบนอก
+CountryUY=อุรุกวัย
+CountryUZ=อุซเบกิ
+CountryVU=วานูอาตู
+CountryVE=เวเนซุเอลา
+CountryVN=เวียดนาม
+CountryVG=หมู่เกาะบริติชเวอร์จิน
+CountryVI=หมู่เกาะเวอร์จินของสหรัฐอเมริกา
+CountryWF=วาลลิสและฟุตูนา
+CountryEH=ซาฮาราตะวันตก
+CountryYE=เยเมน
+CountryZM=แซมเบีย
+CountryZW=ซิมบับเว
+CountryGG=เสื้อไหมพรม
+CountryIM=ไอล์ออฟแมน
+CountryJE=นิวเจอร์ซีย์
+CountryME=มอนเตเนโก
+CountryBL=เซนต์บาร์เธเล
+CountryMF=เซนต์มาร์ติน
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=นาง
+CivilityMR=นาย
+CivilityMLE=นางสาว
+CivilityMTRE=เจ้านาย
+CivilityDR=คุณหมอ
 ##### Currencies #####
-Currencyeuros=Euros
-CurrencyAUD=AU Dollars
-CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
-CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
-CurrencyEUR=Euros
-CurrencySingEUR=Euro
-CurrencyFRF=French Francs
-CurrencySingFRF=French Franc
-CurrencyGBP=GB Pounds
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indian rupee
+Currencyeuros=ยูโร
+CurrencyAUD=ดอลลาร์ออสเตรเลีย
+CurrencySingAUD=ดอลลาร์ออสเตรเลีย
+CurrencyCAD=CAN ดอลลาร์
+CurrencySingCAD=ดอลลาร์ CAN
+CurrencyCHF=ฟรังก์สวิส
+CurrencySingCHF=ฟรังก์สวิส
+CurrencyEUR=ยูโร
+CurrencySingEUR=ยูโร
+CurrencyFRF=ฟรังก์ฝรั่งเศส
+CurrencySingFRF=ฟรังก์ฝรั่งเศส
+CurrencyGBP=GB ปอนด์
+CurrencySingGBP=GB ปอนด์
+CurrencyINR=รูปีอินเดีย
+CurrencySingINR=รูปีอินเดีย
 CurrencyMAD=Dirham
 CurrencySingMAD=Dirham
-CurrencyMGA=Ariary
-CurrencySingMGA=Ariary
-CurrencyMUR=Mauritius rupees
-CurrencySingMUR=Mauritius rupee
-CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
-CurrencyTND=Tunisian dinars
-CurrencySingTND=Tunisian dinar
-CurrencyUSD=US Dollars
-CurrencySingUSD=US Dollar
-CurrencyUAH=Hryvnia
-CurrencySingUAH=Hryvnia
-CurrencyXAF=CFA Francs BEAC
-CurrencySingXAF=CFA Franc BEAC
-CurrencyXOF=CFA Francs BCEAO
-CurrencySingXOF=CFA Franc BCEAO
-CurrencyXPF=CFP Francs
-CurrencySingXPF=CFP Franc
-CurrencyCentSingEUR=cent
-CurrencyThousandthSingTND=thousandth
+CurrencyMGA=มาลากาซี
+CurrencySingMGA=มาลากาซี
+CurrencyMUR=รูปีมอริเชียส
+CurrencySingMUR=รูปีมอริเชียส
+CurrencyNOK=นอร์เวย์ Krones
+CurrencySingNOK=โครนนอร์เวย์
+CurrencyTND=ดินาร์ตูนิเซีย
+CurrencySingTND=ดีนาร์ตูนิเซีย
+CurrencyUSD=สกุลเงินดอลลาร์สหรัฐ
+CurrencySingUSD=เงินดอลลาร์สหรัฐ
+CurrencyUAH=ฮรีฟเนีย
+CurrencySingUAH=ฮรีฟเนีย
+CurrencyXAF=CFA ฟรังก์ BEAC
+CurrencySingXAF=ฟรังก์ BEAC
+CurrencyXOF=CFA ฟรังก์ BCEAO
+CurrencySingXOF=ฟรังก์ BCEAO
+CurrencyXPF=ฟรังก์ CFP
+CurrencySingXPF=ฟรังก์ CFP
+CurrencyCentSingEUR=ร้อย
+CurrencyCentINR=paisa
+CurrencyCentSingINR=เซนต์
+CurrencyThousandthSingTND=ที่พัน
 #### Input reasons #####
-DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-DemandReasonTypeSRC_COMM=Commercial contact
-DemandReasonTypeSRC_SHOP=Shop contact
-DemandReasonTypeSRC_WOM=Word of mouth
-DemandReasonTypeSRC_PARTNER=Partner
-DemandReasonTypeSRC_EMPLOYEE=Employee
-DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_INTE=อินเทอร์เน็ต
+DemandReasonTypeSRC_CAMP_MAIL=แคมเปญทางไปรษณีย์
+DemandReasonTypeSRC_CAMP_EMAIL=แคมเปญการส่งอีเมล
+DemandReasonTypeSRC_CAMP_PHO=แคมเปญโทรศัพท์
+DemandReasonTypeSRC_CAMP_FAX=แคมเปญโทรสาร
+DemandReasonTypeSRC_COMM=ติดต่อพาณิชย์
+DemandReasonTypeSRC_SHOP=ติดต่อร้านค้า
+DemandReasonTypeSRC_WOM=มุขบาฐ
+DemandReasonTypeSRC_PARTNER=หุ้นส่วน
+DemandReasonTypeSRC_EMPLOYEE=ลูกจ้าง
+DemandReasonTypeSRC_SPONSORING=การประกัน
 #### Paper formats ####
-PaperFormatEU4A0=Format 4A0
-PaperFormatEU2A0=Format 2A0
-PaperFormatEUA0=Format A0
-PaperFormatEUA1=Format A1
-PaperFormatEUA2=Format A2
-PaperFormatEUA3=Format A3
-PaperFormatEUA4=Format A4
-PaperFormatEUA5=Format A5
-PaperFormatEUA6=Format A6
-PaperFormatUSLETTER=Format Letter US
-PaperFormatUSLEGAL=Format Legal US
-PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
-PaperFormatCAP1=Format P1 Canada
-PaperFormatCAP2=Format P2 Canada
-PaperFormatCAP3=Format P3 Canada
-PaperFormatCAP4=Format P4 Canada
-PaperFormatCAP5=Format P5 Canada
-PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=รูปแบบ 4A0
+PaperFormatEU2A0=รูปแบบ 2A0
+PaperFormatEUA0=รูปแบบ A0
+PaperFormatEUA1=รูปแบบ A1
+PaperFormatEUA2=รูปแบบ A2
+PaperFormatEUA3=รูปแบบ A3
+PaperFormatEUA4=รูปแบบ A4
+PaperFormatEUA5=รูปแบบ A5
+PaperFormatEUA6=รูปแบบ A6
+PaperFormatUSLETTER=รูปแบบตัวอักษรสหรัฐ
+PaperFormatUSLEGAL=รูปแบบกฎหมายสหรัฐ
+PaperFormatUSEXECUTIVE=รูปแบบการบริหารของสหรัฐ
+PaperFormatUSLEDGER=รูปแบบบัญชีแยกประเภท / แท็บลอยด์
+PaperFormatCAP1=รูปแบบ P1 แคนาดา
+PaperFormatCAP2=รูปแบบ P2 แคนาดา
+PaperFormatCAP3=รูปแบบ P3 แคนาดา
+PaperFormatCAP4=รูปแบบ P4 แคนาดา
+PaperFormatCAP5=รูปแบบ P5 แคนาดา
+PaperFormatCAP6=รูปแบบ P6 แคนาดา
diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang
index 2e9c619194f..2ed5ff592a9 100644
--- a/htdocs/langs/th_TH/donations.lang
+++ b/htdocs/langs/th_TH/donations.lang
@@ -1,43 +1,43 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=Donation
-Donations=Donations
-DonationRef=Donation ref.
-Donor=Donor
-Donors=Donors
-AddDonation=Create a donation
-NewDonation=New donation
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation ?
-ShowDonation=Show donation
-DonationPromise=Gift promise
-PromisesNotValid=Not validated promises
-PromisesValid=Validated promises
-DonationsPaid=Donations paid
-DonationsReceived=Donations received
-PublicDonation=Public donation
-DonationsNumber=Donation number
-DonationsArea=Donations area
-DonationStatusPromiseNotValidated=Draft promise
-DonationStatusPromiseValidated=Validated promise
-DonationStatusPaid=Donation received
-DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
-DonationStatusPaidShort=Received
-DonationTitle=Donation receipt
-DonationDatePayment=Payment date
-ValidPromess=Validate promise
-DonationReceipt=Donation receipt
-BuildDonationReceipt=Build receipt
-DonationsModels=Documents models for donation receipts
-LastModifiedDonations=Last %s modified donations
-SearchADonation=Search a donation
-DonationRecipient=Donation recipient
-ThankYou=Thank You
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-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
+Donation=การบริจาค
+Donations=การบริจาค
+DonationRef=อ้างอิงบริจาค
+Donor=ผู้บริจาค
+Donors=ผู้บริจาค
+AddDonation=สร้างการบริจาค
+NewDonation=บริจาคใหม่
+DeleteADonation=ลบบริจาค
+ConfirmDeleteADonation=คุณแน่ใจหรือว่าต้องการลบการบริจาคครั้งนี้?
+ShowDonation=แสดงบริจาค
+DonationPromise=สัญญาของขวัญ
+PromisesNotValid=การตรวจสอบสัญญาไม่ได้
+PromisesValid=การตรวจสอบสัญญา
+DonationsPaid=บริจาคจ่าย
+DonationsReceived=ได้รับการบริจาค
+PublicDonation=เงินบริจาคของประชาชน
+DonationsNumber=จำนวนการบริจาค
+DonationsArea=พื้นที่บริจาค
+DonationStatusPromiseNotValidated=ร่างสัญญา
+DonationStatusPromiseValidated=การตรวจสอบสัญญา
+DonationStatusPaid=ได้รับการบริจาค
+DonationStatusPromiseNotValidatedShort=ร่าง
+DonationStatusPromiseValidatedShort=ผ่านการตรวจสอบ
+DonationStatusPaidShort=ที่ได้รับ
+DonationTitle=ใบเสร็จรับเงินบริจาค
+DonationDatePayment=วันที่ชำระเงิน
+ValidPromess=ตรวจสอบสัญญา
+DonationReceipt=ใบเสร็จรับเงินบริจาค
+BuildDonationReceipt=สร้างใบเสร็จรับเงิน
+DonationsModels=รูปแบบเอกสารใบเสร็จรับเงินบริจาค
+LastModifiedDonations=% ของเงินบริจาคล่าสุดมีการปรับเปลี่ยน
+SearchADonation=ค้นหาบริจาค
+DonationRecipient=ผู้รับบริจาค
+ThankYou=ขอขอบคุณคุณ
+IConfirmDonationReception=ผู้รับประกาศรับบริจาคเป็นของจำนวนเงินดังต่อไปนี้
+MinimumAmount=จำนวนเงินขั้นต่ำเป็น% s
+FreeTextOnDonations=ข้อความฟรีที่จะแสดงในส่วนท้าย
+FrenchOptions=ตัวเลือกสำหรับฝรั่งเศส
+DONATION_ART200=แสดงบทความจาก 200 CGI ถ้าคุณมีความกังวล
+DONATION_ART238=แสดงบทความจาก 238 CGI ถ้าคุณมีความกังวล
+DONATION_ART885=แสดงบทความจาก 885 CGI ถ้าคุณมีความกังวล
+DonationPayment=การชำระเงินที่บริจาค
diff --git a/htdocs/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
index 4a1931a3217..080a673b3ee 100644
--- a/htdocs/langs/th_TH/ecm.lang
+++ b/htdocs/langs/th_TH/ecm.lang
@@ -1,57 +1,57 @@
 # Dolibarr language file - Source file is en_US - ecm
-MenuECM=Documents
-DocsMine=My documents
-DocsGenerated=Generated documents
-DocsElements=Elements documents
-DocsThirdParties=Documents third parties
-DocsContracts=Documents contracts
-DocsProposals=Documents proposals
-DocsOrders=Documents orders
-DocsInvoices=Documents invoices
-ECMNbOfDocs=Nb of documents in directory
-ECMNbOfDocsSmall=Nb of doc.
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
-ECMRoot=Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
-ECMNewDocument=New document
-ECMCreationDate=Creation date
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
-ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
-ECMDocumentsSection=Document of directory
-ECMSearchByKeywords=Search by keywords
-ECMSearchByEntity=Search by object
-ECMSectionOfDocuments=Directories of documents
-ECMTypeManual=Manual
-ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMNoDirectoryYet=No directory created
-ShowECMSection=Show directory
-DeleteSection=Remove directory
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b> ?
-ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
-ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+MenuECM=เอกสาร
+DocsMine=เอกสารของฉัน
+DocsGenerated=เอกสารที่สร้างขึ้น
+DocsElements=เอกสารองค์ประกอบ
+DocsThirdParties=เอกสารบุคคลที่สาม
+DocsContracts=เอกสารสัญญา
+DocsProposals=ข้อเสนอเอกสาร
+DocsOrders=เอกสารการสั่งซื้อ
+DocsInvoices=ใบแจ้งหนี้เอกสาร
+ECMNbOfDocs=nb ของเอกสารในไดเรกทอรี
+ECMNbOfDocsSmall=nb ของเอกสาร
+ECMSection=สารบบ
+ECMSectionManual=สมุดคู่มือ
+ECMSectionAuto=ไดเรกทอรีอัตโนมัติ
+ECMSectionsManual=ต้นไม้คู่มือการใช้งาน
+ECMSectionsAuto=ต้นไม้อัตโนมัติ
+ECMSections=ไดเรกทอรี
+ECMRoot=ราก
+ECMNewSection=ไดเรกทอรีใหม่
+ECMAddSection=เพิ่มไดเรกทอรี
+ECMNewDocument=เอกสารใหม่
+ECMCreationDate=วันที่สร้าง
+ECMNbOfFilesInDir=จำนวนแฟ้มในไดเรกทอรี
+ECMNbOfSubDir=จำนวนไดเรกทอรีย่อย
+ECMNbOfFilesInSubDir=จำนวนของไฟล์ในไดเรกทอรีย่อย
+ECMCreationUser=ผู้สร้าง
+ECMArea=พื้นที่ EDM
+ECMAreaDesc=EDM (Electronic Document Management) พื้นที่ช่วยให้คุณสามารถบันทึกแบ่งปันและค้นหาได้อย่างรวดเร็วชนิดของเอกสารใน Dolibarr ทั้งหมด
+ECMAreaDesc2=* ไดเรกทอรีอัตโนมัติจะเต็มไปโดยอัตโนมัติเมื่อมีการเพิ่มเอกสารจากบัตรขององค์ประกอบ <br> * ไดเรกทอรีคู่มือการใช้งานสามารถใช้ในการบันทึกเอกสารไม่เชื่อมโยงกับองค์ประกอบโดยเฉพาะอย่างยิ่ง
+ECMSectionWasRemoved=<b>สารบบ% s</b> ได้ถูกลบออก
+ECMDocumentsSection=เอกสารของไดเรกทอรี
+ECMSearchByKeywords=ค้นหาตามคำหลัก
+ECMSearchByEntity=ค้นหาตามวัตถุ
+ECMSectionOfDocuments=ไดเรกทอรีของเอกสาร
+ECMTypeManual=คู่มือ
+ECMTypeAuto=อัตโนมัติ
+ECMDocsBySocialContributions=เอกสารที่เชื่อมโยงกับภาษีทางสังคมหรือทางการคลัง
+ECMDocsByThirdParties=เอกสารที่เชื่อมโยงกับบุคคลที่สาม
+ECMDocsByProposals=เอกสารที่เชื่อมโยงกับข้อเสนอ
+ECMDocsByOrders=เอกสารที่เชื่อมโยงกับคำสั่งซื้อของลูกค้า
+ECMDocsByContracts=เอกสารที่เชื่อมโยงกับสัญญา
+ECMDocsByInvoices=เอกสารที่เชื่อมโยงกับใบแจ้งหนี้ลูกค้า
+ECMDocsByProducts=เอกสารที่เชื่อมโยงกับผลิตภัณฑ์
+ECMDocsByProjects=เอกสารที่เชื่อมโยงกับโครงการ
+ECMDocsByUsers=เอกสารที่เชื่อมโยงกับผู้ใช้งาน
+ECMDocsByInterventions=เอกสารที่เชื่อมโยงกับการแทรกแซง
+ECMNoDirectoryYet=ไดเรกทอรีไม่มีที่สร้างขึ้น
+ShowECMSection=ไดเรกทอรีแสดง
+DeleteSection=ลบไดเรกทอรี
+ConfirmDeleteSection=<b>คุณสามารถยืนยันว่าคุณต้องการลบไดเรกทอรี% s?</b>
+ECMDirectoryForFiles=ไดเรกทอรีญาติไฟล์
+CannotRemoveDirectoryContainsFiles=เอาออกไปไม่ได้เพราะมันมีบางไฟล์
+ECMFileManager=จัดการไฟล์
+ECMSelectASection=เลือกไดเรกทอรีบนต้นไม้ซ้าย ...
+DirNotSynchronizedSyncFirst=ไดเรกทอรีนี้ดูเหมือนว่าจะสร้างหรือปรับเปลี่ยนนอกโมดูล ECM คุณต้องคลิกที่ปุ่ม "รีเฟรช" เป็นครั้งแรกในการประสานดิสก์และฐานข้อมูลที่จะได้รับเนื้อหาของไดเรกทอรีนี้
 
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index dbafde2f6e5..ffe6fc8c351 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -1,192 +1,194 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=ไม่มีข้อผิดพลาดที่เรากระทำ
 # Errors
-Error=Error
-Errors=Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=EMail %s is wrong
-ErrorBadUrl=Url %s is wrong
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorRecordNotFound=Record not found.
-ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
-ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
-ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
-ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
-ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first.
-ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third party name
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
-ErrorCustomerCodeRequired=Customer code required
-ErrorBarCodeRequired=Bar code required
-ErrorCustomerCodeAlreadyUsed=Customer code already used
-ErrorBarCodeAlreadyUsed=Bar code already used
-ErrorPrefixRequired=Prefix required
-ErrorUrlNotValid=The website address is incorrect
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
-ErrorBadParameters=Bad parameters
-ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=Value '%s' has wrong date format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Failed to write in directory %s
-ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
-ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
-ErrorNoMailDefinedForThisUser=No mail defined for this user
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
-ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
-ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
-ErrorDirAlreadyExists=A directory with this name already exists.
-ErrorFileAlreadyExists=A file with this name already exists.
-ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
-ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
-ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
-ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
-ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete records since it has some childs.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
-ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> en provide the error code <b>%s</b> in your message, or even better by adding a screen copy of this page.
-ErrorWrongValueForField=Wrong value for field number <b>%s</b> (value '<b>%s</b>' does not match regex rule <b>%s</b>)
-ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
-ErrorFieldRefNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a <b>%s</b> existing ref)
-ErrorsOnXLines=Errors on <b>%s</b> source record(s)
-ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
-ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorDatabaseParameterWrong=Database setup parameter '<b>%s</b>' has a value not compatible to use Dolibarr (must have value '<b>%s</b>').
-ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete.
-ErrorBadMask=Error on mask
-ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
-ErrorBadMaskBadRazMonth=Error, bad reset value
-ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error. Select at least one entry.
-ErrorProductWithRefNotExist=Product with reference '<i>%s</i>' don't exist
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
-ErrorFailedToSendPassword=Failed to send password
-ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorPasswordDiffers=Passwords differs, please type them again.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorFailedToFindEntity=Failed to read environment '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
-ErrorFailedToChangePassword=Failed to change password
-ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
-ErrorBadValueForCode=Bad value for security code. Try again with new value...
-ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
-ErrorNoActivatedBarcode=No barcode type activated
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date can not be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Iperator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+Error=ความผิดพลาด
+Errors=ข้อผิดพลาด
+ErrorButCommitIsDone=พบข้อผิดพลาด แต่เราตรวจสอบอย่างไรก็ตามเรื่องนี้
+ErrorBadEMail=อีเมล% s ไม่ถูกต้อง
+ErrorBadUrl=% s url ที่ไม่ถูกต้อง
+ErrorLoginAlreadyExists=เข้าสู่ระบบ% s อยู่แล้ว
+ErrorGroupAlreadyExists=s% กลุ่มที่มีอยู่แล้ว
+ErrorRecordNotFound=บันทึกไม่พบ
+ErrorFailToCopyFile=ไม่สามารถคัดลอกแฟ้ม <b>'% s'</b> เป็น <b>'% s'</b>
+ErrorFailToRenameFile=ไม่สามารถเปลี่ยนชื่อไฟล์ <b>'% s'</b> เป็น <b>'% s'</b>
+ErrorFailToDeleteFile=ไม่สามารถลบไฟล์ที่ <b>'% s'</b>
+ErrorFailToCreateFile=ล้มเหลวในการสร้างแฟ้ม <b>'% s'</b>
+ErrorFailToRenameDir=ไม่สามารถเปลี่ยนชื่อไดเรกทอรี <b>'% s'</b> เป็น <b>'% s'</b>
+ErrorFailToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี <b>'% s'</b>
+ErrorFailToDeleteDir=ไม่สามารถลบไดเรกทอรี <b>'% s'</b>
+ErrorFailedToDeleteJoinedFiles=ไม่สามารถลบสภาพแวดล้อมเพราะมีบางส่วนเข้าร่วมไฟล์ ลบเข้าร่วมไฟล์แรก
+ErrorThisContactIsAlreadyDefinedAsThisType=ติดต่อนี้ถูกกำหนดไว้แล้วเป็นผู้ติดต่อสำหรับประเภทนี้
+ErrorCashAccountAcceptsOnlyCashMoney=บัญชีธนาคารนี้เป็นบัญ​​ชีเงินสดดังนั้นจึงยอมรับการชำระเงินของเงินสดชนิดเดียว
+ErrorFromToAccountsMustDiffers=แหล่งที่มาและเป้าหมายบัญชีธนาคารจะต้องแตกต่าง
+ErrorBadThirdPartyName=ค่าที่ไม่ดีสำหรับชื่อของบุคคลที่สาม
+ErrorProdIdIsMandatory=% s มีผลบังคับใช้
+ErrorBadCustomerCodeSyntax=ไวยากรณ์ร้ายสำหรับรหัสลูกค้า
+ErrorBadBarCodeSyntax=ไวยากรณ์ที่ไม่ดีสำหรับบาร์โค้ด คุณอาจจะกำหนดประเภทบาร์โค้ดที่ไม่ดีหรือคุณกำหนดไว้หน้ากากบาร์โค้ดสำหรับหมายเลขที่ไม่ตรงกับค่าที่สแกน
+ErrorCustomerCodeRequired=รหัสลูกค้าจำเป็นต้องใช้
+ErrorBarCodeRequired=บาร์โค้ดที่จำเป็น
+ErrorCustomerCodeAlreadyUsed=รหัสลูกค้าใช้อยู่แล้ว
+ErrorBarCodeAlreadyUsed=บาร์โค้ดที่ใช้แล้ว
+ErrorPrefixRequired=คำนำหน้าต้อง
+ErrorUrlNotValid=ที่อยู่เว็บไซต์ไม่ถูกต้อง
+ErrorBadSupplierCodeSyntax=ไวยากรณ์ Bad รหัสผู้จัดจำหน่าย
+ErrorSupplierCodeRequired=รหัสผู้จำหน่ายต้อง
+ErrorSupplierCodeAlreadyUsed=รหัสผู้จำหน่ายใช้แล้ว
+ErrorBadParameters=พารามิเตอร์ที่ไม่ดี
+ErrorBadValueForParameter=ค่าที่ไม่ถูกต้อง '% s' สำหรับพารามิเตอร์ไม่ถูกต้อง '% s'
+ErrorBadImageFormat=ไฟล์ภาพไม่ได้เป็นรูปแบบที่ได้รับการสนับสนุน (PHP ของคุณไม่สนับสนุนฟังก์ชั่นการแปลงภาพของรูปแบบนี้)
+ErrorBadDateFormat=ค่า '% s' มีรูปแบบวันที่ไม่ถูกต้อง
+ErrorWrongDate=วันที่ไม่ถูกต้อง!
+ErrorFailedToWriteInDir=ไม่สามารถเขียนในไดเรกทอรี% s
+ErrorFoundBadEmailInFile=พบไวยากรณ์อีเมลไม่ถูกต้องสำหรับ% s บรรทัดในไฟล์ (เช่นสาย% s ด้วยอีเมล =% s)
+ErrorUserCannotBeDelete=ผู้ใช้ไม่สามารถลบได้ อาจจะมีความเกี่ยวข้องในหน่วยงาน Dolibarr
+ErrorFieldsRequired=ฟิลด์ที่จำเป็นบางคนไม่เต็ม
+ErrorFailedToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี ตรวจสอบการใช้เว็บเซิร์ฟเวอร์ที่มีสิทธิ์ในการเขียนลงในไดเรกทอรีเอกสาร Dolibarr หาก <b>safe_mode</b> พารามิเตอร์เปิดใช้งานบน PHP นี้ตรวจสอบว่า php ไฟล์ Dolibarr เป็นเจ้าของให้กับผู้ใช้เว็บเซิร์ฟเวอร์ (หรือกลุ่ม)
+ErrorNoMailDefinedForThisUser=จดหมายไม่มีกำหนดไว้สำหรับผู้ใช้นี้
+ErrorFeatureNeedJavascript=คุณลักษณะนี้จะต้องเปิดการใช้งานได้ในการทำงาน เปลี่ยนนี้ในการตั้งค่า - การแสดงผล
+ErrorTopMenuMustHaveAParentWithId0=เมนูประเภทยอด 'ไม่สามารถมีเมนูปกครอง ใส่ 0 ในเมนูปกครองหรือเลือกเมนูประเภท 'ซ้าย'
+ErrorLeftMenuMustHaveAParentId=เมนูชนิด 'ซ้าย' ต้องมีรหัสผู้ปกครอง
+ErrorFileNotFound=<b>ไฟล์% s</b> ไม่พบ (เส้นทาง Bad สิทธิ์ที่ไม่ถูกต้องหรือปฏิเสธการเข้าถึงทุก openbasedir หรือ safe_mode พารามิเตอร์)
+ErrorDirNotFound=<b>สารบบ% s</b> ไม่พบ (เส้นทาง Bad สิทธิ์ที่ไม่ถูกต้องหรือปฏิเสธการเข้าถึงทุก openbasedir หรือ safe_mode พารามิเตอร์)
+ErrorFunctionNotAvailableInPHP=<b>% s</b> ฟังก์ชั่นที่จำเป็นสำหรับคุณลักษณะนี้ แต่ไม่สามารถใช้ได้ในรุ่น / การตั้งค่าของ PHP นี้
+ErrorDirAlreadyExists=ไดเรกทอรีที่มีชื่อนี้อยู่แล้ว
+ErrorFileAlreadyExists=ไฟล์ที่มีชื่อนี้อยู่แล้ว
+ErrorPartialFile=ไฟล์ไม่ได้รับอย่างสมบูรณ์โดยเซิร์ฟเวอร์
+ErrorNoTmpDir=ชั่วคราวโดยตรงได้% s ไม่ได้มีอยู่
+ErrorUploadBlockedByAddon=อัพโหลดบล็อกโดย PHP / ปลั๊กอินอาปาเช่
+ErrorFileSizeTooLarge=ขนาดไฟล์มีขนาดใหญ่เกินไป
+ErrorSizeTooLongForIntType=ขนาดยาวเกินไปสำหรับประเภท int (s% ตัวเลขสูงสุด)
+ErrorSizeTooLongForVarcharType=ขนาดยาวเกินไปสำหรับประเภทสตริง (% s ตัวอักษรสูงสุด)
+ErrorNoValueForSelectType=กรุณากรอกค่าส​​ำหรับรายการเลือก
+ErrorNoValueForCheckBoxType=กรุณากรอกค่าส​​ำหรับรายการช่อง
+ErrorNoValueForRadioType=กรุณากรอกค่าส​​ำหรับรายการวิทยุ
+ErrorBadFormatValueList=<u>มูลค่ารายการไม่สามารถมีมากกว่าหนึ่งมา:% s</u> แต่ต้องไม่น้อยกว่าหนึ่ง Llave, valores
+ErrorFieldCanNotContainSpecialCharacters=<b>s สนาม%</b> ไม่ต้องมีอักขระพิเศษ
+ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>s สนาม%</b> ไม่ต้องมีอักขระพิเศษหรืออักขระตัวพิมพ์ใหญ่
+ErrorNoAccountancyModuleLoaded=ไม่มีการเปิดใช้งานโมดูลบัญชี
+ErrorExportDuplicateProfil=ชื่อโปรไฟล์นี้มีอยู่แล้วสำหรับการตั้งค่าการส่งออกนี้
+ErrorLDAPSetupNotComplete=การจับคู่ Dolibarr-LDAP ไม่สมบูรณ์
+ErrorLDAPMakeManualTest=ไฟล์ .ldif ได้รับการสร้างขึ้นในไดเรกทอรี% s พยายามที่จะโหลดได้ด้วยตนเองจากบรรทัดคำสั่งที่จะมีข้อมูลเพิ่มเติมเกี่ยวกับข้อผิดพลาด
+ErrorCantSaveADoneUserWithZeroPercentage=ไม่สามารถบันทึกการดำเนินการกับ "statut ไม่ได้เริ่ม" ถ้าเขต "ทำโดย" นอกจากนี้ยังเต็มไป
+ErrorRefAlreadyExists=Ref ใช้สำหรับการสร้างที่มีอยู่แล้ว
+ErrorPleaseTypeBankTransactionReportName=กรุณาระบุชื่อของใบเสร็จรับเงินของธนาคารที่มีรายงานการทำธุรกรรม (รูปแบบ YYYYMM หรือ YYYYMMDD)
+ErrorRecordHasChildren=ล้มเหลวในการลบระเบียนเนื่องจากมีเด็กบางคน
+ErrorRecordIsUsedCantDelete=ไม่สามารถลบบันทึก มันถูกใช้ไปแล้วหรือรวมอยู่ในวัตถุอื่น
+ErrorModuleRequireJavascript=จาวาสคริปต์จะต้องไม่ถูกปิดการใช้งานจะมีคุณสมบัติการทำงานนี้ เพื่อเปิด / ปิดการใช้งานจาวาสคริไปที่เมนูหน้าแรก> Setup-> จอแสดงผล
+ErrorPasswordsMustMatch=ทั้งสองพิมพ์รหัสผ่านจะต้องตรงกับแต่ละอื่น ๆ
+ErrorContactEMail=ข้อผิดพลาดทางเทคนิคที่เกิดขึ้น กรุณาติดต่อผู้ดูแลระบบเพื่อต่อไปนี้อีเมล <b>en% s ให้รหัสข้อผิดพลาด% s</b> ในข้อความของคุณหรือดียิ่งขึ้นโดยการเพิ่มสำเนาหน้าจอของหน้านี้
+ErrorWrongValueForField=<b>ค่าที่ไม่ถูกต้องสำหรับจำนวนสนาม% s</b> (ค่า <b>'% s' ไม่ตรงกับกฎ% s</b> regex)
+ErrorFieldValueNotIn=<b>ค่าที่ไม่ถูกต้องสำหรับจำนวนสนาม% s</b> (ค่า <b>'% s' ไม่ใช่ค่าที่มีอยู่เข้าไปในสนาม% s ของตาราง% s =% s)</b>
+ErrorFieldRefNotIn=<b>ค่าที่ไม่ถูกต้องสำหรับจำนวนสนาม% s</b> (ค่า <b>'% s' ไม่ได้อ้างอิง% s</b> ที่มีอยู่)
+ErrorsOnXLines=<b>ข้อผิดพลาดในการบันทึกแหล่ง% s</b> (s)
+ErrorFileIsInfectedWithAVirus=โปรแกรมป้องกันไวรัสที่ไม่สามารถที่จะตรวจสอบไฟล์ (ไฟล์อาจจะมีการติดเชื้อไวรัส)
+ErrorSpecialCharNotAllowedForField=อักขระพิเศษไม่ได้รับอนุญาตสำหรับเขตข้อมูล "% s"
+ErrorDatabaseParameterWrong=ฐานข้อมูลการตั้งค่าพารามิเตอร์ <b>'% s'</b> มีค่าเข้ากันไม่ได้ที่จะใช้ Dolibarr (ต้องมีค่า <b>'% s')</b>
+ErrorNumRefModel=การอ้างอิงที่มีอยู่ในฐานข้อมูล (% s) และไม่ได้เข้ากันได้กับกฎหมายเลขนี้ ลบบันทึกการอ้างอิงหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
+ErrorQtyTooLowForThisSupplier=ปริมาณต่ำเกินไปสำหรับผู้จัดหาสินค้านี้ไม่มีหรือราคาที่กำหนดไว้เกี่ยวกับผลิตภัณฑ์นี้สำหรับผู้จัดหาสินค้านี้
+ErrorModuleSetupNotComplete=การติดตั้งโมดูลดูเหมือนจะเป็น uncomplete ไปในการติดตั้ง - โมดูลที่จะเสร็จสมบูรณ์
+ErrorBadMask=ข้อผิดพลาดในหน้ากาก
+ErrorBadMaskFailedToLocatePosOfSequence=ข้อผิดพลาดหน้ากากไม่มีหมายเลขลำดับ
+ErrorBadMaskBadRazMonth=ข้อผิดพลาดค่าการตั้งค่าที่ไม่ดี
+ErrorMaxNumberReachForThisMask=เข้าถึงจำนวนซ์หน้ากากนี้
+ErrorCounterMustHaveMoreThan3Digits=เคาน์เตอร์จะต้องมีมากกว่า 3 หลัก
+ErrorSelectAtLeastOne=ความผิดพลาด เลือกอย่างน้อยหนึ่งรายการ
+ErrorProductWithRefNotExist=สินค้าที่มีการอ้างอิง <i>'% s'</i> ไม่อยู่
+ErrorDeleteNotPossibleLineIsConsolidated=ลบไปไม่ได้เพราะการบันทึกจะเชื่อมโยงกับรายการระหว่างกันของธนาคารที่ conciliated
+ErrorProdIdAlreadyExist=% s ได้รับมอบหมายให้สามอีก
+ErrorFailedToSendPassword=ล้มเหลวในการส่งรหัสผ่าน
+ErrorFailedToLoadRSSFile=ล้มเหลวที่จะได้รับฟีด RSS พยายามที่จะเพิ่ม MAIN_SIMPLEXMLLOAD_DEBUG คงถ้าข้อความผิดพลาดที่ไม่ได้ให้ข้อมูลที่เพียงพอ
+ErrorPasswordDiffers=แตกต่างรหัสผ่านกรุณาพิมพ์พวกเขาอีกครั้ง
+ErrorForbidden=ปฏิเสธการเข้าใช้ <br> คุณพยายามที่จะเข้าถึงหน้าพื้นที่หรือคุณลักษณะโดยไม่ต้องอยู่ในเซสชั่นหรือรับรองความถูกต้องที่ไม่ได้รับอนุญาตให้ผู้ใช้ของคุณ
+ErrorForbidden2=การอนุญาตให้เข้าสู่ระบบนี้สามารถกำหนดได้โดยผู้ดูแลระบบ Dolibarr ของคุณจากเมนู% s ->% s
+ErrorForbidden3=ดูเหมือนว่า Dolibarr ไม่ได้ใช้ผ่านเซสชั่นการตรวจสอบสิทธิ์ ลองดูที่เอกสารการติดตั้ง Dolibarr จะทราบวิธีการจัดการ authentications (htaccess, mod_auth หรืออื่น ๆ ... )
+ErrorNoImagickReadimage=ระดับ Imagick ไม่พบใน PHP นี้ ไม่มีตัวอย่างสามารถใช้ได้ ผู้ดูแลระบบสามารถปิดการใช้งานแท็บนี้จากการตั้งค่าเมนู - จอแสดงผล
+ErrorRecordAlreadyExists=บันทึกที่มีอยู่แล้ว
+ErrorCantReadFile=ไม่สามารถอ่านไฟล์ '% s'
+ErrorCantReadDir=ไม่สามารถอ่านไดเรกทอรี '% s'
+ErrorFailedToFindEntity=ไม่สามารถอ่านสภาพแวดล้อม '% s'
+ErrorBadLoginPassword=ค่าที่ไม่ดีเพื่อเข้าสู่ระบบหรือรหัสผ่าน
+ErrorLoginDisabled=บัญชีของคุณถูกปิดการใช้งาน
+ErrorFailedToRunExternalCommand=ไม่สามารถเรียกใช้คำสั่งภายนอก ตรวจสอบสามารถใช้ได้และที่ทำงานโดยเซิร์ฟเวอร์ PHP ของคุณ ถ้า PHP <b>เซฟโหมดที่มีการเปิดใช้การตรวจสอบคำสั่งที่อยู่ภายในไดเรกทอรีที่กำหนดโดยพารามิเตอร์ safe_mode_exec_dir</b>
+ErrorFailedToChangePassword=ไม่สามารถเปลี่ยนรหัสผ่าน
+ErrorLoginDoesNotExists=ผู้ใช้ที่มี <b>s%</b> เข้าสู่ระบบไม่พบ
+ErrorLoginHasNoEmail=ผู้ใช้นี้ไม่มีที่อยู่อีเมล ขั้นตอนการยกเลิก
+ErrorBadValueForCode=ค่าร้ายสำหรับรหัสรักษาความปลอดภัย ลองอีกครั้งด้วยค่าใหม่ ...
+ErrorBothFieldCantBeNegative=ทุ่ง% s% และไม่สามารถเป็นได้ทั้งในเชิงลบ
+ErrorQtyForCustomerInvoiceCantBeNegative=จำนวนบรรทัดลงในใบแจ้งหนี้ของลูกค้าที่ไม่สามารถเป็นเชิงลบ
+ErrorWebServerUserHasNotPermission=<b>บัญชีผู้ใช้% s</b> ใช้ในการดำเนินการเว็บเซิร์ฟเวอร์มีสิทธิ์ในการที่ไม่มี
+ErrorNoActivatedBarcode=ประเภทไม่มีการเปิดใช้งานบาร์โค้ด
+ErrUnzipFails=ไม่สามารถเปิดเครื่องรูด% s กับ ZipArchive
+ErrNoZipEngine=เครื่องยนต์ยังไม่ได้เปิดเครื่องรูดแฟ้ม% ใน PHP นี้
+ErrorFileMustBeADolibarrPackage=ไฟล์% s จะต้องเป็นแพคเกจซิป Dolibarr
+ErrorFileRequired=มันต้องใช้เวลา Dolibarr ไฟล์แพคเกจ
+ErrorPhpCurlNotInstalled=PHP CURL ไม่ได้ติดตั้งนี้เป็นสิ่งสำคัญที่จะพูดคุยกับ Paypal
+ErrorFailedToAddToMailmanList=ไม่สามารถเพิ่มบันทึก% s% s รายการบุรุษไปรษณีย์หรือฐานหลักสูตรนานาชาติ
+ErrorFailedToRemoveToMailmanList=ล้มเหลวในการลบบันทึก% s% s รายการบุรุษไปรษณีย์หรือฐานหลักสูตรนานาชาติ
+ErrorNewValueCantMatchOldValue=ค่าใหม่ไม่สามารถจะเท่ากับเก่า
+ErrorFailedToValidatePasswordReset=ล้มเหลวในการ reinit รหัสผ่าน อาจจะ reinit ถูกทำมาแล้ว (ลิงค์นี้สามารถใช้เพียงครั้งเดียว) ถ้าไม่ได้พยายามที่จะเริ่มต้นกระบวนการ reinit
+ErrorToConnectToMysqlCheckInstance=เชื่อมต่อไปยังฐานข้อมูลล้มเหลว ตรวจสอบเซิร์ฟเวอร์ MySQL เป็นที่ทำงาน (ในกรณีส่วนใหญ่คุณสามารถเปิดได้จากบรรทัดคำสั่งด้วย 'sudo /etc/init.d/mysql เริ่มต้น)
+ErrorFailedToAddContact=ล้มเหลวในการเพิ่มรายชื่อ
+ErrorDateMustBeBeforeToday=วันที่ไม่สามารถจะสูงกว่าวันนี้
+ErrorPaymentModeDefinedToWithoutSetup=โหมดการชำระเงินถูกกำหนดให้พิมพ์% s แต่การตั้งค่าของโมดูลใบแจ้งหนี้ที่ยังไม่เสร็จสมบูรณ์เพื่อกำหนดข้อมูลที่จะแสดงโหมดการชำระเงินนี้
+ErrorPHPNeedModule=ข้อผิดพลาด, PHP <b>ของคุณต้องมีโมดูล% s</b> ที่ติดตั้งเพื่อใช้คุณลักษณะนี้
+ErrorOpenIDSetupNotComplete=คุณติดตั้ง Dolibarr ไฟล์ config ที่จะช่วยให้การตรวจสอบ OpenID แต่ URL ของ OpenID บริการไม่ได้ถูกกำหนดลงไปใน s% คงที่
+ErrorWarehouseMustDiffers=แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
+ErrorBadFormat=รูปแบบที่ไม่ดี!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=ข้อผิดพลาดของสมาชิกนี้ไม่ได้เชื่อมโยงยัง thirdparty ใด ๆ สมาชิกเชื่อมโยงไปยังบุคคลที่สามที่มีอยู่หรือสร้าง thirdparty ใหม่ก่อนที่จะสร้างการสมัครสมาชิกกับใบแจ้งหนี้
+ErrorThereIsSomeDeliveries=ข้อผิดพลาดที่มีการส่งมอบบางอย่างที่เชื่อมโยงกับการจัดส่งนี้ ลบปฏิเสธ
+ErrorCantDeletePaymentReconciliated=ไม่สามารถลบการชำระเงินที่ได้สร้างการทำธุรกรรมของธนาคารที่ได้รับการ conciliated
+ErrorCantDeletePaymentSharedWithPayedInvoice=ไม่สามารถลบการชำระเงินที่ใช้ร่วมกันอย่างน้อยหนึ่งใบแจ้งหนี้ที่มีสถานะ payed
+ErrorPriceExpression1=ไม่สามารถกำหนดให้คงที่ '% s'
+ErrorPriceExpression2=ไม่สามารถกำหนดฟังก์ชั่น '% s'
+ErrorPriceExpression3=ตัวแปรที่ไม่ได้กำหนด '% s' ในความหมายฟังก์ชั่น
+ErrorPriceExpression4=ตัวอักษรที่ผิดกฎหมาย '% s'
+ErrorPriceExpression5=ที่ไม่คาดคิด '% s'
+ErrorPriceExpression6=จำนวนที่ไม่ถูกต้องของการขัดแย้ง (% s ได้รับคาดว่า% s)
+ErrorPriceExpression8=ผู้ประกอบการที่ไม่คาดคิด '% s'
+ErrorPriceExpression9=ข้อผิดพลาดที่ไม่คาดคิดเกิดขึ้น
+ErrorPriceExpression10=Iperator '% s' ขาดตัวถูกดำเนินการ
+ErrorPriceExpression11=คาดหวังว่า '% s'
+ErrorPriceExpression14=หารด้วยศูนย์
+ErrorPriceExpression17=ไม่ได้กำหนดตัวแปร '% s'
+ErrorPriceExpression19=ไม่พบการแสดงออก
+ErrorPriceExpression20=การแสดงออกที่ว่างเปล่า
+ErrorPriceExpression21=ผลที่ว่างเปล่า '% s'
+ErrorPriceExpression22=ผลเชิงลบ '% s'
+ErrorPriceExpressionInternal=ข้อผิดพลาดภายใน '% s'
+ErrorPriceExpressionUnknown=ข้อผิดพลาดที่ไม่รู้จัก '% s'
+ErrorSrcAndTargetWarehouseMustDiffers=แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
+ErrorTryToMakeMoveOnProductRequiringBatchData=ข้อผิดพลาดพยายามที่จะทำให้การเคลื่อนไหวของหุ้นโดยไม่ต้องมาก / ข้อมูลอนุกรมเกี่ยวกับผลิตภัณฑ์ที่ต้องจัดสรร / ข้อมูลแบบอนุกรม
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=ลูกเต้าที่บันทึกไว้ทั้งหมดจะต้องได้รับการตรวจสอบแล้ว (ได้รับการอนุมัติหรือปฏิเสธ) ก่อนที่จะได้รับอนุญาตให้ทำการกระทำนี้
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=ลูกเต้าที่บันทึกไว้ทั้งหมดจะต้องได้รับการตรวจสอบแล้ว (ได้รับการอนุมัติ) ก่อนที่จะได้รับอนุญาตให้ทำการกระทำนี้
+ErrorGlobalVariableUpdater0=การร้องขอ HTTP ล้มเหลวด้วยข้อผิดพลาด '% s'
+ErrorGlobalVariableUpdater1=รูปแบบ JSON ไม่ถูกต้อง '% s'
+ErrorGlobalVariableUpdater2=ที่ขาดหายไปพารามิเตอร์ '% s'
+ErrorGlobalVariableUpdater3=ข้อมูลที่ร้องขอไม่พบในผล
+ErrorGlobalVariableUpdater4=ลูกค้า SOAP ล​​้มเหลวด้วยข้อผิดพลาด '% s'
+ErrorGlobalVariableUpdater5=ไม่มีตัวแปรทั่วโลกที่เลือก
+ErrorFieldMustBeANumeric=<b>s สนาม%</b> จะต้องเป็นค่าตัวเลข
+ErrorFieldMustBeAnInteger=<b>s สนาม%</b> ต้องเป็นจำนวนเต็ม
+ErrorMandatoryParametersNotProvided=พารามิเตอร์บังคับ (s) ไม่ได้ให้
 
 # Warnings
-WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
-WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
-WarningAllowUrlFopenMustBeOn=Parameter <b>allow_url_fopen</b> must be set to <b>on</b> in filer <b>php.ini</b> for having this module working completely. You must modify this file manually.
-WarningBuildScriptNotRunned=Script <b>%s</b> was not yet ran to build graphics, or there is no data to show.
-WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
-WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
-WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
-WarningsOnXLines=Warnings on <b>%s</b> source record(s)
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningMandatorySetupNotComplete=พารามิเตอร์การตั้งค่าบังคับไม่ได้กำหนดไว้ยัง
+WarningSafeModeOnCheckExecDir=เตือนตัวเลือก PHP <b>safe_mode</b> อยู่ในคำสั่งดังนั้นจะต้องเก็บไว้ในไดเรคทอประกาศโดย PHP พารามิเตอร์ <b>safe_mode_exec_dir</b>
+WarningAllowUrlFopenMustBeOn=<b>allow_url_fopen พารามิเตอร์จะต้องตั้งค่าใน php.ini</b> filer มีโมดูลนี้ทำงานได้อย่างสมบูรณ์ คุณต้องแก้ไขไฟล์นี้ด้วยตนเอง
+WarningBuildScriptNotRunned=<b>สคริปต์% s</b> ยังไม่ได้วิ่งไปสร้างกราฟิกหรือไม่มีข้อมูลที่จะแสดง
+WarningBookmarkAlreadyExists=บุ๊คมาร์คที่มีชื่อนี้หรือเป้าหมาย (URL) นี้อยู่แล้ว
+WarningPassIsEmpty=คำเตือนรหัสผ่านฐานข้อมูลเป็นที่ว่างเปล่า นี่คือหลุมการรักษาความปลอดภัย คุณควรเพิ่มรหัสผ่านไปยังฐานข้อมูลของคุณและเปลี่ยนไฟล์ conf.php ของคุณเพื่อสะท้อนถึงนี้
+WarningConfFileMustBeReadOnly=เตือนไฟล์ config ของคุณ <b>(htdocs / conf / conf.php)</b> สามารถเขียนทับโดยเว็บเซิร์ฟเวอร์ นี่คือหลุมด้านความปลอดภัยร้ายแรง ปรับเปลี่ยนสิทธิ์ในแฟ้มที่จะอยู่ในโหมดอ่านอย่างเดียวสำหรับผู้ใช้ระบบปฏิบัติการที่ใช้โดยเว็บเซิร์ฟเวอร์ หากคุณใช้รูปแบบ Windows และ FAT ดิสก์ของคุณคุณจะต้องรู้ว่าระบบไฟล์นี้จะไม่อนุญาตให้มีการเพิ่มสิทธิ์ในแฟ้มจึงไม่สามารถมีความปลอดภัยอย่างสมบูรณ์
+WarningsOnXLines=<b>คำเตือนในการบันทึกแหล่ง% s</b> (s)
+WarningNoDocumentModelActivated=รูปแบบไม่มีสำหรับการสร้างเอกสารได้รับการเปิดใช้งาน รูปแบบจะถูกเลือกโดยค่าเริ่มต้นจนกว่าคุณจะตรวจสอบการติดตั้งโมดูลของคุณ
+WarningLockFileDoesNotExists=คำเตือนเมื่อการติดตั้งเสร็จแล้วคุณจะต้องปิดการใช้งานติดตั้ง / ย้ายเครื่องมือโดยการเพิ่ม <b>install.lock ไฟล์ลงในไดเรกทอรี%</b> s หายไปไฟล์นี้เป็นหลุมรักษาความปลอดภัย
+WarningUntilDirRemoved=ทุกคำเตือนความปลอดภัย (มองเห็นได้โดยผู้ใช้ผู้ดูแลระบบเท่านั้น) จะยังคงใช้งานเป็นเวลานานเป็นช่องโหว่ที่เป็นปัจจุบัน (หรือที่ MAIN_REMOVE_INSTALL_WARNING คงที่เพิ่มเข้ามาใน Setup-> ตั้งค่าอื่น ๆ )
+WarningCloseAlways=คำเตือนปิดจะทำแม้ว่าจำนวนเงินที่แตกต่างกันระหว่างแหล่งที่มาและองค์ประกอบเป้าหมาย เปิดใช้งานคุณลักษณะนี้ด้วยความระมัดระวัง
+WarningUsingThisBoxSlowDown=คำเตือนการใช้ช่องนี้ชะลอตัวลงอย่างจริงจังทุกหน้าแสดงกล่อง
+WarningClickToDialUserSetupNotComplete=การตั้งค่าข้อมูล ClickToDial สำหรับผู้ใช้ของคุณจะไม่สมบูรณ์ (ดู ClickToDial แท็บลงบนบัตรผู้ใช้ของคุณ)
+WarningNotRelevant=การดำเนินงานที่ไม่เกี่ยวข้องสำหรับชุดนี้
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=คุณสมบัติปิดการใช้งานการตั้งค่าการแสดงผลเมื่อเป็นที่เหมาะสำหรับคนตาบอดหรือข้อความเบราว์เซอร์
+WarningPaymentDateLowerThanInvoiceDate=วันที่ชำระเงิน (% s) ก่อนวันที่ใบแจ้งหนี้ (% s) สำหรับใบแจ้งหนี้% s
+WarningTooManyDataPleaseUseMoreFilters=ข้อมูลจำนวนมากเกินไป กรุณาใช้ตัวกรองมากขึ้น
+WarningSomeLinesWithNullHourlyRate=บางครั้งถูกบันทึกไว้โดยผู้ใช้เมื่ออัตราชั่วโมงของพวกเขาไม่ได้กำหนดไว้ ค่า 0 ถูกนำมาใช้ แต่อาจส่งผลในการประเมินมูลค่าที่ไม่ถูกต้องของเวลาที่ใช้
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index d79df485608..2d00b823127 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -1,134 +1,134 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exports area
-ImportArea=Import area
-NewExport=New export
-NewImport=New import
-ExportableDatas=Exportable dataset
-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 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...
-ExportModelName=Export profile name
-ExportModelSaved=Export profile saved under name <b>%s</b>.
-ExportableFields=Exportable fields
-ExportedFields=Exported fields
-ImportModelName=Import profile name
-ImportModelSaved=Import profile saved under name <b>%s</b>.
-ImportableFields=Importable fields
-ImportedFields=Imported fields
-DatasetToExport=Dataset to export
-DatasetToImport=Import file into dataset
-NoDiscardedFields=No fields in source file are discarded
-Dataset=Dataset
-ChooseFieldsOrdersAndTitle=Choose fields order...
-FieldsOrder=Fields order
-FieldsTitle=Fields title
-FieldOrder=Field order
-FieldTitle=Field title
-ChooseExportFormat=Choose export format
-NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file...
-AvailableFormats=Available formats
-LibraryShort=Library
-LibraryUsed=Library used
-LibraryVersion=Version
-Step=Step
-FormatedImport=Import assistant
-FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge.
-FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load.
-FormatedExport=Export assistant
-FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order.
-FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
-Sheet=Sheet
-NoImportableData=No importable data (no module with definitions to allow data imports)
-FileSuccessfullyBuilt=Export file generated
-SQLUsedForExport=SQL Request used to build export file
-LineId=Id of line
-LineDescription=Description of line
-LineUnitPrice=Unit price of line
-LineVATRate=VAT Rate of line
-LineQty=Quantity for line
-LineTotalHT=Amount net of tax for line
-LineTotalTTC=Amount with tax for line
-LineTotalVAT=Amount of VAT for line
-TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
-FileWithDataToImport=File with data to import
-FileToImport=Source file to import
-FileMustHaveOneOfFollowingFormat=File to import must have one of following format
-DownloadEmptyExample=Download example of empty source file
-ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it...
-ChooseFileToImport=Upload file then click on picto %s to select file as source import file...
-SourceFileFormat=Source file format
-FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
-Field=Field
-NoFields=No fields
-MoveField=Move field column number %s
+ExportsArea=พื้นที่การส่งออก
+ImportArea=พื้นที่นำเข้า
+NewExport=การส่งออกใหม่
+NewImport=นำเข้าใหม่
+ExportableDatas=ชุดข้อมูลที่ส่งออก
+ImportableDatas=ชุด importable
+SelectExportDataSet=เลือกชุดข้อมูลที่คุณต้องการส่งออก ...
+SelectImportDataSet=เลือกชุดข้อมูลที่คุณต้องการนำเข้า ...
+SelectExportFields=เลือกสาขาที่คุณต้องการส่งออกหรือเลือกรายละเอียดการส่งออกที่กำหนดไว้ล่วงหน้า
+SelectImportFields=เลือกสาขาแฟ้มแหล่งที่คุณต้องการนำเข้าและเขตเป้าหมายของพวกเขาในฐานข้อมูลโดยการย้ายขึ้นและลงด้วยสมอ% s หรือเลือกนำเข้ารายละเอียดที่กำหนดไว้ล่วงหน้า:
+NotImportedFields=ทุ่งแฟ้มแหล่งที่มาไม่ได้นำเข้า
+SaveExportModel=บันทึกรายละเอียดการส่งออกนี้ถ้าคุณวางแผนที่จะนำมาใช้ใหม่ได้ในภายหลัง ...
+SaveImportModel=บันทึกรายละเอียดการนำเข้านี้ถ้าคุณวางแผนที่จะนำมาใช้ใหม่ได้ในภายหลัง ...
+ExportModelName=ชื่อรายละเอียดการส่งออก
+ExportModelSaved=<b>รายละเอียดส่งออกภายใต้ชื่อ%</b> s
+ExportableFields=สาขาส่งออก
+ExportedFields=สาขาการส่งออก
+ImportModelName=ชื่อโปรไฟล์นำเข้า
+ImportModelSaved=<b>รายละเอียดบันทึกไว้นำเข้าภายใต้ชื่อ%</b> s
+ImportableFields=สาขา importable
+ImportedFields=สาขาที่นำเข้า
+DatasetToExport=ชุดข้อมูลในการส่งออก
+DatasetToImport=ไฟล์นำเข้าชุด
+NoDiscardedFields=ไม่มีสาขาในแฟ้มแหล่งที่มาจะถูกยกเลิก
+Dataset=ชุดข้อมูล
+ChooseFieldsOrdersAndTitle=สาขาที่เลือกสั่งซื้อ ...
+FieldsOrder=ทุ่งเพื่อ
+FieldsTitle=ชื่อฟิลด์
+FieldOrder=เพื่อฟิลด์
+FieldTitle=ชื่อฟิลด์
+ChooseExportFormat=เลือกรูปแบบการส่งออก
+NowClickToGenerateToBuildExportFile=ตอนนี้รูปแบบไฟล์ที่เลือกในกล่องคำสั่งผสมและคลิกที่ "สร้าง" เพื่อสร้างไฟล์การส่งออก ...
+AvailableFormats=รูปแบบที่ใช้ได้
+LibraryShort=ห้องสมุด
+LibraryUsed=ห้องสมุดที่ใช้
+LibraryVersion=รุ่น
+Step=ขั้นตอน
+FormatedImport=ช่วยนำเข้า
+FormatedImportDesc1=พื้นที่บริเวณนี้จะช่วยให้เพื่อนำเข้าข้อมูลส่วนบุคคลโดยใช้ผู้ช่วยที่จะช่วยให้คุณในขั้นตอนที่ไม่มีความรู้ทางเทคนิค
+FormatedImportDesc2=ขั้นตอนแรกคือการเลือกพระมหากษัตริย์ของข้อมูลที่คุณต้องการโหลดแล้วไฟล์ที่จะโหลดแล้วให้เลือกเขตข้อมูลที่คุณต้องการโหลด
+FormatedExport=ช่วยส่งออก
+FormatedExportDesc1=บริเวณนี้จะช่วยให้การส่งออกข้อมูลส่วนบุคคลโดยใช้ผู้ช่วยที่จะช่วยให้คุณในขั้นตอนที่ไม่มีความรู้ทางเทคนิค
+FormatedExportDesc2=ขั้นตอนแรกคือการเลือกชุดที่กำหนดไว้ล่วงหน้าแล้วที่จะเลือกเขตข้อมูลที่คุณต้องการในผลไฟล์ของคุณและการสั่งซื้อ
+FormatedExportDesc3=เมื่อข้อมูลเพื่อการส่งออกจะถูกเลือกคุณสามารถกำหนดรูปแบบไฟล์ที่ส่งออกคุณต้องการส่งออกข้อมูลของคุณไป
+Sheet=แผ่น
+NoImportableData=ไม่มีข้อมูล importable (โมดูลใด ๆ กับคำจำกัดความที่จะอนุญาตให้นำเข้าข้อมูล)
+FileSuccessfullyBuilt=ไฟล์ส่งออกที่สร้าง
+SQLUsedForExport=SQL ขอใช้ในการสร้างไฟล์การส่งออก
+LineId=Id ของสาย
+LineDescription=คำอธิบายของสาย
+LineUnitPrice=ราคาต่อหน่วยของสาย
+LineVATRate=ภาษีมูลค่าเพิ่มอัตราสาย
+LineQty=จำนวนสาย
+LineTotalHT=สุทธิจำนวนภาษีสำหรับสาย
+LineTotalTTC=จำนวนเงินที่มีภาษีสำหรับสาย
+LineTotalVAT=จำนวนเงินภาษีมูลค่าเพิ่มสำหรับสาย
+TypeOfLineServiceOrProduct=ประเภทของสาย (0 = ผลิตภัณฑ์ 1 = บริการแล้ว)
+FileWithDataToImport=ไฟล์ที่มีข้อมูลที่จะนำเข้า
+FileToImport=แหล่งที่มาของไฟล์ที่จะนำเข้า
+FileMustHaveOneOfFollowingFormat=ไฟล์ที่จะนำเข้าต้องมีหนึ่งในรูปแบบต่อไป
+DownloadEmptyExample=ดาวน์โหลดตัวอย่างของแฟ้มแหล่งที่ว่างเปล่า
+ChooseFormatOfFileToImport=เลือกรูปแบบไฟล์ที่จะใช้เป็นรูปแบบไฟล์ที่นำเข้าโดยการคลิกที่ picto% s เพื่อเลือก ...
+ChooseFileToImport=อัปโหลดไฟล์แล้วคลิกที่ s picto% เพื่อเลือกแฟ้มเป็นไฟล์นำเข้าแหล่งที่มา ...
+SourceFileFormat=แหล่งที่มาของรูปแบบไฟล์
+FieldsInSourceFile=เขตข้อมูลในแฟ้มแหล่งที่มา
+FieldsInTargetDatabase=สาขาเป้าหมายในฐานข้อมูล Dolibarr (ตัวหนา = บังคับ)
+Field=สนาม
+NoFields=ไม่มีสาขา
+MoveField=คอลัมน์ย้ายสนามจำนวน% s
 ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Save this import profile
-ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
-ImportSummary=Import setup summary
-TablesTarget=Targeted tables
-FieldsTarget=Targeted fields
-TableTarget=Targeted table
-FieldTarget=Targeted field
-FieldSource=Source field
-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 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
-SelectAtLeastOneField=Switch at least one source field in the column of fields to export
-SelectFormat=Choose this import file format
-RunImportFile=Launch import file
-NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import.
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s<b>
-ErrorMissingMandatoryValue=Mandatory data is empty in source file for field <b>%s</b>.
-TooMuchErrors=There is still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There is still <b>%s</b> other source lines with warnings but output has been limited.
-EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import.
-FileWasImported=File was imported with number <b>%s</b>.
-YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
-NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
-DataComeFromNoWhere=Value to insert comes from nowhere in source file.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the objet <b>%s</b> that has the ref. from source file must exists into Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
-DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
-SourceRequired=Data value is mandatory
-SourceExample=Example of possible data value
-ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
-CsvOptions=Csv Options
-Separator=Separator
-Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
-BankCode=Bank code
-DeskCode=Desk code
-BankAccountNumber=Account number
-BankAccountNumberKey=Key
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+SaveImportProfile=บันทึกรายละเอียดการนำเข้านี้
+ErrorImportDuplicateProfil=ไม่สามารถบันทึกรายละเอียดการนำเข้านี้กับชื่อนี้ โปรไฟล์ที่มีอยู่แล้วกับชื่อนี้
+ImportSummary=นำเข้าสรุปการติดตั้ง
+TablesTarget=ตารางกำหนดเป้​​าหมาย
+FieldsTarget=สาขาที่กำหนดเป้​​าหมาย
+TableTarget=ตารางกำหนดเป้​​าหมาย
+FieldTarget=เขตกำหนดเป้​​าหมาย
+FieldSource=ด้านแหล่งที่มา
+DoNotImportFirstLine=อย่านำเข้าบรรทัดแรกของแฟ้มแหล่งที่มา
+NbOfSourceLines=จำนวนบรรทัดในแฟ้มแหล่งที่มา
+NowClickToTestTheImport=นำเข้าตรวจสอบพารามิเตอร์ที่คุณได้กำหนดไว้ หากพวกเขาถูกต้องคลิกที่ปุ่ม <b>"% s"</b> ที่จะเปิดตัวแบบจำลองของกระบวนการนำเข้า (ไม่มีข้อมูลที่จะมีการเปลี่ยนแปลงในฐานข้อมูลของคุณเป็นเพียงการจำลองในขณะนั้น) ...
+RunSimulateImportFile=เปิดตัวแบบจำลองนำเข้า
+FieldNeedSource=สนามนี้ต้องใช้ข้อมูลจากแฟ้มแหล่งที่มา
+SomeMandatoryFieldHaveNoSource=บางสาขาบังคับมีแหล่งที่มาจากแฟ้มข้อมูลไม่มี
+InformationOnSourceFile=ข้อมูลเกี่ยวกับแฟ้มแหล่งที่มา
+InformationOnTargetTables=ข้อมูลเกี่ยวกับสาขาเป้าหมาย
+SelectAtLeastOneField=สวิทช์ด้านแหล่งที่มาอย่างน้อยหนึ่งในคอลัมน์ของเขตข้อมูลที่จะส่งออก
+SelectFormat=เลือกรูปแบบไฟล์นำเข้านี้
+RunImportFile=เปิดไฟล์นำเข้า
+NowClickToRunTheImport=ตรวจสอบผลของการจำลองนำเข้า หากทุกอย่างก็โอเคเปิดนำเข้าที่ชัดเจน
+DataLoadedWithId=<b>ข้อมูลทั้งหมดจะเต็มไปด้วยรหัสนำเข้าต่อไปนี้:% s</b>
+ErrorMissingMandatoryValue=<b>ข้อมูลที่ได้รับมอบอำนาจเป็นที่ว่างเปล่าในแฟ้มแหล่งที่มาสำหรับเขตข้อมูล%</b> s
+TooMuchErrors=<b>ยังคงมี% s</b> เส้นแหล่งที่มาอื่น ๆ ที่มีข้อผิดพลาด แต่การส่งออกได้รับการ จำกัด
+TooMuchWarnings=<b>ยังคงมี% s</b> เส้นแหล่งที่มาอื่น ๆ ที่มีคำเตือน แต่การส่งออกได้รับการ จำกัด
+EmptyLine=บรรทัดที่ว่างเปล่า (จะถูกยกเลิก)
+CorrectErrorBeforeRunningImport=ก่อนอื่นคุณต้องแก้ไขข้อผิดพลาดทั้งหมดก่อนที่จะใช้นำเข้าที่ชัดเจน
+FileWasImported=<b>ไฟล์ถูกนำเข้าที่มีจำนวน%</b> s
+YouCanUseImportIdToFindRecord=คุณสามารถค้นหาระเบียนที่นำเข้าทั้งหมดในฐานข้อมูลของคุณโดยการกรองในเขต <b>import_key = '% s'</b>
+NbOfLinesOK=<b>จำนวนเส้นที่มีข้อผิดพลาดและไม่มีคำเตือน:%</b> s
+NbOfLinesImported=<b>จำนวนของเส้นที่นำเข้ามาประสบความสำเร็จ:%</b> s
+DataComeFromNoWhere=คุ้มค่าที่จะแทรกมาจากที่ไหนเลยในแฟ้มแหล่งที่มา
+DataComeFromFileFieldNb=<b>คุ้มค่าที่จะแทรกมาจากหมายเลขสนาม%</b> ในแฟ้มแหล่งที่มา
+DataComeFromIdFoundFromRef=<b>คุ้มค่าที่มาจากหมายเลขสนาม%</b> ของแฟ้มแหล่งที่จะใช้ในการหารหัสของวัตถุแม่ที่จะใช้ (ดังนั้น <b>Objet% s</b> ที่มีการอ้างอิง. จากแฟ้มแหล่งที่มาที่มีอยู่ต้องเข้า Dolibarr)
+DataComeFromIdFoundFromCodeId=<b>รหัสที่มาจากหมายเลขสนาม%</b> ของแฟ้มแหล่งที่จะใช้ในการหารหัสของวัตถุแม่ที่จะใช้ <b>(ดังนั้นรหัสจากแฟ้มแหล่งที่มาต้องมีอยู่ลงในพจนานุกรม% s)</b> โปรดทราบว่าถ้าคุณรู้รหัสนี้คุณยังสามารถใช้มันลงไปในแฟ้มแหล่งที่มาแทนรหัส นำเข้าควรจะทำงานในทั้งสองกรณี
+DataIsInsertedInto=ข้อมูลที่มาจากแฟ้มแหล่งที่มาจะถูกแทรกเข้าไปในสนามต่อไปนี้:
+DataIDSourceIsInsertedInto=รหัสของวัตถุแม่พบโดยใช้ข้อมูลในแฟ้มแหล่งที่มาจะถูกแทรกเข้าไปในสนามต่อไปนี้:
+DataCodeIDSourceIsInsertedInto=รหัสของสายผู้ปกครองพบได้จากรหัสจะถูกแทรกเข้าไปในสนามต่อไปนี้:
+SourceRequired=ค่าข้อมูลมีผลบังคับใช้
+SourceExample=ตัวอย่างของค่าข้อมูลที่เป็นไปได้
+ExampleAnyRefFoundIntoElement=อ้างอิงใด ๆ <b>ที่พบองค์ประกอบ% s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=รหัสใด ๆ (หรือรหัส) <b>ที่พบลงในพจนานุกรม% s</b>
+CSVFormatDesc=<b>จุลภาคค่าแยกรูปแบบไฟล์</b> (.csv) <br> นี่คือรูปแบบไฟล์ข้อความที่เขตข้อมูลที่แยกจากกันโดยแยก [% s] หากคั่นพบเนื้อหาภายในเขตข้อมูลจะถูกปัดเศษรอบด้วยอักขระ [% s] ตัวละครที่จะหลบหนีหนีตัวละครรอบ [% s]
+Excel95FormatDesc=รูปแบบไฟล์ <b>Excel</b> (.xls) <br> นี้เป็นชนพื้นเมือง Excel 95 รูปแบบ (BIFF5)
+Excel2007FormatDesc=รูปแบบไฟล์ <b>Excel</b> (.xlsx) <br> นี้เป็นชนพื้นเมือง Excel 2007 รูปแบบ (SpreadsheetML)
+TsvFormatDesc=<b>แท็บแยกรูปแบบไฟล์มูลค่า</b> (.tsv) <br> นี่คือรูปแบบไฟล์ข้อความที่เขตข้อมูลที่แยกจากกันโดยตีตาราง [แท็บ]
+ExportFieldAutomaticallyAdded=<b>สนาม% s</b> ถูกบันทึกโดยอัตโนมัติ มันจะหลีกเลี่ยงการให้คุณมีสายที่คล้ายกันที่จะถือว่าเป็นระเบียนที่ซ้ำกัน (กับข้อมูลนี้เพิ่มทุกสายจะเป็นเจ้าของรหัสของตัวเองและจะแตกต่างกัน)
+CsvOptions=csv ตัวเลือก
+Separator=เครื่องสกัด
+Enclosure=สวน
+SuppliersProducts=ผลิตภัณฑ์ซัพพลายเออร์
+BankCode=รหัสธนาคาร
+DeskCode=รหัสโต๊ะ
+BankAccountNumber=เลขที่บัญชี
+BankAccountNumberKey=สำคัญ
+SpecialCode=รหัสพิเศษ
+ExportStringFilter=%% ช่วยให้แทนที่ตัวอักษรหนึ่งหรือมากกว่าหนึ่งในข้อความ
+ExportDateFilter=ปปปป YYYYMM, YYYYMMDD: กรองโดยหนึ่งปี / เดือน / วัน <br> ปปปปปปปป +, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: กรองในช่วงปี / เดือน / วัน <br> > ปปปป> YYYYMM> YYYYMMDD: กรองต่อไปนี้ในทุกปี / เดือน / วัน <br> <ปปปป <YYYYMM <YYYYMMDD: ตัวกรองในปีที่ผ่านมาก่อนหน้านี้ทั้งหมด / เดือน / วัน
+ExportNumericFilter=กรอง 'nnnnn โดยหนึ่งค่า <br> 'nnnnn + nnnnn' ตัวกรองในช่วงของค่า <br> '> nnnnn' ตัวกรองโดยค่าที่ต่ำกว่า <br> '> nnnnn' ตัวกรองโดยค่าที่สูงขึ้น
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
+SelectFilterFields=หากคุณต้องการที่จะกรองบางค่าเพียงค่าที่ป้อนเข้าที่นี่
 FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFields=สาขากรอง
+FilteredFieldsValues=ราคากรอง
diff --git a/htdocs/langs/th_TH/externalsite.lang b/htdocs/langs/th_TH/externalsite.lang
index da4853df0df..fcb010a6ab3 100644
--- a/htdocs/langs/th_TH/externalsite.lang
+++ b/htdocs/langs/th_TH/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
-ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
+ExternalSiteSetup=การติดตั้งการเชื่อมโยงไปยังเว็บไซต์ภายนอก
+ExternalSiteURL=URL ของเว็บไซต์ภายนอก
+ExternalSiteModuleNotComplete=โมดูล ExternalSite ไม่ได้กำหนดค่าอย่างถูกต้อง
+ExampleMyMenuEntry=รายการเมนู
diff --git a/htdocs/langs/th_TH/ftp.lang b/htdocs/langs/th_TH/ftp.lang
index 9984ce689ee..5e0e8f85b2a 100644
--- a/htdocs/langs/th_TH/ftp.lang
+++ b/htdocs/langs/th_TH/ftp.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
+FTPClientSetup=การติดตั้งโมดูล FTP ไคลเอนต์
+NewFTPClient=การตั้งค่าการเชื่อมต่อใหม่ FTP
+FTPArea=พื้นที่ FTP
+FTPAreaDesc=หน้าจอนี้จะแสดงให้คุณเห็นเนื้อหาในมุมมองของ FTP เซิร์ฟเวอร์
+SetupOfFTPClientModuleNotComplete=การติดตั้งโมดูลลูกค้า FTP ดูเหมือนว่าจะไม่สมบูรณ์
+FTPFeatureNotSupportedByYourPHP=PHP ของคุณไม่สนับสนุนฟังก์ชั่น FTP
+FailedToConnectToFTPServer=ล้มเหลวในการเชื่อมต่อกับเซิร์ฟเวอร์ FTP (เซิร์ฟเวอร์% s พอร์ต% s)
+FailedToConnectToFTPServerWithCredentials=ล้มเหลวในการเข้าสู่เซิร์ฟเวอร์ FTP ที่มีกำหนดเข้าสู่ระบบ / รหัสผ่าน
+FTPFailedToRemoveFile=<b>ไม่สามารถลบไฟล์%</b> s
+FTPFailedToRemoveDir=<b>ไม่สามารถลบไดเรกทอรี% s</b> (สิทธิ์ตรวจสอบไดเรกทอรีที่ว่างเปล่า)
+FTPPassiveMode=โหมด Passive
diff --git a/htdocs/langs/th_TH/help.lang b/htdocs/langs/th_TH/help.lang
index 1bbd6e94f03..fb12f4d1a60 100644
--- a/htdocs/langs/th_TH/help.lang
+++ b/htdocs/langs/th_TH/help.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-ClickHere=Click here
-HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
-TypeSupportCommunauty=Community (free)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-NeedHelpCenter=Need help or support ?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-MakeADonation=Help Dolibarr project, make a donation
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+CommunitySupport=ฟอรั่มการสนับสนุน / วิกิพีเดีย
+EMailSupport=สนับสนุนอีเมล์
+RemoteControlSupport=ออนไลน์เรียลไทม์ / สนับสนุนระยะไกล
+OtherSupport=การสนับสนุนอื่น ๆ
+ToSeeListOfAvailableRessources=หากต้องการติดต่อ / ดูทรัพยากรที่มีอยู่:
+ClickHere=คลิกที่นี่
+HelpCenter=ศูนย์ช่วยเหลือ
+DolibarrHelpCenter=ช่วยเหลือ Dolibarr และศูนย์การสนับสนุน
+ToGoBackToDolibarr=หรือคลิก <a href="%s">ที่นี่เพื่อใช้ Dolibarr</a>
+TypeOfSupport=แหล่งที่มาของการสนับสนุน
+TypeSupportCommunauty=ชุมชน (ฟรี)
+TypeSupportCommercial=เชิงพาณิชย์
+TypeOfHelp=ชนิด
+NeedHelpCenter=ต้องการความช่วยเหลือหรือการสนับสนุน?
+Efficiency=ประสิทธิภาพ
+TypeHelpOnly=ช่วยเหลือเท่านั้น
+TypeHelpDev=ความช่วยเหลือ + พัฒนา
+TypeHelpDevForm=ความช่วยเหลือ + + การพัฒนาสร้าง
+ToGetHelpGoOnSparkAngels1=บาง บริษัท สามารถให้บริการได้อย่างรวดเร็ว (บางครั้งทันที) และมีประสิทธิภาพมากขึ้นการสนับสนุนทางออนไลน์โดยการควบคุมของเครื่องคอมพิวเตอร์ของคุณ <b>ช่วยเหลือดังกล่าวสามารถพบได้บน% s</b> เว็บไซต์:
+ToGetHelpGoOnSparkAngels3=นอกจากนี้คุณยังสามารถไปที่รายชื่อของโค้ชที่มีอยู่ทั้งหมดสำหรับ Dolibarr สำหรับนี้คลิกที่ปุ่ม
+ToGetHelpGoOnSparkAngels2=บางครั้งไม่มี บริษัท ที่มีอยู่ในช่วงเวลาที่คุณให้การค้นหาของคุณจึงคิดที่จะเปลี่ยนแปลงตัวกรองที่จะมองหา "ทั้งหมดพร้อมใช้งาน" คุณจะสามารถที่จะส่งคำขอเพิ่มเติม
+BackToHelpCenter=หรือคลิกที่นี่เพื่อไป <a href="%s">กลับไปช่วยหน้าบ้านศูนย์</a>
+LinkToGoldMember=คุณสามารถเรียกหนึ่งในโค้ชไว้ล่วงหน้าโดย Dolibarr สำหรับภาษาของคุณ (% s) โดยคลิกที่เครื่องมือของเขา (สถานะและราคาสูงสุดที่มีการปรับปรุงโดยอัตโนมัติ):
+PossibleLanguages=ภาษาที่รองรับ
+MakeADonation=ช่วยเหลือโครงการ Dolibarr ให้บริจาค
+SubscribeToFoundation=ช่วยเหลือโครงการ Dolibarr สมัครให้กับมูลนิธิ
+SeeOfficalSupport=สำหรับการสนับสนุนอย่างเป็นทางการ Dolibarr ในภาษาของคุณ: <br> <a href="%s" target="_blank"><b>% s</b></a>
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index f5b87fefb08..9f6de8a8541 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -1,148 +1,151 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
-Employe=Employee
-DateDebCP=Start date
-DateFinCP=End date
-DateCreateCP=Creation date
-DraftCP=Draft
-ToReviewCP=Awaiting approval
-ApprovedCP=Approved
-CancelCP=Canceled
-RefuseCP=Refused
+HRM=ระบบบริหารจัดการทรัพยากรบุคคล
+Holidays=ใบลา
+CPTitreMenu=ใบลา
+MenuReportMonth=คำสั่งรายเดือน
+MenuAddCP=คำขอลาใหม่
+NotActiveModCP=คุณต้องเปิดใบโมดูลเพื่อดูหน้านี้
+NotConfigModCP=คุณต้องกำหนดค่าใบโมดูลเพื่อดูหน้านี้ การทำเช่นนี้ <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">คลิกที่นี่</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
+NoCPforUser=คุณไม่ได้มีวันใด ๆ
+AddCP=ขอลา
+Employe=ลูกจ้าง
+DateDebCP=วันที่เริ่มต้น
+DateFinCP=วันที่สิ้นสุด
+DateCreateCP=วันที่สร้าง
+DraftCP=ร่าง
+ToReviewCP=รอการอนุมัติ
+ApprovedCP=ได้รับการอนุมัติ
+CancelCP=ยกเลิก
+RefuseCP=ปฏิเสธ
 ValidatorCP=Approbator
-ListeCP=List of leaves
-ReviewedByCP=Will be reviewed by
-DescCP=Description
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
-EditCP=Edit
-DeleteCP=Delete
-ActionValidCP=Validate
-ActionRefuseCP=Refuse
-ActionCancelCP=Cancel
-StatutCP=Status
-SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-CantUpdate=You cannot update this leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
-MotifCP=Reason
-UserCP=User
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-UserName=Name
-Employee=Employee
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
+ListeCP=รายการของใบ
+ReviewedByCP=จะถูกตรวจสอบโดย
+DescCP=ลักษณะ
+SendRequestCP=สร้างการร้องขอลา
+DelayToRequestCP=<b>ออกจากการร้องขอจะต้องทำอย่างน้อย% s วัน (s)</b> ก่อนหน้าพวกเขา
+MenuConfCP=แก้ไขความสมดุลของใบ
+UpdateAllCP=อัพเดทใบ
+SoldeCPUser=<b>สมดุลใบเป็น% s</b> วัน
+ErrorEndDateCP=คุณต้องเลือกวันที่สิ้นสุดมากกว่าวันที่เริ่มต้น
+ErrorSQLCreateCP=ข้อผิดพลาดที่เกิดขึ้นในช่วง SQL สร้าง:
+ErrorIDFicheCP=เกิดข้อผิดพลาดขอลาไม่อยู่
+ReturnCP=กลับไปยังหน้าก่อนหน้า
+ErrorUserViewCP=คุณยังไม่ได้รับอนุญาตให้อ่านคำขอลานี้
+InfosCP=ข้อมูลการขอลา
+InfosWorkflowCP=ข้อมูลเวิร์กโฟลว์
+RequestByCP=การร้องขอจาก
+TitreRequestCP=คำขอฝาก
+NbUseDaysCP=จำนวนวันของวันหยุดบริโภค
+EditCP=แก้ไข
+DeleteCP=ลบ
+ActionValidCP=ตรวจสอบ
+ActionRefuseCP=ปฏิเสธ
+ActionCancelCP=ยกเลิก
+StatutCP=สถานะ
+SendToValidationCP=ส่งให้ตรวจสอบ
+TitleDeleteCP=ลบคำขอลา
+ConfirmDeleteCP=ยืนยันการลบคำขอออกจากนี้หรือไม่?
+ErrorCantDeleteCP=ข้อผิดพลาดของคุณไม่ได้มีสิทธิ์ในการลบคำขอลานี้
+CantCreateCP=คุณไม่ได้มีสิทธิที่จะขอลา
+InvalidValidatorCP=คุณต้องเลือก approbator การร้องขอการลาของคุณ
+CantUpdate=คุณไม่สามารถปรับปรุงคำขอลานี้
+NoDateDebut=คุณต้องเลือกวันที่เริ่มต้น
+NoDateFin=คุณต้องเลือกวันที่สิ้นสุด
+ErrorDureeCP=คำขอลาของคุณไม่ได้มีวันทำงาน
+TitleValidCP=อนุมัติคำขอลา
+ConfirmValidCP=คุณแน่ใจว่าคุณต้องการที่จะอนุมัติคำขอลา?
+DateValidCP=วันที่ได้รับการอนุมัติ
+TitleToValidCP=ส่งคำขอร้องลา
+ConfirmToValidCP=คุณแน่ใจว่าคุณต้องการที่จะส่งคำขอลา?
+TitleRefuseCP=ปฏิเสธคำขอลา
+ConfirmRefuseCP=คุณแน่ใจหรือว่าต้องการที่จะปฏิเสธคำขอลา?
+NoMotifRefuseCP=คุณต้องเลือกเหตุผลสำหรับการปฏิเสธการร้องขอ
+TitleCancelCP=ยกเลิกการขอลา
+ConfirmCancelCP=คุณแน่ใจว่าคุณต้องการที่จะยกเลิกการขอลาหรือไม่
+DetailRefusCP=เหตุผลในการปฏิเสธ
+DateRefusCP=วันที่ของการปฏิเสธ
+DateCancelCP=วันที่มีการยกเลิก
+DefineEventUserCP=กำหนดลาพิเศษสำหรับผู้ใช้
+addEventToUserCP=กำหนดออกจาก
+MotifCP=เหตุผล
+UserCP=ผู้ใช้งาน
+ErrorAddEventToUserCP=เกิดข้อผิดพลาดในขณะที่เพิ่มการลาพิเศษ
+AddEventToUserOkCP=นอกเหนือจากการลาพิเศษเสร็จเรียบร้อยแล้ว
+MenuLogCP=ดูบันทึกการเปลี่ยนแปลง
+LogCP=เข้าสู่ระบบการปรับปรุงวันวันหยุดใช้ได้
+ActionByCP=ดำเนินการโดย
+UserUpdateCP=สำหรับผู้ใช้
+PrevSoldeCP=คงเหลือก่อนหน้า
+NewSoldeCP=นิวบาลานซ์
+alreadyCPexist=คำขอลาได้ทำไปแล้วในเวลานี้
+UserName=ชื่อ
+Employee=ลูกจ้าง
+FirstDayOfHoliday=วันแรกของวันหยุด
+LastDayOfHoliday=วันสุดท้ายของวันหยุด
+HolidaysMonthlyUpdate=การปรับปรุงรายเดือน
+ManualUpdate=การปรับปรุงคู่มือการใช้งาน
+HolidaysCancelation=ออกจากคำขอยกเลิก
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
-DescOptionCP=Description of the option
-ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve leave requests
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of leaves allocation
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of leave request
-TitleOptionEventCP=Settings of leave requets for events
-ValidEventCP=Validate
-UpdateEventCP=Update events
-CreateEventCP=Create
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
-DeleteEventOptionCP=Delete
-UpdateEventOptionCP=Update
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Leaves
+ConfCP=การกำหนดค่าของโมดูลคำขอลา
+DescOptionCP=คำอธิบายของตัวเลือก
+ValueOptionCP=มูลค่า
+GroupToValidateCP=กลุ่มที่มีความสามารถในการอนุมัติการร้องขอลา
+ConfirmConfigCP=ตรวจสอบการตั้งค่า
+LastUpdateCP=การปรับปรุงอัตโนมัติล่าสุดของการจัดสรรใบ
+MonthOfLastMonthlyUpdate=เดือนของการปรับปรุงอัตโนมัติที่ผ่านมาของการจัดสรรใบ
+UpdateConfCPOK=ปรับปรุงเรียบร้อยแล้ว
+ErrorUpdateConfCP=เกิดข้อผิดพลาดในระหว่างการปรับปรุงโปรดลองอีกครั้ง
+AddCPforUsers=โปรดเพิ่มความสมดุลของการจัดสรรใบของผู้ใช้โดย <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">การคลิ๊กที่นี่</a>
+DelayForSubmitCP=กำหนดเวลาที่จะทำให้การร้องขอลา
+AlertapprobatortorDelayCP=ป้องกัน approbator ถ้าขอลาไม่ตรงกับกำหนดเส้นตาย
+AlertValidatorDelayCP=Préevent approbator ถ้าขอลาเกินความล่าช้า
+AlertValidorSoldeCP=ป้องกัน approbator ถ้าขอลาเกินสมดุล
+nbUserCP=จำนวนผู้ใช้สนับสนุนในใบโมดูล
+nbHolidayDeductedCP=จำนวนวันลาที่จะถูกหักออกต่อวันของวันหยุดถ่าย
+nbHolidayEveryMonthCP=จำนวนวันลาเพิ่มทุกเดือน
+Module27130Name= การบริหารจัดการของการร้องขอลา
+Module27130Desc= การบริหารจัดการของการร้องขอลา
+TitleOptionMainCP=การตั้งค่าหลักของการร้องขอลา
+TitleOptionEventCP=การตั้งค่าของ requets ลาสำหรับการจัดกิจกรรม
+ValidEventCP=ตรวจสอบ
+UpdateEventCP=เหตุการณ์การปรับปรุง
+CreateEventCP=สร้าง
+NameEventCP=ชื่อเหตุการณ์
+OkCreateEventCP=นอกเหนือจากการจัดงานเป็นไปด้วยดี
+ErrorCreateEventCP=ข้อผิดพลาดในการสร้างเหตุการณ์
+UpdateEventOkCP=การปรับปรุงการจัดงานเป็นไปด้วยดี
+ErrorUpdateEventCP=ข้อผิดพลาดในขณะที่การปรับปรุงการจัดงาน
+DeleteEventCP=ลบเหตุการณ์
+DeleteEventOkCP=เหตุการณ์ได้ถูกลบไปแล้ว
+ErrorDeleteEventCP=ข้อผิดพลาดขณะลบเหตุการณ์
+TitleDeleteEventCP=ลบออกจากที่โดดเด่น
+TitleCreateEventCP=สร้างลาพิเศษ
+TitleUpdateEventCP=แก้ไขหรือลบออกจากที่โดดเด่น
+DeleteEventOptionCP=ลบ
+UpdateEventOptionCP=ปรับปรุง
+ErrorMailNotSend=เกิดข้อผิดพลาดขณะที่การส่งอีเมล์
+NoCPforMonth=ไม่มีออกในเดือนนี้
+nbJours=จำนวนวัน
+TitleAdminCP=การกำหนดค่าของใบ
+NoticePeriod=ระยะเวลาการแจ้งให้ทราบล่วงหน้า
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Hello=สวัสดี
+HolidaysToValidate=ตรวจสอบการร้องขอลา
+HolidaysToValidateBody=ด้านล่างคำขอลาในการตรวจสอบคือ
+HolidaysToValidateDelay=คำขอลานี้จะเกิดขึ้นภายในระยะเวลาน้อยกว่า% s วัน
+HolidaysToValidateAlertSolde=ผู้ใช้ที่ทำนี้ออกจากข้อความร้องขอไม่ได้มีวันที่เพียงพอ
+HolidaysValidated=การตรวจสอบการร้องขอลา
+HolidaysValidatedBody=คำขอลาสำหรับ% s% s ได้รับการตรวจสอบ
+HolidaysRefused=ขอปฏิเสธ
+HolidaysRefusedBody=คำขอลาสำหรับ% s% s ได้รับการปฏิเสธด้วยเหตุผลต่อไปนี้:
+HolidaysCanceled=ยกเลิกคำขอใบ
+HolidaysCanceledBody=คำขอลาสำหรับ% s% s ได้ถูกยกเลิก
+Permission20001=อ่านที่คุณเป็นเจ้าของร้องขอลา
+Permission20002=สร้าง / แก้ไขการร้องขอการลาของคุณ
+Permission20003=ลบออกจากการร้องขอ
+Permission20004=อ่านร้องขอลาสำหรับทุกคน
+Permission20005=สร้าง / แก้ไขการร้องขอลาสำหรับทุกคน
+Permission20006=ธุรการร้องขอลา (การติดตั้งและการปรับปรุงความสมดุล)
+NewByMonth=ที่เพิ่มเข้ามาต่อเดือน
+GoIntoDictionaryHolidayTypes=<strong>ไปลงในหน้าหลัก - การติดตั้ง - พจนานุกรม - ประเภทของใบจะติดตั้งที่แตกต่างกันของใบ</strong>
diff --git a/htdocs/langs/th_TH/incoterm.lang b/htdocs/langs/th_TH/incoterm.lang
index 2396d2acb0e..fe2e3886c9d 100644
--- a/htdocs/langs/th_TH/incoterm.lang
+++ b/htdocs/langs/th_TH/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=เพิ่มคุณสมบัติในการจัดการ Incoterm
 IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
-IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+IncotermSetupTitle1=ลักษณะ
+IncotermSetupTitle2=สถานะ
+IncotermSetup=การติดตั้งโมดูล Incoterm
+IncotermFunctionDesc=เปิดใช้งานคุณสมบัติ Incoterm (Thirdparty, ข้อเสนอ, สั่งซื้อของลูกค้า, ใบแจ้งหนี้ของลูกค้า, การจัดส่งคำสั่งผลิต)
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index dcd8df6e7db..9f80252111c 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -1,214 +1,215 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-DolibarrWelcome=Welcome to Dolibarr
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExists=Configuration file <b>%s</b> does not exist !
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileReload=Reload all information from configuration file.
-PHPSupportSessions=This PHP supports sessions.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportUTF8=This PHP support UTF8 functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
-ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
-ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
-ErrorFailedToCreateDatabase=Failed to create database '%s'.
-ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
-ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
-IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
-PHPVersion=PHP Version
-YouCanContinue=You can continue...
-PleaseBePatient=Please be patient...
-License=Using license
-ConfigurationFile=Configuration file
-WebPagesDirectory=Directory where web pages are stored
-DocumentsDirectory=Directory to store uploaded and generated documents
-URLRoot=URL Root
-ForceHttps=Force secure connections (https)
-CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseChoice=Database choice
-DatabaseType=Database type
-DriverType=Driver type
-Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
-ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
-DatabaseName=Database name
-DatabasePrefix=Database prefix table
-Login=Login
-AdminLogin=Login for Dolibarr database owner.
-Password=Password
-PasswordAgain=Retype password a second time
-AdminPassword=Password for Dolibarr database owner.
-CreateDatabase=Create database
-CreateUser=Create owner
-DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-Experimental=(experimental)
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
-ConfigurationSaving=Saving configuration file
-ServerConnection=Server connection
-DatabaseConnection=Database connection
-DatabaseCreation=Database creation
-UserCreation=User creation
-CreateDatabaseObjects=Database objects creation
-ReferenceDataLoading=Reference data loading
-TablesAndPrimaryKeysCreation=Tables and Primary keys creation
-CreateTableAndPrimaryKey=Create table %s
-CreateOtherKeysForTable=Create foreign keys and indexes for table %s
-OtherKeysCreation=Foreign keys and indexes creation
-FunctionsCreation=Functions creation
-AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
-SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
-SystemIsUpgraded=Dolibarr has been upgraded successfully.
-YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfuly.
-GoToDolibarr=Go to Dolibarr
-GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
-GoToUpgradePage=Go to upgrade page again
-Examples=Examples
-WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
-LoginAlreadyExists=Already exists
-DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s
-FunctionNotAvailableInThisPHP=Not available on this PHP
-MigrateScript=Migration script
-ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
-ProcessMigrateScript=Script processing
-ChooseYourSetupMode=Choose your setup mode and click "Start"...
-FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Upgrade
-UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
-Start=Start
-InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-NotAvailable=Not available
-YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
-AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
-YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
-CharsetChoice=Character set choice
-CharacterSetClient=Character set used for generated HTML web pages
-CharacterSetClientComment=Choose character set for web display.<br/> Default proposed character set is the one of your database.
-DBSortingCollation=Character sorting order
-DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/>This parameter can't be defined if database already exists.
-CharacterSetDatabase=Character set for database
-CharacterSetDatabaseComment=Choose character set wanted for database creation.<br/>This parameter can't be defined if database already exists.
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
-InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
-InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
-ActivateModule=Activate module %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+InstallEasy=เพียงทำตามคำแนะนำทีละขั้นตอน
+MiscellaneousChecks=สิ่งที่ต้องมีการตรวจสอบ
+DolibarrWelcome=ยินดีต้อนรับสู่ Dolibarr
+ConfFileExists=<b>การกำหนดค่าไฟล์% s</b> อยู่
+ConfFileDoesNotExists=<b>การกำหนดค่าไฟล์% s</b> ไม่อยู่!
+ConfFileDoesNotExistsAndCouldNotBeCreated=<b>การกำหนดค่าไฟล์% s</b> ไม่ได้อยู่และไม่สามารถสร้าง!
+ConfFileCouldBeCreated=<b>การกำหนดค่าไฟล์% s</b> จะถูกสร้างขึ้น
+ConfFileIsNotWritable=<b>การกำหนดค่าไฟล์% s</b> ไม่สามารถเขียนได้ สิทธิ์ในการตรวจสอบ สำหรับการติดตั้งครั้งแรกเว็บเซิร์ฟเวอร์ของคุณต้องได้รับเพื่อให้สามารถเขียนลงในไฟล์นี้ในระหว่างขั้นตอนการตั้งค่า ("chmod 666" ตัวอย่างเช่นในระบบปฏิบัติการยูนิกซ์เช่น OS)
+ConfFileIsWritable=<b>การกำหนดค่าไฟล์% s</b> เขียนได้
+ConfFileReload=โหลดข้อมูลจากแฟ้มการกำหนดค่า
+PHPSupportSessions=PHP นี้สนับสนุนการประชุม
+PHPSupportPOSTGETOk=PHP นี้สนับสนุนตัวแปร POST และ GET
+PHPSupportPOSTGETKo=มันเป็นไปได้ที่การตั้งค่า PHP ของคุณไม่สนับสนุนตัวแปร POST และ / หรือได้รับ ตรวจสอบ <b>variables_order</b> พารามิเตอร์ใน php.ini
+PHPSupportGD=การสนับสนุนนี้ PHP GD ฟังก์ชั่นกราฟิก
+PHPSupportUTF8=นี้สนับสนุน PHP ฟังก์ชั่ UTF8
+PHPMemoryOK=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง%</b> s นี้ควรจะเพียงพอ
+PHPMemoryTooLow=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง% s</b> ไบต์ นี้ควรจะต่ำเกินไป เปลี่ยน <b>php.ini</b> ของคุณเพื่อตั้งค่าพารามิเตอร์ <b>memory_limit อย่างน้อย% s</b> ไบต์
+Recheck=คลิกที่นี่เพื่อทดสอบเพิ่มเติม significative
+ErrorPHPDoesNotSupportSessions=การติดตั้ง PHP ของคุณไม่สนับสนุนการประชุม คุณลักษณะนี้เป็นสิ่งจำเป็นที่จะทำให้การทำงาน Dolibarr ตรวจสอบการติดตั้ง PHP ของคุณ
+ErrorPHPDoesNotSupportGD=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่นกราฟิก GD กราฟจะไม่สามารถใช้ได้
+ErrorPHPDoesNotSupportUTF8=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่น UTF8 Dolibarr ไม่สามารถทำงานได้อย่างถูกต้อง แก้ปัญหานี้ก่อนการติดตั้ง Dolibarr
+ErrorDirDoesNotExists=สารบบ% s ไม่ได้อยู่
+ErrorGoBackAndCorrectParameters=ย้อนกลับไปและแก้ไขพารามิเตอร์ที่ไม่ถูกต้อง
+ErrorWrongValueForParameter=คุณอาจจะพิมพ์ค่าที่ไม่ถูกต้องสำหรับพารามิเตอร์ '% s'
+ErrorFailedToCreateDatabase=ไม่สามารถสร้างฐานข้อมูล '% s'
+ErrorFailedToConnectToDatabase=ไม่สามารถเชื่อมต่อกับฐานข้อมูล '% s'
+ErrorDatabaseVersionTooLow=รุ่นฐานข้อมูล (% s) เก่าเกินไป รุ่น s% หรือสูงกว่าที่จำเป็น
+ErrorPHPVersionTooLow=PHP รุ่นเก่าเกินไป % s รุ่นจะต้อง
+WarningPHPVersionTooLow=PHP รุ่นเก่าเกินไป รุ่น% s หรือมากกว่าที่คาดว่า รุ่นนี้จะช่วยให้ติดตั้งได้ แต่ไม่ได้รับการสนับสนุน
+ErrorConnectedButDatabaseNotFound=เชื่อมต่อกับเซิร์ฟเวอร์ที่ประสบความสำเร็จ แต่ฐานข้อมูล '% s' ไม่พบ
+ErrorDatabaseAlreadyExists=ฐานข้อมูล '% s' อยู่แล้ว
+IfDatabaseNotExistsGoBackAndUncheckCreate=ถ้าฐานข้อมูลที่มีอยู่ไม่ได้กลับไปและตรวจสอบตัวเลือก "สร้างฐานข้อมูล"
+IfDatabaseExistsGoBackAndCheckCreate=ถ้าฐานข้อมูลที่มีอยู่แล้วให้กลับไปและยกเลิก "สร้างฐานข้อมูลตัวเลือก"
+WarningBrowserTooOld=รุ่นเก่าเกินไปของเบราว์เซอร์ เบราว์เซอร์ของคุณอัพเกรดเป็นรุ่นล่าสุดของ Firefox, Chrome หรือ Opera เป็น recommanded สูง
+PHPVersion=PHP รุ่น
+YouCanContinue=คุณสามารถดำเนินการต่อ ...
+PleaseBePatient=กรุณาเป็นผู้ป่วย ...
+License=ใช้ใบอนุญาต
+ConfigurationFile=แฟ้มการกำหนดค่า
+WebPagesDirectory=สารบบที่หน้าเว็บจะถูกเก็บไว้
+DocumentsDirectory=สารบบการจัดเก็บเอกสารที่อัปโหลดและสร้าง
+URLRoot=URL ราก
+ForceHttps=กองทัพเชื่อมต่อที่ปลอดภัย (https)
+CheckToForceHttps=เลือกตัวเลือกนี้จะบังคับให้เชื่อมต่อที่ปลอดภัย (https) <br> นี้ต้องการให้เว็บเซิร์ฟเวอร์ที่มีการกำหนดค่าที่มีใบรับรอง SSL
+DolibarrDatabase=Dolibarr ฐานข้อมูล
+DatabaseChoice=ทางเลือกฐานข้อมูล
+DatabaseType=ชนิดของฐานข้อมูล
+DriverType=ชนิดตัวขับ
+Server=เซิร์ฟเวอร์
+ServerAddressDescription=ชื่อหรือที่อยู่ IP สำหรับเซิร์ฟเวอร์ฐานข้อมูลมักจะ 'localhost' เมื่อเซิร์ฟเวอร์ฐานข้อมูลโฮสต์บนเซิร์ฟเวอร์เดียวกันกว่าเว็บเซิร์ฟเวอร์
+ServerPortDescription=ฐานข้อมูลเซิร์ฟเวอร์พอร์ต ให้ว่างเปล่าถ้าไม่รู้จัก
+DatabaseServer=เซิร์ฟเวอร์ฐานข้อมูล
+DatabaseName=ชื่อฐานข้อมูล
+DatabasePrefix=ฐานข้อมูลตารางคำนำหน้า
+Login=เข้าสู่ระบบ
+AdminLogin=เข้าสู่ระบบฐานข้อมูลสำหรับเจ้าของ Dolibarr
+Password=รหัสผ่าน
+PasswordAgain=พิมพ์รหัสผ่านเป็นครั้งที่สอง
+AdminPassword=รหัสผ่านสำหรับเจ้าของฐานข้อมูล Dolibarr
+CreateDatabase=สร้างฐานข้อมูล
+CreateUser=สร้างเจ้าของ
+DatabaseSuperUserAccess=เซิร์ฟเวอร์ฐานข้อมูล - การเข้าถึง Superuser
+CheckToCreateDatabase=กล่องตรวจสอบว่าฐานข้อมูลไม่ได้อยู่และจะต้องสร้างขึ้น <br> ในกรณีนี้คุณต้องกรอกข้อมูลเข้าสู่ระบบ / รหัสผ่านสำหรับบัญชี superuser ที่ด้านล่างของหน้านี้
+CheckToCreateUser=กล่องตรวจสอบว่าเจ้าของฐานข้อมูลไม่ได้อยู่และจะต้องสร้างขึ้น <br> ในกรณีนี้คุณต้องเลือกล็อกอินและรหัสผ่านและยังเติมเต็มการเข้าสู่ระบบ / รหัสผ่านสำหรับบัญชี superuser ที่ด้านล่างของหน้านี้ ถ้ากล่องนี้จะไม่ถูกตรวจสอบฐานข้อมูลเจ้าของและรหัสผ่านที่จะต้องมีอยู่
+Experimental=(จากการทดลอง)
+Deprecated=(เลิก)
+DatabaseRootLoginDescription=เข้าสู่ระบบของผู้ใช้ที่ได้รับอนุญาตในการสร้างฐานข้อมูลใหม่หรือผู้ใช้ใหม่บังคับถ้าฐานข้อมูลหรือเจ้าของของคุณไม่ได้อยู่แล้ว
+KeepEmptyIfNoPassword=ปล่อยว่างไว้ถ้าผู้ใช้มีรหัสผ่านไม่ (หลีกเลี่ยงปัญหานี้)
+SaveConfigurationFile=ประหยัดค่า
+ConfigurationSaving=แฟ้มการกำหนดค่าการบันทึก
+ServerConnection=การเชื่อมต่อเซิร์ฟเวอร์
+DatabaseConnection=เชื่อมต่อฐานข้อมูล
+DatabaseCreation=การสร้างฐานข้อมูล
+UserCreation=การสร้างผู้ใช้
+CreateDatabaseObjects=ฐานข้อมูลการสร้างวัตถุ
+ReferenceDataLoading=การโหลดข้อมูลอ้างอิง
+TablesAndPrimaryKeysCreation=ตารางและคีย์หลักในการสร้าง
+CreateTableAndPrimaryKey=สร้างตาราง% s
+CreateOtherKeysForTable=สร้างปุ่มต่างประเทศและดัชนีสำหรับตาราง% s
+OtherKeysCreation=คีย์ต่างประเทศและการสร้างดัชนี
+FunctionsCreation=ฟังก์ชั่นการสร้าง
+AdminAccountCreation=ผู้ดูแลระบบเข้าสู่ระบบการสร้าง
+PleaseTypePassword=กรุณาพิมพ์รหัสผ่านรห​​ัสผ่านที่ว่างเปล่าไม่ได้รับอนุญาต!
+PleaseTypeALogin=กรุณาพิมพ์เข้าสู่ระบบ!
+PasswordsMismatch=รหัสผ่านที่แตกต่างโปรดลองอีกครั้ง!
+SetupEnd=ในตอนท้ายของการตั้งค่า
+SystemIsInstalled=การติดตั้งนี้เสร็จสมบูรณ์
+SystemIsUpgraded=Dolibarr ได้รับการอัพเกรดที่ประสบความสำเร็จ
+YouNeedToPersonalizeSetup=คุณต้องกำหนดค่า Dolibarr เพื่อให้เหมาะกับความต้องการของคุณ (ลักษณะคุณสมบัติ, ... ) การทำเช่นนี้โปรดทำตามลิงค์ด้านล่าง:
+AdminLoginCreatedSuccessfuly=ผู้ดูแลระบบเข้าสู่ระบบ Dolibarr <b>'% s'</b> สร้าง successfuly
+GoToDolibarr=ไปที่ Dolibarr
+GoToSetupArea=ไปที่ Dolibarr (พื้นที่ติดตั้ง)
+MigrationNotFinished=รุ่นของฐานข้อมูลของคุณไม่สมบูรณ์ถึงวันดังนั้นคุณจะต้องใช้กระบวนการปรับรุ่นอีกครั้ง
+GoToUpgradePage=ไปที่หน้าอัพเกรดอีกครั้ง
+Examples=ตัวอย่าง
+WithNoSlashAtTheEnd=โดยไม่ต้องเฉือน "/" ในตอนท้าย
+DirectoryRecommendation=มันเป็น recommanded ใช้ไดเรกทอรีนอกไดเรกทอรีของคุณหน้าเว็บของคุณ
+LoginAlreadyExists=ที่มีอยู่แล้ว
+DolibarrAdminLogin=ผู้ดูแลระบบเข้าสู่ระบบ Dolibarr
+AdminLoginAlreadyExists=Dolibarr บัญชีผู้ดูแลระบบ <b>'% s'</b> อยู่แล้ว กลับไปถ้าคุณต้องการที่จะสร้างอีกคนหนึ่ง
+WarningRemoveInstallDir=คำเตือนเพื่อความปลอดภัยเมื่อติดตั้งหรืออัพเกรดเสร็จสมบูรณ์หลีกเลี่ยงการใช้ติดตั้งเครื่องมืออีกครั้งคุณควรเพิ่มไฟล์ที่เรียกว่า <b>install.lock</b> ลงในไดเรกทอรีเอกสาร Dolibarr เพื่อที่จะหลีกเลี่ยงการใช้ที่เป็นอันตรายของมัน
+ThisPHPDoesNotSupportTypeBase=ระบบ PHP นี้ไม่สนับสนุนอินเตอร์เฟซในการเข้าถึงของชนิดของฐานข้อมูล% ใด ๆ
+FunctionNotAvailableInThisPHP=ไม่สามารถใช้ได้ใน PHP นี้
+MigrateScript=สคริปต์การย้ายถิ่น
+ChoosedMigrateScript=เลือกสคริปต์การย้ายถิ่น
+DataMigration=การโยกย้ายข้อมูล
+DatabaseMigration=การย้ายฐานข้อมูลโครงสร้าง
+ProcessMigrateScript=การประมวลผลสคริปต์
+ChooseYourSetupMode=เลือกโหมดการตั้งค่าของคุณและคลิกที่ "เริ่มต้น" ...
+FreshInstall=ติดตั้งใหม่
+FreshInstallDesc=ใช้โหมดนี้ถ้านี้เป็นครั้งแรกของคุณติดตั้ง ถ้าไม่ได้โหมดนี้สามารถซ่อมแซมติดตั้งก่อนหน้านี้ไม่สมบูรณ์ แต่ถ้าคุณต้องการที่จะปรับรุ่นของคุณเลือก "การอัพเกรดโหมด"
+Upgrade=อัพเกรด
+UpgradeDesc=ใช้โหมดนี้ถ้าคุณได้เปลี่ยนไฟล์ Dolibarr กับไฟล์จากเวอร์ชันที่ใหม่กว่า นี้จะอัพเกรดฐานข้อมูลและข้อมูลของคุณ
+Start=เริ่มต้น
+InstallNotAllowed=ติดตั้งไม่ได้รับอนุญาตตามสิทธิ์ <b>conf.php</b>
+NotAvailable=ไม่พร้อม
+YouMustCreateWithPermission=คุณต้องสร้างแฟ้ม% s และกำหนดสิทธิ์ในการเขียนเกี่ยวกับมันสำหรับเว็บเซิร์ฟเวอร์ในระหว่างขั้นตอนการติดตั้ง
+CorrectProblemAndReloadPage=โปรดแก้ไขปัญหาและกด F5 เพื่อโหลดหน้าเว็บ
+AlreadyDone=อพยพแล้ว
+DatabaseVersion=รุ่นฐานข้อมูล
+ServerVersion=เซิร์ฟเวอร์ฐานข้อมูลรุ่น
+YouMustCreateItAndAllowServerToWrite=คุณต้องสร้างไดเรกทอรีนี้และอนุญาตให้เว็บเซิร์ฟเวอร์ที่จะเขียนลงไป
+CharsetChoice=ทางเลือกชุดอักขระ
+CharacterSetClient=ชุดตัวอักษรที่ใช้ในการสร้างหน้าเว็บ HTML
+CharacterSetClientComment=เลือกชุดตัวอักษรสำหรับการแสดงผลเว็บ <br/> เริ่มต้นชุดตัวอักษรที่นำเสนอเป็นหนึ่งในฐานข้อมูลของคุณ
+DBSortingCollation=เรียงลำดับตัวอักษร
+DBSortingCollationComment=เลือกหน้ารหัสที่กำหนดลำดับการเรียงตัวละครที่ใช้โดยฐานข้อมูล พารามิเตอร์นี้จะเรียกว่า 'การเปรียบเทียบโดยฐานข้อมูลบางอย่าง <br/> พารามิเตอร์นี้ไม่สามารถกำหนดถ้าฐานข้อมูลที่มีอยู่แล้ว
+CharacterSetDatabase=ตัวอักษรที่กำหนดไว้สำหรับฐานข้อมูล
+CharacterSetDatabaseComment=เลือกชุดตัวอักษรที่ต้องการสำหรับการสร้างฐานข้อมูล <br/> พารามิเตอร์นี้ไม่สามารถกำหนดถ้าฐานข้อมูลที่มีอยู่แล้ว
+YouAskDatabaseCreationSoDolibarrNeedToConnect=<b>คุณถามในการสร้างฐานข้อมูล%</b> แต่สำหรับเรื่องนี้ Dolibarr <b>จำเป็นต้องเชื่อมต่อกับเซิร์ฟเวอร์% s</b> ด้วยสิทธิ์ผู้ใช้ <b>super% s</b>
+YouAskLoginCreationSoDolibarrNeedToConnect=<b>คุณถามเพื่อสร้างฐานข้อมูลเข้าสู่ระบบ%</b> แต่สำหรับเรื่องนี้ Dolibarr <b>จำเป็นต้องเชื่อมต่อกับเซิร์ฟเวอร์% s</b> ด้วยสิทธิ์ผู้ใช้ <b>super% s</b>
+BecauseConnectionFailedParametersMayBeWrong=ขณะที่การเชื่อมต่อล้มเหลวโฮสต์หรือพารามิเตอร์ผู้ใช้ super ต้องผิด
+OrphelinsPaymentsDetectedByMethod=การชำระเงินเด็กกำพร้าที่ตรวจพบโดยวิธี% s
+RemoveItManuallyAndPressF5ToContinue=ลบออกด้วยตนเองและกด F5 เพื่อดำเนินการต่อไป
+KeepDefaultValuesWamp=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จาก DoliWamp ดังนั้นค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เปลี่ยนพวกเขาเท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
+KeepDefaultValuesDeb=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จากแพคเกจลินุกซ์ (Ubuntu, Debian, Fedora ... ) ดังนั้นค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เฉพาะรหัสผ่านของเจ้าของฐานข้อมูลเพื่อสร้างจะต้องเสร็จสิ้น เปลี่ยนพารามิเตอร์อื่น ๆ เท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
+KeepDefaultValuesMamp=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จาก DoliMamp ดังนั้นค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เปลี่ยนพวกเขาเท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
+KeepDefaultValuesProxmox=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จาก Proxmox เสมือนเครื่องเพื่อให้ค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เปลี่ยนพวกเขาเท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
+FieldRenamed=เปลี่ยนชื่อสนาม
+IfLoginDoesNotExistsCheckCreateUser=หากเข้าสู่ระบบไม่ได้มีอยู่ แต่คุณต้องตรวจสอบตัวเลือก "สร้างผู้ใช้"
+ErrorConnection=เซิร์ฟเวอร์ <b>"% s"</b> ชื่อฐานข้อมูล <b>"% s"</b> เข้าสู่ระบบ <b>"% s"</b> หรือรหัสผ่านฐานข้อมูลอาจจะผิดหรือ PHP รุ่นลูกค้าอาจจะเก่าเกินไปเมื่อเทียบกับเวอร์ชันของฐานข้อมูล
+InstallChoiceRecommanded=<b>ทางเลือกที่แนะนำในการติดตั้งเวอร์ชั่น% s จากรุ่นปัจจุบันของคุณ% s</b>
+InstallChoiceSuggested=<b>ติดตั้งทางเลือกที่แนะนำโดยการติดตั้ง</b>
+MigrateIsDoneStepByStep=รุ่นที่มีการกำหนดเป้​​าหมาย (% s) มีช่องว่างของหลายรุ่นเพื่อให้การติดตั้งตัวช่วยสร้างจะกลับมาเพื่อแสดงให้เห็นการโยกย้ายครั้งเดียวต่อไปนี้จะแล้วเสร็จ
+CheckThatDatabasenameIsCorrect=ตรวจสอบชื่อของฐานข้อมูลที่ <b>"% s"</b> ถูกต้อง
+IfAlreadyExistsCheckOption=ถ้าชื่อนี้ถูกต้องและฐานข้อมูลที่ยังไม่ปรากฏอยู่คุณต้องตรวจสอบตัวเลือก "สร้างฐานข้อมูล"
+OpenBaseDir=PHP openbasedir พารามิเตอร์
+YouAskToCreateDatabaseSoRootRequired=คุณตรวจสอบกล่อง "สร้างฐานข้อมูล" สำหรับนี้คุณจำเป็นต้องให้เข้าสู่ระบบ / รหัสผ่านของ superuser (ด้านล่างของรูปแบบ)
+YouAskToCreateDatabaseUserSoRootRequired=คุณตรวจสอบกล่อง "สร้างเจ้าของฐานข้อมูล" สำหรับนี้คุณจำเป็นต้องให้เข้าสู่ระบบ / รหัสผ่านของ superuser (ด้านล่างของรูปแบบ)
+NextStepMightLastALongTime=ขั้นตอนปัจจุบันอาจนานหลายนาที กรุณารอสักครู่จนกระทั่งหน้าจอต่อไปคือการแสดงให้เห็นก่อนที่จะดำเนินการต่อไป
+MigrationCustomerOrderShipping=โยกย้ายการจัดส่งสินค้าให้กับลูกค้าจัดเก็บข้อมูลการสั่งซื้อ
+MigrationShippingDelivery=เพิ่มระดับการจัดเก็บข้อมูลในการจัดส่ง
+MigrationShippingDelivery2=เพิ่มระดับการจัดเก็บข้อมูลในการจัดส่ง 2
+MigrationFinished=การโยกย้ายเสร็จ
+LastStepDesc=<strong>ขั้นตอนสุดท้าย:</strong> กำหนดเข้าสู่ระบบที่นี่และรหัสผ่านที่คุณวางแผนที่จะใช้ในการเชื่อมต่อกับซอฟแวร์ ไม่หลวมนี้มันเป็นบัญ​​ชีที่จะดูแลคนอื่น ๆ ทั้งหมด
+ActivateModule=เปิดใช้งานโมดูล% s
+ShowEditTechnicalParameters=คลิกที่นี่เพื่อแสดง / แก้ไขพารามิเตอร์ขั้นสูง (โหมดผู้เชี่ยวชาญ)
+WarningUpgrade=คำเตือน: ไม่เรียกใช้การสำรองฐานข้อมูลของคุณเป็นอันดับแรก นี้ recommanded สูง: ยกตัวอย่างเช่นเนื่องจากข้อบกพร่องบางอย่างในระบบฐานข้อมูล (ตัวอย่างเช่นรุ่น MySQL 5.5.40) ข้อมูลบางอย่างหรือตารางอาจจะหายไปในระหว่างกระบวนการนี​​้จึง recommanded สูงที่จะมีการถ่ายโอนข้อมูลที่สมบูรณ์ของฐานข้อมูลของคุณก่อน เริ่มต้นการย้ายถิ่น คลิก OK เพื่อเริ่มต้นกระบวนการการย้ายถิ่น ...
+ErrorDatabaseVersionForbiddenForMigration=รุ่นฐานข้อมูลของคุณ% s แต่ก็มีข้อผิดพลาดที่สำคัญทำให้การสูญเสียข้อมูลถ้าคุณทำการเปลี่ยนแปลงโครงสร้างฐานข้อมูลของคุณเหมือนว่ามันจะถูกต้องตามกระบวนการโยกย้าย ด้วยเหตุผลของการย้ายถิ่นจะไม่ได้รับอนุญาตจนกว่าคุณจะอัพเกรดฐานข้อมูลของคุณไปเป็นรุ่นที่คงที่ที่สูงขึ้น (รายชื่อที่รู้จักกันร้องรุ่น:% s)
 
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
-MigrationProposal=Data migration for commercial proposals
-MigrationInvoice=Data migration for customer's invoices
-MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
-MigrationRelationshipTables=Data migration for relationship tables (%s)
-MigrationPaymentsUpdate=Payment data correction
-MigrationPaymentsNumberToUpdate=%s payment(s) to update
-MigrationProcessPaymentUpdate=Update payment(s) %s
-MigrationPaymentsNothingToUpdate=No more things to do
-MigrationPaymentsNothingUpdatable=No more payments that can be corrected
-MigrationContractsUpdate=Contract data correction
-MigrationContractsNumberToUpdate=%s contract(s) to update
-MigrationContractsLineCreation=Create contract line for contract ref %s
-MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly
-MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
-MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
-MigrationContractsInvalidDatesUpdate=Bad value date contract correction
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
-MigrationContractsInvalidDatesNumber=%s contracts modified
-MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
-MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly
-MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
-MigrationReopeningContracts=Open contract closed by error
-MigrationReopenThisContract=Reopen contract %s
-MigrationReopenedContractsNumber=%s contracts modified
-MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer
-MigrationBankTransfertsNothingToUpdate=All links are up to date
-MigrationShipmentOrderMatching=Sendings receipt update
-MigrationDeliveryOrderMatching=Delivery receipt update
-MigrationDeliveryDetail=Delivery update
-MigrationStockDetail=Update stock value of products
-MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
-MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
-MigrationProjectTaskTime=Update time spent in seconds
-MigrationActioncommElement=Update data on actions
-MigrationPaymentMode=Data migration for payment mode
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationFixData=แก้ไขข้อมูล denormalized
+MigrationOrder=การโยกย้ายข้อมูลสำหรับการสั่งซื้อของลูกค้า
+MigrationSupplierOrder=การโยกย้ายข้อมูลสำหรับการสั่งซื้อของซัพพลายเออร์
+MigrationProposal=การโยกย้ายข้อมูลสำหรับข้อเสนอในเชิงพาณิชย์
+MigrationInvoice=การโยกย้ายข้อมูลสำหรับใบแจ้งหนี้ของลูกค้า
+MigrationContract=การโยกย้ายข้อมูลในการทำสัญญา
+MigrationSuccessfullUpdate=การปรับรุ่นที่ประสบความสำเร็จ
+MigrationUpdateFailed=การอัพเกรดล้มเหลว
+MigrationRelationshipTables=การโยกย้ายข้อมูลสำหรับตารางความสัมพันธ์ (% s)
+MigrationPaymentsUpdate=แก้ไขข้อมูลการชำระเงิน
+MigrationPaymentsNumberToUpdate=% s การชำระเงิน (s) เพื่อปรับปรุง
+MigrationProcessPaymentUpdate=ปรับปรุงการชำระเงิน (s)% s
+MigrationPaymentsNothingToUpdate=ไม่มีสิ่งที่ต้องทำ
+MigrationPaymentsNothingUpdatable=ไม่มีการชำระเงินอื่น ๆ ที่สามารถได้รับการแก้ไข
+MigrationContractsUpdate=สัญญาแก้ไขข้อมูล
+MigrationContractsNumberToUpdate=สัญญา% s (s) เพื่อปรับปรุง
+MigrationContractsLineCreation=สร้างสายสัญญาสำหรับการอ้างอิงสัญญา% s
+MigrationContractsNothingToUpdate=ไม่มีสิ่งที่ต้องทำ
+MigrationContractsFieldDontExist=fk_facture สนามไม่อยู่อีกต่อไป ไม่มีอะไรที่จะทำ
+MigrationContractsEmptyDatesUpdate=การแก้ไขสัญญาวันที่ว่างเปล่า
+MigrationContractsEmptyDatesUpdateSuccess=สัญญาแก้ไขวัน emtpy ทำ successfuly
+MigrationContractsEmptyDatesNothingToUpdate=ไม่มีวันที่ทำสัญญาที่ว่างเปล่าที่จะแก้ไข
+MigrationContractsEmptyCreationDatesNothingToUpdate=วันที่สร้างสัญญายังไม่ได้แก้ไข
+MigrationContractsInvalidDatesUpdate=วันที่คิดมูลค่าการแก้ไขสัญญาที่ไม่ดี
+MigrationContractsInvalidDateFix=สัญญาที่ถูกต้อง% s (วันที่สัญญา =% s เริ่มต้นบริการวันที่นาที =% s)
+MigrationContractsInvalidDatesNumber=สัญญา% s การแก้ไข
+MigrationContractsInvalidDatesNothingToUpdate=ไม่มีวันที่มีมูลค่าที่ดีที่จะแก้ไข
+MigrationContractsIncoherentCreationDateUpdate=การสร้างมูลค่าสัญญาที่ไม่ดีแก้ไขวันที่
+MigrationContractsIncoherentCreationDateUpdateSuccess=การสร้างมูลค่าสัญญาที่ไม่ดีวันที่แก้ไขทำ succesfuly
+MigrationContractsIncoherentCreationDateNothingToUpdate=ไม่มีค่าที่ไม่ดีสำหรับวันที่สร้างสัญญาที่จะแก้ไข
+MigrationReopeningContracts=สัญญาเปิดปิดโดยข้อผิดพลาด
+MigrationReopenThisContract=เปิดสัญญา% s
+MigrationReopenedContractsNumber=สัญญา% s การแก้ไข
+MigrationReopeningContractsNothingToUpdate=ไม่มีการทำสัญญาในการเปิดปิด
+MigrationBankTransfertsUpdate=การเชื่อมโยงระหว่างการปรับปรุงการทำธุรกรรมธนาคารและโอนเงินผ่านธนาคาร
+MigrationBankTransfertsNothingToUpdate=การเชื่อมโยงทั้งหมดมีถึงวันที่
+MigrationShipmentOrderMatching=อัปเดตได้รับตอบรับ
+MigrationDeliveryOrderMatching=การปรับปรุงการจัดส่งใบเสร็จรับเงิน
+MigrationDeliveryDetail=การปรับปรุงการจัดส่งสินค้า
+MigrationStockDetail=อัพเดตค่าหุ้นของผลิตภัณฑ์
+MigrationMenusDetail=ปรับปรุงตารางเมนูแบบไดนามิก
+MigrationDeliveryAddress=ที่อยู่จัดส่งการปรับปรุงในการจัดส่ง
+MigrationProjectTaskActors=การโยกย้ายข้อมูลสำหรับตาราง llx_projet_task_actors
+MigrationProjectUserResp=เขตการโยกย้ายข้อมูล fk_user_resp ของ llx_projet เพื่อ llx_element_contact
+MigrationProjectTaskTime=เวลาการปรับปรุงการใช้จ่ายในไม่กี่วินาที
+MigrationActioncommElement=ปรับปรุงข้อมูลเกี่ยวกับการกระทำ
+MigrationPaymentMode=การโยกย้ายข้อมูลสำหรับโหมดการชำระเงิน
+MigrationCategorieAssociation=การย้ายถิ่นของประเภท
+MigrationEvents=การย้ายถิ่นของเหตุการณ์ที่จะเพิ่มเจ้าของเหตุการณ์ลงในตาราง assignement
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=แสดงตัวเลือกที่มีอยู่ไม่ได้
+HideNotAvailableOptions=ซ่อนตัวเลือกที่มีอยู่ไม่ได้
diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
index 67d4f61d9f1..19e29161782 100644
--- a/htdocs/langs/th_TH/interventions.lang
+++ b/htdocs/langs/th_TH/interventions.lang
@@ -1,53 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervention
-Interventions=Interventions
-InterventionCard=Intervention card
-NewIntervention=New intervention
-AddIntervention=Create intervention
-ListOfInterventions=List of interventions
-EditIntervention=Edit intervention
-ActionsOnFicheInter=Actions on intervention
-LastInterventions=Last %s interventions
-AllInterventions=All interventions
-CreateDraftIntervention=Create draft
-CustomerDoesNotHavePrefix=Customer does not have a prefix
-InterventionContact=Intervention contact
-DeleteIntervention=Delete intervention
-ValidateIntervention=Validate intervention
-ModifyIntervention=Modify intervention
-DeleteInterventionLine=Delete intervention line
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-NameAndSignatureOfInternalContact=Name and signature of intervening :
-NameAndSignatureOfExternalContact=Name and signature of customer :
-DocumentModelStandard=Standard document model for interventions
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
-StatusInterInvoiced=Billed
-RelatedInterventions=Related interventions
-ShowIntervention=Show intervention
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+Intervention=การแทรกแซง
+Interventions=การแทรกแซง
+InterventionCard=บัตรแทรกแซง
+NewIntervention=การแทรกแซงใหม่
+AddIntervention=การแทรกแซงสร้าง
+ListOfInterventions=รายชื่อของการแทรกแซง
+EditIntervention=การแทรกแซงแก้ไข
+ActionsOnFicheInter=การดำเนินการเกี่ยวกับการแทรกแซง
+LastInterventions=การแทรกแซง% s ล่าสุด
+AllInterventions=การแทรกแซงทั้งหมด
+CreateDraftIntervention=สร้างร่าง
+CustomerDoesNotHavePrefix=ลูกค้าไม่ได้มีคำนำหน้า
+InterventionContact=ติดต่อแทรกแซง
+DeleteIntervention=ลบแทรกแซง
+ValidateIntervention=การแทรกแซงการตรวจสอบ
+ModifyIntervention=การแทรกแซงการปรับเปลี่ยน
+DeleteInterventionLine=ลบเส้นแทรกแซง
+ConfirmDeleteIntervention=คุณแน่ใจหรือว่าต้องการลบแทรกแซงนี้หรือไม่?
+ConfirmValidateIntervention=<b>คุณแน่ใจหรือว่าต้องการตรวจสอบการแทรกแซงนี้ภายใต้ชื่อ% s?</b>
+ConfirmModifyIntervention=คุณแน่ใจหรือว่าต้องการปรับเปลี่ยนการแทรกแซงนี้หรือไม่?
+ConfirmDeleteInterventionLine=คุณแน่ใจหรือว่าต้องการลบบรรทัดแทรกแซงนี้หรือไม่?
+NameAndSignatureOfInternalContact=ชื่อและลายเซ็นของการแทรกแซง:
+NameAndSignatureOfExternalContact=ชื่อและลายเซ็นของลูกค้า:
+DocumentModelStandard=รูปแบบเอกสารมาตรฐานสำหรับการแทรกแซง
+InterventionCardsAndInterventionLines=การแทรกแซงและเส้นของการแทรกแซง
+InterventionClassifyBilled=จำแนก "เรียกเก็บเงิน"
+InterventionClassifyUnBilled=แยกประเภท "ยังไม่เรียกเก็บ"
+StatusInterInvoiced=การเรียกเก็บเงิน
+RelatedInterventions=การแทรกแซงที่เกี่ยวข้อง
+ShowIntervention=การแทรกแซงการแสดง
+SendInterventionRef=การส่งของการแทรกแซง% s
+SendInterventionByMail=ส่งการแทรกแซงทางอีเมล
+InterventionCreatedInDolibarr=s แทรกแซง% สร้าง
+InterventionValidatedInDolibarr=s% แทรกแซงการตรวจสอบ
+InterventionModifiedInDolibarr=s% แทรกแซงการแก้ไข
+InterventionClassifiedBilledInDolibarr=ชุดแทรกแซง% s เป็นการเรียกเก็บเงิน
+InterventionClassifiedUnbilledInDolibarr=การแทรกแซง% s เป็นชุดยังไม่เรียกเก็บ
+InterventionSentByEMail=การแทรกแซง% s ส่งทางอีเมล
+InterventionDeletedInDolibarr=s แทรกแซง% ลบ
+SearchAnIntervention=ค้นหาแทรกแซง
 ##### Types de contacts #####
-TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
-TypeContact_fichinter_internal_INTERVENING=Intervening
-TypeContact_fichinter_external_BILLING=Billing customer contact
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=แทนการแทรกแซงดังต่อไปนี้ขึ้น
+TypeContact_fichinter_internal_INTERVENING=ที่แทรกแซง
+TypeContact_fichinter_external_BILLING=การเรียกเก็บเงินการติดต่อกับลูกค้า
+TypeContact_fichinter_external_CUSTOMER=ติดตามการติดต่อกับลูกค้า
 # Modele numérotation
-ArcticNumRefModelDesc1=Generic number model
-ArcticNumRefModelError=Failed to activate
-PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
+ArcticNumRefModelDesc1=หมายเลขรุ่นทั่วไป
+ArcticNumRefModelError=ไม่สามารถเปิดใช้งาน
+PacificNumRefModelDesc1=กลับ Numero ที่มีรูปแบบ% syymm-nnnn ที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
+PacificNumRefModelError=บัตรเริ่มต้นด้วยการแทรกแซง $ syymm อยู่แล้วและไม่ได้เข้ากันได้กับรูปแบบของลำดับนี้ ลบหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
+PrintProductsOnFichinter=ผลิตภัณฑ์ด้านการพิมพ์บนบัตรแทรกแซง
+PrintProductsOnFichinterDetails=การแทรกแซงที่เกิดจากคำสั่งซื้อ
diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang
index 32545205240..d49050d3126 100644
--- a/htdocs/langs/th_TH/languages.lang
+++ b/htdocs/langs/th_TH/languages.lang
@@ -2,71 +2,77 @@
 
 Language_ar_AR=ภาษาอาหรับ
 Language_ar_SA=ภาษาอาหรับ
+Language_bn_BD=ประเทศบังคลาเทศ
 Language_bg_BG=บัลแกเรีย
-Language_bs_BA=ชาวบอสเนีย
+Language_bs_BA=บอสเนีย
 Language_ca_ES=คาตาลัน
-Language_cs_CZ=เช็ก
-Language_da_DA=ภาษาเดนมาร์ก
-Language_da_DK=ภาษาเดนมาร์ก
-Language_de_DE=ภาษาเยอรมัน
+Language_cs_CZ=สาธารณรัฐเช็ก
+Language_da_DA=เดนมาร์ก
+Language_da_DK=เดนมาร์ก
+Language_de_DE=เยอรมัน
 Language_de_AT=เยอรมัน (ออสเตรีย)
 Language_de_CH=ภาษาเยอรมัน
 Language_el_GR=กรีก
 Language_en_AU=ภาษาอังกฤษ (ออสเตรเลีย)
-Language_en_CA=English (Canada)
-Language_en_GB=ภาษาอังกฤษ (สหราชอาณาจักร)
+Language_en_CA=ภาษาอังกฤษ (แคนาดา)
+Language_en_GB=อังกฤษ (สหราชอาณาจักร)
 Language_en_IN=ภาษาอังกฤษ (อินเดีย)
-Language_en_NZ=ภาษาอังกฤษ (นิวซีแลนด์)
-Language_en_SA=ภาษาอังกฤษ (ซาอุดีอาระเบีย)
+Language_en_NZ=อังกฤษ (นิวซีแลนด์)
+Language_en_SA=อังกฤษ (ซาอุดีอาระเบีย)
 Language_en_US=ภาษาอังกฤษ (สหรัฐอเมริกา)
 Language_en_ZA=ภาษาอังกฤษ (แอฟริกาใต้)
-Language_es_ES=ภาษาสเปน
-Language_es_DO=ภาษาสเปน
+Language_es_ES=สเปน
 Language_es_AR=สเปน (อาร์เจนตินา)
-Language_es_CL=ภาษาสเปน (ชิลี)
+Language_es_CL=สเปน (ชิลี)
+Language_es_CO=สเปน (โคลอมเบีย)
+Language_es_DO=ภาษาสเปน
 Language_es_HN=สเปน (ฮอนดูรัส)
 Language_es_MX=สเปน (เม็กซิโก)
 Language_es_PY=สเปน (ปารากวัย)
-Language_es_PE=สเปน (เปรู)
+Language_es_PE=เสปน (เปรู)
 Language_es_PR=สเปน (เปอร์โตริโก)
 Language_et_EE=เอสโตเนีย
 Language_eu_ES=ชาวแบสค์
-Language_fa_IR=ชาวเปอร์เซีย
+Language_fa_IR=เปอร์เซีย
 Language_fi_FI=ครีบ
-Language_fr_BE=ฝรั่งเศส (เบลเยียม)
+Language_fr_BE=ฝรั่งเศส (เบลเยี่ยม)
 Language_fr_CA=ฝรั่งเศส (แคนาดา)
 Language_fr_CH=ฝรั่งเศส (วิตเซอร์แลนด์)
 Language_fr_FR=ฝรั่งเศส
 Language_fr_NC=ฝรั่งเศส (ใหม่แคลิโดเนีย)
-Language_he_IL=ภาษาฮิบ​​รู
+Language_he_IL=ชาวอิสราเอล
 Language_hr_HR=โครเอเชีย
-Language_hu_HU=ชาวฮังการี
+Language_hu_HU=ฮังการี
 Language_id_ID=ภาษาอินโดนีเซีย
 Language_is_IS=ไอซ์แลนด์
-Language_it_IT=อิตาเลียน
+Language_it_IT=อิตาลี
 Language_ja_JP=ญี่ปุ่น
+Language_ka_GE=จอร์เจีย
+Language_kn_IN=นาดา
 Language_ko_KR=เกาหลี
+Language_lo_LA=ลาว
 Language_lt_LT=ภาษาลิธัวเนีย
 Language_lv_LV=ลัตเวีย
 Language_mk_MK=มาซิโดเนีย
-Language_nb_NO=นอร์เวย์ (บ็อก)
-Language_nl_BE=ดัตช์ (เบลเยียม)
+Language_nb_NO=นอร์เวย์ (บ็อกมัล)
+Language_nl_BE=ดัตช์ (เบลเยี่ยม)
 Language_nl_NL=ดัตช์ (เนเธอร์แลนด์)
-Language_pl_PL=ขัด
+Language_pl_PL=โปแลนด์
 Language_pt_BR=โปรตุเกส (บราซิล)
-Language_pt_PT=ภาษาโปรตุเกส
+Language_pt_PT=โปรตุเกส
 Language_ro_RO=โรมาเนีย
-Language_ru_RU=ชาวรัสเซีย
+Language_ru_RU=รัสเซีย
 Language_ru_UA=รัสเซีย (ยูเครน)
 Language_tr_TR=ตุรกี
 Language_sl_SI=ภาษาสโลเวเนีย
-Language_sv_SV=สวีดิช
-Language_sv_SE=สวีดิช
-Language_sq_AL=ภาษาอัลบาเนีย
-Language_sk_SK=สโลวะเกีย
-Language_th_TH=ภาษาไทย
-Language_uk_UA=ภาษายูเครน
-Language_uz_UZ=อุซเบกิ
+Language_sv_SV=สวีเดน
+Language_sv_SE=สวีเดน
+Language_sq_AL=แอลเบเนีย
+Language_sk_SK=สโลวาเกีย
+Language_sw_SW=Kiswahili
+Language_th_TH=ไทย
+Language_uk_UA=ยูเครน
+Language_uz_UZ=อุซเบก
 Language_vi_VN=เวียตนาม
 Language_zh_CN=จีน
-Language_zh_TW=ภาษาจีน (แบบดั้งเดิม)
+Language_zh_TW=จีน (ดั้งเดิม)
diff --git a/htdocs/langs/th_TH/ldap.lang b/htdocs/langs/th_TH/ldap.lang
index 02e457446a6..6ee527baea7 100644
--- a/htdocs/langs/th_TH/ldap.lang
+++ b/htdocs/langs/th_TH/ldap.lang
@@ -1,29 +1,29 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LdapUacf_NORMAL_ACCOUNT=User account
-LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires
-LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
-LDAPAttribute=LDAP attribute
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
-LDAPGroups=Groups in LDAP database
-LDAPFieldStatus=Status
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
-SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP)
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+DomainPassword=รหัสผ่านสำหรับโดเมน
+YouMustChangePassNextLogon=<b>รหัสผ่านสำหรับผู้ใช้% s% s</b> ในโดเมนต้องมีการเปลี่ยนแปลง
+UserMustChangePassNextLogon=ผู้ใช้ต้องเปลี่ยนรหัสผ่านในโดเมน% s
+LdapUacf_NORMAL_ACCOUNT=บัญชีผู้ใช้
+LdapUacf_DONT_EXPIRE_PASSWORD=รหัสผ่านไม่หมดอายุ
+LdapUacf_ACCOUNTDISABLE=บัญชีถูกปิดใช้งานในโดเมน% s
+LDAPInformationsForThisContact=ข้อมูลในฐานข้อมูล LDAP สำหรับการติดต่อนี้
+LDAPInformationsForThisUser=ข้อมูลในฐานข้อมูล LDAP สำหรับผู้ใช้นี้
+LDAPInformationsForThisGroup=ข้อมูลในฐานข้อมูล LDAP สำหรับกลุ่มนี้
+LDAPInformationsForThisMember=ข้อมูลในฐานข้อมูล LDAP ของสมาชิกนี้
+LDAPAttribute=แอตทริบิวต์ LDAP
+LDAPAttributes=คุณลักษณะ LDAP
+LDAPCard=บัตร LDAP
+LDAPRecordNotFound=บันทึกไม่พบในฐานข้อมูล LDAP
+LDAPUsers=ผู้ใช้ในฐานข้อมูล LDAP
+LDAPGroups=กลุ่มในฐานข้อมูล LDAP
+LDAPFieldStatus=สถานะ
+LDAPFieldFirstSubscriptionDate=วันที่สมัครสมาชิกครั้งแรก
+LDAPFieldFirstSubscriptionAmount=จำนวนการสมัครสมาชิกครั้งแรก
+LDAPFieldLastSubscriptionDate=วันที่สมัครสมาชิกล่าสุด
+LDAPFieldLastSubscriptionAmount=จำนวนการสมัครสมาชิกล่าสุด
+SynchronizeDolibarr2Ldap=ประสานผู้ใช้ (Dolibarr -> LDAP)
+UserSynchronized=ผู้ใช้ตรงกัน
+GroupSynchronized=กลุ่มตรงกัน
+MemberSynchronized=สมาชิกตรงกัน
+ContactSynchronized=ติดต่อตรง
+ForceSynchronize=กองทัพตรงกัน Dolibarr -> LDAP
+ErrorFailedToReadLDAP=ไม่สามารถอ่านฐานข้อมูล LDAP ตรวจสอบการติดตั้งโมดูล LDAP และการเข้าถึงฐานข้อมูล
diff --git a/htdocs/langs/th_TH/link.lang b/htdocs/langs/th_TH/link.lang
index 8b1efb75ef3..4e284d1cb66 100644
--- a/htdocs/langs/th_TH/link.lang
+++ b/htdocs/langs/th_TH/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=เชื่อมโยงไฟล์ใหม่ / เอกสาร
+LinkedFiles=แฟ้มที่เชื่อมโยงและเอกสาร
+NoLinkFound=ไม่มีการเชื่อมโยงลงทะเบียน
+LinkComplete=ไฟล์ที่ได้รับการประสบความสำเร็จในการเชื่อมโยง
+ErrorFileNotLinked=ไฟล์ไม่สามารถเชื่อมโยง
+LinkRemoved=การเชื่อมโยง% s ได้ถูกลบออก
+ErrorFailedToDeleteLink= ล้มเหลวในการลบการเชื่อมโยง <b>'% s'</b>
+ErrorFailedToUpdateLink= ล้มเหลวในการปรับปรุงการเชื่อมโยง <b>'% s'</b>
diff --git a/htdocs/langs/th_TH/loan.lang b/htdocs/langs/th_TH/loan.lang
new file mode 100644
index 00000000000..7616cb4acbe
--- /dev/null
+++ b/htdocs/langs/th_TH/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=เงินกู้
+Loans=เงินให้กู้ยืม
+NewLoan=สินเชื่อใหม่
+ShowLoan=แสดงสินเชื่อ
+PaymentLoan=การชำระเงินสินเชื่อ
+ShowLoanPayment=แสดงการชำระเงินสินเชื่อ
+Capital=เมืองหลวง
+Insurance=ประกันภัย
+Interest=ความสนใจ
+Nbterms=จำนวนของข้อตกลง
+LoanAccountancyCapitalCode=บัญชีทุนรหัส
+LoanAccountancyInsuranceCode=รหัสบัญชีประกัน
+LoanAccountancyInterestCode=บัญชีที่น่าสนใจรหัส
+LoanPayment=การชำระเงินสินเชื่อ
+ConfirmDeleteLoan=ยืนยันการลบเงินให้กู้ยืมนี้
+LoanDeleted=สินเชื่อที่ถูกลบประสบความสำเร็จ
+ConfirmPayLoan=ยืนยันการจำแนกจ่ายเงินให้กู้ยืมนี้
+LoanPaid=สินเชื่อการชำระเงิน
+ErrorLoanCapital=การกู้ยืมเงินจะต้องมีตัวเลขและมากกว่าศูนย์
+ErrorLoanLength=ระยะเวลาในการกู้เงินจะต้องมีตัวเลขและมากกว่าศูนย์
+ErrorLoanInterest=ที่น่าสนใจประจำปีจะต้องมีตัวเลขและมากกว่าศูนย์
+# Calc
+LoanCalc=เครื่องคิดเลขสินเชื่อธนาคาร
+PurchaseFinanceInfo=ข้อมูลการสั่งซื้อและการเงิน
+SalePriceOfAsset=ราคาขายของสินทรัพย์
+PercentageDown=ลงร้อยละ
+LengthOfMortgage=ความยาวของสินเชื่อที่อยู่อาศัย
+AnnualInterestRate=อัตราดอกเบี้ยประจำปี
+ExplainCalculations=อธิบายการคำนวณ
+ShowMeCalculationsAndAmortization=แสดงการคำนวณและค่าตัดจำหน่าย
+MortgagePaymentInformation=สินเชื่อที่อยู่อาศัยข้อมูลการชำระเงิน
+DownPayment=การชำระเงินลง
+DownPaymentDesc=<b>การชำระเงินลง</b> = ราคาของบ้านคูณด้วยอัตราร้อยละแบ่งลดลง 100 (ต่อ 5% ลดลงกลายเป็น 5/100 หรือ 0.05)
+InterestRateDesc=<b>อัตราดอกเบี้ย</b> = ร้อยละที่น่าสนใจประจำปีหารด้วย 100
+MonthlyFactorDesc=<b>ปัจจัยรายเดือน</b> = ผลมาจากสูตรต่อไปนี้
+MonthlyInterestRateDesc=<b>อัตราดอกเบี้ยรายเดือน</b> = อัตราดอกเบี้ยประจำปีหารด้วย 12 (12 เดือนต่อปี)
+MonthTermDesc=<b>ระยะเดือนของเงินกู้ในเดือน</b> = จำนวนปีที่คุณได้ถ่ายออกเงินกู้ครั้งที่ 12
+MonthlyPaymentDesc=การชำระเงินรายเดือนจะคิดออกโดยใช้สูตรต่อไปนี้
+AmortizationPaymentDesc=<a href="#amortization">ค่าตัดจำหน่าย</a> แบ่งลงเท่าใดของการชำระเงินรายเดือนของคุณไปสู่ความสนใจของธนาคารและวิธีการมากที่จะเข้าสู่การจ่ายเงินออกหลักของเงินกู้ของคุณ
+AmountFinanced=จํานวนเงินทุน
+AmortizationMonthlyPaymentOverYears=<b>ค่าตัดจำหน่ายสำหรับการชำระเงินรายเดือน:% s%</b> s มากกว่าปีที่ผ่านมา
+Totalsforyear=ผลรวมสำหรับปี
+MonthlyPayment=การชำระเงินรายเดือน
+LoanCalcDesc=<b>เครื่องคิดเลขจำนองนี้สามารถใช้ในการคิดออกชำระเงินรายเดือนของสินเชื่อจำนองบ้านขึ้นอยู่กับราคาขายบ้านของระยะเวลาของเงินกู้ที่ต้องการชำระเงินลงร้อยละของผู้ซื้อและอัตราดอกเบี้ยเงินกู้ของ</b> <br> ปัจจัยเครื่องคิดเลขนี้ใน PMI (Private ประกันสินเชื่อที่อยู่อาศัย) สำหรับเงินให้สินเชื่อที่น้อยกว่า 20% จะใส่เป็นชำระเงินลง ยังนำเข้าสู่การพิจารณาเป็นภาษีทรัพย์สินเมืองและผลกระทบต่อการชำระเงินจำนองรายเดือนทั้งหมด <br>
+GoToInterest=% s จะไปสู่​​ความสนใจ
+GoToPrincipal=% s จะไปต่อที่สำคัญ
+YouWillSpend=คุณจะใช้% s ในบ้านของคุณในปีที่% s
+# Admin
+ConfigLoan=การกำหนดค่าของเงินให้กู้ยืมโมดูล
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=ทุนการบัญชีรหัสโดยค่าเริ่มต้น
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=ที่น่าสนใจการบัญชีรหัสโดยค่าเริ่มต้น
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=ประกันการบัญชีรหัสโดยค่าเริ่มต้น
diff --git a/htdocs/langs/th_TH/mailmanspip.lang b/htdocs/langs/th_TH/mailmanspip.lang
index c85b3d60db2..e47c790f0b3 100644
--- a/htdocs/langs/th_TH/mailmanspip.lang
+++ b/htdocs/langs/th_TH/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed succesfully
-MailmanDeletionSuccess=Unsubscription test was executed succesfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+MailmanSpipSetup=บุรุษไปรษณีย์และหลักสูตรนานาชาติติดตั้งโมดูล
+MailmanTitle=ระบบรายชื่อผู้รับจดหมายบุรุษไปรษณีย์
+TestSubscribe=เพื่อทดสอบการสมัครสมาชิกไปยังรายการบุรุษไปรษณีย์
+TestUnSubscribe=เพื่อทดสอบการยกเลิกการเป็นสมาชิกจากรายการบุรุษไปรษณีย์
+MailmanCreationSuccess=การทดสอบการสมัครสมาชิกได้ดำเนินการประสบความสำเร็จ
+MailmanDeletionSuccess=ยกเลิกการทดสอบได้ดำเนินการประสบความสำเร็จ
+SynchroMailManEnabled=การปรับปรุงบุรุษไปรษณีย์จะดำเนินการ
+SynchroSpipEnabled=การปรับปรุงหลักสูตรนานาชาติจะดำเนินการ
+DescADHERENT_MAILMAN_ADMINPW=รหัสผ่านผู้ดูแลบุรุษไปรษณีย์
+DescADHERENT_MAILMAN_URL=URL สำหรับการสมัครสมาชิกบุรุษไปรษณีย์
+DescADHERENT_MAILMAN_UNSUB_URL=URL สำหรับ unsubscriptions บุรุษไปรษณีย์
+DescADHERENT_MAILMAN_LISTS=รายการ (s) สำหรับจารึกอัตโนมัติของสมาชิกใหม่ (คั่นด้วยเครื่องหมายจุลภาค)
+SPIPTitle=หลักสูตรนานาชาติระบบการจัดการเนื้อหา
+DescADHERENT_SPIP_SERVEUR=เซิร์ฟเวอร์หลักสูตรนานาชาติ
+DescADHERENT_SPIP_DB=ชื่อฐานข้อมูลหลักสูตรนานาชาติ
+DescADHERENT_SPIP_USER=หลักสูตรนานาชาติเข้าสู่ระบบฐานข้อมูล
+DescADHERENT_SPIP_PASS=รหัสผ่านฐานข้อมูลหลักสูตรนานาชาติ
+AddIntoSpip=เพิ่มเข้าไปในหลักสูตรนานาชาติ
+AddIntoSpipConfirmation=คุณแน่ใจว่าคุณต้องการที่จะเพิ่มสมาชิกนี้ลงในหลักสูตรนานาชาติ?
+AddIntoSpipError=ไม่สามารถเพิ่มผู้ใช้ในหลักสูตรนานาชาติ
+DeleteIntoSpip=ลบออกจากหลักสูตรนานาชาติ
+DeleteIntoSpipConfirmation=คุณแน่ใจว่าคุณต้องการที่จะลบสมาชิกจากหลักสูตรนานาชาตินี้หรือไม่?
+DeleteIntoSpipError=ล้มเหลวในการปราบปรามผู้ใช้จากหลักสูตรนานาชาติ
+SPIPConnectionFailed=ไม่สามารถเชื่อมต่อหลักสูตรนานาชาติ
+SuccessToAddToMailmanList=เพิ่ม% s ในรายการ% s บุรุษไปรษณีย์หรือฐานข้อมูลหลักสูตรนานาชาติทำ
+SuccessToRemoveToMailmanList=การกำจัดของ% s จากรายชื่อของบุรุษไปรษณีย์% หรือฐานข้อมูลหลักสูตรนานาชาติทำ
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 89c71da9123..d6d650681a9 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -1,143 +1,144 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=EMailing
-EMailing=EMailing
+Mailing=การส่งอีเมล
+EMailing=การส่งอีเมล
 Mailings=EMailings
 EMailings=EMailings
-AllEMailings=All eMailings
-MailCard=EMailing card
-MailTargets=Targets
-MailRecipients=Recipients
-MailRecipient=Recipient
-MailTitle=Description
-MailFrom=Sender
-MailErrorsTo=Errors to
-MailReply=Reply to
-MailTo=Receiver(s)
-MailCC=Copy to
-MailCCC=Cached copy to
-MailTopic=EMail topic
-MailText=Message
-MailFile=Attached files
-MailMessage=EMail body
-ShowEMailing=Show emailing
-ListOfEMailings=List of emailings
-NewMailing=New emailing
-EditMailing=Edit emailing
-ResetMailing=Resend emailing
-DeleteMailing=Delete emailing
-DeleteAMailing=Delete an emailing
-PreviewMailing=Preview emailing
-PrepareMailing=Prepare emailing
-CreateMailing=Create emailing
-MailingDesc=This page allows you to send emailings to a group of people.
-MailingResult=Sending emails result
-TestMailing=Test email
-ValidMailing=Valid emailing
-ApproveMailing=Approve emailing
-MailingStatusDraft=Draft
-MailingStatusValidated=Validated
-MailingStatusApproved=Approved
-MailingStatusSent=Sent
-MailingStatusSentPartialy=Sent partialy
-MailingStatusSentCompletely=Sent completely
-MailingStatusError=Error
-MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-Unsuscribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
-ErrorMailRecipientIsEmpty=Email recipient is empty
-WarningNoEMailsAdded=No new Email to add to recipient's list.
-ConfirmValidMailing=Are you sure you want to validate this emailing ?
-ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ?
-ConfirmDeleteMailing=Are you sure you want to delete this emailling ?
-NbOfRecipients=Number of recipients
-NbOfUniqueEMails=Nb of unique emails
-NbOfEMails=Nb of EMails
-TotalNbOfDistinctRecipients=Number of distinct recipients
-NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
-AddRecipients=Add recipients
-RemoveRecipient=Remove recipient
-CommonSubstitutions=Common substitutions
-YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
-EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
-MailingAddFile=Attach this file
-NoAttachedFiles=No attached files
-BadEMail=Bad value for EMail
-CloneEMailing=Clone Emailing
-ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
-CloneContent=Clone message
-CloneReceivers=Cloner recipients
-DateLastSend=Date of last sending
-DateSending=Date sending
-SentTo=Sent to <b>%s</b>
-MailingStatusRead=Read
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
-MailtoEMail=Hyper link to email
-ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
-EMailSentToNRecipients=EMail sent to %s recipients.
-XTargetsAdded=<b>%s</b> recipients added into target list
-EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
-SendRemind=Send reminder by EMails
-RemindSent=%s reminder(s) sent
-AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
-NoRemindSent=No EMail reminder sent
-ResultOfMassSending=Result of mass EMail reminders sending
+AllEMailings=eMailings ทั้งหมด
+MailCard=บัตรการส่งอีเมล
+MailTargets=เป้าหมาย
+MailRecipients=ผู้รับ
+MailRecipient=ผู้รับ
+MailTitle=ลักษณะ
+MailFrom=ผู้ส่ง
+MailErrorsTo=ข้อผิดพลาดที่จะ
+MailReply=ตอบกลับ
+MailTo=รับสัญญาณ (s)
+MailCC=คัดลอกไป
+MailCCC=คัดลอกเก็บไว้เพื่อ
+MailTopic=หัวข้ออีเมล
+MailText=ข่าวสาร
+MailFile=ไฟล์ที่แนบมา
+MailMessage=ร่างกายอีเมล
+ShowEMailing=แสดงการส่งอีเมล
+ListOfEMailings=รายการ emailings
+NewMailing=ส่งอีเมลใหม่
+EditMailing=แก้ไขการส่งอีเมล
+ResetMailing=ส่งการส่งอีเมล
+DeleteMailing=ลบการส่งอีเมล
+DeleteAMailing=ลบการส่งอีเมล
+PreviewMailing=ส่งอีเมลตัวอย่าง
+PrepareMailing=เตรียมการส่งอีเมล
+CreateMailing=สร้างการส่งอีเมล
+MailingDesc=หน้านี้ช่วยให้คุณส่ง emailings ไปยังกลุ่มคน
+MailingResult=ส่งผลให้การส่งอีเมล
+TestMailing=อีเมลทดสอบ
+ValidMailing=การส่งอีเมลที่ถูกต้อง
+ApproveMailing=อนุมัติการส่งอีเมล
+MailingStatusDraft=ร่าง
+MailingStatusValidated=ผ่านการตรวจสอบ
+MailingStatusApproved=ได้รับการอนุมัติ
+MailingStatusSent=ส่ง
+MailingStatusSentPartialy=ส่ง partialy
+MailingStatusSentCompletely=ส่งสมบูรณ์
+MailingStatusError=ความผิดพลาด
+MailingStatusNotSent=ส่งไม่ได้
+MailSuccessfulySent=อีเมลที่ส่งประสบความสำเร็จ (จาก% s% s)
+MailingSuccessfullyValidated=ตรวจสอบการส่งอีเมลที่ประสบความสำเร็จ
+MailUnsubcribe=ยกเลิก
+Unsuscribe=ยกเลิก
+MailingStatusNotContact=ไม่ติดต่ออีกต่อไป
+ErrorMailRecipientIsEmpty=ผู้รับอีเมล์เป็นที่ว่างเปล่า
+WarningNoEMailsAdded=ไม่มีอีเมล์ใหม่เพื่อเพิ่มรายชื่อของผู้รับ
+ConfirmValidMailing=คุณแน่ใจหรือว่าต้องการตรวจสอบการส่งอีเมลนี้หรือไม่?
+ConfirmResetMailing=คำเตือนโดยการส่งอีเมล <b>reinitializing% s,</b> คุณอนุญาตเพื่อให้มวลส่งอีเมล์นี้อีกครั้ง คุณแน่ใจหรือว่านี่คือสิ่งที่คุณต้องการจะทำอย่างไร?
+ConfirmDeleteMailing=คุณแน่ใจหรือว่าต้องการลบ emailling นี้หรือไม่?
+NbOfRecipients=จำนวนผู้รับ
+NbOfUniqueEMails=nb ของอีเมลที่ไม่ซ้ำกัน
+NbOfEMails=nb ของอีเมล
+TotalNbOfDistinctRecipients=จำนวนผู้รับที่แตกต่างกัน
+NoTargetYet=ผู้รับไม่มีกำหนดเลย (ไปที่แท็บ 'ผู้รับ')
+AddRecipients=เพิ่มผู้รับ
+RemoveRecipient=ลบผู้รับ
+CommonSubstitutions=แทนทั่วไป
+YouCanAddYourOwnPredefindedListHere=การสร้างโมดูลเลือกอีเมลของคุณให้ดู htdocs / หลัก / modules / จดหมาย / README
+EMailTestSubstitutionReplacedByGenericValues=เมื่อใช้โหมดการทดสอบตัวแปรแทนจะถูกแทนที่ด้วยค่าทั่วไป
+MailingAddFile=แนบไฟล์นี้
+NoAttachedFiles=ไม่มีไฟล์ที่แนบมา
+BadEMail=ค่าที่ไม่ดีสำหรับอีเมล
+CloneEMailing=ส่งอีเมลโคลน
+ConfirmCloneEMailing=คุณแน่ใจหรือว่าต้องการโคลนส่งอีเมลนี้หรือไม่?
+CloneContent=ข้อความโคลน
+CloneReceivers=Cloner ผู้รับ
+DateLastSend=วันสุดท้ายของการส่ง
+DateSending=วันที่ส่ง
+SentTo=<b>ส่งไปยัง% s</b>
+MailingStatusRead=อ่าน
+CheckRead=อ่านใบเสร็จรับเงิน
+YourMailUnsubcribeOK=<b>อีเมล% s</b> ถูกต้อง unsubcribe จากรายการทางไปรษณีย์
+MailtoEMail=การเชื่อมโยงไปยังอีเมลของ Hyper
+ActivateCheckRead=อนุญาตให้มีการใช้ "Unsubcribe" การเชื่อมโยง
+ActivateCheckReadKey=ที่สำคัญที่ใช้ในการเข้ารหัส URL ที่ใช้ในการ "อ่านใบเสร็จรับเงิน" และ "Unsubcribe" คุณสมบัติ
+EMailSentToNRecipients=อีเมลที่ส่งไปยังผู้รับ% s
+XTargetsAdded=<b>ผู้รับ% s</b> เพิ่มเข้าไปในรายชื่อเป้าหมาย
+EachInvoiceWillBeAttachedToEmail=เอกสารที่ใช้แม่แบบเอกสารใบแจ้งหนี้ค่าเริ่มต้นจะถูกสร้างขึ้นและแนบมากับอีเมลแต่ละ
+MailTopicSendRemindUnpaidInvoices=เตือนความทรงจำของใบแจ้งหนี้% (% s)
+SendRemind=ส่งการแจ้งเตือนโดยอีเมล์
+RemindSent=เตือน% s (s) ส่ง
+AllRecipientSelectedForRemind=thirdparties เลือกและถ้าอีเมลที่มีการตั้งค่า (โปรดทราบว่าหนึ่งอีเมลต่อใบแจ้งหนี้จะถูกส่ง)
+NoRemindSent=ไม่มีการแจ้งเตือนอีเมลที่ส่ง
+ResultOfMassSending=ผลการแจ้งเตือนมวลส่งอีเมล์
 
 # Libelle des modules de liste de destinataires mailing
-MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...)
-MailingModuleDescDolibarrUsers=Dolibarr users
-MailingModuleDescFundationMembers=Foundation members with emails
-MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other)
-MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other)
-MailingModuleDescContactsCategories=Third parties (by category)
-MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines
-MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category)
-MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
-MailingModuleDescMembersCategories=Foundation members (by categories)
-MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function)
-LineInFile=Line %s in file
-RecipientSelectionModules=Defined requests for recipient's selection
-MailSelectedRecipients=Selected recipients
-MailingArea=EMailings area
-LastMailings=Last %s emailings
-TargetsStatistics=Targets statistics
-NbOfCompaniesContacts=Unique contacts/addresses
-MailNoChangePossible=Recipients for validated emailing can't be changed
-SearchAMailing=Search mailing
-SendMailing=Send emailing
-SendMail=Send email
-SentBy=Sent by
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
-TargetsReset=Clear list
-ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
-ToAddRecipientsChooseHere=Add recipients by choosing from the lists
-NbOfEMailingsReceived=Mass emailings received
-NbOfEMailingsSend=Mass emailings sent
-IdRecord=ID record
-DeliveryReceipt=Delivery Receipt
-YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
-TagMailtoEmail=Recipient EMail
+MailingModuleDescContactCompanies=รายชื่อ / ที่อยู่ของบุคคลที่สามทั้งหมด (ลูกค้าโอกาสผู้จัดจำหน่าย, ... )
+MailingModuleDescDolibarrUsers=ผู้ใช้ Dolibarr
+MailingModuleDescFundationMembers=สมาชิกมูลนิธิกับอีเมล
+MailingModuleDescEmailsFromFile=อีเมลจากแฟ้มข้อความ (อีเมล; นามสกุล; FirstName; อื่น ๆ )
+MailingModuleDescEmailsFromUser=อีเมลจากผู้ใช้ป้อน (อีเมล์นามสกุล; FirstName; อื่น ๆ )
+MailingModuleDescContactsCategories=บุคคลที่สาม (ตามหมวดหมู่)
+MailingModuleDescDolibarrContractsLinesExpired=บุคคลที่สามที่มีเส้นที่หมดอายุสัญญา
+MailingModuleDescContactsByCompanyCategory=รายชื่อ / ที่อยู่ของบุคคลที่สาม (โดยบุคคลที่สามหมวดหมู่)
+MailingModuleDescContactsByCategory=รายชื่อ / ที่อยู่ของบุคคลที่สามตามหมวดหมู่
+MailingModuleDescMembersCategories=สมาชิกมูลนิธิ (ตามประเภท)
+MailingModuleDescContactsByFunction=รายชื่อ / ที่อยู่ของบุคคลที่สาม (โดยตำแหน่ง / ฟังก์ชั่น)
+LineInFile=สาย% s ในแฟ้ม
+RecipientSelectionModules=การร้องขอที่กำหนดไว้สำหรับการเลือกผู้รับ
+MailSelectedRecipients=เลือกผู้รับ
+MailingArea=พื้นที่ EMailings
+LastMailings=% s emailings ล่าสุด
+TargetsStatistics=สถิติเป้าหมาย
+NbOfCompaniesContacts=รายชื่อที่ไม่ซ้ำกัน / ที่อยู่
+MailNoChangePossible=ผู้รับการตรวจสอบสำหรับการส่งอีเมลที่ไม่สามารถเปลี่ยนแปลงได้
+SearchAMailing=ค้นหาทางไปรษณีย์
+SendMailing=ส่งการส่งอีเมล
+SendMail=ส่งอีเมล
+SentBy=ที่ส่งมาจาก
+MailingNeedCommand=ด้วยเหตุผลด้านความปลอดภัยการส่งการส่งอีเมลที่ดีกว่าเมื่อดำเนินการจากบรรทัดคำสั่ง หากคุณมีหนึ่งขอให้ผู้ดูแลระบบเซิร์ฟเวอร์ของคุณเพื่อเปิดคำสั่งต่อไปที่จะส่งส่งอีเมลไปยังผู้รับทั้งหมด:
+MailingNeedCommand2=แต่คุณสามารถส่งพวกเขาออนไลน์ด้วยการเพิ่ม MAILING_LIMIT_SENDBYWEB พารามิเตอร์ที่มีค่าจำนวนสูงสุดของอีเมลที่คุณต้องการส่งโดยเซสชั่น สำหรับเรื่องนี้ไปในหน้าแรก - การติดตั้ง - อื่น ๆ
+ConfirmSendingEmailing=ถ้าคุณไม่สามารถหรือชอบส่งให้กับเบราว์เซอร์ของคุณ www โปรดยืนยันคุณแน่ใจว่าคุณต้องการที่จะส่งการส่งอีเมลในขณะนี้จากเบราว์เซอร์ของคุณหรือไม่
+LimitSendingEmailing=หมายเหตุ: การส่งของ emailings จากอินเตอร์เฟซเว็บที่จะทำในหลาย ๆ <b>ครั้งเพื่อความปลอดภัยและเหตุผลหมดเวลาผู้รับ% s</b> ในเวลาสำหรับแต่ละเซสชั่นการส่ง
+TargetsReset=รายชื่อที่ชัดเจน
+ToClearAllRecipientsClickHere=คลิกที่นี่เพื่อล้างรายชื่อผู้รับสำหรับการส่งอีเมลนี้
+ToAddRecipientsChooseHere=เพิ่มผู้รับโดยเลือกจากรายการ
+NbOfEMailingsReceived=emailings มวลที่ได้รับ
+NbOfEMailingsSend=emailings มวลส่ง
+IdRecord=บันทึก ID
+DeliveryReceipt=จัดส่งใบเสร็จรับเงิน
+YouCanUseCommaSeparatorForSeveralRecipients=<b>คุณสามารถใช้คั่นด้วยเครื่องหมายจุลภาคเพื่อระบุผู้รับหลาย</b>
+TagCheckMail=ติดตามการเปิดอีเมล
+TagUnsubscribe=ยกเลิกการเชื่อมโยง
+TagSignature=ลายเซ็นผู้ส่ง
+TagMailtoEmail=ผู้รับอีเมล
+NoEmailSentBadSenderOrRecipientEmail=ส่งอีเมลไม่มี ผู้ส่งที่ไม่ดีหรืออีเมลของผู้รับ ตรวจสอบรายละเอียดของผู้ใช้
 # Module Notifications
-Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active email notification targets
-ListOfNotificationsDone=List all email notifications sent
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
+Notifications=การแจ้งเตือน
+NoNotificationsWillBeSent=ไม่มีการแจ้งเตือนอีเมลที่มีการวางแผนสำหรับเหตุการณ์และ บริษัท นี้
+ANotificationsWillBeSent=1 การแจ้งเตือนจะถูกส่งไปทางอีเมล
+SomeNotificationsWillBeSent=% s การแจ้งเตือนจะถูกส่งไปทางอีเมล
+AddNewNotification=เปิดใช้งานเป้าหมายการแจ้งเตือนอีเมลใหม่
+ListOfActiveNotifications=รายชื่อเป้าหมายการแจ้งเตือนอีเมลที่ใช้งานทั้งหมด
+ListOfNotificationsDone=รายการทั้งหมดแจ้งเตือนอีเมลที่ส่ง
+MailSendSetupIs=การกำหนดค่าของการส่งอีเมล์ที่ได้รับการติดตั้งเพื่อ '% s' โหมดนี้ไม่สามารถใช้ในการส่งการส่งอีเมลมวล
+MailSendSetupIs2=ก่อนอื่นคุณต้องไปกับบัญชีผู้ดูแลระบบลงไปในเมนู% sHome - การติดตั้ง - อีเมล์% s จะเปลี่ยนพารามิเตอร์ <strong>'% s'</strong> เพื่อใช้โหมด '% s' ด้วยโหมดนี้คุณสามารถเข้าสู่การตั้งค่าของเซิร์ฟเวอร์ที่ให้บริการโดยผู้ให้บริการอินเทอร์เน็ตของคุณและใช้คุณลักษณะการส่งอีเมลมวล
+MailSendSetupIs3=หากคุณมีคำถามใด ๆ เกี่ยวกับวิธีการติดตั้งเซิร์ฟเวอร์ของคุณคุณสามารถขอให้% s
+YouCanAlsoUseSupervisorKeyword=นอกจากนี้คุณยังสามารถเพิ่ม <strong>__SUPERVISOREMAIL__</strong> คำหลักที่จะมีอีเมลถูกส่งไปยังผู้บังคับบัญชาของผู้ใช้ (ใช้งานได้เฉพาะในกรณีที่อีเมลถูกกำหนดไว้สำหรับหัวหน้างานนี้)
+NbOfTargetedContacts=ปัจจุบันจำนวนของอีเมลที่ติดต่อการกำหนดเป้​​าหมาย
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index c40847a8726..bf94be312e3 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -4,727 +4,734 @@ DIRECTION=ltr
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
-FONTFORPDF=DejaVuSans
-FONTSIZEFORPDF=8
+FONTFORPDF=Helvetica
+FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
-FormatHourShortJQuery=HH:MI
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH: MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
 FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTranslation=No translation
-NoRecordFound=No record found
-NoError=No error
-Error=Error
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Can not create dir %s
-ErrorCanNotReadDir=Can not read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorAttachedFilesDisabled=File attaching is disabled on this server
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorNoRequestRan=No request ran
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later.
-ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
-ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
-ErrorFailedToSaveFile=Error, failed to save file.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-BackgroundColorByDefault=Default background color
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (need Internet access)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DefinedAndHasThisValue=Defined and value to
-IsNotDefined=undefined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that password database is extern to Dolibarr, so changing this field may have no effects.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten ?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Last connection
-PreviousConnexion=Previous connection
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentification mode
-RequestedUrl=Requested Url
-DatabaseTypeManager=Database type manager
-RequestLastAccess=Request for last database access
-RequestLastAccessInError=Request for last database access in error
-ReturnCodeLastAccessInError=Return code for last database access in error
-InformationLastAccessInError=Information for last database access in error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This is information that can help diagnostic
-MoreInformation=More information
-TechnicalInformation=Technical information
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-Update=Update
-AddActionToDo=Add event to do
-AddActionDone=Add event done
-Close=Close
-Close2=Close
-Confirm=Confirm
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b> ?
-Delete=Delete
-Remove=Remove
+DatabaseConnection=เชื่อมต่อฐานข้อมูล
+NoTranslation=แปลไม่มี
+NoRecordFound=บันทึกไม่พบ
+NoError=ไม่มีข้อผิดพลาด
+Error=ความผิดพลาด
+ErrorFieldRequired=สนาม '% s' จะต้อง
+ErrorFieldFormat=สนาม '% s' มีค่าที่ไม่ดี
+ErrorFileDoesNotExists=ไฟล์% s ไม่ได้อยู่
+ErrorFailedToOpenFile=ไม่สามารถเปิดไฟล์% s
+ErrorCanNotCreateDir=ไม่สามารถสร้าง% s dir
+ErrorCanNotReadDir=ไม่สามารถอ่าน% s dir
+ErrorConstantNotDefined=พารามิเตอร์% s ไม่ได้กำหนดไว้
+ErrorUnknown=ข้อผิดพลาดที่ไม่รู้จัก
+ErrorSQL=ข้อผิดพลาด SQL
+ErrorLogoFileNotFound=ไฟล์โลโก้ '% s' ไม่พบ
+ErrorGoToGlobalSetup=ไปที่ 'บริษัท / มูลนิธิการติดตั้งการแก้ไขปัญหานี้
+ErrorGoToModuleSetup=ไปยังโมดูลการติดตั้งการแก้ไขปัญหานี้
+ErrorFailedToSendMail=ล้มเหลวในการส่งอีเมล (ส่ง =% s รับ =% s)
+ErrorAttachedFilesDisabled=แนบไฟล์ถูกปิดใช้งานบนเซิร์ฟเวอร์นี้
+ErrorFileNotUploaded=ไฟล์ที่อัปโหลดไม่ได้ ตรวจสอบขนาดที่ไม่เกินสูงสุดที่อนุญาตที่พื้นที่ว่างที่มีอยู่บนดิสก์และนั่นก็คือไม่ได้อยู่แล้วไฟล์ที่มีชื่อเดียวกันในไดเรกทอรีนี้
+ErrorInternalErrorDetected=ข้อผิดพลาดที่ตรวจพบ
+ErrorNoRequestRan=คำขอวิ่งไม่มี
+ErrorWrongHostParameter=โฮสต์พารามิเตอร์ที่ไม่ถูกต้อง
+ErrorYourCountryIsNotDefined=ประเทศของคุณจะไม่ได้กำหนดไว้ ไปที่บ้านติดตั้ง-แก้ไขและโพสต์รูปแบบอีกครั้ง
+ErrorRecordIsUsedByChild=ไม่สามารถลบบันทึกนี้ บันทึกนี้ถูกนำมาใช้อย่างน้อยหนึ่งบันทึกเด็ก
+ErrorWrongValue=ค่าที่ไม่ถูกต้อง
+ErrorWrongValueForParameterX=ค่าที่ไม่ถูกต้องสำหรับพารามิเตอร์% s
+ErrorNoRequestInError=คำขอในไม่มีข้อผิดพลาด
+ErrorServiceUnavailableTryLater=ไม่มีบริการสำหรับช่วงเวลาที่ ลองใหม่อีกครั้ง
+ErrorDuplicateField=ค่าที่ซ้ำกันในสนามที่ไม่ซ้ำกัน
+ErrorSomeErrorWereFoundRollbackIsDone=ข้อผิดพลาดบางคนพบว่า เราย้อนกลับการเปลี่ยนแปลง
+ErrorConfigParameterNotDefined=<b>พารามิเตอร์% s</b> ไม่ได้กำหนดไว้ภายในไฟล์ config Dolibarr <b>conf.php</b>
+ErrorCantLoadUserFromDolibarrDatabase=<b>ไม่พบผู้ใช้% s</b> ในฐานข้อมูล Dolibarr
+ErrorNoVATRateDefinedForSellerCountry=ข้อผิดพลาดอัตราภาษีมูลค่าเพิ่มไม่มีกำหนดสำหรับประเทศ '% s'
+ErrorNoSocialContributionForSellerCountry=ข้อผิดพลาดที่ไม่มีทางสังคม / ประเภทภาษีทางการคลังที่กำหนดไว้สำหรับประเทศ '% s'
+ErrorFailedToSaveFile=ข้อผิดพลาดล้มเหลวที่จะบันทึกไฟล์
+SetDate=วันที่ตั้ง
+SelectDate=เลือกวันที่
+SeeAlso=ดูยัง% s
+SeeHere=ดูที่นี่
+BackgroundColorByDefault=สีพื้นหลังเริ่มต้น
+FileNotUploaded=ไฟล์ที่อัปโหลดไม่ได้
+FileUploaded=ไฟล์อัพโหลดประสบความสำเร็จ
+FileWasNotUploaded=ไฟล์ที่ถูกเลือกสำหรับสิ่งที่แนบมา แต่ยังไม่ได้อัปโหลดยัง คลิกที่ "แนบไฟล์" สำหรับเรื่องนี้
+NbOfEntries=nb ของรายการ
+GoToWikiHelpPage=อ่านวิธีใช้แบบออนไลน์ (ต้องเชื่อมต่ออินเทอร์เน็ต)
+GoToHelpPage=อ่านความช่วยเหลือ
+RecordSaved=บันทึกที่บันทึกไว้
+RecordDeleted=บันทึกลบ
+LevelOfFeature=ระดับของคุณสมบัติ
+NotDefined=ไม่กำหนด
+DefinedAndHasThisValue=ที่กำหนดและความคุ้มค่าที่จะ
+IsNotDefined=ตะคุ่ม
+DolibarrInHttpAuthenticationSoPasswordUseless=โหมดการตรวจสอบ Dolibarr <b>คือการติดตั้ง% s</b> ในแฟ้มการกำหนด <b>conf.php</b> <br> ซึ่งหมายความว่าฐานข้อมูลรหัสผ่านเป็น extern เพื่อ Dolibarr ดังนั้นการเปลี่ยนแปลงข้อมูลนี้อาจมีผลไม่
+Administrator=ผู้บริหาร
+Undefined=ตะคุ่ม
+PasswordForgotten=ลืมรหัสผ่าน?
+SeeAbove=ดูข้างต้น
+HomeArea=พื้นที่หน้าแรก
+LastConnexion=การเชื่อมต่อล่าสุด
+PreviousConnexion=การเชื่อมต่อก่อนหน้า
+ConnectedOnMultiCompany=ที่เชื่อมต่อกับสภาพแวดล้อม
+ConnectedSince=เชื่อมต่อตั้งแต่
+AuthenticationMode=โหมด authentification
+RequestedUrl=URL ที่ร้องขอ
+DatabaseTypeManager=ผู้จัดการฐานข้อมูลประเภท
+RequestLastAccess=ขอการเข้าถึงฐานข้อมูลที่ผ่านมา
+RequestLastAccessInError=ขอการเข้าถึงฐานข้อมูลที่ผ่านมาในข้อผิดพลาด
+ReturnCodeLastAccessInError=ย้อนกลับไปสำหรับการเข้าถึงฐานข้อมูลที่ผ่านมาในข้อผิดพลาด
+InformationLastAccessInError=ข้อมูลสำหรับการเข้าถึงฐานข้อมูลที่ผ่านมาในข้อผิดพลาด
+DolibarrHasDetectedError=Dolibarr ตรวจพบข้อผิดพลาดทางเทคนิค
+InformationToHelpDiagnose=นี่คือข้อมูลที่สามารถช่วยในการวินิจฉัย
+MoreInformation=ข้อมูลเพิ่มเติม
+TechnicalInformation=ข้อมูลด้านเทคนิค
+NotePublic=หมายเหตุ (มหาชน)
+NotePrivate=หมายเหตุ (เอกชน)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr ถูกติดตั้งเพื่อ จำกัด <b>แม่นยำของราคาต่อหน่วย% s</b> ทศนิยม
+DoTest=ทดสอบ
+ToFilter=กรอง
+WarningYouHaveAtLeastOneTaskLate=คำเตือนคุณมีอย่างน้อยองค์ประกอบหนึ่งที่ได้เกินความล่าช้าความอดทน
+yes=ใช่
+Yes=ใช่
+no=ไม่
+No=ไม่
+All=ทั้งหมด
+Home=บ้าน
+Help=ช่วย
+OnlineHelp=ความช่วยเหลือออนไลน์
+PageWiki=หน้าวิกิพีเดีย
+Always=เสมอ
+Never=ไม่เคย
+Under=ภายใต้
+Period=ระยะเวลา
+PeriodEndDate=วันที่สิ้นสุดระยะเวลา
+Activate=กระตุ้น
+Activated=เปิดใช้งาน
+Closed=ปิด
+Closed2=ปิด
+Enabled=ที่เปิดใช้งาน
+Deprecated=เลิกใช้
+Disable=ปิดการใช้งาน
+Disabled=พิการ
+Add=เพิ่ม
+AddLink=เพิ่มการเชื่อมโยง
+Update=ปรับปรุง
+AddActionToDo=เพิ่มเหตุการณ์ที่จะทำ
+AddActionDone=เพิ่มเหตุการณ์ทำ
+Close=ใกล้
+Close2=ใกล้
+Confirm=ยืนยัน
+ConfirmSendCardByMail=<b>จริงๆคุณต้องการที่จะส่งเนื้อหาของการ์ดใบนี้ทางไปรษณีย์ไปยัง% s?</b>
+Delete=ลบ
+Remove=เอาออก
 Resiliate=Resiliate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-ChooseLangage=Please choose your language
-Resize=Resize
+Cancel=ยกเลิก
+Modify=แก้ไข
+Edit=แก้ไข
+Validate=ตรวจสอบ
+ValidateAndApprove=ตรวจสอบและอนุมัติ
+ToValidate=ในการตรวจสอบ
+Save=บันทึก
+SaveAs=บันทึกเป็น
+TestConnection=ทดสอบการเชื่อมต่อ
+ToClone=โคลน
+ConfirmClone=เลือกข้อมูลที่คุณต้องการในการโคลน:
+NoCloneOptionsSpecified=ไม่มีข้อมูลที่จะโคลนที่กำหนดไว้
+Of=ของ
+Go=ไป
+Run=วิ่ง
+CopyOf=สำเนา
+Show=แสดง
+ShowCardHere=การ์ดแสดง
+Search=ค้นหา
+SearchOf=ค้นหา
+Valid=ถูกต้อง
+Approve=อนุมัติ
+Disapprove=ไม่พอใจ
+ReOpen=Re: เปิด
+Upload=ส่งไฟล์
+ToLink=ลิงค์
+Select=เลือก
+Choose=เลือก
+ChooseLangage=กรุณาเลือกภาษาที่คุณ
+Resize=การปรับขนาด
 Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-GlobalValue=Global value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-CurrentNote=Current note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Model
-DefaultModel=Default model
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-DevelopmentTeam=Development Team
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateStart=Date start
-DateEnd=Date end
-DateCreation=Creation date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Last modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DatePlanShort=Date planed
-DateRealShort=Date real.
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
+Author=ผู้เขียน
+User=ผู้ใช้งาน
+Users=ผู้ใช้
+Group=กลุ่ม
+Groups=กลุ่ม
+NoUserGroupDefined=ไม่มีกลุ่มผู้ใช้ที่กำหนดไว้
+Password=รหัสผ่าน
+PasswordRetype=พิมพ์รหัสผ่านของคุณ
+NoteSomeFeaturesAreDisabled=โปรดทราบว่าจำนวนมากของคุณสมบัติ / โมดูลถูกปิดใช้งานในการสาธิตนี้
+Name=ชื่อ
+Person=คน
+Parameter=พารามิเตอร์
+Parameters=พารามิเตอร์
+Value=มูลค่า
+GlobalValue=มูลค่าทั่วโลก
+PersonalValue=ค่าส่วนบุคคล
+NewValue=ค่าใหม่
+CurrentValue=มูลค่าปัจจุบัน
+Code=รหัส
+Type=ชนิด
+Language=ภาษา
+MultiLanguage=หลายภาษา
+Note=บันทึก
+CurrentNote=บันทึกปัจจุบัน
+Title=ชื่อเรื่อง
+Label=ฉลาก
+RefOrLabel=อ้าง หรือฉลาก
+Info=เข้าสู่ระบบ
+Family=ครอบครัว
+Description=ลักษณะ
+Designation=ลักษณะ
+Model=แบบ
+DefaultModel=รูปแบบเริ่มต้น
+Action=เหตุการณ์
+About=เกี่ยวกับ
+Number=จำนวน
+NumberByMonth=จำนวนเดือน
+AmountByMonth=จํานวนเงินตามเดือน
+Numero=จำนวน
+Limit=จำกัด
+Limits=ขีด จำกัด
+DevelopmentTeam=ทีมพัฒนา
+Logout=ออกจากระบบ
+NoLogoutProcessWithAuthMode=ไม่มีคุณลักษณะปลดปรับใช้กับโหมดการตรวจสอบ <b>%s</b>
+Connection=สัมพันธ์
+Setup=การติดตั้ง
+Alert=เตือนภัย
+Previous=ก่อน
+Next=ถัดไป
+Cards=การ์ด
+Card=บัตร
+Now=ตอนนี้
+HourStart=เริ่มต้นชั่วโมง
+Date=วันที่
+DateAndHour=วันที่และชั่วโมง
+DateStart=เริ่มต้นวันที่
+DateEnd=สิ้นสุดวันที่
+DateCreation=วันที่สร้าง
+DateModification=วันที่แก้ไข
+DateModificationShort=Modif วันที่
+DateLastModification=วันที่แก้ไขล่าสุด
+DateValidation=วันที่ตรวจสอบ
+DateClosing=วันปิดสมุดทะเบียน
+DateDue=วันที่ครบกำหนด
+DateValue=วันที่คิดมูลค่า
+DateValueShort=วันที่คิดมูลค่า
+DateOperation=วันที่การดำเนินงาน
+DateOperationShort=โรงละครโอเปรา วันที่
+DateLimit=วัน จำกัด
+DateRequest=วันที่ขอ
+DateProcess=วันที่กระบวนการ
+DatePlanShort=วันที่วางแผน
+DateRealShort=วันจริง
+DateBuild=รายงานวันที่สร้าง
+DatePayment=วันที่ชำระเงิน
+DateApprove=วันที่อนุมัติ
+DateApprove2=วันที่อนุมัติ (ที่สองได้รับการอนุมัติ)
+DurationYear=ปี
+DurationMonth=เดือน
+DurationWeek=สัปดาห์
+DurationDay=วัน
+DurationYears=ปี
+DurationMonths=เดือน
+DurationWeeks=สัปดาห์ที่ผ่านมา
+DurationDays=วัน
+Year=ปี
+Month=เดือน
+Week=สัปดาห์
+Day=วัน
+Hour=ชั่วโมง
+Minute=นาที
+Second=ที่สอง
+Years=ปีที่ผ่านมา
+Months=เดือน
+Days=วัน
+days=วัน
+Hours=ชั่วโมง
+Minutes=นาที
+Seconds=วินาที
+Weeks=สัปดาห์ที่ผ่านมา
+Today=ในวันนี้
+Yesterday=เมื่อวาน
+Tomorrow=วันพรุ่งนี้
+Morning=ตอนเช้า
+Afternoon=บ่าย
 Quadri=Quadri
-MonthOfDay=Month of the day
+MonthOfDay=เดือนของวัน
 HourShort=H
-MinuteShort=mn
-Rate=Rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
+MinuteShort=ล้าน
+Rate=ประเมิน
+UseLocalTax=รวมภาษี
+Bytes=ไบต์
+KiloBytes=กิโลไบต์
+MegaBytes=เมกะไบต์
+GigaBytes=กิกะไบต์
+TeraBytes=เทราไบต์
+b=ข
+Kb=กิโลไบต์
 Mb=Mb
 Gb=Gb
 Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-DefaultGlobalValue=Global value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyHT=Price for this quantity (net of tax)
-PriceQtyMinHT=Price quantity min. (net of tax)
-PriceQtyTTC=Price for this quantity (inc. tax)
-PriceQtyMinTTC=Price quantity min. (inc. of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-IncludedVAT=Included tax
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
+Cut=ตัด
+Copy=สำเนา
+Paste=แปะ
+Default=ผิดนัด
+DefaultValue=ค่ามาตรฐาน
+DefaultGlobalValue=มูลค่าทั่วโลก
+Price=ราคา
+UnitPrice=ราคาต่อหน่วย
+UnitPriceHT=ราคาต่อหน่วย (สุทธิ)
+UnitPriceTTC=ราคาต่อหน่วย
+PriceU=UP
+PriceUHT=UP (สุทธิ)
+AskPriceSupplierUHT=ขอขึ้นสุทธิ
+PriceUTTC=UP (รวมภาษี).
+Amount=จำนวน
+AmountInvoice=จำนวนใบแจ้งหนี้
+AmountPayment=จำนวนเงินที่ชำระ
+AmountHTShort=จำนวนเงิน (สุทธิ)
+AmountTTCShort=จํานวนเงิน (รวมภาษี).
+AmountHT=จำนวนเงิน (สุทธิจากภาษี)
+AmountTTC=จํานวนเงิน (รวมภาษี).
+AmountVAT=จํานวนเงินภาษี
+AmountLT1=จำนวนเงินภาษี 2
+AmountLT2=จำนวนเงินภาษี 3
+AmountLT1ES=จำนวน RE
+AmountLT2ES=จำนวน IRPF
+AmountTotal=จำนวนเงินรวม
+AmountAverage=จำนวนเงินเฉลี่ย
+PriceQtyHT=ราคานี้สำหรับปริมาณ (สุทธิจากภาษี)
+PriceQtyMinHT=ปริมาณราคาต่ำสุด (สุทธิจากภาษี)
+PriceQtyTTC=ราคานี้สำหรับปริมาณ (รวมภาษี).
+PriceQtyMinTTC=ปริมาณราคาต่ำสุด (inc. ภาษี)
+Percentage=ร้อยละ
+Total=ทั้งหมด
+SubTotal=ไม่ทั้งหมด
+TotalHTShort=รวม (สุทธิ)
+TotalTTCShort=รวม (รวมภาษี).
+TotalHT=รวม (สุทธิจากภาษี)
+TotalHTforthispage=รวม (สุทธิจากภาษี) สำหรับหน้านี้
+TotalTTC=รวม (รวมภาษี).
+TotalTTCToYourCredit=รวม (inc. ภาษี) เพื่อเครดิตของคุณ
+TotalVAT=รวมภาษี
+TotalLT1=ภาษีทั้งหมด 2
+TotalLT2=ภาษีทั้งหมด 3
+TotalLT1ES=RE รวม
+TotalLT2ES=IRPF รวม
+IncludedVAT=รวมภาษี
+HT=สุทธิจากภาษี
+TTC=อิงค์ภาษี
+VAT=ภาษีการขาย
+VATs=ภาษีขาย
 LT1ES=RE
 LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsDone=Events done
-ActionsToDoShort=To do
-ActionsRunningshort=Started
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=Started
-ActionDoneShort=Finished
+VATRate=อัตราภาษี
+Average=เฉลี่ย
+Sum=รวม
+Delta=รูปสามเหลี่ยม
+Module=โมดูล
+Option=ตัวเลือก
+List=รายการ
+FullList=รายการเต็มรูปแบบ
+Statistics=สถิติ
+OtherStatistics=สถิติอื่น ๆ
+Status=สถานะ
+Favorite=ที่ชื่นชอบ
+ShortInfo=ข้อมูล
+Ref=อ้าง
+ExternalRef=อ้าง extern
+RefSupplier=อ้าง ผู้จัดจำหน่าย
+RefPayment=อ้าง การชำระเงิน
+CommercialProposalsShort=ข้อเสนอเชิงพาณิชย์
+Comment=ความเห็น
+Comments=ความคิดเห็น
+ActionsToDo=เหตุการณ์ที่จะทำ
+ActionsDone=เหตุการณ์ทำ
+ActionsToDoShort=ที่จะทำ
+ActionsRunningshort=เริ่มต้น
+ActionsDoneShort=เสร็จสิ้น
+ActionNotApplicable=ไม่สามารถใช้งาน
+ActionRunningNotStarted=ในการเริ่มต้น
+ActionRunningShort=เริ่มต้น
+ActionDoneShort=เสร็จสิ้น
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events about this third party
-ActionsOnMember=Events about this member
-NActions=%s events
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-MyBookmarks=My bookmarks
-OtherInformationsBoxes=Other information boxes
-DolibarrBoard=Dolibarr board
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Popularity=Popularity
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-ReCalculate=Recalculate
-ResultOk=Success
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Sujet
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Receipts=Receipts
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-PreviousStep=Previous step
-Datas=Data
-None=None
-NoneF=None
-Late=Late
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-Login=Login
-CurrentLogin=Current login
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
+CompanyFoundation=บริษัท / มูลนิธิ
+ContactsForCompany=สำหรับรายชื่อของบุคคลที่สามนี้
+ContactsAddressesForCompany=รายชื่อ / ที่อยู่สำหรับบุคคลที่สามนี้
+AddressesForCompany=สำหรับที่อยู่ของบุคคลที่สามนี้
+ActionsOnCompany=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับบุคคลที่สามนี้
+ActionsOnMember=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับสมาชิกในนี้
+NActions=% s เหตุการณ์
+NActionsLate=% s ปลาย
+RequestAlreadyDone=ขอบันทึกไว้แล้ว
+Filter=กรอง
+RemoveFilter=ลบฟิลเตอร์
+ChartGenerated=สร้างแผนภูมิ
+ChartNotGenerated=ผังไม่ได้สร้างขึ้น
+GeneratedOn=สร้าง% s
+Generate=ผลิต
+Duration=ระยะเวลา
+TotalDuration=ระยะเวลารวม
+Summary=ย่อ
+MyBookmarks=ฉันบุ๊คมาร์ค
+OtherInformationsBoxes=กล่องข้อมูลอื่น ๆ
+DolibarrBoard=คณะกรรมการ Dolibarr
+DolibarrStateBoard=สถิติ
+DolibarrWorkBoard=คณะกรรมการงานการทำงาน
+Available=มีจำหน่าย
+NotYetAvailable=ยังไม่สามารถใช้ได้
+NotAvailable=ไม่พร้อม
+Popularity=ความนิยม
+Categories=แท็ก / ประเภท
+Category=Tag / หมวดหมู่
+By=โดย
+From=จาก
+to=ไปยัง
+and=และ
+or=หรือ
+Other=อื่น ๆ
+Others=คนอื่น ๆ
+OtherInformations=ข้อมูลอื่น ๆ
+Quantity=ปริมาณ
+Qty=จำนวน
+ChangedBy=เปลี่ยนแปลงได้โดย
+ApprovedBy=อนุมัติโดย
+ApprovedBy2=อนุมัติโดย (อนุมัติวินาที)
+Approved=ได้รับการอนุมัติ
+Refused=ปฏิเสธ
+ReCalculate=คำนวณ
+ResultOk=ความสำเร็จ
+ResultKo=ความล้มเหลว
+Reporting=การรายงาน
+Reportings=การรายงาน
+Draft=ร่าง
+Drafts=ร่าง
+Validated=ผ่านการตรวจสอบ
+Opened=เปิด
+New=ใหม่
+Discount=ส่วนลด
+Unknown=ไม่ทราบ
+General=ทั่วไป
+Size=ขนาด
+Received=ที่ได้รับ
+Paid=ต้องจ่าย
+Topic=sujet
+ByCompanies=โดยบุคคลที่สาม
+ByUsers=โดยผู้ใช้
+Links=ลิงค์
+Link=ลิงค์
+Receipts=รายรับ
+Rejects=เสีย
+Preview=ดูตัวอย่าง
+NextStep=ขั้นตอนต่อไป
+PreviousStep=ขั้นตอนก่อนหน้า
+Datas=ข้อมูล
+None=ไม่
+NoneF=ไม่
+Late=สาย
+Photo=ภาพ
+Photos=รูปภาพ
+AddPhoto=เพิ่มรูปภาพ
+Login=เข้าสู่ระบบ
+CurrentLogin=เข้าสู่ระบบปัจจุบัน
+January=มกราคม
+February=กุมภาพันธ์
+March=มีนาคม
+April=เมษายน
+May=พฤษภาคม
+June=มิถุนายน
+July=กรกฎาคม
+August=สิงหาคม
+September=กันยายน
+October=ตุลาคม
+November=พฤศจิกายน
+December=ธันวาคม
+JanuaryMin=ม.ค.
+FebruaryMin=กุมภาพันธ์
+MarchMin=ทำลาย
+AprilMin=เมษายน
+MayMin=พฤษภาคม
+JuneMin=มิถุนายน
+JulyMin=กรกฎาคม
+AugustMin=สิงหาคม
+SeptemberMin=กันยายน
+OctoberMin=ตุลาคม
+NovemberMin=พฤศจิกายน
+DecemberMin=ธันวาคม
+Month01=มกราคม
+Month02=กุมภาพันธ์
+Month03=มีนาคม
+Month04=เมษายน
+Month05=พฤษภาคม
+Month06=มิถุนายน
+Month07=กรกฎาคม
+Month08=สิงหาคม
+Month09=กันยายน
+Month10=ตุลาคม
+Month11=พฤศจิกายน
+Month12=ธันวาคม
+MonthShort01=ม.ค.
+MonthShort02=กุมภาพันธ์
+MonthShort03=ทำลาย
+MonthShort04=เมษายน
+MonthShort05=พฤษภาคม
+MonthShort06=มิถุนายน
+MonthShort07=กรกฎาคม
+MonthShort08=สิงหาคม
+MonthShort09=กันยายน
+MonthShort10=ตุลาคม
+MonthShort11=พฤศจิกายน
+MonthShort12=ธันวาคม
+AttachedFiles=ไฟล์ที่แนบมาและเอกสาร
+FileTransferComplete=ไฟล์อัพโหลด successfuly
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Mot clé
-Legend=Legend
-FillTownFromZip=Fill city from zip
-Fill=Fill
-Reset=Reset
-ShowLog=Show log
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfCustomers=Number of customers
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfReferers=Number of referrers
-Referers=Refering objects
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildPDF=Build PDF
-RebuildPDF=Rebuild PDF
-BuildDoc=Build Doc
-RebuildDoc=Rebuild Doc
-Entity=Environment
-Entities=Entities
-EventLogs=Logs
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-AccountancyPreview=Accountancy preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-ShowAccountancyPreview=Show accountancy preview
-ShowProspectPreview=Show prospect preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Question=Question
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send Ack. by email
-NoEMail=No email
-NoMobilePhone=No mobile phone
-Owner=Owner
-DetectedVersion=Detected version
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s records modified
-AutomaticCode=Automatic code
-NotManaged=Not managed
-FeatureDisabled=Feature disabled
-MoveBox=Move box %s
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-PartialWoman=Partial
-PartialMan=Partial
-TotalWoman=Total
-TotalMan=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-Color=Color
-Documents=Linked files
-DocumentsNb=Linked files (%s)
-Documents2=Documents
-BuildDocuments=Generated documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
+ReportName=ชื่อรายงาน
+ReportPeriod=ระยะเวลาที่รายงาน
+ReportDescription=ลักษณะ
+Report=รายงาน
+Keyword=Mot Clé
+Legend=ตำนาน
+FillTownFromZip=กรอกเมืองจากไปรษณีย์
+Fill=ใส่
+Reset=ตั้งใหม่
+ShowLog=แสดงการเข้าสู่ระบบ
+File=ไฟล์
+Files=ไฟล์
+NotAllowed=ไม่อนุญาตให้
+ReadPermissionNotAllowed=ได้รับอนุญาตอ่านไม่ได้รับอนุญาต
+AmountInCurrency=จำนวนเงินในสกุลเงิน% s
+Example=ตัวอย่าง
+Examples=ตัวอย่าง
+NoExample=ตัวอย่างเช่นไม่มี
+FindBug=รายงานข้อผิดพลาด
+NbOfThirdParties=จำนวนของบุคคลที่สาม
+NbOfCustomers=จำนวนของลูกค้า
+NbOfLines=จำนวนของเส้น
+NbOfObjects=จำนวนของวัตถุ
+NbOfReferers=จำนวนการอ้างอิง
+Referers=หมายวัตถุ
+TotalQuantity=ปริมาณรวม
+DateFromTo=จาก% s% s
+DateFrom=จาก% s
+DateUntil=จนกระทั่ง% s
+Check=ตรวจสอบ
+Uncheck=ยกเลิกการเลือก
+Internal=ภายใน
+External=ภายนอก
+Internals=ภายใน
+Externals=ภายนอก
+Warning=การเตือน
+Warnings=คำเตือน
+BuildPDF=สร้างรูปแบบไฟล์ PDF
+RebuildPDF=สร้างรูปแบบไฟล์ PDF
+BuildDoc=สร้างหมอ
+RebuildDoc=สร้างหมอ
+Entity=สิ่งแวดล้อม
+Entities=หน่วยงานที่
+EventLogs=บันทึก
+CustomerPreview=ตัวอย่างลูกค้า
+SupplierPreview=ตัวอย่างผู้ผลิต
+AccountancyPreview=ตัวอย่างการบัญชี
+ShowCustomerPreview=แสดงตัวอย่างของลูกค้า
+ShowSupplierPreview=แสดงตัวอย่างผู้จัดจำหน่าย
+ShowAccountancyPreview=แสดงตัวอย่างบัญชี
+ShowProspectPreview=แสดงตัวอย่างโอกาส
+RefCustomer=อ้าง ลูกค้า
+Currency=เงินตรา
+InfoAdmin=ข้อมูลสำหรับผู้ดูแล
+Undo=แก้
+Redo=ทำซ้ำ
+ExpandAll=ขยายทั้งหมด
+UndoExpandAll=ยกเลิกการขยาย
+Reason=เหตุผล
+FeatureNotYetSupported=มียังไม่สนับสนุน
+CloseWindow=ปิดหน้าต่าง
+Question=คำถาม
+Response=คำตอบ
+Priority=ลำดับความสำคัญ
+SendByMail=ส่งทางอีเมล
+MailSentBy=อีเมล์ที่ส่งมาจาก
+TextUsedInTheMessageBody=ร่างกายอีเมล์
+SendAcknowledgementByMail=ส่ง Ack โดยการส่งอีเมล์
+NoEMail=ไม่มีอีเมล
+NoMobilePhone=ไม่มีโทรศัพท์มือถือ
+Owner=เจ้าของ
+DetectedVersion=รุ่นที่ตรวจพบ
+FollowingConstantsWillBeSubstituted=ค่าคงที่ต่อไปนี้จะถูกแทนที่ด้วยค่าที่สอดคล้องกัน
+Refresh=รีเฟรช
+BackToList=กลับไปยังรายการ
+GoBack=กลับไป
+CanBeModifiedIfOk=สามารถแก้ไขได้ถ้าถูกต้อง
+CanBeModifiedIfKo=สามารถแก้ไขได้ถ้าไม่ถูกต้อง
+RecordModifiedSuccessfully=บันทึกแก้ไขเรียบร้อย
+RecordsModified=% s บันทึกการแก้ไข
+AutomaticCode=รหัสอัตโนมัติ
+NotManaged=การจัดการไม่ได้
+FeatureDisabled=ปิดใช้งานคุณลักษณะ
+MoveBox=ย้ายกล่อง% s
+Offered=ที่นำเสนอ
+NotEnoughPermissions=คุณไม่ได้รับอนุญาตสำหรับการดำเนินการนี​​้
+SessionName=ชื่อเซสชั่น
+Method=วิธี
+Receive=ได้รับ
+PartialWoman=เป็นบางส่วน
+PartialMan=เป็นบางส่วน
+TotalWoman=ทั้งหมด
+TotalMan=ทั้งหมด
+NeverReceived=ไม่เคยได้รับ
+Canceled=ยกเลิก
+YouCanChangeValuesForThisListFromDictionarySetup=คุณสามารถเปลี่ยนค่าสำหรับรายชื่อจากการตั้งค่าเมนูนี้ - พจนานุกรม
+Color=สี
+Documents=แฟ้มที่เชื่อมโยง
+DocumentsNb=แฟ้มที่เชื่อมโยง (% s)
+Documents2=เอกสาร
+BuildDocuments=เอกสารที่สร้างขึ้น
+UploadDisabled=อัพโหลดพิการ
+MenuECM=เอกสาร
 MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-ListOfFiles=List of available files
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
-NoMenu=No sub-menu
-WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
-CoreErrorTitle=System error
-CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator.
-CreditCard=Credit card
-FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-OptionalFieldsSetup=Extra attributes setup
-URLPhoto=URL of photo/logo
-SetLinkToThirdParty=Link to another third party
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-DeleteAFile=Delete a file
-ConfirmDeleteAFile=Are you sure you want to delete file
-NoResults=No results
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-HomeDashboard=Home summary
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show transaction
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
+MenuMembers=สมาชิก
+MenuAgendaGoogle=วาระการประชุมของ Google
+ThisLimitIsDefinedInSetup=Dolibarr ขีด จำกัด (เมนูที่บ้านการตั้งค่าการรักษาความปลอดภัย):% s Kb, PHP ขีด จำกัด :% s Kb
+NoFileFound=ไม่มีเอกสารที่บันทึกไว้ในไดเรกทอรีนี้
+CurrentUserLanguage=ภาษาปัจจุบัน
+CurrentTheme=รูปแบบปัจจุบัน
+CurrentMenuManager=ผู้จัดการเมนูปัจจุบัน
+DisabledModules=โมดูลพิการ
+For=สำหรับ
+ForCustomer=สำหรับลูกค้า
+Signature=ลายเซ็น
+HidePassword=แสดงคำสั่งที่มีรหัสผ่านที่ซ่อน
+UnHidePassword=แสดงคำสั่งที่แท้จริงด้วยรหัสผ่านที่ชัดเจน
+Root=ราก
+Informations=ข้อมูล
+Page=หน้า
+Notes=หมายเหตุ
+AddNewLine=เพิ่มบรรทัดใหม่
+AddFile=เพิ่มไฟล์
+ListOfFiles=รายชื่อของไฟล์ที่มีอยู่
+FreeZone=รายการฟรี
+FreeLineOfType=รายการฟรีประเภท
+CloneMainAttributes=วัตถุโคลนที่มีคุณลักษณะหลัก
+PDFMerge=ผสานรูปแบบไฟล์ PDF
+Merge=ผสาน
+PrintContentArea=หน้าแสดงพื้นที่ในการพิมพ์เนื้อหาหลัก
+MenuManager=ผู้จัดการเมนู
+NoMenu=ไม่มีเมนูย่อย
+WarningYouAreInMaintenanceMode=<b>คำเตือนคุณอยู่ในโหมดการบำรุงรักษาดังนั้นเพียง% s</b> เข้าสู่ระบบได้รับอนุญาตให้ใช้โปรแกรมในขณะนี้
+CoreErrorTitle=ผิดพลาดของระบบ
+CoreErrorMessage=ขออภัยเกิดข้อผิดพลาด ตรวจสอบบันทึกหรือติดต่อผู้ดูแลระบบของคุณ
+CreditCard=เครดิตการ์ด
+FieldsWithAreMandatory=<b>เขตข้อมูลที่มี% s</b> มีผลบังคับใช้
+FieldsWithIsForPublic=<b>เขตข้อมูลที่มี% s</b> จะปรากฏอยู่ในรายชื่อของประชาชนสมาชิก ถ้าคุณไม่อยากให้เรื่องนี้, ตรวจสอบการปิดกล่อง "สาธารณะ"
+AccordingToGeoIPDatabase=(ตาม GeoIP แปลง)
+Line=สาย
+NotSupported=ไม่สนับสนุน
+RequiredField=ฟิลด์ที่จำเป็น
+Result=ผล
+ToTest=ทดสอบ
+ValidateBefore=บัตรจะต้องถูกตรวจสอบก่อนที่จะใช้คุณลักษณะนี้
+Visibility=ความชัดเจน
+Private=ส่วนตัว
+Hidden=ซ่อนเร้น
+Resources=ทรัพยากร
+Source=แหล่ง
+Prefix=อุปสรรค
+Before=ก่อนที่
+After=หลังจาก
+IPAddress=ที่อยู่ IP
+Frequency=ความถี่
+IM=การส่งข้อความโต้ตอบแบบทันที
+NewAttribute=คุณลักษณะใหม่
+AttributeCode=รหัสแอตทริบิวต์
+OptionalFieldsSetup=คุณลักษณะพิเศษติดตั้ง
+URLPhoto=URL ของภาพ / โลโก้
+SetLinkToThirdParty=เชื่อมโยงไปยังบุคคลที่สามอีก
+CreateDraft=สร้างร่าง
+SetToDraft=กลับไปร่าง
+ClickToEdit=คลิกเพื่อแก้ไข
+ObjectDeleted=วัตถุ% s ลบ
+ByCountry=ตามประเทศ
+ByTown=โดยเมือง
+ByDate=โดยวันที่
+ByMonthYear=โดยเดือน / ปี
+ByYear=โดยปี
+ByMonth=โดยเดือน
+ByDay=โดยวันที่
+BySalesRepresentative=โดยตัวแทนฝ่ายขาย
+LinkedToSpecificUsers=เชื่อมโยงกับการติดต่อผู้ใช้โดยเฉพาะอย่างยิ่ง
+DeleteAFile=ลบไฟล์
+ConfirmDeleteAFile=คุณแน่ใจหรือว่าต้องการที่จะลบไฟล์
+NoResults=ไม่มีผลลัพธ์
+SystemTools=เครื่องมือของระบบ
+ModulesSystemTools=เครื่องมือโมดูล
+Test=ทดสอบ
+Element=ธาตุ
+NoPhotoYet=ภาพที่ยังไม่มี
+HomeDashboard=สรุปหน้าแรก
+Deductible=หัก
+from=จาก
+toward=ไปทาง
+Access=การเข้าถึง
+HelpCopyToClipboard=ใช้ Ctrl + C เพื่อคัดลอกไปที่คลิปบอร์ด
+SaveUploadedFileWithMask=บันทึกไฟล์บนเซิร์ฟเวอร์ที่มีชื่อ "<strong>%s</strong>" (มิฉะนั้น "%s")
+OriginFileName=ชื่อไฟล์ต้นฉบับ
+SetDemandReason=แหล่งที่มาของการตั้งค่า
+SetBankAccount=กำหนดบัญชีธนาคาร
+AccountCurrency=สกุลเงินในบัญชี
+ViewPrivateNote=ดูบันทึก
+XMoreLines=% s สาย (s) ซ่อน
+PublicUrl=URL ที่สาธารณะ
+AddBox=เพิ่มกล่อง
+SelectElementAndClickRefresh=เลือกองค์ประกอบและคลิกฟื้นฟู
+PrintFile=พิมพ์ไฟล์% s
+ShowTransaction=แสดงการทำธุรกรรม
+GoIntoSetupToChangeLogo=ไปลงในหน้าหลัก - การติดตั้ง - บริษัท ที่จะเปลี่ยนโลโก้หรือไปลงในหน้าแรก - การติดตั้ง - จอแสดงผลที่จะซ่อน
+Deny=ปฏิเสธ
+Denied=ปฏิเสธ
+ListOfTemplates=รายชื่อของแม่แบบ
+Genderman=คน
+Genderwoman=หญิง
 # Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
+Monday=วันจันทร์
+Tuesday=วันอังคาร
+Wednesday=วันพุธ
+Thursday=วันพฤหัสบดี
+Friday=วันศุกร์
+Saturday=วันเสาร์
+Sunday=วันอาทิตย์
+MondayMin=โม
+TuesdayMin=เฉิงตู
+WednesdayMin=เรา
 ThursdayMin=Th
 FridayMin=Fr
 SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
+SundayMin=ซู
+Day1=วันจันทร์
+Day2=วันอังคาร
+Day3=วันพุธ
+Day4=วันพฤหัสบดี
+Day5=วันศุกร์
+Day6=วันเสาร์
+Day0=วันอาทิตย์
 ShortMonday=M
 ShortTuesday=T
 ShortWednesday=W
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=แม่แบบอีเมลเลือก
diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
index 748b3c71f30..65ae3af6533 100644
--- a/htdocs/langs/th_TH/margins.lang
+++ b/htdocs/langs/th_TH/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
-ProductService=Product or Service
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-StartDate=Start date
-EndDate=End date
-Launch=Start
-ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Margin type
-MargeBrute=Raw margin
-MargeNette=Net margin
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-CostPrice=Cost price
-BuyingCost=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+Margin=ขอบ
+Margins=อัตรากำไรขั้นต้น
+TotalMargin=มาร์จิ้นรวม
+MarginOnProducts=อัตรากำไรขั้นต้น / ผลิตภัณฑ์
+MarginOnServices=อัตรากำไรขั้นต้น / บริการ
+MarginRate=อัตรากำไร
+MarkRate=อัตรามาร์ค
+DisplayMarginRates=แสดงอัตรากำไร
+DisplayMarkRates=แสดงอัตราเครื่องหมาย
+InputPrice=ราคานำเข้า
+margin=การจัดการกำไรอัตรากำไรขั้นต้น
+margesSetup=การตั้งค่าการจัดการกำไรอัตรากำไรขั้นต้น
+MarginDetails=รายละเอียดอัตรากำไรขั้นต้น
+ProductMargins=อัตรากำไรขั้นต้นของผลิตภัณฑ์
+CustomerMargins=อัตรากำไรขั้นต้นของลูกค้า
+SalesRepresentativeMargins=อัตรากำไรขั้นต้นเป็นตัวแทนขาย
+UserMargins=อัตรากำไรขั้นต้นของผู้ใช้
+ProductService=สินค้าหรือบริการ
+AllProducts=ผลิตภัณฑ์และบริการทั้งหมด
+ChooseProduct/Service=เลือกสินค้าหรือบริการ
+StartDate=วันที่เริ่มต้น
+EndDate=วันที่สิ้นสุด
+Launch=เริ่มต้น
+ForceBuyingPriceIfNull=กองทัพราคาซื้อถ้า null
+ForceBuyingPriceIfNullDetails=ถ้า "ON" ขอบจะเป็นศูนย์ในบรรทัด (ซื้อราคา = ราคาขาย) มิฉะนั้น ("OFF"), มาร์จจะเท่ากับราคาขาย (ซื้อราคา = 0)
+MARGIN_METHODE_FOR_DISCOUNT=วิธี Margin ส่วนลดทั่วโลก
+UseDiscountAsProduct=เป็นผลิตภัณฑ์
+UseDiscountAsService=เป็นบริการ
+UseDiscountOnTotal=เกี่ยวกับผลรวมย่อย
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=กำหนดถ้าลดราคาทั่วโลกจะถือว่าเป็นสินค้าบริการหรือเพียง แต่ในผลรวมย่อยสำหรับการคำนวณอัตรากำไรขั้นต้น
+MARGIN_TYPE=ประเภทมาร์จิ้น
+MargeBrute=ขอบดิบ
+MargeNette=อัตรากำไรสุทธิ
+MARGIN_TYPE_DETAILS=ขอบดิบ: ราคาขาย - ราคาซื้อ <br/> อัตรากำไรสุทธิ: ราคาขาย - ราคาต้นทุน
+CostPrice=ราคาทุน
+BuyingCost=ราคาทุน
+UnitCharges=ค่าใช้จ่ายต่อหน่วย
+Charges=ค่าใช้จ่าย
+AgentContactType=ตัวแทนพาณิชย์ประเภทการติดต่อ
+AgentContactTypeDetails=กำหนดประเภทติดต่อ (เชื่อมโยงในใบแจ้งหนี้) จะใช้สำหรับการรายงานอัตรากำไรขั้นต้นต่อตัวแทนขาย
+rateMustBeNumeric=อัตราจะต้องเป็นค่าตัวเลข
+markRateShouldBeLesserThan100=อัตรามาร์คควรจะต่ำกว่า 100
+ShowMarginInfos=แสดงขอบข่าวสาร
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 40bca8e85fb..c4171bd46dc 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -1,206 +1,207 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-PublicMembersArea=Public members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
-Members=Members
-MemberAccount=Member login
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
-MembersTickets=Members Tickets
-FundationMembers=Foundation members
-Attributs=Attributes
-ErrorMemberTypeNotDefined=Member type not defined
-ListOfPublicMembers=List of public members
-ListOfValidatedPublicMembers=List of validated public members
-ErrorThisMemberIsNotPublic=This member is not public
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=This is details of your card
-CardContent=Content of your member card
-SetLinkToUser=Link to a Dolibarr user
-SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
-MembersList=List of members
-MembersListToValid=List of draft members (to be validated)
-MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
-MembersListResiliated=List of resiliated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
-MenuMembersResiliated=Resiliated members
-MembersWithSubscriptionToReceive=Members with subscription to receive
-DateAbonment=Subscription date
-DateSubscription=Subscription date
-DateNextSubscription=Next subscription
-DateEndSubscription=Subscription end date
-EndSubscription=End subscription
-SubscriptionId=Subscription id
-MemberId=Member id
-NewMember=New member
-NewType=New member type
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
-MembersTypes=Members types
-MembersAttributes=Members attributes
-SearchAMember=Search a member
-MemberStatusDraft=Draft (needs to be validated)
-MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting subscription)
-MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
-MemberStatusActiveLateShort=Expired
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusResiliated=Resiliated member
+MembersArea=พื้นที่สมาชิก
+PublicMembersArea=พื้นที่สาธารณะสมาชิก
+MemberCard=บัตรสมาชิก
+SubscriptionCard=สมัครสมาชิกบัตร
+Member=สมาชิก
+Members=สมาชิก
+MemberAccount=เข้าสู่ระบบสมาชิก
+ShowMember=แสดงบัตรสมาชิก
+UserNotLinkedToMember=ผู้ใช้ไม่ได้เชื่อมโยงไปยังสมาชิก
+ThirdpartyNotLinkedToMember=บุคคลที่สามไม่ได้เชื่อมโยงไปยังสมาชิก
+MembersTickets=บัตรสมาชิก
+FundationMembers=สมาชิกมูลนิธิ
+Attributs=คุณลักษณะ
+ErrorMemberTypeNotDefined=สมาชิกประเภทไม่ได้กำหนดไว้
+ListOfPublicMembers=รายชื่อสมาชิกที่สาธารณะ
+ListOfValidatedPublicMembers=ตรวจสอบรายชื่อของสมาชิกในที่สาธารณะ
+ErrorThisMemberIsNotPublic=สมาชิกคนนี้ไม่ได้เป็นของประชาชน
+ErrorMemberIsAlreadyLinkedToThisThirdParty=สมาชิกอีกคนหนึ่ง <b>(ชื่อ:% s, เข้าสู่ระบบ:% s) จะเชื่อมโยงกับบุคคลที่สาม%</b> s ลบลิงค์นี้ก่อนเพราะบุคคลที่สามไม่สามารถเชื่อมโยงไปยังสมาชิกเท่านั้น (และในทางกลับกัน)
+ErrorUserPermissionAllowsToLinksToItselfOnly=ด้วยเหตุผลด้านความปลอดภัยคุณต้องได้รับสิทธิ์ในการแก้ไขผู้ใช้ทุกคนที่จะสามารถที่จะเชื่อมโยงสมาชิกให้กับผู้ใช้ที่ไม่ได้เป็นของคุณ
+ThisIsContentOfYourCard=นี่คือรายละเอียดของบัตรของคุณ
+CardContent=เนื้อหาของบัตรสมาชิกของคุณ
+SetLinkToUser=เชื่อมโยงไปยังผู้ใช้ Dolibarr
+SetLinkToThirdParty=เชื่อมโยงไปยัง Dolibarr ของบุคคลที่สาม
+MembersCards=สมาชิกบัตรธุรกิจ
+MembersList=รายชื่อสมาชิก
+MembersListToValid=รายชื่อสมาชิกร่าง (ที่จะถูกตรวจสอบ)
+MembersListValid=รายชื่อสมาชิกที่ถูกต้อง
+MembersListUpToDate=รายชื่อสมาชิกที่ถูกต้องที่มีถึงวันที่สมัครสมาชิก
+MembersListNotUpToDate=รายชื่อสมาชิกที่ถูกต้องด้วยการสมัครสมาชิกออกจากวันที่
+MembersListResiliated=รายชื่อสมาชิก resiliated
+MembersListQualified=รายชื่อสมาชิกที่ผ่านการรับรอง
+MenuMembersToValidate=สมาชิกร่าง
+MenuMembersValidated=สมาชิกผ่านการตรวจสอบ
+MenuMembersUpToDate=ขึ้นอยู่กับสมาชิกในวันที่
+MenuMembersNotUpToDate=ออกจากสมาชิกวัน
+MenuMembersResiliated=สมาชิก Resiliated
+MembersWithSubscriptionToReceive=สมาชิกที่มีการสมัครสมาชิกจะได้รับ
+DateAbonment=วันที่สมัครสมาชิก
+DateSubscription=วันที่สมัครสมาชิก
+DateNextSubscription=สมัครสมาชิกถัดไป
+DateEndSubscription=วันที่สิ้นสุดการสมัครสมาชิก
+EndSubscription=สมัครสมาชิก End
+SubscriptionId=รหัสการจองซื้อ
+MemberId=รหัสสมาชิก
+NewMember=สมาชิกใหม่
+NewType=ประเภทสมาชิกใหม่
+MemberType=ประเภทสมาชิก
+MemberTypeId=หมายเลขสมาชิกประเภท
+MemberTypeLabel=สมาชิกป้ายพิมพ์
+MembersTypes=สมาชิกประเภท
+MembersAttributes=คุณลักษณะสมาชิก
+SearchAMember=ค้นหาสมาชิก
+MemberStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
+MemberStatusDraftShort=ร่าง
+MemberStatusActive=การตรวจสอบ (รอการสมัครสมาชิก)
+MemberStatusActiveShort=ผ่านการตรวจสอบ
+MemberStatusActiveLate=สมัครสมาชิกหมดอายุ
+MemberStatusActiveLateShort=หมดอายุ
+MemberStatusPaid=สมัครสมาชิกถึงวันที่
+MemberStatusPaidShort=ถึงวันที่
+MemberStatusResiliated=สมาชิก Resiliated
 MemberStatusResiliatedShort=Resiliated
-MembersStatusToValid=Draft members
-MembersStatusToValidShort=Draft members
-MembersStatusValidated=Validated members
-MembersStatusPaid=Subscription up to date
-MembersStatusPaidShort=Up to date
-MembersStatusNotPaid=Subscription out of date
-MembersStatusNotPaidShort=Out of date
-MembersStatusResiliated=Resiliated members
-MembersStatusResiliatedShort=Resiliated members
-NewCotisation=New contribution
-PaymentSubscription=New contribution payment
-EditMember=Edit member
-SubscriptionEndDate=Subscription's end date
-MembersTypeSetup=Members type setup
-NewSubscription=New subscription
-NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Subscription
-Subscriptions=Subscriptions
-SubscriptionLate=Late
-SubscriptionNotReceived=Subscription never received
-SubscriptionLateShort=Late
-SubscriptionNotReceivedShort=Never received
-ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
-AddMember=Create member
-NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
-SubscriptionRequired=Subscription required
-EditType=Edit member type
-DeleteType=Delete
-VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorPhy=Moral/Physical
-Reenable=Reenable
-ResiliateMember=Resiliate a member
-ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-Filehtpasswd=htpasswd file
-ValidateMember=Validate a member
-ConfirmValidateMember=Are you sure you want to validate this member ?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-PublicMemberList=Public member list
-BlankSubscriptionForm=Public auto-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public auto-subscription form
-MemberPublicLinks=Public links/pages
-ExportDataset_member_1=Members and subscriptions
-ImportDataset_member_1=Members
-LastMembers=Last %s members
-LastMembersModified=Last %s modified members
-LastSubscriptionsModified=Last %s modified subscriptions
-AttributeName=Attribute name
-String=String
-Text=Text
+MembersStatusToValid=สมาชิกร่าง
+MembersStatusToValidShort=สมาชิกร่าง
+MembersStatusValidated=สมาชิกผ่านการตรวจสอบ
+MembersStatusPaid=สมัครสมาชิกถึงวันที่
+MembersStatusPaidShort=ถึงวันที่
+MembersStatusNotPaid=สมัครสมาชิกออกจากวันที่
+MembersStatusNotPaidShort=ออกจากวันที่
+MembersStatusResiliated=สมาชิก Resiliated
+MembersStatusResiliatedShort=สมาชิก Resiliated
+NewCotisation=ผลงานใหม่
+PaymentSubscription=การชำระเงินผลงานใหม่
+EditMember=แก้ไขสมาชิก
+SubscriptionEndDate=วันที่สิ้นสุดการสมัครสมาชิกของ
+MembersTypeSetup=สมาชิกประเภทการติดตั้ง
+NewSubscription=สมัครสมาชิกใหม่
+NewSubscriptionDesc=รูปแบบนี้จะช่วยให้คุณสามารถบันทึกการสมัครสมาชิกของคุณเป็นสมาชิกใหม่ของมูลนิธิ หากคุณต้องการที่จะต่ออายุการเป็นสมาชิกของคุณ (ถ้าเป็นสมาชิกอยู่แล้ว) กรุณาติดต่อคณะกรรมการมูลนิธิแทนโดยการส่งอีเมล์% s
+Subscription=สมัครสมาชิก
+Subscriptions=การสมัครเป็นสมาชิก
+SubscriptionLate=สาย
+SubscriptionNotReceived=ไม่เคยได้รับการจองซื้อ
+SubscriptionLateShort=สาย
+SubscriptionNotReceivedShort=ไม่เคยได้รับ
+ListOfSubscriptions=รายชื่อของการสมัคร
+SendCardByMail=ส่งบัตรทางอีเมล์
+AddMember=สร้างสมาชิก
+NoTypeDefinedGoToSetup=ประเภทสมาชิกไม่มีกำหนด ไปที่เมนู "สมาชิกประเภท"
+NewMemberType=ประเภทสมาชิกใหม่
+WelcomeEMail=ยินดีต้อนรับอีเมล
+SubscriptionRequired=ต้องสมัครสมาชิก
+EditType=แก้ไขประเภทสมาชิก
+DeleteType=ลบ
+VoteAllowed=โหวตที่ได้รับอนุญาต
+Physical=กายภาพ
+Moral=ศีลธรรม
+MorPhy=คุณธรรม / กายภาพบำบัด
+Reenable=reenable
+ResiliateMember=Resiliate สมาชิก
+ConfirmResiliateMember=คุณแน่ใจหรือว่าต้องการ resiliate สมาชิกนี้?
+DeleteMember=ลบสมาชิก
+ConfirmDeleteMember=คุณแน่ใจหรือว่าต้องการลบสมาชิกนี้ (ลบสมาชิกจะลบการสมัครสมาชิกของเขาทั้งหมด)?
+DeleteSubscription=ลบการสมัครสมาชิก
+ConfirmDeleteSubscription=คุณแน่ใจหรือว่าต้องการลบการสมัครสมาชิกนี้?
+Filehtpasswd=ไฟล์ htpasswd
+ValidateMember=ตรวจสอบสมาชิก
+ConfirmValidateMember=คุณแน่ใจว่าคุณต้องการที่จะตรวจสอบสมาชิกนี้?
+FollowingLinksArePublic=การเชื่อมโยงต่อไปนี้เป็นหน้าเปิดไม่ได้รับการคุ้มครองโดยได้รับอนุญาตใด ๆ Dolibarr พวกเขาจะไม่หน้าจัดรูปแบบให้เป็นตัวอย่างแสดงให้เห็นว่าในรายการฐานข้อมูลสมาชิก
+PublicMemberList=รายชื่อสมาชิกสาธารณะ
+BlankSubscriptionForm=ใบจองซื้อรถยนต์สาธารณะ
+BlankSubscriptionFormDesc=Dolibarr สามารถให้คุณ URL ที่สาธารณะเพื่อให้ผู้เข้าชมภายนอกเพื่อขอสมัครเป็นสมาชิกมูลนิธิ ถ้าโมดูลการชำระเงินออนไลน์มีการใช้งานรูปแบบการชำระเงินจะได้รับการให้โดยอัตโนมัติ
+EnablePublicSubscriptionForm=เปิดใช้งานรูปแบบการสมัครสมาชิกอัตโนมัติสาธารณะ
+MemberPublicLinks=การเชื่อมโยงสาธารณะ / หน้า
+ExportDataset_member_1=และการสมัครสมาชิก
+ImportDataset_member_1=สมาชิก
+LastMembers=ล่าสุดสมาชิก% s
+LastMembersModified=% ล่าสุดสมาชิกปรับเปลี่ยน
+LastSubscriptionsModified=% ล่าสุดของการปรับเปลี่ยนการสมัครสมาชิก
+AttributeName=Attribute ชื่อ
+String=เชือก
+Text=ข้อความ
 Int=Int
-Date=Date
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Create subscription
-ShowSubscription=Show subscription
-MemberModifiedInDolibarr=Member modified in Dolibarr
-SendAnEMailToMember=Send information email to member
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-DescADHERENT_CARD_TYPE=Format of cards page
-DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-MayBeOverwrited=This text can be overwrited by value defined for member's type
-ShowTypeCard=Show type '%s'
-HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated to this member
-ThirdPartyDolibarr=Dolibarr third party
-MembersAndSubscriptions= Members and Subscriptions
-MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-MoreActionBankDirect=Create a direct transaction record on account
-MoreActionBankViaInvoice=Create an invoice and payment on account
-MoreActionInvoiceOnly=Create an invoice with no payment
-LinkToGeneratedPages=Generate visit cards
-LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-DocForAllMembersCards=Generate business cards for all members
-DocForOneMemberCards=Generate business cards for a particular member
-DocForLabels=Generate address sheets
-SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
-MembersStatisticsByCountries=Members statistics by country
-MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTown=Members statistics by town
-MembersStatisticsByRegion=Members statistics by region
-MemberByRegion=Members by region
-NbOfMembers=Number of members
-NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
-MembersStatisticsDesc=Choose statistics you want to read...
-MenuMembersStats=Statistics
-LastMemberDate=Last member date
-Nature=Nature
-Public=Information are public
-Exports=Exports
-NewMemberbyWeb=New member added. Awaiting approval
-NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
-NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
-TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of subscription
-CanEditAmount=Visitor can choose/edit amount of its subscription
-MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-Associations=Foundations
-Collectivités=Organizations
-Particuliers=Personal
-Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+Date=วันที่
+DateAndTime=วันที่และเวลา
+PublicMemberCard=สมาชิกบัตรประชาชน
+MemberNotOrNoMoreExpectedToSubscribe=สมาชิกไม่ได้หรือไม่มีเลยที่คาดว่าจะมากขึ้นในการสมัครเป็นสมาชิก
+AddSubscription=สร้างการสมัครสมาชิก
+ShowSubscription=แสดงการสมัครสมาชิก
+MemberModifiedInDolibarr=สมาชิกปรับเปลี่ยนใน Dolibarr
+SendAnEMailToMember=ส่งอีเมลข้อมูลให้กับสมาชิก
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=เรื่องของ e-mail ที่ได้รับในกรณีที่มีการจารึกอัตโนมัติของผู้เข้าพัก
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail ที่ได้รับในกรณีที่มีการจารึกอัตโนมัติของผู้เข้าพัก
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=เรื่องอีเมลของสมาชิก autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=อีเมลของสมาชิก autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=เรื่องอีเมลสำหรับการตรวจสอบสมาชิก
+DescADHERENT_MAIL_VALID=อีเมลสำหรับการตรวจสอบสมาชิก
+DescADHERENT_MAIL_COTIS_SUBJECT=เรื่องอีเมลสำหรับการสมัครสมาชิก
+DescADHERENT_MAIL_COTIS=อีเมลสำหรับการสมัครสมาชิก
+DescADHERENT_MAIL_RESIL_SUBJECT=เรื่องอีเมลของสมาชิก resiliation
+DescADHERENT_MAIL_RESIL=อีเมลของสมาชิก resiliation
+DescADHERENT_MAIL_FROM=ส่งอีเมลสำหรับอีเมลอัตโนมัติ
+DescADHERENT_ETIQUETTE_TYPE=รูปแบบของหน้าป้าย
+DescADHERENT_ETIQUETTE_TEXT=ข้อความที่พิมพ์อยู่บนแผ่นสมาชิก
+DescADHERENT_CARD_TYPE=รูปแบบของหน้าไพ่
+DescADHERENT_CARD_HEADER_TEXT=ข้อความที่พิมพ์อยู่ด้านบนของบัตรสมาชิก
+DescADHERENT_CARD_TEXT=ข้อความที่พิมพ์บนบัตรสมาชิก (จัดบนซ้าย)
+DescADHERENT_CARD_TEXT_RIGHT=ข้อความที่พิมพ์บนบัตรสมาชิก (จัดบนขวา)
+DescADHERENT_CARD_FOOTER_TEXT=ข้อความที่พิมพ์อยู่ด้านล่างของบัตรสมาชิก
+GlobalConfigUsedIfNotDefined=ข้อความที่กำหนดไว้ในการติดตั้งโมดูลมูลนิธิจะใช้ในกรณีที่ไม่ได้กำหนดไว้ที่นี่
+MayBeOverwrited=ข้อความนี้สามารถ overwrited โดยค่าที่กำหนดไว้สำหรับประเภทของสมาชิก
+ShowTypeCard=แสดงชนิด '% s'
+HTPasswordExport=การสร้างแฟ้ม htpassword
+NoThirdPartyAssociatedToMember=ไม่มีบุคคลที่สามที่เกี่ยวข้องกับสมาชิกนี้
+ThirdPartyDolibarr=บุคคลที่สาม Dolibarr
+MembersAndSubscriptions= สมาชิกและสมัครสมาชิก
+MoreActions=การกระทำประกอบการบันทึก
+MoreActionsOnSubscription=การกระทำที่สมบูรณ์แนะนำโดยเริ่มต้นเมื่อมีการบันทึกการสมัครสมาชิก
+MoreActionBankDirect=สร้างบันทึกรายการในบัญชีโดยตรง
+MoreActionBankViaInvoice=สร้างใบแจ้งหนี้และการชำระเงินในบัญชี
+MoreActionInvoiceOnly=สร้างใบแจ้งหนี้ที่มีการชำระเงินไม่มี
+LinkToGeneratedPages=สร้างบัตรเข้าชม
+LinkToGeneratedPagesDesc=หน้าจอนี้จะช่วยให้คุณสามารถสร้างไฟล์ PDF ด้วยนามบัตรสำหรับสมาชิกทุกคนของคุณหรือสมาชิกโดยเฉพาะอย่างยิ่ง
+DocForAllMembersCards=สร้างนามบัตรสำหรับสมาชิกทุกคน
+DocForOneMemberCards=สร้างนามบัตรของสมาชิกโดยเฉพาะอย่างยิ่ง
+DocForLabels=สร้างแผ่นอยู่
+SubscriptionPayment=การชำระเงินการสมัครสมาชิก
+LastSubscriptionDate=วันที่สมัครสมาชิกล่าสุด
+LastSubscriptionAmount=จำนวนการสมัครสมาชิกล่าสุด
+MembersStatisticsByCountries=สถิติสมาชิกตามประเทศ
+MembersStatisticsByState=สถิติสมาชิกโดยรัฐ / จังหวัด
+MembersStatisticsByTown=สถิติสมาชิกโดยเมือง
+MembersStatisticsByRegion=สถิติสมาชิกตามภูมิภาค
+MemberByRegion=สมาชิกตามภูมิภาค
+NbOfMembers=จำนวนสมาชิก
+NoValidatedMemberYet=ไม่มีสมาชิกตรวจสอบพบว่า
+MembersByCountryDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับประเทศสมาชิก กราฟฟิค แต่ขึ้นอยู่กับบริการของ Google กราฟออนไลน์และสามารถใช้ได้เฉพาะในกรณีที่การเชื่อมต่ออินเทอร์เน็ตจะเป็นคนที่ทำงาน
+MembersByStateDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกโดยรัฐ / จังหวัด / ตำบล
+MembersByTownDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกเมือง
+MembersStatisticsDesc=เลือกสถิติที่คุณต้องการอ่าน ...
+MenuMembersStats=สถิติ
+LastMemberDate=วันที่สมาชิกคนสุดท้าย
+Nature=ธรรมชาติ
+Public=ข้อมูลเป็นสาธารณะ
+Exports=การส่งออก
+NewMemberbyWeb=สมาชิกใหม่ที่เพิ่ม รอการอนุมัติ
+NewMemberForm=แบบฟอร์มการสมัครสมาชิกใหม่
+SubscriptionsStatistics=สถิติเกี่ยวกับการสมัครสมาชิก
+NbOfSubscriptions=จำนวนการสมัครสมาชิก
+AmountOfSubscriptions=จำนวนเงินของการสมัคร
+TurnoverOrBudget=มูลค่าการซื้อขาย (สำหรับ บริษัท ) หรืองบประมาณ (มูลนิธิ)
+DefaultAmount=จำนวนเงินที่เริ่มต้นของการสมัครสมาชิก
+CanEditAmount=ผู้เข้าชมสามารถเลือก / แก้ไขจำนวนเงินของการสมัครสมาชิก
+MEMBER_NEWFORM_PAYONLINE=กระโดดขึ้นไปบนหน้าการชำระเงินออนไลน์แบบบูรณาการ
+Associations=มูลนิธิ
+Collectivités=องค์กร
+Particuliers=ส่วนบุคคล
+Entreprises=บริษัท
+DOLIBARRFOUNDATION_PAYMENT_FORM=ที่จะทำให้การชำระเงินการสมัครของคุณโดยใช้การโอนเงินผ่านธนาคารดูหน้า <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> <br> เพื่อชำระเงินโดยใช้บัตรเครดิตหรือ Paypal คลิกที่ปุ่มด้านล่างของหน้านี้ <br>
+ByProperties=โดยลักษณะ
+MembersStatisticsByProperties=สถิติสมาชิกตามลักษณะ
+MembersByNature=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกโดยธรรมชาติ
+MembersByRegion=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกตามภูมิภาค
+VATToUseForSubscriptions=อัตราภาษีมูลค่าเพิ่มที่จะใช้สำหรับการสมัครสมาชิก
+NoVatOnSubscription=ไม่มี TVA สำหรับการสมัครสมาชิก
+MEMBER_PAYONLINE_SENDEMAIL=อีเมล์เตือนเมื่อ Dolibarr ได้รับการยืนยันการชำระเงินของการตรวจสอบสำหรับการสมัครสมาชิก
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ผลิตภัณฑ์ที่ใช้สำหรับสายการสมัครสมาชิกเข้าไปในใบแจ้งหนี้:% s
diff --git a/htdocs/langs/th_TH/opensurvey.lang b/htdocs/langs/th_TH/opensurvey.lang
index 0b191e426ec..37fb9169fe6 100644
--- a/htdocs/langs/th_TH/opensurvey.lang
+++ b/htdocs/langs/th_TH/opensurvey.lang
@@ -1,66 +1,66 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-NewSurvey=New poll
-NoSurveysInDatabase=%s poll(s) into database.
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=Limit date
-NbOfSurveys=Number of polls
-NbOfVoters=Nb of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Abstention=Abstention
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-ErrorPollDoesNotExists=Error, poll <strong>%s</strong> does not exists.
-OpenSurveyNothingToSetup=There is no specific setup to do.
-PollWillExpire=Your poll will expire automatically <strong>%s</strong> days after the last date of your poll.
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanEditVotes=Can change vote of others
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The voting time of this poll has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+Survey=โพลล์
+Surveys=โพลล์
+OrganizeYourMeetingEasily=จัดประชุมและการสำรวจความคิดเห็นของคุณได้อย่างง่ายดาย เลือกชนิดแรกของการเลือกตั้ง ...
+NewSurvey=โพลใหม่
+NoSurveysInDatabase=% s การสำรวจความคิดเห็น (s) ลงในฐานข้อมูล
+OpenSurveyArea=พื้นที่โพลล์
+AddACommentForPoll=คุณสามารถเพิ่มความคิดเห็นลงในการสำรวจความคิดเห็น ...
+AddComment=เพิ่มความคิดเห็น
+CreatePoll=สร้างแบบสำรวจ
+PollTitle=ชื่อเรื่องการสำรวจความคิดเห็น
+ToReceiveEMailForEachVote=ได้รับอีเมลสำหรับการลงคะแนนเสียงในแต่ละ
+TypeDate=วันที่ประเภท
+TypeClassic=ประเภทมาตรฐาน
+OpenSurveyStep2=เลือกวันที่ที่คุณ amoung วันฟรี (สีเทา) วันที่เลือกเป็นสีเขียว คุณสามารถยกเลิกการเลือกวันที่เลือกก่อนหน้านี้โดยคลิกที่มันอีกครั้ง
+RemoveAllDays=ลบทุกวัน
+CopyHoursOfFirstDay=คัดลอกชั่วโมงของวันแรก
+RemoveAllHours=ลบทุกชั่วโมง
+SelectedDays=วันที่เลือก
+TheBestChoice=เลือกที่ดีที่สุดในขณะนี้
+TheBestChoices=เลือกที่ดีที่สุดขณะนี้
+with=กับ
+OpenSurveyHowTo=ถ้าคุณเห็นด้วยกับการออกเสียงลงคะแนนในการสำรวจนี้คุณจะต้องให้ชื่อของคุณให้เลือกค่าที่เหมาะสมที่สุดสำหรับคุณและตรวจสอบด้วยปุ่มบวกที่ท้ายบรรทัด
+CommentsOfVoters=ความคิดเห็นของผู้มีสิทธิเลือกตั้ง
+ConfirmRemovalOfPoll=คุณแน่ใจหรือว่าต้องการลบโพลนี้ (และเสียงทั้งหมด)
+RemovePoll=ลบสำรวจความคิดเห็น
+UrlForSurvey=URL ในการสื่อสารที่จะได้รับการเข้าถึงโดยตรงไปสำรวจ
+PollOnChoice=คุณกำลังสร้างการสำรวจความคิดเห็นเพื่อให้เป็นทางเลือกหลายสำหรับการสำรวจความคิดเห็น ใส่ตัวเลือกที่เป็นไปได้ทั้งหมดสำหรับการสำรวจความคิดเห็นของคุณ:
+CreateSurveyDate=สร้างแบบสำรวจวัน
+CreateSurveyStandard=สร้างมาตรฐานการสำรวจความคิดเห็น
+CheckBox=ช่องที่เรียบง่าย
+YesNoList=รายชื่อ (ที่ว่างเปล่า / ใช่ / ไม่ใช่)
+PourContreList=รายชื่อ (ที่ว่างเปล่า / สำหรับ / ต่อต้าน)
+AddNewColumn=เพิ่มคอลัมน์ใหม่
+TitleChoice=ป้ายทางเลือก
+ExportSpreadsheet=ส่งออกผลสเปรดชีต
+ExpireDate=วัน จำกัด
+NbOfSurveys=จำนวนโพลล์
+NbOfVoters=nb ของผู้มีสิทธิเลือกตั้ง
+SurveyResults=ผล
+PollAdminDesc=คุณได้รับอนุญาตให้เปลี่ยนทุกสายการโหวตของโพลนี้ด้วยปุ่ม "แก้ไข" คุณสามารถเป็นอย่างดีเอาคอลัมน์หรือสายกับ% s นอกจากนี้คุณยังสามารถเพิ่มคอลัมน์ใหม่กับ% s
+5MoreChoices=5 ทางเลือกมากขึ้น
+Abstention=การงดออกเสียง
+Against=กับ
+YouAreInivitedToVote=คุณได้รับเชิญให้คะแนนสำหรับการสำรวจนี้
+VoteNameAlreadyExists=ชื่อนี้ถูกใช้ไปแล้วสำหรับการสำรวจนี้
+ErrorPollDoesNotExists=<strong>ข้อผิดพลาดการสำรวจ% s</strong> ไม่ได้มีอยู่
+OpenSurveyNothingToSetup=ไม่มีการติดตั้งเฉพาะที่จะทำคือ
+PollWillExpire=<strong>การสำรวจความคิดเห็นของคุณจะหมดอายุโดยอัตโนมัติ% s</strong> วันหลังจากวันสุดท้ายของการสำรวจความคิดเห็นของคุณ
+AddADate=เพิ่มวันที่
+AddStartHour=เพิ่มเริ่มต้นชั่วโมง
+AddEndHour=เพิ่มท้ายชั่วโมง
+votes=การออกเสียงลงคะแนน (s)
+NoCommentYet=ไม่มีความคิดเห็นที่ได้รับการโพสต์สำหรับการสำรวจนี้ยัง
+CanEditVotes=สามารถเปลี่ยนการลงคะแนนของคนอื่น ๆ
+CanComment=ผู้มีสิทธิเลือกตั้งสามารถแสดงความคิดเห็นในการสำรวจ
+CanSeeOthersVote=ผู้มีสิทธิเลือกตั้งสามารถดูการลงคะแนนของคนอื่น
+SelectDayDesc=สำหรับแต่ละวันที่เลือกคุณสามารถเลือกหรือไม่ประชุมชั่วโมงในรูปแบบต่อไปนี้: <br> - ที่ว่างเปล่า <br> - "8h", "8H" หรือ "08:00" เพื่อให้ชั่วโมงการเริ่มต้นการประชุม, <br> - "8-11", "8h-11h", "8H-11H" หรือ "8: 00-11: 00" เพื่อให้เริ่มต้นการประชุมและสิ้นสุดชั่วโมง <br> - "8h15-11h15", "8H15-11H15" หรือ "8: 15-11: 15" สำหรับสิ่งเดียวกัน แต่มีไม่กี่นาที
+BackToCurrentMonth=กลับไปเดือนปัจจุบัน
+ErrorOpenSurveyFillFirstSection=คุณยังไม่ได้เต็มไปส่วนแรกของการสร้างแบบสำรวจความคิดเห็น
+ErrorOpenSurveyOneChoice=ใส่อย่างน้อยหนึ่งทางเลือก
+ErrorOpenSurveyDateFormat=วันที่จะต้องมีรูปแบบ YYYY-MM-DD
+ErrorInsertingComment=มีข้อผิดพลาดในขณะที่การใส่ความคิดเห็นของคุณ
+MoreChoices=ใส่เลือกมากขึ้นสำหรับผู้มีสิทธิเลือกตั้ง
+SurveyExpiredInfo=เวลาออกเสียงทั้งหมดของการสำรวจนี้ได้หมดอายุแล้ว
+EmailSomeoneVoted=% s ที่เต็มไปด้วยเส้น คุณสามารถค้นหาการสำรวจความคิดเห็นของคุณได้ที่ลิงค์:% s
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 044bcc0eb01..6e6b5d50610 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -1,172 +1,173 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
-OrderCard=Order card
-OrderId=Order Id
-Order=Order
-Orders=Orders
-OrderLine=Order line
-OrderFollow=Follow up
-OrderDate=Order date
-OrderToProcess=Order to process
-NewOrder=New order
-ToOrder=Make order
-MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
-StatusOrderCanceledShort=Canceled
-StatusOrderDraftShort=Draft
-StatusOrderValidatedShort=Validated
-StatusOrderSentShort=In process
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
-StatusOrderProcessedShort=Processed
-StatusOrderToBillShort=Delivered
-StatusOrderToBill2Short=To bill
-StatusOrderApprovedShort=Approved
-StatusOrderRefusedShort=Refused
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
-StatusOrderCanceled=Canceled
-StatusOrderDraft=Draft (needs to be validated)
-StatusOrderValidated=Validated
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusOrderProcessed=Processed
-StatusOrderToBill=Delivered
-StatusOrderToBill2=To bill
-StatusOrderApproved=Approved
-StatusOrderRefused=Refused
-StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
-ShippingExist=A shipment exists
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-DraftOrWaitingApproved=Draft or approved not yet ordered
-DraftOrWaitingShipped=Draft or validated not yet shipped
-MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Billable orders
-SearchOrder=Search order
-SearchACustomerOrder=Search a customer order
-SearchASupplierOrder=Search a supplier order
-ShipProduct=Ship product
-Discount=Discount
-CreateOrder=Create Order
-RefuseOrder=Refuse order
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
-ValidateOrder=Validate order
-UnvalidateOrder=Unvalidate order
-DeleteOrder=Delete order
-CancelOrder=Cancel order
-AddOrder=Create order
-AddToMyOrders=Add to my orders
-AddToOtherOrders=Add to other orders
-AddToDraftOrders=Add to draft order
-ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
-NoDraftOrders=No draft orders
-OtherOrders=Other orders
-LastOrders=Last %s customer orders
-LastCustomerOrders=Last %s customer orders
-LastSupplierOrders=Last %s supplier orders
-LastModifiedOrders=Last %s modified orders
-LastClosedOrders=Last %s closed orders
-AllOrders=All orders
-NbOfOrders=Number of orders
-OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
-NumberOfOrdersByMonth=Number of orders by month
-AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-ListOfOrders=List of orders
-CloseOrder=Close order
-ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-ConfirmDeleteOrder=Are you sure you want to delete this order ?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-ConfirmCancelOrder=Are you sure you want to cancel this order ?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-GenerateBill=Generate invoice
-ClassifyShipped=Classify delivered
-ClassifyBilled=Classify billed
-ComptaCard=Accountancy card
-DraftOrders=Draft orders
-RelatedOrders=Related orders
-RelatedCustomerOrders=Related customer orders
-RelatedSupplierOrders=Related supplier orders
-OnProcessOrders=In process orders
-RefOrder=Ref. order
-RefCustomerOrder=Ref. customer order
-RefCustomerOrderShort=Ref. cust. order
-SendOrderByMail=Send order by mail
-ActionsOnOrder=Events on order
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-OrderMode=Order method
-AuthorRequest=Request author
-UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-RunningOrders=Orders on process
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-CloneOrder=Clone order
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-DispatchSupplierOrder=Receiving supplier order %s
-FirstApprovalAlreadyDone=First approval already done
+OrdersArea=ลูกค้าที่สั่งซื้อในพื้นที่
+SuppliersOrdersArea=ซัพพลายเออร์ในพื้นที่การสั่งซื้อ
+OrderCard=สั่งซื้อบัตร
+OrderId=รหัสการสั่งซื้อ
+Order=สั่งซื้อ
+Orders=คำสั่งซื้อ
+OrderLine=สายการสั่งซื้อ
+OrderFollow=ติดตาม
+OrderDate=วันที่สั่งซื้อ
+OrderToProcess=เพื่อที่จะดำเนินการ
+NewOrder=คำสั่งซื้อใหม่
+ToOrder=ทำให้การสั่งซื้อ
+MakeOrder=ทำให้การสั่งซื้อ
+SupplierOrder=เพื่อที่ผู้ผลิต
+SuppliersOrders=คำสั่งซัพพลายเออร์
+SuppliersOrdersRunning=ซัพพลายเออร์ที่ปัจจุบันคำสั่งซื้อ
+CustomerOrder=สั่งซื้อของลูกค้า
+CustomersOrders=สั่งซื้อของลูกค้า
+CustomersOrdersRunning=สั่งซื้อของลูกค้าในปัจจุบัน
+CustomersOrdersAndOrdersLines=สั่งซื้อของลูกค้าและสายการสั่งซื้อ
+OrdersToValid=สั่งซื้อของลูกค้าในการตรวจสอบ
+OrdersToBill=สั่งซื้อของลูกค้าที่ส่งมอบ
+OrdersInProcess=สั่งซื้อของลูกค้าในกระบวนการ
+OrdersToProcess=สั่งซื้อของลูกค้าในการประมวลผล
+SuppliersOrdersToProcess=คำสั่งผู้ผลิตในการประมวลผล
+StatusOrderCanceledShort=ยกเลิก
+StatusOrderDraftShort=ร่าง
+StatusOrderValidatedShort=ผ่านการตรวจสอบ
+StatusOrderSentShort=ในกระบวนการ
+StatusOrderSent=ในขั้นตอนการจัดส่ง
+StatusOrderOnProcessShort=ได้รับคำสั่ง
+StatusOrderProcessedShort=การประมวลผล
+StatusOrderToBillShort=จัดส่ง
+StatusOrderToBill2Short=เพื่อเรียกเก็บเงิน
+StatusOrderApprovedShort=ได้รับการอนุมัติ
+StatusOrderRefusedShort=ปฏิเสธ
+StatusOrderToProcessShort=ในการประมวลผล
+StatusOrderReceivedPartiallyShort=ได้รับบางส่วน
+StatusOrderReceivedAllShort=ทุกอย่างที่ได้รับ
+StatusOrderCanceled=ยกเลิก
+StatusOrderDraft=ร่าง (จะต้องมีการตรวจสอบ)
+StatusOrderValidated=ผ่านการตรวจสอบ
+StatusOrderOnProcess=ได้รับคำสั่ง - พนักงานต้อนรับสแตนด์บาย
+StatusOrderOnProcessWithValidation=ได้รับคำสั่ง - พนักงานต้อนรับสแตนด์บายหรือการตรวจสอบ
+StatusOrderProcessed=การประมวลผล
+StatusOrderToBill=จัดส่ง
+StatusOrderToBill2=เพื่อเรียกเก็บเงิน
+StatusOrderApproved=ได้รับการอนุมัติ
+StatusOrderRefused=ปฏิเสธ
+StatusOrderReceivedPartially=ได้รับบางส่วน
+StatusOrderReceivedAll=ทุกอย่างที่ได้รับ
+ShippingExist=การจัดส่งสินค้าที่มีอยู่
+ProductQtyInDraft=ปริมาณการสั่งซื้อสินค้าเข้ามาในร่าง
+ProductQtyInDraftOrWaitingApproved=ปริมาณสินค้าเข้าร่างหรือคำสั่งได้รับการอนุมัติยังไม่ได้รับคำสั่ง
+DraftOrWaitingApproved=ร่างหรือได้รับการอนุมัติยังไม่ได้รับคำสั่ง
+DraftOrWaitingShipped=ร่างหรือการตรวจสอบไม่ได้ส่งเลย
+MenuOrdersToBill=ส่งคำสั่งซื้อ
+MenuOrdersToBill2=คำสั่งที่เรียกเก็บเงิน
+SearchOrder=เพื่อค้นหา
+SearchACustomerOrder=ค้นหาคำสั่งของลูกค้า
+SearchASupplierOrder=เพื่อค้นหาผู้จัดจำหน่าย
+ShipProduct=เรือสินค้า
+Discount=ส่วนลด
+CreateOrder=สร้างใบสั่ง
+RefuseOrder=ปฏิเสธการสั่งซื้อ
+ApproveOrder=อนุมัติคำสั่งซื้อ
+Approve2Order=อนุมัติคำสั่งซื้อ (ระดับที่สอง)
+ValidateOrder=ตรวจสอบการสั่งซื้อ
+UnvalidateOrder=เพื่อ Unvalidate
+DeleteOrder=เพื่อลบ
+CancelOrder=ยกเลิกคำสั่งซื้อ
+AddOrder=สร้างใบสั่ง
+AddToMyOrders=เพิ่มลงในคำสั่งซื้อของฉัน
+AddToOtherOrders=เพิ่มคำสั่งอื่น ๆ
+AddToDraftOrders=เพิ่มลงในร่างคำสั่ง
+ShowOrder=เพื่อแสดง
+OrdersOpened=คำสั่งในการประมวลผล
+NoOpenedOrders=ไม่มีคำสั่งเปิด
+NoOtherOpenedOrders=ไม่มีคำสั่งอื่น ๆ ที่เปิด
+NoDraftOrders=ไม่มีคำสั่งร่าง
+OtherOrders=คำสั่งอื่น ๆ
+LastOrders=% s ล่าสุดสั่งซื้อของลูกค้า
+LastCustomerOrders=% s ล่าสุดสั่งซื้อของลูกค้า
+LastSupplierOrders=% s ล่าสุดคำสั่งผู้จัดจำหน่าย
+LastModifiedOrders=% ล่าสุดของคำสั่งการปรับเปลี่ยน
+LastClosedOrders=% s ล่าสุดปิดคำสั่งซื้อ
+AllOrders=คำสั่งซื้อทั้งหมด
+NbOfOrders=จำนวนการสั่งซื้อ
+OrdersStatistics=การสั่งซื้อของสถ​​ิติ
+OrdersStatisticsSuppliers=เพื่อที่ผู้ผลิตสถิติ
+NumberOfOrdersByMonth=จำนวนการสั่งซื้อโดย
+AmountOfOrdersByMonthHT=จำนวนเงินของการสั่งซื้อตามเดือน (สุทธิจากภาษี)
+ListOfOrders=รายชื่อของคำสั่ง
+CloseOrder=ปิดการสั่งซื้อ
+ConfirmCloseOrder=คุณแน่ใจหรือว่าต้องการตั้งค่าเพื่อ deliverd นี้หรือไม่? เมื่อสั่งซื้อจะถูกส่งก็สามารถกำหนดให้เรียกเก็บเงิน
+ConfirmCloseOrderIfSending=คุณแน่ใจหรือว่าต้องการที่จะปิดการสั่งซื้อนี้? คุณต้องปิดคำสั่งเฉพาะเมื่อการจัดส่งสินค้าทั้งหมดจะทำ
+ConfirmDeleteOrder=คุณแน่ใจหรือว่าต้องการลบคำสั่งนี้?
+ConfirmValidateOrder=<b>คุณแน่ใจหรือว่าต้องการตรวจสอบการสั่งซื้อภายใต้ชื่อ% s</b> นี้หรือไม่?
+ConfirmUnvalidateOrder=<b>คุณแน่ใจหรือว่าต้องการเรียกคืนสินค้า% s</b> ร่างสถานะ?
+ConfirmCancelOrder=คุณแน่ใจหรือว่าต้องการที่จะยกเลิกคำสั่งนี้หรือไม่?
+ConfirmMakeOrder=<b>คุณแน่ใจหรือว่าต้องการที่จะยืนยันว่าคุณทำคำสั่งนี้ใน% s?</b>
+GenerateBill=สร้างใบแจ้งหนี้
+ClassifyShipped=จำแนกส่ง
+ClassifyBilled=แบ่งประเภทเรียกเก็บเงิน
+ComptaCard=บัตรบัญชี
+DraftOrders=ร่างคำสั่ง
+RelatedOrders=คำสั่งที่เกี่ยวข้อง
+RelatedCustomerOrders=สั่งซื้อของลูกค้าที่เกี่ยวข้อง
+RelatedSupplierOrders=คำสั่งผู้จัดจำหน่ายที่เกี่ยวข้อง
+OnProcessOrders=ขั้นตอนในการสั่งซื้อ
+RefOrder=อ้าง สั่งซื้อ
+RefCustomerOrder=อ้าง สั่งซื้อของลูกค้า
+RefCustomerOrderShort=อ้าง cust สั่งซื้อ
+SendOrderByMail=ส่งคำสั่งซื้อทางไปรษณีย์
+ActionsOnOrder=เหตุการณ์ที่เกิดขึ้นในการสั่งซื้อ
+NoArticleOfTypeProduct=บทความไม่มีชนิด 'สินค้า' จึงไม่มีบทความ shippable สำหรับการสั่งซื้อนี้
+OrderMode=วิธีการสั่งซื้อ
+AuthorRequest=ผู้เขียนขอ
+UseCustomerContactAsOrderRecipientIfExist=ใช้ที่อยู่การติดต่อกับลูกค้าถ้ากำหนดไว้แทนการที่อยู่ของบุคคลที่สามเป็นที่อยู่ของผู้รับคำสั่ง
+RunningOrders=สั่งซื้อเกี่ยวกับกระบวนการ
+UserWithApproveOrderGrant=ผู้ใช้งานที่ได้รับด้วย "อนุมัติคำสั่ง" ได้รับอนุญาต
+PaymentOrderRef=การชำระเงินของการสั่งซื้อ% s
+CloneOrder=เพื่อโคลน
+ConfirmCloneOrder=<b>คุณแน่ใจหรือว่าต้องการโคลน% s</b> สั่งซื้อนี้?
+DispatchSupplierOrder=ผู้จัดจำหน่ายที่ได้รับการสั่งซื้อ% s
+FirstApprovalAlreadyDone=ได้รับการอนุมัติครั้งแรกที่ทำมาแล้ว
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-TypeContact_commande_external_BILLING=Customer invoice contact
-TypeContact_commande_external_SHIPPING=Customer shipping contact
-TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_commande_internal_SALESREPFOLL=ต่อไปนี้แทนขึ้นสั่งซื้อของลูกค้า
+TypeContact_commande_internal_SHIPPING=แทนการจัดส่งสินค้าต่อไปนี้ขึ้น
+TypeContact_commande_external_BILLING=ติดต่อใบแจ้งหนี้ของลูกค้า
+TypeContact_commande_external_SHIPPING=ติดต่อลูกค้าการจัดส่งสินค้า
+TypeContact_commande_external_CUSTOMER=การติดต่อกับลูกค้าเพื่อติดตาม
+TypeContact_order_supplier_internal_SALESREPFOLL=แทนต่อไปนี้ขึ้นเพื่อจัดจำหน่าย
+TypeContact_order_supplier_internal_SHIPPING=แทนการจัดส่งสินค้าต่อไปนี้ขึ้น
+TypeContact_order_supplier_external_BILLING=ติดต่อผู้ผลิตใบแจ้งหนี้
+TypeContact_order_supplier_external_SHIPPING=ติดต่อผู้ผลิตจัดส่งสินค้า
+TypeContact_order_supplier_external_CUSTOMER=ติดต่อผู้ผลิตลำดับต่อไปนี้ขึ้น
 
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-Error_OrderNotChecked=No orders to invoice selected
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON คงที่ไม่ได้กำหนดไว้
+Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON คงที่ไม่ได้กำหนดไว้
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=ไม่สามารถโหลดไฟล์โมดูล '% s'
+Error_FailedToLoad_COMMANDE_ADDON_File=ไม่สามารถโหลดไฟล์โมดูล '% s'
+Error_OrderNotChecked=คำสั่งซื้อที่ยังไม่ได้ออกใบแจ้งหนี้ที่เลือก
 # Sources
-OrderSource0=Commercial proposal
-OrderSource1=Internet
-OrderSource2=Mail campaign
-OrderSource3=Phone compaign
-OrderSource4=Fax campaign
-OrderSource5=Commercial
-OrderSource6=Store
-QtyOrdered=Qty ordered
-AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
+OrderSource0=ข้อเสนอเชิงพาณิชย์
+OrderSource1=อินเทอร์เน็ต
+OrderSource2=แคมเปญจดหมาย
+OrderSource3=โทรศัพท์ compaign
+OrderSource4=แคมเปญโทรสาร
+OrderSource5=เชิงพาณิชย์
+OrderSource6=ร้านค้า
+QtyOrdered=จำนวนที่สั่งซื้อ
+AddDeliveryCostLine=เพิ่มเส้นค่าจัดส่งที่ระบุน้ำหนักของการสั่งซื้อ
 # Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=รูปแบบการสั่งซื้อฉบับสมบูรณ์ (โลโก้ ... )
+PDFEdisonDescription=รูปแบบการสั่งซื้อที่ง่าย
+PDFProformaDescription=ใบแจ้งหนี้เสมือนฉบับสมบูรณ์ (โลโก้ ... )
 # Orders modes
-OrderByMail=Mail
-OrderByFax=Fax
-OrderByEMail=EMail
-OrderByWWW=Online
-OrderByPhone=Phone
-CreateInvoiceForThisCustomer=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=จดหมาย
+OrderByFax=แฟกซ์
+OrderByEMail=อีเมล
+OrderByWWW=ออนไลน์
+OrderByPhone=โทรศัพท์
+CreateInvoiceForThisCustomer=บิลสั่งซื้อ
+NoOrdersToInvoice=ไม่มีการเรียกเก็บเงินการสั่งซื้อ
+CloseProcessedOrdersAutomatically=จำแนก "แปรรูป" คำสั่งที่เลือกทั้งหมด
+OrderCreation=การสร้างการสั่งซื้อ
+Ordered=ได้รับคำสั่ง
+OrderCreated=คำสั่งของคุณได้ถูกสร้างขึ้น
+OrderFail=ข้อผิดพลาดที่เกิดขึ้นในระหว่างการสร้างคำสั่งของคุณ
+CreateOrders=สร้างคำสั่งซื้อ
+ToBillSeveralOrderSelectCustomer=การสร้างใบแจ้งหนี้สำหรับการสั่งซื้อหลายคลิกแรกบนลูกค้าแล้วเลือก "% s"
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 819005d4f4a..1ae66888047 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -1,240 +1,242 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
-Calendar=Calendar
-Tools=Tools
-ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
-Birthday=Birthday
-BirthdayDate=Birthday
-DateToBirth=Date of birth
-BirthdayAlertOn= birthday alert active
-BirthdayAlertOff= birthday alert inactive
-Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_BILL_VALIDATE=Customer invoice validated
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
-Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
-Notify_ORDER_VALIDATE=Customer order validated
-Notify_PROPAL_VALIDATE=Customer proposal validated
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_ORDER_SENTBYMAIL=Customer order sent by mail
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_BILL_PAYED=Customer invoice payed
-Notify_BILL_CANCEL=Customer invoice canceled
-Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
-Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
-Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
-Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
-Notify_CONTRACT_VALIDATE=Contract validated
-Notify_FICHEINTER_VALIDATE=Intervention validated
-Notify_SHIPPING_VALIDATE=Shipping validated
-Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
-Notify_MEMBER_VALIDATE=Member validated
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Member subscribed
-Notify_MEMBER_RESILIATE=Member resiliated
-Notify_MEMBER_DELETE=Member deleted
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See setup of module %s
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
-Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
-PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
-PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__SIGNATURE__
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that match your activity...
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
-GoToDemo=Go to demo
-CreatedBy=Created by %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
-CanceledBy=Canceled by %s
-ClosedBy=Closed by %s
-CreatedById=User id who created
-ModifiedById=User id who made last change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made last change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailableShort=Available in a next version
-FeatureNotYetAvailable=Feature not yet available in this version
-FeatureExperimental=Experimental feature. Not stable in this version
-FeatureDevelopment=Development feature. Not stable in this version
-FeaturesSupported=Features supported
-Width=Width
-Height=Height
-Depth=Depth
-Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
-TotalWeight=Total weight
-WeightUnitton=tonnes
-WeightUnitkg=kg
-WeightUnitg=g
-WeightUnitmg=mg
-WeightUnitpound=pound
-Length=Length
-LengthUnitm=m
-LengthUnitdm=dm
-LengthUnitcm=cm
-LengthUnitmm=mm
-Surface=Area
+SecurityCode=รหัสรักษาความปลอดภัย
+Calendar=ปฏิทิน
+Tools=เครื่องมือ
+ToolsDesc=บริเวณนี้เป็นที่ทุ่มเทให้กับกลุ่มเครื่องมืออื่น ๆ ที่ไม่สามารถใช้ได้เข้าไปในรายการเมนูอื่น ๆ <br><br> เครื่องมือเหล่านั้นสามารถเข้าถึงได้จากเมนูด้านข้าง
+Birthday=วันเกิด
+BirthdayDate=วันเกิด
+DateToBirth=วันเกิด
+BirthdayAlertOn= การแจ้งเตือนการใช้งานวันเกิด
+BirthdayAlertOff= การแจ้งเตือนวันเกิดไม่ได้ใช้งาน
+Notify_FICHINTER_VALIDATE=การแทรกแซงการตรวจสอบ
+Notify_FICHINTER_SENTBYMAIL=การแทรกแซงส่งทางไปรษณีย์
+Notify_BILL_VALIDATE=ตรวจสอบใบแจ้งหนี้ของลูกค้า
+Notify_BILL_UNVALIDATE=ใบแจ้งหนี้ของลูกค้า unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=เพื่อที่ผู้ผลิตบันทึก
+Notify_ORDER_SUPPLIER_APPROVE=เพื่อที่ผู้ผลิตได้รับการอนุมัติ
+Notify_ORDER_SUPPLIER_REFUSE=เพื่อที่ผู้ผลิตไม่ยอม
+Notify_ORDER_VALIDATE=การตรวจสอบการสั่งซื้อของลูกค้า
+Notify_PROPAL_VALIDATE=ข้อเสนอของลูกค้าผ่านการตรวจสอบ
+Notify_PROPAL_CLOSE_SIGNED=propal ลูกค้าปิดลงนาม
+Notify_PROPAL_CLOSE_REFUSED=propal ลูกค้าไม่ยอมปิด
+Notify_WITHDRAW_TRANSMIT=ถอนการส่ง
+Notify_WITHDRAW_CREDIT=ถอนเครดิต
+Notify_WITHDRAW_EMIT=ดำเนินการถอนตัว
+Notify_ORDER_SENTBYMAIL=สั่งซื้อของลูกค้าส่งทางไปรษณีย์
+Notify_COMPANY_CREATE=บุคคลที่สามสร้าง
+Notify_COMPANY_SENTBYMAIL=อีเมลที่ส่งจากบัตรของบุคคลที่สาม
+Notify_PROPAL_SENTBYMAIL=ข้อเสนอเชิงพาณิชย์ส่งทางไปรษณีย์
+Notify_BILL_PAYED=ใบแจ้งหนี้ของลูกค้า payed
+Notify_BILL_CANCEL=ยกเลิกใบแจ้งหนี้ของลูกค้า
+Notify_BILL_SENTBYMAIL=ใบแจ้งหนี้ของลูกค้าส่งทางไปรษณีย์
+Notify_ORDER_SUPPLIER_VALIDATE=เพื่อที่ผู้ผลิตบันทึก
+Notify_ORDER_SUPPLIER_SENTBYMAIL=เพื่อที่ผู้ผลิตส่งทางไปรษณีย์
+Notify_BILL_SUPPLIER_VALIDATE=ผู้ผลิตตรวจสอบใบแจ้งหนี้
+Notify_BILL_SUPPLIER_PAYED=ใบแจ้งหนี้ผู้ผลิต payed
+Notify_BILL_SUPPLIER_SENTBYMAIL=ใบแจ้งหนี้ที่ผู้ผลิตส่งทางไปรษณีย์
+Notify_BILL_SUPPLIER_CANCELED=ผู้ผลิตยกเลิกใบแจ้งหนี้
+Notify_CONTRACT_VALIDATE=การตรวจสอบสัญญา
+Notify_FICHEINTER_VALIDATE=การแทรกแซงการตรวจสอบ
+Notify_SHIPPING_VALIDATE=การจัดส่งสินค้าผ่านการตรวจสอบ
+Notify_SHIPPING_SENTBYMAIL=การจัดส่งสินค้าส่งทางไปรษณีย์
+Notify_MEMBER_VALIDATE=สมาชิกผ่านการตรวจสอบ
+Notify_MEMBER_MODIFY=สมาชิกมีการปรับเปลี่ยน
+Notify_MEMBER_SUBSCRIPTION=สมัครสมาชิก
+Notify_MEMBER_RESILIATE=สมาชิก resiliated
+Notify_MEMBER_DELETE=สมาชิกที่ถูกลบ
+Notify_PROJECT_CREATE=การสร้างโครงการ
+Notify_TASK_CREATE=งานที่สร้างขึ้น
+Notify_TASK_MODIFY=งานการแก้ไข
+Notify_TASK_DELETE=งานที่ถูกลบ
+SeeModuleSetup=ดูการตั้งค่าของโมดูล% s
+NbOfAttachedFiles=จำนวนแนบไฟล์ / เอกสาร
+TotalSizeOfAttachedFiles=ขนาดของไฟล์ที่แนบมา / เอกสาร
+MaxSize=ขนาดสูงสุด
+AttachANewFile=แนบไฟล์ใหม่ / เอกสาร
+LinkedObject=วัตถุที่เชื่อมโยง
+Miscellaneous=เบ็ดเตล็ด
+NbOfActiveNotifications=จำนวนการแจ้งเตือน (nb ของอีเมลผู้รับ)
+PredefinedMailTest=นี่คือการทดสอบอีเมล สองสายแยกจากกันโดยกลับรถ __SIGNATURE__
+PredefinedMailTestHtml=<b>นี่คือจดหมายทดสอบ</b> (ทดสอบคำว่าจะต้องอยู่ในตัวหนา) <br> สองสายแยกจากกันโดยกลับรถ <br><br> __SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่ใบแจ้งหนี้ __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ เราอยากจะเตือนคุณว่า __FACREF__ ใบแจ้งหนี้ที่ดูเหมือนว่าจะไม่ได้รับการ payed ดังนั้นนี่คือสิ่งที่แนบมาในใบแจ้งหนี้อีกครั้งเป็นตัวเตือน __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่ข้อเสนอในเชิงพาณิชย์ __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่คำขอราคา __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่เพื่อ __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่เพื่อเรา __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่ใบแจ้งหนี้ __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่จัดส่ง __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่แทรกแซง __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+DemoDesc=Dolibarr เป็นที่กะทัดรัด ERP / CRM ประกอบด้วยโมดูลการทำงานหลาย ๆ สาธิตที่มีโมดูลทั้งหมดไม่ได้หมายความอะไรเช่นนี้ไม่เคยเกิดขึ้น ดังนั้นรูปแบบการสาธิตหลายที่มีอยู่
+ChooseYourDemoProfil=เลือกรายละเอียดการสาธิตที่ตรงกับกิจกรรมของคุณ ...
+DemoFundation=จัดการสมาชิกของมูลนิธิ
+DemoFundation2=จัดการสมาชิกและบัญชีธนาคารของมูลนิธิ
+DemoCompanyServiceOnly=การจัดการการขายบริการกิจกรรมอิสระเท่านั้น
+DemoCompanyShopWithCashDesk=บริหารจัดการร้านค้าพร้อมโต๊ะเงินสด
+DemoCompanyProductAndStocks=จัดการ บริษัท ขนาดเล็กหรือขนาดกลางขายสินค้า
+DemoCompanyAll=จัดการ บริษัท ขนาดเล็กหรือขนาดกลางที่มีกิจกรรมหลาย ๆ (ทุกโมดูลหลัก)
+GoToDemo=ไปสาธิต
+CreatedBy=สร้างโดย% s
+ModifiedBy=ดัดแปลงโดย% s
+ValidatedBy=การตรวจสอบโดย% s
+CanceledBy=ยกเลิกโดย% s
+ClosedBy=ปิดโดย% s
+CreatedById=รหัสผู้ใช้ที่สร้าง
+ModifiedById=รหัสผู้ใช้ที่ทำให้การเปลี่ยนแปลงที่ผ่านมา
+ValidatedById=รหัสผู้ใช้ที่ผ่านการตรวจสอบ
+CanceledById=รหัสผู้ใช้ที่ยกเลิก
+ClosedById=รหัสผู้ใช้ที่ปิด
+CreatedByLogin=เข้าสู่ระบบผู้ใช้ที่สร้าง
+ModifiedByLogin=เข้าสู่ระบบของผู้ใช้ที่ทำให้การเปลี่ยนแปลงที่ผ่านมา
+ValidatedByLogin=เข้าสู่ระบบผู้ใช้ที่ผ่านการตรวจสอบ
+CanceledByLogin=เข้าสู่ระบบที่ผู้ใช้ยกเลิก
+ClosedByLogin=ผู้ใช้ที่เข้าสู่ระบบปิด
+FileWasRemoved=ไฟล์% s จะถูกลบออก
+DirWasRemoved=สารบบ% s จะถูกลบออก
+FeatureNotYetAvailableShort=ที่มีจำหน่ายในรุ่นถัดไป
+FeatureNotYetAvailable=มียังไม่สามารถใช้ได้ในรุ่นนี้
+FeatureExperimental=คุณลักษณะการทดลอง ไม่มั่นคงในรุ่นนี้
+FeatureDevelopment=คุณลักษณะการพัฒนา ไม่มั่นคงในรุ่นนี้
+FeaturesSupported=คุณสมบัติที่รองรับ
+Width=ความกว้าง
+Height=ความสูง
+Depth=ความลึก
+Top=ด้านบน
+Bottom=ก้น
+Left=ซ้าย
+Right=เหมาะสม
+CalculatedWeight=น้ำหนักการคำนวณ
+CalculatedVolume=ปริมาณการคำนวณ
+Weight=น้ำหนัก
+TotalWeight=น้ำหนักรวม
+WeightUnitton=ตัน
+WeightUnitkg=กก.
+WeightUnitg=ก.
+WeightUnitmg=มก.
+WeightUnitpound=ปอนด์
+Length=ความยาว
+LengthUnitm=ม.
+LengthUnitdm=DM
+LengthUnitcm=ซม.
+LengthUnitmm=มิลลิเมตร
+Surface=พื้นที่
 SurfaceUnitm2=m2
-SurfaceUnitdm2=dm2
+SurfaceUnitdm2=DM2
 SurfaceUnitcm2=cm2
 SurfaceUnitmm2=mm2
 SurfaceUnitfoot2=ft2
 SurfaceUnitinch2=in2
-Volume=Volume
-TotalVolume=Total volume
+Volume=ปริมาณ
+TotalVolume=ปริมาณรวม
 VolumeUnitm3=m3
 VolumeUnitdm3=dm3
 VolumeUnitcm3=cm3
 VolumeUnitmm3=mm3
 VolumeUnitfoot3=ft3
 VolumeUnitinch3=in3
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
-Size=size
-SizeUnitm=m
-SizeUnitdm=dm
-SizeUnitcm=cm
-SizeUnitmm=mm
-SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
-BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option.
-EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib)
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals on last 12 month
-NumberOfCustomerOrders=Number of customer orders on last 12 month
-NumberOfCustomerInvoices=Number of customer invoices on last 12 month
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
-NumberOfSupplierInvoices=Number of supplier invoices on last 12 month
-NumberOfUnitsProposals=Number of units on proposals on last 12 month
-NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=The invoice %s has been validated.
-EMailTextProposalValidated=The proposal %s has been validated.
-EMailTextOrderValidated=The order %s has been validated.
-EMailTextOrderApproved=The order %s has been approved.
-EMailTextOrderValidatedBy=The order %s has been recorded by %s.
-EMailTextOrderApprovedBy=The order %s has been approved by %s.
-EMailTextOrderRefused=The order %s has been refused.
-EMailTextOrderRefusedBy=The order %s has been refused by %s.
-EMailTextExpeditionValidated=The shipping %s has been validated.
-ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
-NewSizeAfterCropping=New size after cropping
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image
-ImageEditor=Image editor
-YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
-YouReceiveMailBecauseOfNotification2=This event is the following:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-ClickHere=Click here
-UseAdvancedPerms=Use the advanced permissions of some modules
-FileFormat=File format
-SelectAColor=Choose a color
+VolumeUnitounce=ออนซ์
+VolumeUnitlitre=ลิตร
+VolumeUnitgallon=แกลลอน
+Size=ขนาด
+SizeUnitm=ม.
+SizeUnitdm=DM
+SizeUnitcm=ซม.
+SizeUnitmm=มิลลิเมตร
+SizeUnitinch=นิ้ว
+SizeUnitfoot=เท้า
+SizeUnitpoint=จุด
+BugTracker=ติดตามข้อผิดพลาด
+SendNewPasswordDesc=รูปแบบนี้จะช่วยให้คุณเพื่อขอรหัสผ่านใหม่ มันจะถูกส่งไปยังที่อยู่อีเมลของคุณ <br> เปลี่ยนจะมีผลเฉพาะหลังจากที่คลิกที่ลิงค์ยืนยันภายในอีเมล์นี้ <br> ตรวจสอบซอฟต์แวร์การอ่านอีเมลของคุณ
+BackToLoginPage=กลับไปหน้าเข้าสู่ระบบ
+AuthenticationDoesNotAllowSendNewPassword=<b>โหมดการตรวจสอบเป็น%</b> s <br> ในโหมดนี้ Dolibarr ไม่สามารถรู้หรือเปลี่ยนรหัสผ่านของคุณ <br> ติดต่อผู้ดูแลระบบของคุณถ้าคุณต้องการที่จะเปลี่ยนรหัสผ่านของคุณ
+EnableGDLibraryDesc=ติดตั้งหรือเปิดใช้งานห้องสมุด GD กับ PHP ของคุณสำหรับการใช้งานตัวเลือกนี้
+EnablePhpAVModuleDesc=คุณจำเป็นต้องติดตั้งโมดูลเข้ากันได้กับการป้องกันไวรัสของคุณ (Clamav: php4-clamavlib อู php5-clamavlib)
+ProfIdShortDesc=<b>ศ Id% s</b> ข้อมูลขึ้นอยู่กับประเทศของบุคคลที่สาม <br> <b>ตัวอย่างเช่นสำหรับประเทศ% s ก็รหัส%</b> s
+DolibarrDemo=Dolibarr ERP / CRM สาธิต
+StatsByNumberOfUnits=สถิติในจำนวนของผลิตภัณฑ์ / หน่วยบริการ
+StatsByNumberOfEntities=สถิติในจำนวนของหน่วยงานหมาย
+NumberOfProposals=จำนวนของข้อเสนอในวันที่ 12 เดือนที่ผ่านมา
+NumberOfCustomerOrders=จำนวนสั่งซื้อของลูกค้าในวันที่ 12 เดือนที่ผ่านมา
+NumberOfCustomerInvoices=จำนวนใบแจ้งหนี้ของลูกค้าในวันที่ 12 เดือนที่ผ่านมา
+NumberOfSupplierOrders=จำนวนการสั่งซื้อผู้จัดจำหน่ายในวันที่ 12 เดือนที่ผ่านมา
+NumberOfSupplierInvoices=จำนวนใบแจ้งหนี้จัดจำหน่ายในวันที่ 12 เดือนที่ผ่านมา
+NumberOfUnitsProposals=จำนวนหน่วยเกี่ยวกับข้อเสนอในวันที่ 12 เดือนที่ผ่านมา
+NumberOfUnitsCustomerOrders=จำนวนหน่วยในการสั่งซื้อของลูกค้าในวันที่ 12 เดือนที่ผ่านมา
+NumberOfUnitsCustomerInvoices=จำนวนหน่วยในใบแจ้งหนี้ของลูกค้าในวันที่ 12 เดือนที่ผ่านมา
+NumberOfUnitsSupplierOrders=จำนวนหน่วยตามคำสั่งผู้จัดจำหน่ายในวันที่ 12 เดือนที่ผ่านมา
+NumberOfUnitsSupplierInvoices=จำนวนหน่วยในใบแจ้งหนี้จัดจำหน่ายในวันที่ 12 เดือนที่ผ่านมา
+EMailTextInterventionValidated=การแทรกแซง% s ได้รับการตรวจสอบ
+EMailTextInvoiceValidated=ใบแจ้งหนี้% s ได้รับการตรวจสอบ
+EMailTextProposalValidated=ข้อเสนอของ% s ได้รับการตรวจสอบ
+EMailTextOrderValidated=% s เพื่อได้รับการตรวจสอบ
+EMailTextOrderApproved=% s การสั่งซื้อได้รับการอนุมัติ
+EMailTextOrderValidatedBy=เพื่อ% s ได้รับการบันทึกโดย% s
+EMailTextOrderApprovedBy=เพื่อ% s ได้รับการอนุมัติโดย% s
+EMailTextOrderRefused=% s เพื่อได้รับการปฏิเสธ
+EMailTextOrderRefusedBy=เพื่อ% s ได้รับการปฏิเสธโดย% s
+EMailTextExpeditionValidated=จัดส่ง% s ได้รับการตรวจสอบ
+ImportedWithSet=การนำเข้าข้อมูลที่ตั้ง
+DolibarrNotification=การแจ้งเตือนอัตโนมัติ
+ResizeDesc=<b>ป้อนความกว้างใหม่หรือสูงใหม่</b> อัตราส่วนจะถูกเก็บไว้ในช่วงการปรับขนาด ...
+NewLength=ความกว้างของใหม่
+NewHeight=ความสูงใหม่
+NewSizeAfterCropping=ขนาดใหม่หลังจากการปลูกพืช
+DefineNewAreaToPick=กำหนดพื้นที่ใหม่ที่ภาพเพื่อเลือก (ซ้ายคลิกที่ภาพแล้วลากจนกว่าจะถึงมุมตรงข้าม)
+CurrentInformationOnImage=เครื่องมือนี้ถูกออกแบบมาเพื่อช่วยให้คุณสามารถปรับขนาดหรือตัดภาพ นี้เป็นข้อมูลเกี่ยวกับการแก้ไขภาพปัจจุบัน
+ImageEditor=โปรแกรมแก้ไขภาพ
+YouReceiveMailBecauseOfNotification=คุณได้รับข้อความนี้เนื่องจากอีเมลของคุณได้รับการเพิ่มรายชื่อของเป้าหมายที่จะได้รับทราบถึงเหตุการณ์ที่เกิดขึ้นโดยเฉพาะอย่างยิ่งเข้าไปในซอฟต์แวร์% ของ% s
+YouReceiveMailBecauseOfNotification2=เหตุการณ์นี้เป็นดังต่อไปนี้:
+ThisIsListOfModules=นี่คือรายชื่อของโมดูลไว้ล่วงหน้าโดยรายละเอียดการสาธิตนี้ (โมดูลเฉพาะที่พบมากที่สุดที่สามารถมองเห็นในการสาธิตนี้) แก้ไขนี้จะมีการสาธิตส่วนบุคคลมากขึ้นและคลิกที่ "เริ่มต้น"
+ClickHere=คลิกที่นี่
+UseAdvancedPerms=ใช้สิทธิ์ขั้นสูงของโมดูลบาง
+FileFormat=รูปแบบไฟล์
+SelectAColor=เลือกสี
 AddFiles=Add Files
-StartUpload=Start upload
-CancelUpload=Cancel upload
-FileIsTooBig=Files is too big
-PleaseBePatient=Please be patient...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
+StartUpload=เริ่มอัพโหลด
+CancelUpload=ยกเลิกการอัปโหลด
+FileIsTooBig=ไฟล์ที่มีขนาดใหญ่เกินไป
+PleaseBePatient=กรุณาเป็นผู้ป่วย ...
+RequestToResetPasswordReceived=ขอให้เปลี่ยนรหัสผ่านของคุณ Dolibarr ได้รับการตอบรับ
+NewKeyIs=นี่คือกุญแจใหม่ของคุณเข้าสู่ระบบ
+NewKeyWillBe=คีย์ใหม่ของคุณที่จะเข้าสู่ระบบซอฟแวร์จะเป็น
+ClickHereToGoTo=คลิกที่นี่เพื่อไปยัง% s
+YouMustClickToChange=คุณต้อง แต่แรกคลิกที่ลิงค์ต่อไปนี้ในการตรวจสอบการเปลี่ยนแปลงรหัสผ่านนี้
+ForgetIfNothing=หากคุณไม่ได้ขอเปลี่ยนแปลงนี้เพียงแค่ลืมอีเมล์นี้ ข้อมูลประจำตัวของคุณจะถูกเก็บไว้ที่ปลอดภัย
+IfAmountHigherThan=หากจำนวนเงินที่สูงกว่า <strong>s%</strong>
+SourcesRepository=พื้นที่เก็บข้อมูลสำหรับแหล่งที่มา
 
 ##### Calendar common #####
-AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+AddCalendarEntry=เพิ่มรายการในปฏิทิน% s
+NewCompanyToDolibarr=บริษัท % s เพิ่ม
+ContractValidatedInDolibarr=สัญญา% ผ่านการตรวจสอบ
+ContractCanceledInDolibarr=สัญญา% s ยกเลิก
+ContractClosedInDolibarr=สัญญา% s ปิด
+PropalClosedSignedInDolibarr=ข้อเสนอ% s ลงนาม
+PropalClosedRefusedInDolibarr=ข้อเสนอ% s ปฏิเสธ
+PropalValidatedInDolibarr=s% ข้อเสนอการตรวจสอบ
+PropalClassifiedBilledInDolibarr=ข้อเสนอ% s แยกการเรียกเก็บเงิน
+InvoiceValidatedInDolibarr=ใบแจ้งหนี้% s ตรวจสอบ
+InvoicePaidInDolibarr=ใบแจ้งหนี้% s เปลี่ยนไปจ่าย
+InvoiceCanceledInDolibarr=ใบแจ้งหนี้% s ยกเลิก
+PaymentDoneInDolibarr=% s การชำระเงินเสร็จแล้ว
+CustomerPaymentDoneInDolibarr=การชำระเงินของลูกค้า% s ทำ
+SupplierPaymentDoneInDolibarr=การชำระเงิน% ผู้ผลิต s ทำ
+MemberValidatedInDolibarr=สมาชิก s% ผ่านการตรวจสอบ
+MemberResiliatedInDolibarr=สมาชิก% s resiliated
+MemberDeletedInDolibarr=สมาชิก s% ลบ
+MemberSubscriptionAddedInDolibarr=สมัครสมาชิกสำหรับสมาชิก% s เพิ่ม
+ShipmentValidatedInDolibarr=% s การตรวจสอบการจัดส่ง
+ShipmentDeletedInDolibarr=% s การจัดส่งที่ถูกลบ
 ##### Export #####
-Export=Export
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Librairy used
-LibraryVersion=Version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
-ToExport=Export
-NewExport=New export
+Export=ส่งออก
+ExportsArea=พื้นที่การส่งออก
+AvailableFormats=รูปแบบที่ใช้ได้
+LibraryUsed=Librairy ใช้
+LibraryVersion=รุ่น
+ExportableDatas=ข้อมูลที่ส่งออก
+NoExportableData=ไม่มีข้อมูลส่งออก (โมดูลใด ๆ กับข้อมูลที่ส่งออกได้โหลดหรือสิทธิ์ที่ขาดหายไป)
+ToExport=ส่งออก
+NewExport=การส่งออกใหม่
 ##### External sites #####
-ExternalSites=External sites
+ExternalSites=เว็บไซต์ภายนอก
diff --git a/htdocs/langs/th_TH/paybox.lang b/htdocs/langs/th_TH/paybox.lang
index aced32a4944..39d77d840c6 100644
--- a/htdocs/langs/th_TH/paybox.lang
+++ b/htdocs/langs/th_TH/paybox.lang
@@ -1,40 +1,40 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Go on payment
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-PleaseBePatient=Please, be patient
-Continue=Next
-ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-VendorName=Name of vendor
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-MessageOK=Message on validated payment return page
-MessageKO=Message on canceled payment return page
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PayBoxSetup=PayBox ติดตั้งโมดูล
+PayBoxDesc=หน้าเสนอโมดูลนี้จะอนุญาตให้มีการชำระเงินใน <a href="http://www.paybox.com" target="_blank">Paybox</a> จากลูกค้า นี้สามารถใช้สำหรับการชำระเงินฟรีหรือการชำระเงินบนวัตถุโดยเฉพาะอย่างยิ่ง Dolibarr (ใบแจ้งหนี้การสั่งซื้อ ... )
+FollowingUrlAreAvailableToMakePayments=URL ต่อไปนี้จะพร้อมที่จะให้หน้าให้กับลูกค้าที่จะทำให้การชำระเงินบนวัตถุ Dolibarr
+PaymentForm=รูปแบบการชำระเงิน
+WelcomeOnPaymentPage=ยินดีต้อนรับในการให้บริการการชำระเงินออนไลน์ของเรา
+ThisScreenAllowsYouToPay=หน้าจอนี้จะช่วยให้คุณสามารถชำระเงินออนไลน์ไปยัง% s
+ThisIsInformationOnPayment=นี้เป็นข้อมูลเกี่ยวกับการชำระเงินที่จะทำ
+ToComplete=ให้เสร็จสมบูรณ์
+YourEMail=ส่งอีเมล์ถึงจะได้รับการยืนยันการชำระเงิน
+Creditor=เจ้าหนี้
+PaymentCode=รหัสการชำระเงิน
+PayBoxDoPayment=ไปในการชำระเงิน
+YouWillBeRedirectedOnPayBox=คุณจะถูกเปลี่ยนเส้นทางในหน้า Paybox การรักษาความปลอดภัยในการป้อนข้อมูลบัตรเครดิต
+PleaseBePatient=กรุณาเป็นผู้ป่วย
+Continue=ถัดไป
+ToOfferALinkForOnlinePayment=สำหรับการชำระเงิน URL% s
+ToOfferALinkForOnlinePaymentOnOrder=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์ s% สำหรับการสั่งซื้อของลูกค้า
+ToOfferALinkForOnlinePaymentOnInvoice=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับใบแจ้งหนี้ลูกค้า
+ToOfferALinkForOnlinePaymentOnContractLine=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับสายสัญญา
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์ s% สำหรับจำนวนเงินที่ฟรี
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับการสมัครสมาชิก
+YouCanAddTagOnUrl=นอกจากนี้คุณยังสามารถเพิ่มพารามิเตอร์ URL <b>และแท็ก = <i>ค่าใด</i></b> ๆ ของ URL เหล่านั้น (ที่จำเป็นเท่านั้นสำหรับการชำระเงินฟรี) เพื่อเพิ่มแท็กความคิดเห็นการชำระเงินของคุณเอง
+SetupPayBoxToHavePaymentCreatedAutomatically=ติดตั้ง PayBox <b>ของคุณด้วยสมาชิก% s</b> จะมีการชำระเงินที่สร้างขึ้นโดยอัตโนมัติเมื่อมีการตรวจสอบโดย paybox
+YourPaymentHasBeenRecorded=หน้านี้ยืนยันว่าชำระเงินของคุณได้รับการบันทึก ขอบคุณ
+YourPaymentHasNotBeenRecorded=ชำระเงินที่คุณยังไม่ได้รับการบันทึกไว้และได้รับการยกเลิกการทำธุรกรรม ขอบคุณ
+AccountParameter=พารามิเตอร์บัญชี
+UsageParameter=พารามิเตอร์การใช้งาน
+InformationToFindParameters=ช่วยในการหาข้อมูลเกี่ยวกับบัญชีของคุณ s%
+PAYBOX_CGI_URL_V2=url ของ Paybox โมดูล CGI สำหรับการชำระเงิน
+VendorName=ชื่อของผู้ขาย
+CSSUrlForPaymentForm=รูปแบบ CSS url ของแผ่นสำหรับรูปแบบการชำระเงิน
+MessageOK=ข้อความในหน้ากลับมาตรวจสอบการชำระเงิน
+MessageKO=ข้อความในหน้าผลตอบแทนการชำระเงินยกเลิก
+NewPayboxPaymentReceived=การชำระเงิน Paybox ใหม่ที่ได้รับ
+NewPayboxPaymentFailed=การชำระเงิน Paybox ใหม่พยายาม แต่ล้มเหลว
+PAYBOX_PAYONLINE_SENDEMAIL=อีเมลเตือนหลังจากการชำระเงิน (ความสำเร็จหรือความล้มเหลว)
+PAYBOX_PBX_SITE=ราคาเว็บไซต์ PBX
+PAYBOX_PBX_RANG=ราคา PBX รัง
+PAYBOX_PBX_IDENTIFIANT=ราคา PBX ID
diff --git a/htdocs/langs/th_TH/paypal.lang b/htdocs/langs/th_TH/paypal.lang
index 65a3dc45a23..7df021d3754 100644
--- a/htdocs/langs/th_TH/paypal.lang
+++ b/htdocs/langs/th_TH/paypal.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with credit card or Paypal
-PaypalDoPayment=Pay with Paypal
-PaypalCBDoPayment=Pay with credit card
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page
-ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
-PAYPAL_IPN_MAIL_ADDRESS=E-mail address for the instant notification of payment (IPN)
-PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
-YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
-PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+PaypalSetup=PayPal การติดตั้งโมดูล
+PaypalDesc=หน้าเสนอโมดูลนี้จะอนุญาตให้มีการชำระเงินใน <a href="http://www.paypal.com" target="_blank">PayPal</a> โดยลูกค้า นี้สามารถใช้สำหรับการชำระเงินฟรีหรือการชำระเงินบนวัตถุโดยเฉพาะอย่างยิ่ง Dolibarr (ใบแจ้งหนี้การสั่งซื้อ ... )
+PaypalOrCBDoPayment=ชำระเงินด้วยบัตรเครดิตหรือ Paypal
+PaypalDoPayment=ชำระเงินด้วย PayPal
+PaypalCBDoPayment=ชำระเงินด้วยบัตรเครดิต
+PAYPAL_API_SANDBOX=การทดสอบ Mode / ทราย
+PAYPAL_API_USER=ชื่อผู้ใช้ API
+PAYPAL_API_PASSWORD=รหัสผ่าน API
+PAYPAL_API_SIGNATURE=ลายเซ็น API
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=การชำระเงินที่เสนอซื้อ "หนึ่ง" (บัตรเครดิต Paypal +) หรือ "Paypal" เท่านั้น
+PaypalModeIntegral=สำคัญ
+PaypalModeOnlyPaypal=PayPal เท่านั้น
+PAYPAL_CSS_URL=Optionnal Url ของแผ่นสไตล์ CSS ในหน้าชำระเงิน
+ThisIsTransactionId=<b>นี่คือรหัสของรายการ:% s</b>
+PAYPAL_ADD_PAYMENT_URL=เพิ่ม URL ของการชำระเงิน Paypal เมื่อคุณส่งเอกสารทางไปรษณีย์
+PAYPAL_IPN_MAIL_ADDRESS=E-mail address สำหรับการแจ้งเตือนทันทีของการชำระเงิน (IPN)
+PredefinedMailContentLink=คุณสามารถคลิกที่ลิงค์ด้านล่างเพื่อความปลอดภัยในการชำระเงินของคุณ (PayPal) หากยังไม่ได้ทำมาแล้ว % s
+YouAreCurrentlyInSandboxMode=คุณกำลังอยู่ใน "ทราย" โหมด
+NewPaypalPaymentReceived=ใหม่การชำระเงินที่ได้รับ Paypal
+NewPaypalPaymentFailed=การชำระเงิน Paypal ใหม่พยายาม แต่ล้มเหลว
+PAYPAL_PAYONLINE_SENDEMAIL=อีเมลเตือนหลังจากการชำระเงิน (ประสบความสำเร็จหรือไม่)
+ReturnURLAfterPayment=URL ที่กลับมาหลังจากการชำระเงิน
+ValidationOfPaypalPaymentFailed=การตรวจสอบการชำระเงิน Paypal ล้มเหลว
+PaypalConfirmPaymentPageWasCalledButFailed=หน้ายืนยันการชำระเงินสำหรับ Paypal ถูกเรียกโดย Paypal แต่ไม่ยืนยัน
diff --git a/htdocs/langs/th_TH/printing.lang b/htdocs/langs/th_TH/printing.lang
index f0cd2a40292..7d253862b92 100644
--- a/htdocs/langs/th_TH/printing.lang
+++ b/htdocs/langs/th_TH/printing.lang
@@ -1,74 +1,73 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-ModuleDriverSetup=Setup Module Driver
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-SetupDriver=Driver setup
-TestDriver=Test
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP=Google Cloud Print
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PRINTGCP_LOGIN=Google Account Login
-PRINTGCP_PASSWORD=Google Account Password
-STATE_ONLINE=Online
-STATE_UNKNOWN=Unknown
-STATE_OFFLINE=Offline
-STATE_DORMANT=Offline for quite a while
+Module64000Name=พิมพ์โดยตรง
+Module64000Desc=การเปิดใช้งานระบบการพิมพ์โดยตรง
+PrintingSetup=การติดตั้งระบบการพิมพ์โดยตรง
+PrintingDesc=โมดูลนี้จะเพิ่มปุ่มพิมพ์ส่งเอกสารโดยตรงไปยังเครื่องพิมพ์ (โดยไม่ต้องเปิดเอกสารลงในใบสมัคร) กับโมดูลต่างๆ
+ModuleDriverSetup=การติดตั้งไดร์เวอร์โมดูล
+PrintingDriverDesc=ตัวแปรการกำหนดค่าสำหรับโปรแกรมควบคุมการพิมพ์
+ListDrivers=รายชื่อของผู้ขับขี่
+PrintTestDesc=รายชื่อของเครื่องพิมพ์
+FileWasSentToPrinter=ไฟล์% s ถู​​กส่งไปยังเครื่องพิมพ์
+NoActivePrintingModuleFound=ไม่มีโมดูลที่ใช้งานพิมพ์เอกสาร
+PleaseSelectaDriverfromList=กรุณาเลือกขับจากรายการ
+SetupDriver=การติดตั้งไดร์เวอร์
+TestDriver=ทดสอบ
+TargetedPrinter=เครื่องพิมพ์กำหนดเป้​​าหมาย
+UserConf=การติดตั้งต่อผู้ใช้
+PRINTGCP=Google Cloud Print ได้
+PrintGCPDesc=ไดรเวอร์นี้อนุญาตให้มีการส่งเอกสารโดยตรงไปยังเครื่องพิมพ์กับ Google Cloud Print ได้
+PrintingDriverDescprintgcp=ตัวแปรการกำหนดค่าสำหรับการพิมพ์คนขับของ Google Cloud Print
+PrintTestDescprintgcp=รายการสำหรับเครื่องพิมพ์ของ Google Cloud Print
+PRINTGCP_LOGIN=เข้าสู่ระบบบัญชี Google
+PRINTGCP_PASSWORD=บัญชี Google รหัสผ่าน
+STATE_ONLINE=ออนไลน์
+STATE_UNKNOWN=ไม่ทราบ
+STATE_OFFLINE=ออฟไลน์
+STATE_DORMANT=ออฟไลน์มากในขณะที่
 TYPE_GOOGLE=Google
-TYPE_HP=HP Printer
+TYPE_HP=เครื่องพิมพ์ HP
 TYPE_DOCS=DOCS
-TYPE_DRIVE=Google Drive
-TYPE_FEDEX=Fedex
+TYPE_DRIVE=Google ไดรฟ์
+TYPE_FEDEX=เฟดเอ็กซ์
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PRINTIPP=PrintIPP Driver
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
-PrintTestDescprintipp=List of Printers for driver PrintIPP.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+GCP_Name=ชื่อ
+GCP_displayName=ชื่อที่ใช้แสดง
+GCP_Id=Id เครื่องพิมพ์
+GCP_OwnerName=ชื่อเจ้าของ
+GCP_State=เครื่องพิมพ์รัฐ
+GCP_connectionStatus=รัฐออนไลน์
+GCP_Type=ชนิดของเครื่องพิมพ์
+PRINTIPP=ไดร์เวอร์ PrintIPP
+PrintIPPSetup=การติดตั้งโมดูลการพิมพ์โดยตรง
+PrintIPPDesc=ไดรเวอร์นี้อนุญาตให้มีการส่งเอกสารโดยตรงไปยังเครื่องพิมพ์ มันต้องมีระบบ Linux CUPS กับการติดตั้ง
+PrintingDriverDescprintipp=ตัวแปรการกำหนดค่าสำหรับการพิมพ์ขับ PrintIPP
+PrintTestDescprintipp=รายชื่อของเครื่องพิมพ์สำหรับโปรแกรมควบคุม PrintIPP
+PRINTIPP_ENABLED=แสดง "พิมพ์โดยตรง" ไอคอนในรายการเอกสาร
+PRINTIPP_HOST=เซิร์ฟเวอร์การพิมพ์
+PRINTIPP_PORT=พอร์ต
+PRINTIPP_USER=เข้าสู่ระบบ
+PRINTIPP_PASSWORD=รหัสผ่าน
+NoPrinterFound=ไม่พบเ​​ครื่องพิมพ์ (ตรวจสอบการตั้งค่า CUPS ของคุณ)
+NoDefaultPrinterDefined=ไม่มีเครื่องพิมพ์เริ่มต้นที่กำหนดไว้
+DefaultPrinter=เครื่องพิมพ์เริ่มต้น
+Printer=เครื่องพิมพ์
+CupsServer=CUPS เซิร์ฟเวอร์
+IPP_Uri=เครื่องพิมพ์ยูริ
+IPP_Name=เครื่องพิมพ์ชื่อ
+IPP_State=เครื่องพิมพ์รัฐ
+IPP_State_reason=เหตุผลที่รัฐ
+IPP_State_reason1=รัฐ reason1
 IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
-STATE_IPP_idle=Idle
-STATE_IPP_stopped=Stopped
-STATE_IPP_paused=Paused
-STATE_IPP_toner-low-report=Low Toner
-STATE_IPP_none=None
-MEDIA_IPP_stationery=Stationery
-MEDIA_IPP_thermal=Thermal
-IPP_COLOR_print-black=BW Printer
+IPP_Color=สี
+IPP_Device=เครื่อง
+IPP_Media=สื่อเครื่องพิมพ์
+IPP_Supported=ประเภทของสื่อ
+STATE_IPP_idle=ว่าง
+STATE_IPP_stopped=หยุด
+STATE_IPP_paused=หยุดชั่วคราว
+STATE_IPP_toner-low-report=หมึกต่ำ
+STATE_IPP_none=ไม่
+MEDIA_IPP_stationery=เครื่องเขียน
+MEDIA_IPP_thermal=ร้อน
+IPP_COLOR_print-black=BW เครื่องพิมพ์
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index 85b1d27f3a6..3fc25e05159 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -1,22 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ManageLotSerial=การใช้งานจำนวนมาก / หมายเลขซีเรีย
+ProductStatusOnBatch=ใช่ (มาก / อนุกรมที่จำเป็น)
+ProductStatusNotOnBatch=ไม่ (มาก / อนุกรมไม่ได้ใช้)
+ProductStatusOnBatchShort=ใช่
+ProductStatusNotOnBatchShort=ไม่
+Batch=จัดสรร / อนุกรม
+atleast1batchfield=กินตามวันที่หรือขายโดยวันที่หรือ Lot / หมายเลข Serial
+batch_number=Lot / หมายเลข Serial
+BatchNumberShort=จัดสรร / อนุกรม
+l_eatby=กินตามวันที่
+l_sellby=ขายตามวันที่
+DetailBatchNumber=จัดสรร / รายละเอียดอนุกรม
+DetailBatchFormat=จัดสรร / อนุกรม:% s - กินโดย:% s - ขายโดย:% s (จำนวน:% d)
+printBatch=จัดสรร / อนุกรม:% s
+printEatby=กินโดย:% s
+printSellby=ขายโดย:% s
+printQty=จำนวน:% d
+AddDispatchBatchLine=เพิ่มบรรทัดสำหรับอายุการเก็บรักษาการฝึกอบรม
+BatchDefaultNumber=ตะคุ่ม
+WhenProductBatchModuleOnOptionAreForced=เมื่อโมดูลจัดสรร / อนุกรมอยู่บนเพิ่มขึ้น / ลดโหมดหุ้นถูกบังคับให้ต้องเลือกสุดท้ายและไม่สามารถแก้ไขได้ ตัวเลือกอื่น ๆ สามารถกำหนดได้ตามที่คุณต้องการ
+ProductDoesNotUseBatchSerial=ผลิตภัณฑ์นี้ไม่ได้ใช้มาก / หมายเลขซีเรีย
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index c29232087b9..5b247bee191 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -1,269 +1,298 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductServiceCard=Products/Services card
-Products=Products
-Services=Services
-Product=Product
-Service=Service
-ProductId=Product/service id
-Create=Create
-Reference=Reference
-NewProduct=New product
-NewService=New service
-ProductCode=Product code
-ServiceCode=Service code
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
-ProductOrService=Product or Service
-ProductsAndServices=Products and Services
-ProductsOrServices=Products or Services
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
-ProductsAndServicesStatistics=Products and Services statistics
-ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-InternalRef=Internal reference
-LastRecorded=Last products/services on sell recorded
-LastRecordedProductsAndServices=Last %s recorded products/services
-LastModifiedProductsAndServices=Last %s modified products/services
-LastRecordedProducts=Last %s products recorded
-LastRecordedServices=Last %s services recorded
-LastProducts=Last products
-CardProduct0=Product card
-CardProduct1=Service card
-CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
-WarehouseClosed=Warehouse closed
-Stock=Stock
-Stocks=Stocks
-Movement=Movement
-Movements=Movements
-Sell=Sales
-Buy=Purchases
-OnSell=For sale
-OnBuy=For purchase
-NotOnSell=Not for sale
-ProductStatusOnSell=For sale
-ProductStatusNotOnSell=Not for sale
-ProductStatusOnSellShort=For sale
-ProductStatusNotOnSellShort=Not for sale
-ProductStatusOnBuy=For purchase
-ProductStatusNotOnBuy=Not for purchase
-ProductStatusOnBuyShort=For purchase
-ProductStatusNotOnBuyShort=Not for purchase
-UpdatePrice=Update price
-AppliedPricesFrom=Applied prices from
-SellingPrice=Selling price
-SellingPriceHT=Selling price (net of tax)
-SellingPriceTTC=Selling price (inc. tax)
-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
-ContractStatusRunning=Running
-ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
-ErrorProductAlreadyExists=A product with reference %s already exists.
-ErrorProductBadRefOrLabel=Wrong value for reference or label.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
-Suppliers=Suppliers
-SupplierRef=Supplier's product ref.
-ShowProduct=Show product
-ShowService=Show service
-ProductsAndServicesArea=Product and Services area
-ProductsArea=Product area
-ServicesArea=Services area
-AddToMyProposals=Add to my proposals
-AddToOtherProposals=Add to other proposals
-AddToMyBills=Add to my bills
-AddToOtherBills=Add to other bills
-CorrectStock=Correct stock
-AddPhoto=Add photo
-ListOfStockMovements=List of stock movements
-BuyingPrice=Buying price
-SupplierCard=Supplier card
-CommercialCard=Commercial card
-AllWays=Path to find your product in stock
-NoCat=Your product is not in any category
-PrimaryWay=Primary path
-PriceRemoved=Price removed
-BarCode=Barcode
-BarcodeType=Barcode type
-SetDefaultBarcodeType=Set barcode type
-BarcodeValue=Barcode value
-NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
-CreateCopy=Create copy
-ServiceLimitedDuration=If product is a service with limited duration:
-MultiPricesAbility=Several level of prices per product/service
-MultiPricesNumPrices=Number of prices
-MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
-ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
-EditAssociate=Associate
-Translation=Translation
-KeywordFilter=Keyword filter
-CategoryFilter=Category filter
-ProductToAddSearch=Search product to add
-AddDel=Add/Delete
-Quantity=Quantity
-NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of package products/services with this product as a component
-ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
-DeleteProduct=Delete a product/service
-ConfirmDeleteProduct=Are you sure you want to delete this product/service?
-ProductDeleted=Product/Service "%s" deleted from database.
-DeletePicture=Delete a picture
-ConfirmDeletePicture=Are you sure you want to delete this picture ?
-ExportDataset_produit_1=Products
-ExportDataset_service_1=Services
-ImportDataset_produit_1=Products
-ImportDataset_service_1=Services
-DeleteProductLine=Delete product line
-ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-NoProductMatching=No product/service match your criteria
-MatchingProducts=Matching products/services
-NoStockForThisProduct=No stock for this product
-NoStock=No Stock
-Restock=Restock
-ProductSpecial=Special
-QtyMin=Minimum Qty
-PriceQty=Price for this quantity
-PriceQtyMin=Price for this min. qty (w/o discount)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
-NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
-NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product
-RecordedProducts=Products recorded
-RecordedServices=Services recorded
-RecordedProductsAndServices=Products/services recorded
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
-GenerateThumb=Generate thumb
-ProductCanvasAbility=Use special "canvas" addons
-ServiceNb=Service #%s
-ListProductServiceByPopularity=List of products/services by popularity
-ListProductByPopularity=List of products by popularity
-ListServiceByPopularity=List of services by popularity
-Finished=Manufactured product
-RowMaterial=Raw Material
-CloneProduct=Clone product or service
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
-CloneContentProduct=Clone all main informations of product/service
-ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
-CustomCode=Customs code
-CountryOrigin=Origin country
-HiddenIntoCombo=Hidden into select lists
-Nature=Nature
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-AddThisProductCard=Create product card
-HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
-AddThisServiceCard=Create service card
-HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-PriceByQuantityRange=Quantity range
-ProductsDashboard=Products/Services summary
-UpdateOriginalProductLabel=Modify original label
-HelpUpdateOriginalProductLabel=Allows to edit the name of the product
+ProductRef=สินค้าอ้างอิง
+ProductLabel=ฉลากสินค้า
+ProductServiceCard=สินค้า / บริการบัตร
+Products=ผลิตภัณฑ์
+Services=บริการ
+Product=สินค้า
+Service=บริการ
+ProductId=สินค้า / บริการรหัส
+Create=สร้าง
+Reference=การอ้างอิง
+NewProduct=ผลิตภัณฑ์ใหม่
+NewService=บริการใหม่
+ProductCode=รหัสสินค้า
+ServiceCode=รหัสบริการ
+ProductVatMassChange=การเปลี่ยนแปลงภาษีมูลค่าเพิ่มมวล
+ProductVatMassChangeDesc=หน้านี้สามารถนำมาใช้ในการปรับเปลี่ยนอัตราภาษีมูลค่าเพิ่มที่กำหนดไว้เกี่ยวกับผลิตภัณฑ์หรือบริการจากมูลค่าให้กับอีกคนหนึ่ง คำเตือนการเปลี่ยนแปลงนี้จะทำในฐานข้อมูลทั้งหมด
+MassBarcodeInit=init บาร์โค้ดมวล
+MassBarcodeInitDesc=หน้านี้สามารถนำมาใช้ในการเริ่มต้นบาร์โค้ดบนวัตถุที่ไม่ได้มีการกำหนดบาร์โค้ด ก่อนที่จะตรวจสอบการตั้งค่าของบาร์โค้ดโมดูลที่เสร็จสมบูรณ์
+ProductAccountancyBuyCode=รหัสบัญชี (ซื้อ)
+ProductAccountancySellCode=รหัสบัญชี (ขาย)
+ProductOrService=สินค้าหรือบริการ
+ProductsAndServices=สินค้าและบริการ
+ProductsOrServices=ผลิตภัณฑ์หรือบริการ
+ProductsAndServicesOnSell=สินค้าและบริการเพื่อขายหรือให้ซื้อ
+ProductsAndServicesNotOnSell=สินค้าและบริการไม่ได้สำหรับการขาย
+ProductsAndServicesStatistics=ผลิตภัณฑ์บริการและสถิติ
+ProductsStatistics=สถิติผลิตภัณฑ์
+ProductsOnSell=สินค้าเพื่อขายหรือให้ซื้อ
+ProductsNotOnSell=สินค้าไม่ขายและไม่ได้สำหรับการซื้อ
+ProductsOnSellAndOnBuy=ผลิตภัณฑ์สำหรับการขายและการซื้อ
+ServicesOnSell=บริการเพื่อขายหรือให้ซื้อ
+ServicesNotOnSell=บริการไม่ได้สำหรับการขาย
+ServicesOnSellAndOnBuy=บริการสำหรับการขายและการซื้อ
+InternalRef=อ้างอิงภายใน
+LastRecorded=ผลิตภัณฑ์ล่าสุด / บริการขายที่บันทึกไว้
+LastRecordedProductsAndServices=% s บันทึกล่าสุดผลิตภัณฑ์ / บริการ
+LastModifiedProductsAndServices=% ล่าสุดของการปรับเปลี่ยนผลิตภัณฑ์ / บริการ
+LastRecordedProducts=ผลิตภัณฑ์% s บันทึกล่าสุด
+LastRecordedServices=บริการ% s บันทึกล่าสุด
+LastProducts=ผลิตภัณฑ์ล่าสุด
+CardProduct0=รหัสผลิตภัณฑ์
+CardProduct1=บัตรบริการ
+CardContract=บัตรสัญญา
+Warehouse=คลังสินค้า
+Warehouses=โกดัง
+WarehouseOpened=เปิดคลังสินค้า
+WarehouseClosed=คลังสินค้าปิด
+Stock=สต็อกสินค้า
+Stocks=หุ้น
+Movement=การเคลื่อนไหว
+Movements=การเคลื่อนไหว
+Sell=ขาย
+Buy=การสั่งซื้อสินค้า
+OnSell=สำหรับการขาย
+OnBuy=สำหรับการซื้อ
+NotOnSell=ไม่ขาย
+ProductStatusOnSell=สำหรับการขาย
+ProductStatusNotOnSell=ไม่ขาย
+ProductStatusOnSellShort=สำหรับการขาย
+ProductStatusNotOnSellShort=ไม่ขาย
+ProductStatusOnBuy=สำหรับการซื้อ
+ProductStatusNotOnBuy=ไม่ได้สำหรับการซื้อ
+ProductStatusOnBuyShort=สำหรับการซื้อ
+ProductStatusNotOnBuyShort=ไม่ได้สำหรับการซื้อ
+UpdatePrice=ราคาที่ปรับปรุง
+AppliedPricesFrom=ราคาประยุกต์จาก
+SellingPrice=ราคาขาย
+SellingPriceHT=ราคาขาย (สุทธิจากภาษี)
+SellingPriceTTC=ราคาขาย (รวมภาษี).
+PublicPrice=ราคาที่สาธารณะ
+CurrentPrice=ราคาปัจจุบัน
+NewPrice=ราคาใหม่
+MinPrice=นาที ราคาขาย
+MinPriceHT=นาที ราคาขาย (สุทธิจากภาษี)
+MinPriceTTC=นาที ขายราคา (รวมภาษี).
+CantBeLessThanMinPrice=ราคาขายไม่สามารถจะต่ำกว่าขั้นต่ำที่ได้รับอนุญาตสำหรับสินค้านี้ (% s โดยไม่มีภาษี) ข้อความนี้ยังสามารถปรากฏขึ้นถ้าคุณพิมพ์ส่วนลดสำคัญมากเกินไป
+ContractStatus=สถานะสัญญา
+ContractStatusClosed=ปิด
+ContractStatusRunning=ต่อเนื่อง
+ContractStatusExpired=ที่หมดอายุแล้ว
+ContractStatusOnHold=ไว้
+ContractStatusToRun=ให้อย่างต่อเนื่อง
+ContractNotRunning=สัญญานี้ไม่ได้อย่างต่อเนื่อง
+ErrorProductAlreadyExists=ผลิตภัณฑ์ที่มีการอ้างอิง% s อยู่แล้ว
+ErrorProductBadRefOrLabel=ค่าที่ไม่ถูกต้องสำหรับการอ้างอิงหรือฉลาก
+ErrorProductClone=มีปัญหาในขณะที่พยายามจะโคลนสินค้าหรือบริการ
+ErrorPriceCantBeLowerThanMinPrice=ข้อผิดพลาดราคาไม่สามารถจะต่ำกว่าราคาขั้นต่ำ
+Suppliers=ซัพพลายเออร์
+SupplierRef=อ้างอิงสินค้าที่ผู้ผลิต
+ShowProduct=แสดงผลิตภัณฑ์
+ShowService=แสดงบริการ
+ProductsAndServicesArea=สินค้าและพื้นที่บริการ
+ProductsArea=พื้นที่สินค้า
+ServicesArea=พื้นที่บริการ
+AddToMyProposals=เพิ่มข้อเสนอของฉัน
+AddToOtherProposals=เพิ่มลงในข้อเสนออื่น ๆ
+AddToMyBills=เพิ่มในค่าของฉัน
+AddToOtherBills=เพิ่มในค่าใช้จ่ายอื่น ๆ
+CorrectStock=หุ้นที่ถูกต้อง
+AddPhoto=เพิ่มภาพถ่าย
+ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
+BuyingPrice=ราคาที่ซื้อ
+SupplierCard=ผู้ผลิตบัตร
+CommercialCard=บัตรพาณิชย์
+AllWays=เส้นทางในการค้นหาสินค้าในสต็อกของคุณ
+NoCat=ผลิตภัณฑ์ของคุณไม่ได้อยู่ในหมวดหมู่ใด ๆ
+PrimaryWay=เส้นทางหลัก
+PriceRemoved=ราคาลบออก
+BarCode=บาร์โค้ด
+BarcodeType=ประเภทเครื่องอ่านบาร์โค้ด
+SetDefaultBarcodeType=ตั้งค่าชนิดบาร์โค้ด
+BarcodeValue=ค่าบาร์โค้ด
+NoteNotVisibleOnBill=หมายเหตุ (ไม่ปรากฏในใบแจ้งหนี้ข้อเสนอ ... )
+CreateCopy=สร้างสำเนา
+ServiceLimitedDuration=หากผลิตภัณฑ์เป็นบริการที่มีระยะเวลา จำกัด :
+MultiPricesAbility=ระดับหลายราคาต่อสินค้า / บริการ
+MultiPricesNumPrices=จำนวนของราคา
+MultiPriceLevelsName=ราคาประเภท
+AssociatedProductsAbility=เปิดใช้งานคุณสมบัติแพคเกจ
+AssociatedProducts=แพคเกจสินค้า
+AssociatedProductsNumber=จำนวนของผลิตภัณฑ์แต่งผลิตภัณฑ์แพคเกจนี้
+ParentProductsNumber=จำนวนผู้ปกครองผลิตภัณฑ์บรรจุภัณฑ์
+IfZeroItIsNotAVirtualProduct=ถ้า 0 ผลิตภัณฑ์นี้ไม่ได้เป็นสินค้าที่แพคเกจ
+IfZeroItIsNotUsedByVirtualProduct=0 หากผลิตภัณฑ์นี้จะไม่ใช้ผลิตภัณฑ์แพคเกจใด ๆ
+EditAssociate=ภาคี
+Translation=การแปล
+KeywordFilter=กรองคำ
+CategoryFilter=ตัวกรองหมวดหมู่
+ProductToAddSearch=ค้นหาสินค้าที่จะเพิ่ม
+AddDel=เพิ่ม / ลบ
+Quantity=ปริมาณ
+NoMatchFound=ไม่พบการแข่งขัน
+ProductAssociationList=รายการผลิตภัณฑ์ / บริการที่มีส่วนประกอบของผลิตภัณฑ์นี้เสมือน / แพคเกจ
+ProductParentList=รายการสินค้าของแพคเกจ / บริการกับผลิตภัณฑ์นี้เป็นส่วนประกอบ
+ErrorAssociationIsFatherOfThis=หนึ่งในผลิตภัณฑ์ที่เลือกเป็นผู้ปกครองกับผลิตภัณฑ์ในปัจจุบัน
+DeleteProduct=ลบสินค้า / บริการ
+ConfirmDeleteProduct=คุณแน่ใจหรือว่าต้องการลบสินค้า / บริการนี​​้
+ProductDeleted=สินค้า / บริการ "% s" ลบออกจากฐานข้อมูล
+DeletePicture=ลบภาพ
+ConfirmDeletePicture=คุณแน่ใจว่าคุณต้องการลบภาพนี้?
+ExportDataset_produit_1=ผลิตภัณฑ์
+ExportDataset_service_1=บริการ
+ImportDataset_produit_1=ผลิตภัณฑ์
+ImportDataset_service_1=บริการ
+DeleteProductLine=ลบสายผลิตภัณฑ์
+ConfirmDeleteProductLine=คุณแน่ใจหรือว่าต้องการลบบรรทัดผลิตภัณฑ์นี้หรือไม่
+NoProductMatching=สินค้า / บริการที่ตรงกับเกณฑ์ของคุณ
+MatchingProducts=การจับคู่ผลิตภัณฑ์ / บริการ
+NoStockForThisProduct=หุ้นสำหรับสินค้านี้ไม่มี
+NoStock=ไม่มีสต็อก
+Restock=ใส่ให้ใหม่
+ProductSpecial=พิเศษ
+QtyMin=จำนวนขั้นต่ำ
+PriceQty=ราคาสำหรับปริมาณนี้
+PriceQtyMin=ราคาสำหรับนาทีนี้ จำนวน (w / o ส่วนลด)
+VATRateForSupplierProduct=ภาษีมูลค่าเพิ่ม Rate (สำหรับผู้จัดจำหน่าย / ผลิตภัณฑ์นี้)
+DiscountQtyMin=เริ่มต้นส่วนลดสำหรับจำนวน
+NoPriceDefinedForThisSupplier=ไม่มีราคา / จำนวนที่กำหนดไว้สำหรับผู้จัดหาสินค้านี้ / ผลิตภัณฑ์
+NoSupplierPriceDefinedForThisProduct=ไม่มีราคาผู้ผลิต / จำนวนที่กำหนดไว้สำหรับสินค้านี้
+RecordedProducts=ผลิตภัณฑ์ที่บันทึกไว้
+RecordedServices=บริการที่บันทึกไว้
+RecordedProductsAndServices=สินค้า / บริการที่บันทึกไว้
+PredefinedProductsToSell=ผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้าที่จะขาย
+PredefinedServicesToSell=บริการที่กำหนดไว้ล่วงหน้าที่จะขาย
+PredefinedProductsAndServicesToSell=ผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า / บริการที่จะขาย
+PredefinedProductsToPurchase=สินค้าที่กำหนดไว้ล่วงหน้าจะซื้อ
+PredefinedServicesToPurchase=บริการที่กำหนดไว้ล่วงหน้าจะซื้อ
+PredefinedProductsAndServicesToPurchase=ผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า / บริการเพื่อ puchase
+GenerateThumb=สร้างหัวแม่มือ
+ProductCanvasAbility=ใช้พิเศษ "ผ้าใบ" addons
+ServiceNb=บริการ #% s
+ListProductServiceByPopularity=รายการผลิตภัณฑ์ / บริการตามความนิยม
+ListProductByPopularity=รายการของผลิตภัณฑ์ตามความนิยม
+ListServiceByPopularity=รายการของการบริการตามความนิยม
+Finished=ผลิตภัณฑ์ที่ผลิต
+RowMaterial=วัตถุดิบ
+CloneProduct=โคลนสินค้าหรือบริการ
+ConfirmCloneProduct=<b>คุณแน่ใจหรือว่าต้องการโคลนสินค้าหรือบริการ% s?</b>
+CloneContentProduct=โคลนข้อมูลหลักทั้งหมดของสินค้า / บริการ
+ClonePricesProduct=ข้อมูลหลักโคลนและราคา
+CloneCompositionProduct=โคลนบรรจุสินค้า / บริการ
+ProductIsUsed=ผลิตภัณฑ์นี้ถูกนำมาใช้
+NewRefForClone=อ้าง ของผลิตภัณฑ์ / บริการใหม่
+CustomerPrices=ราคาของลูกค้า
+SuppliersPrices=ราคาผู้ผลิต
+SuppliersPricesOfProductsOrServices=ราคาผู้ผลิต (ของสินค้าหรือบริการ)
+CustomCode=รหัสศุลกากร
+CountryOrigin=ประเทศแหล่งกำเนิดสินค้า
+HiddenIntoCombo=ที่ซ่อนอยู่เป็นรายการเลือก
+Nature=ธรรมชาติ
+ShortLabel=ป้ายสั้น
+Unit=หน่วย
+p=ยู
+set=ชุด
+se=ชุด
+second=ที่สอง
+s=s
+hour=ชั่วโมง
+h=ชั่วโมง
+day=วัน
+d=d
+kilogram=กิโลกรัม
+kg=กก.
+gram=กรัม
+g=ก.
+meter=เมตร
+m=ม.
+linear เมตร = เมตรเชิงเส้น
+lm=LM
+square เมตร = ตารางเมตร
+m2=ตารางเมตร
+cubic เมตร = ลูกบาศก์เมตร
+m3=ลูกบาศก์เมตร
+liter=ลิตร
+l=L
+ProductCodeModel=แม่แบบสินค้าอ้างอิง
+ServiceCodeModel=แม่แบบอ้างอิงบริการ
+AddThisProductCard=สร้างรหัสผลิตภัณฑ์
+HelpAddThisProductCard=ตัวเลือกนี้จะช่วยให้คุณสามารถสร้างหรือโคลนสินค้าถ้ามันไม่ได้อยู่
+AddThisServiceCard=สร้างบริการบัตร
+HelpAddThisServiceCard=ตัวเลือกนี้จะช่วยให้คุณสามารถสร้างหรือโคลนบริการถ้ามันไม่ได้อยู่
+CurrentProductPrice=ราคาปัจจุบัน
+AlwaysUseNewPrice=มักจะใช้ราคาปัจจุบันของสินค้า / บริการ
+AlwaysUseFixedPrice=ใช้ราคาคงที่
+PriceByQuantity=ราคาที่แตกต่างกันตามปริมาณ
+PriceByQuantityRange=จำนวนช่วง
+ProductsDashboard=สินค้า / บริการสรุป
+UpdateOriginalProductLabel=แก้ไขป้ายเดิม
+HelpUpdateOriginalProductLabel=จะช่วยให้การแก้ไขชื่อของผลิตภัณฑ์
 ### composition fabrication
-Building=Production and items dispatchment
-Build=Produce
-BuildIt=Produce & Dispatch
-BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action)
-QtyNeed=Qty
-UnitPmp=Net unit VWAP
-CostPmpHT=Net total VWAP
-ProductUsedForBuild=Auto consumed by production
-ProductBuilded=Production completed
-ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly VWAP
-ServiceSellByQuarterHT=Services turnover quarterly VWAP
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-DynamicPriceConfiguration=Dynamic price configuration
-GlobalVariables=Global variables
-GlobalVariableUpdaters=Global variable updaters
-GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
+Building=การผลิตและรายการ dispatchment
+Build=ก่อ
+BuildIt=การผลิตและการจัดส่ง
+BuildindListInfo=ปริมาณที่มีจำหน่ายสำหรับการผลิตต่อคลังสินค้า (ตั้งค่าเป็น 0 ไม่ดำเนินการต่อไป)
+QtyNeed=จำนวน
+UnitPmp=หน่วยสุทธิ VWAP
+CostPmpHT=รวมสุทธิ VWAP
+ProductUsedForBuild=Auto บริโภคโดยการผลิต
+ProductBuilded=ผลิตเสร็จสมบูรณ์
+ProductsMultiPrice=สินค้าหลายราคา
+ProductsOrServiceMultiPrice=ราคาของลูกค้า (ของผลิตภัณฑ์หรือบริการราคาหลาย)
+ProductSellByQuarterHT=ผลประกอบการไตรมาส VWAP ผลิตภัณฑ์
+ServiceSellByQuarterHT=ผลประกอบการไตรมาส VWAP บริการ
+Quarter1=1 ย่าน
+Quarter2=2 ย่าน
+Quarter3=3 ย่าน
+Quarter4=4 ย่าน
+BarCodePrintsheet=พิมพ์บาร์โค้ด
+PageToGenerateBarCodeSheets=ด้วยเครื่องมือนี้คุณสามารถพิมพ์แผ่นสติกเกอร์บาร์โค้ด <b>เลือกรูปแบบของหน้าสติกเกอร์ของคุณชนิดของบาร์โค้ดและค่าของบาร์โค้ดแล้วคลิกที่ปุ่ม%</b> s
+NumberOfStickers=จำนวนสติกเกอร์พิมพ์บนหน้า
+PrintsheetForOneBarCode=พิมพ์สติกเกอร์หลายหนึ่งบาร์โค้ด
+BuildPageToPrint=สร้างหน้าในการพิมพ์
+FillBarCodeTypeAndValueManually=กรอกประเภทบาร์โค้ดและความคุ้มค่าด้วยตนเอง
+FillBarCodeTypeAndValueFromProduct=กรอกประเภทบาร์โค้ดและความคุ้มค่าจากบาร์โค้ดของผลิตภัณฑ์
+FillBarCodeTypeAndValueFromThirdParty=กรอกประเภทบาร์โค้ดและความคุ้มค่าจากบาร์โค้ดของ thirdparty
+DefinitionOfBarCodeForProductNotComplete=ความหมายของประเภทหรือมูลค่าของบาร์โค้ดไม่สมบูรณ์สำหรับผลิตภัณฑ์% s
+DefinitionOfBarCodeForThirdpartyNotComplete=ความหมายของประเภทหรือมูลค่าของบาร์โค้ดที่ไม่สมบูรณ์แบบสำหรับ thirdparty% s
+BarCodeDataForProduct=ข้อมูลบาร์โค้ดของผลิตภัณฑ์% s:
+BarCodeDataForThirdparty=ข้อมูลบาร์โค้ดของ thirdparty% s:
+ResetBarcodeForAllRecords=กำหนดค่าบาร์โค้ดสำหรับระเบียนทั้งหมด (นี้ยังจะตั้งค่าบาร์โค้ดที่กำหนดไว้แล้วด้วยค่าใหม่)
+PriceByCustomer=ราคาที่แตกต่างกันสำหรับลูกค้าแต่ละราย
+PriceCatalogue=ราคาที่ไม่ซ้ำกันต่อสินค้า / บริการ
+PricingRule=กฎสำหรับราคาของลูกค้า
+AddCustomerPrice=เพิ่มราคาโดยลูกค้า
+ForceUpdateChildPriceSoc=ตั้งราคาเดียวกันกับ บริษัท ย่อยของลูกค้า
+PriceByCustomerLog=ราคาโดยการเข้าสู่ระบบของลูกค้า
+MinimumPriceLimit=ราคาขั้นต่ำไม่สามารถจะลดลงแล้ว% s
+MinimumRecommendedPrice=ราคาแนะนำขั้นต่ำ:% s
+PriceExpressionEditor=บรรณาธิการแสดงออกราคา
+PriceExpressionSelected=การแสดงออกของราคาที่เลือกไว้
+PriceExpressionEditorHelp1="ราคา = 2 + 2" หรือ "2 + 2" สำหรับการตั้งราคา ใช้; การแสดงออกทางแยก
+PriceExpressionEditorHelp2=คุณสามารถเข้าถึง ExtraFields กับตัวแปรเช่น <b># # extrafield_myextrafieldkey</b> และตัวแปรระดับโลกที่มี <b>global_mycode # #</b>
+PriceExpressionEditorHelp3=ในผลิตภัณฑ์ / บริการและราคาที่ผู้ผลิตมีตัวแปรเหล่านี้สามารถใช้ได้: <br> <b>tva_tx # # # # # # # # # localtax1_tx localtax2_tx # # # # # # # # น้ำหนักความยาวพื้นผิว # # # # # # # # # price_min</b>
+PriceExpressionEditorHelp4=ในผลิตภัณฑ์ / บริการราคาเพียง: <b># supplier_min_price #</b> <br> ผู้จัดจำหน่ายในราคาเพียง: <b># supplier_quantity # และ # supplier_tva_tx #</b>
+PriceExpressionEditorHelp5=ค่าระดับโลกที่มีจำหน่าย:
+PriceMode=โหมดราคา
+PriceNumeric=จำนวน
+DefaultPrice=ราคาเริ่มต้น
+ComposedProductIncDecStock=เพิ่มขึ้น / ลดลงหุ้นเกี่ยวกับการเปลี่ยนแปลงผู้ปกครอง
+ComposedProduct=สินค้าย่อย
+MinSupplierPrice=ผู้จัดจำหน่ายราคาขั้นต่ำ
+DynamicPriceConfiguration=การกำหนดค่าราคาแบบไดนามิก
+GlobalVariables=ตัวแปรทั่วโลก
+GlobalVariableUpdaters=อัพเดทตัวแปรทั่วโลก
+GlobalVariableUpdaterType0=ข้อมูล JSON
+GlobalVariableUpdaterHelp0=แยกวิเคราะห์ข้อมูล JSON จาก URL ที่ระบุมูลค่าระบุตำแหน่งของค่าที่เกี่ยวข้อง
+GlobalVariableUpdaterHelpFormat0=รูปแบบ {"URL": "http://example.com/urlofjson", "มูลค่า": "array1, array2, targetvalue"}
+GlobalVariableUpdaterType1=ข้อมูลเว็บเซอร์
+GlobalVariableUpdaterHelp1=แยกวิเคราะห์ข้อมูลจากเว็บเซอร์ URL ที่ระบุ, NS ระบุ namespace, มูลค่าระบุตำแหน่งของค่าที่เกี่ยวข้อง, ข้อมูลควรมีข้อมูลที่จะส่งและเป็นวิธีการเรียกวิธี WS
+GlobalVariableUpdaterHelpFormat1=รูปแบบ {"URL": "http://example.com/urlofws", "มูลค่า": "อาร์เรย์ targetvalue", "NS": "http://example.com/urlofns", "วิธีการ": " myWSMethod "," ข้อมูล ": {" ของคุณ ":" ข้อมูล "เพื่อ": "ส่ง"}}
+UpdateInterval=ช่วงเวลาการปรับปรุง (นาที)
+LastUpdated=อัพเดทล่าสุด
+CorrectlyUpdated=ปรับปรุงอย่างถูกต้อง
+PropalMergePdfProductActualFile=ไฟล์ที่ใช้ในการเพิ่มเป็น PDF ดาซูร์มี / เป็น
+PropalMergePdfProductChooseFile=ไฟล์ PDF เลือก
+IncludingProductWithTag=รวมทั้งสินค้าที่มีแท็ก
+DefaultPriceRealPriceMayDependOnCustomer=ราคาเริ่มต้นราคาที่แท้จริงอาจขึ้นอยู่กับลูกค้า
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index eac0f41d321..584322cec95 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -1,146 +1,156 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
-Project=Project
-Projects=Projects
-ProjectStatus=Project status
-SharedProject=Everybody
-PrivateProject=Contacts of project
-MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
-ProjectsPublicDesc=This view presents all projects you are allowed to read.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
-ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
-TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
-TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
-ProjectsArea=Projects area
-NewProject=New project
-AddProject=Create project
-DeleteAProject=Delete a project
-DeleteATask=Delete a task
-ConfirmDeleteAProject=Are you sure you want to delete this project ?
-ConfirmDeleteATask=Are you sure you want to delete this task ?
-OfficerProject=Officer project
-LastProjects=Last %s projects
-AllProjects=All projects
-ProjectsList=List of projects
-ShowProject=Show project
-SetProject=Set project
-NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
-NbOfProjects=Nb of projects
-TimeSpent=Time spent
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
-TimesSpent=Time spent
-RefTask=Ref. task
-LabelTask=Label task
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
-MyTimeSpent=My time spent
-MyTasks=My tasks
-Tasks=Tasks
-Task=Task
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
-NewTask=New task
-AddTask=Create task
-AddDuration=Add duration
-Activity=Activity
-Activities=Tasks/activities
-MyActivity=My activity
-MyActivities=My tasks/activities
-MyProjects=My projects
-DurationEffective=Effective duration
-Progress=Progress
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
-Time=Time
-ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's predefined invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
-ListContractAssociatedProject=List of contracts associated with the project
-ListFichinterAssociatedProject=List of interventions associated with the project
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
-ListDonationsAssociatedProject=List of donations associated with the project
-ListActionsAssociatedProject=List of events associated with the project
-ActivityOnProjectThisWeek=Activity on project this week
-ActivityOnProjectThisMonth=Activity on project this month
-ActivityOnProjectThisYear=Activity on project this year
-ChildOfTask=Child of project/task
-NotOwnerOfProject=Not owner of this private project
-AffectedTo=Allocated to
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
-ValidateProject=Validate projet
-ConfirmValidateProject=Are you sure you want to validate this project ?
-CloseAProject=Close project
-ConfirmCloseAProject=Are you sure you want to close this project ?
-ReOpenAProject=Open project
-ConfirmReOpenAProject=Are you sure you want to re-open this project ?
-ProjectContact=Project contacts
-ActionsOnProject=Events on project
-YouAreNotContactOfProject=You are not a contact of this private project
-DeleteATimeSpent=Delete time spent
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
-ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
-NoTasks=No tasks for this project
-LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
-ErrorTimeSpentIsEmpty=Time spent is empty
-ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
-IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
-CloneProject=Clone project
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
-ConfirmCloneProject=Are you sure to clone this project ?
-ProjectReportDate=Change task date according project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+RefProject=อ้าง โครงการ
+ProjectId=Id โครงการ
+Project=โครงการ
+Projects=โครงการ
+ProjectStatus=สถานะของโครงการ
+SharedProject=ทุกคน
+PrivateProject=รายชื่อของโครงการ
+MyProjectsDesc=มุมมองนี้จะ จำกัด ให้กับโครงการที่คุณกำลังติดต่อ (สิ่งที่เป็นประเภท)
+ProjectsPublicDesc=มุมมองนี้จะนำเสนอโครงการทั้งหมดที่คุณได้รับอนุญาตให้อ่าน
+ProjectsPublicTaskDesc=มุมมองนี้นำเสนอทุกโครงการและงานที่คุณได้รับอนุญาตในการอ่าน
+ProjectsDesc=มุมมองนี้นำเสนอทุกโครงการ (สิทธิ์ผู้ใช้ของคุณอนุญาตให้คุณสามารถดูทุกอย่าง)
+MyTasksDesc=มุมมองนี้จะ จำกัด ให้กับโครงการหรืองานที่คุณกำลังติดต่อ (สิ่งที่เป็นประเภท)
+OnlyOpenedProject=เฉพาะโครงการที่เปิดจะมองเห็นได้ (โครงการในร่างหรือสถานะปิดจะมองไม่เห็น)
+TasksPublicDesc=มุมมองนี้นำเสนอทุกโครงการและงานที่คุณได้รับอนุญาตในการอ่าน
+TasksDesc=มุมมองนี้นำเสนอทุกโครงการและงาน (สิทธิ์ผู้ใช้ของคุณอนุญาตให้คุณสามารถดูทุกอย่าง)
+AllTaskVisibleButEditIfYouAreAssigned=งานทั้งหมดสำหรับโครงการดังกล่าวจะมองเห็นได้ แต่คุณสามารถใส่เพียงครั้งเดียวสำหรับงานที่คุณจะได้รับมอบหมายใน มอบหมายงานให้คุณถ้าคุณต้องการที่จะป้อนเวลากับมัน
+OnlyYourTaskAreVisible=งานเดียวที่คุณจะได้รับมอบหมายในการมองเห็นได้ มอบหมายงานให้คุณถ้าคุณต้องการที่จะป้อนเวลากับมัน
+ProjectsArea=พื้นที่โครงการ
+NewProject=โครงการใหม่
+AddProject=สร้างโครงการ
+DeleteAProject=ลบโครงการ
+DeleteATask=ลบงาน
+ConfirmDeleteAProject=คุณแน่ใจว่าคุณต้องการลบโครงการนี​​้หรือไม่
+ConfirmDeleteATask=คุณแน่ใจหรือว่าต้องการลบงานนี้?
+OfficerProject=เจ้าหน้าที่โครงการ
+LastProjects=โครงการ% s ล่าสุด
+AllProjects=ทุกโครงการ
+ProjectsList=รายการของโครงการ
+ShowProject=แสดงโครงการ
+SetProject=โครงการตั้ง
+NoProject=ไม่มีโครงการที่กำหนดไว้หรือเป็นเจ้าของ
+NbOpenTasks=nb ของงานเปิด
+NbOfProjects=nb ของโครงการ
+TimeSpent=เวลาที่ใช้
+TimeSpentByYou=เวลาที่ใช้โดยคุณ
+TimeSpentByUser=เวลาที่ใช้โดยผู้ใช้
+TimesSpent=เวลาที่ใช้
+RefTask=อ้าง งาน
+LabelTask=งานป้าย
+TaskTimeSpent=เวลาที่ใช้ในงาน
+TaskTimeUser=ผู้ใช้งาน
+TaskTimeNote=บันทึก
+TaskTimeDate=วันที่
+TasksOnOpenedProject=งานเกี่ยวกับโครงการที่เปิด
+WorkloadNotDefined=ภาระงานที่ไม่ได้กำหนดไว้
+NewTimeSpent=เวลาใหม่ใช้เวลา
+MyTimeSpent=เวลาของการใช้จ่าย
+MyTasks=งานของฉัน
+Tasks=งาน
+Task=งาน
+TaskDateStart=วันที่เริ่มต้นงาน
+TaskDateEnd=งานวันที่สิ้นสุด
+TaskDescription=รายละเอียดงาน
+NewTask=งานใหม่
+AddTask=สร้างงาน
+AddDuration=เพิ่มระยะเวลา
+Activity=กิจกรรม
+Activities=งาน / กิจกรรม
+MyActivity=กิจกรรมของฉัน
+MyActivities=งานของฉัน / กิจกรรม
+MyProjects=โครงการของฉัน
+DurationEffective=ระยะเวลาที่มีประสิทธิภาพ
+Progress=ความคืบหน้า
+ProgressDeclared=ความคืบหน้าการประกาศ
+ProgressCalculated=ความคืบหน้าของการคำนวณ
+Time=เวลา
+ListProposalsAssociatedProject=รายชื่อของข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้องกับโครงการ
+ListOrdersAssociatedProject=รายชื่อของการสั่งซื้อของลูกค้าที่เกี่ยวข้องกับโครงการ
+ListInvoicesAssociatedProject=รายการของใบแจ้งหนี้ของลูกค้าที่เกี่ยวข้องกับโครงการ
+ListPredefinedInvoicesAssociatedProject=รายการของใบแจ้งหนี้ที่กำหนดไว้ล่วงหน้าของลูกค้าที่เกี่ยวข้องกับโครงการ
+ListSupplierOrdersAssociatedProject=รายชื่อของคำสั่งของซัพพลายเออร์ที่เกี่ยวข้องกับโครงการ
+ListSupplierInvoicesAssociatedProject=รายการของใบแจ้งหนี้ของซัพพลายเออร์ที่เกี่ยวข้องกับโครงการ
+ListContractAssociatedProject=รายการของสัญญาที่เกี่ยวข้องกับโครงการ
+ListFichinterAssociatedProject=รายชื่อของการแทรกแซงที่เกี่ยวข้องกับโครงการ
+ListExpenseReportsAssociatedProject=รายชื่อของรายงานค่าใช้จ่ายที่เกี่ยวข้องกับการโครงการ
+ListDonationsAssociatedProject=รายชื่อของการบริจาคที่เกี่ยวข้องกับการโครงการ
+ListActionsAssociatedProject=รายการของเหตุการณ์ที่เกี่ยวข้องกับโครงการ
+ListTaskTimeUserProject=รายชื่อของเวลาที่ใช้ในงานของโครงการ
+TaskTimeUserProject=เวลาที่ใช้ในงานของโครงการ
+ActivityOnProjectThisWeek=กิจกรรมในโครงการสัปดาห์นี้
+ActivityOnProjectThisMonth=กิจกรรมในโครงการในเดือนนี้
+ActivityOnProjectThisYear=กิจกรรมในโครงการในปีนี้
+ChildOfTask=เด็กของโครงการ / งาน
+NotOwnerOfProject=ไม่ได้เป็นเจ้าของโครงการนี​​้ส่วนตัว
+AffectedTo=จัดสรรให้กับ
+CantRemoveProject=โครงการนี​​้ไม่สามารถลบออกได้ในขณะที่มันถูกอ้างอิงโดยวัตถุอื่น ๆ บางคน (ใบแจ้งหนี้การสั่งซื้อหรืออื่น ๆ ) ดูแท็บ referers
+ValidateProject=ตรวจสอบ Projet
+ConfirmValidateProject=คุณแน่ใจว่าคุณต้องการที่จะตรวจสอบโครงการนี​​้หรือไม่
+CloseAProject=โครงการปิด
+ConfirmCloseAProject=คุณแน่ใจว่าคุณต้องการที่จะปิดโครงการนี​​้หรือไม่
+ReOpenAProject=เปิดโครงการ
+ConfirmReOpenAProject=คุณแน่ใจหรือว่าต้องการที่จะเปิดโครงการนี​​้หรือไม่
+ProjectContact=รายชื่อโครงการ
+ActionsOnProject=เหตุการณ์ที่เกิดขึ้นในโครงการ
+YouAreNotContactOfProject=คุณยังไม่ได้ติดต่อส่วนตัวของโครงการนี​​้
+DeleteATimeSpent=ลบเวลาที่ใช้
+ConfirmDeleteATimeSpent=คุณแน่ใจหรือว่าต้องการลบในครั้งนี้ใช้เวลา?
+DoNotShowMyTasksOnly=ดูยังไม่ได้รับมอบหมายงานมาให้ฉัน
+ShowMyTasksOnly=ดูเฉพาะงานที่ได้รับมอบหมายมาให้ฉัน
+TaskRessourceLinks=ทรัพยากร
+ProjectsDedicatedToThisThirdParty=โครงการที่ทุ่มเทให้กับบุคคลที่สามนี้
+NoTasks=ไม่มีงานสำหรับโครงการนี​​้
+LinkedToAnotherCompany=เชื่อมโยงไปยังบุคคลที่สาม
+TaskIsNotAffectedToYou=งานไม่ได้มอบหมายให้คุณ
+ErrorTimeSpentIsEmpty=เวลาที่ใช้เป็นที่ว่างเปล่า
+ThisWillAlsoRemoveTasks=การดำเนินการนี้จะลบงานทั้งหมดของโครงการ <b>(% s</b> งานในขณะนี้) และปัจจัยการผลิตทั้งหมดของเวลาที่ใช้
+IfNeedToUseOhterObjectKeepEmpty=หากวัตถ​​ุบางอย่าง (ใบแจ้งหนี้การสั่งซื้อ ... ) เป็นของอีกบุคคลที่สามจะต้องเชื่อมโยงกับโครงการที่จะสร้างให้ที่ว่างเปล่านี้จะมีโครงการที่เป็นบุคคลที่สามหลาย
+CloneProject=โครงการโคลน
+CloneTasks=งานโคลน
+CloneContacts=รายชื่อโคลน
+CloneNotes=บันทึกโคลน
+CloneProjectFiles=เข้าร่วมโครงการโคลนไฟล์
+CloneTaskFiles=งานโคลน (s) เข้าร่วมไฟล์ (ถ้างาน (s) โคลน)
+CloneMoveDate=โครงการปรับปรุง / งานจากวันที่ตอนนี้หรือไม่
+ConfirmCloneProject=คุณแน่ใจว่าจะโคลนโครงการนี​​้หรือไม่
+ProjectReportDate=เปลี่ยนวันงานโครงการตามวันที่เริ่มต้น
+ErrorShiftTaskDate=เป็นไปไม่ได้ที่จะเปลี่ยนวันงานตามโครงการใหม่วันที่เริ่มต้น
+ProjectsAndTasksLines=โครงการและงาน
+ProjectCreatedInDolibarr=โครงการสร้าง% s
+TaskCreatedInDolibarr=งาน% s สร้าง
+TaskModifiedInDolibarr=งาน% s การแก้ไข
+TaskDeletedInDolibarr=งาน% s ลบ
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Project leader
-TypeContact_project_external_PROJECTLEADER=Project leader
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
-TypeContact_project_task_external_TASKEXECUTIVE=Task executive
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-UnlinkElement=Unlink element
+TypeContact_project_internal_PROJECTLEADER=หัวหน้าโครงการ
+TypeContact_project_external_PROJECTLEADER=หัวหน้าโครงการ
+TypeContact_project_internal_PROJECTCONTRIBUTOR=ผู้สนับสนุน
+TypeContact_project_external_PROJECTCONTRIBUTOR=ผู้สนับสนุน
+TypeContact_project_task_internal_TASKEXECUTIVE=ผู้บริหารงาน
+TypeContact_project_task_external_TASKEXECUTIVE=ผู้บริหารงาน
+TypeContact_project_task_internal_TASKCONTRIBUTOR=ผู้สนับสนุน
+TypeContact_project_task_external_TASKCONTRIBUTOR=ผู้สนับสนุน
+SelectElement=องค์ประกอบที่เลือก
+AddElement=เชื่อมโยงไปยังองค์ประกอบ
+UnlinkElement=องค์ประกอบยกเลิกการเชื่อมโยง
 # Documents models
-DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+DocumentModelBaleine=รูปแบบรายงานที่สมบูรณ์ของโครงการ (โลโก้ ... )
+PlannedWorkload=ภาระงานที่วางแผนไว้
+PlannedWorkloadShort=จำนวนงาน
+WorkloadOccupation=ภาระงานนัด
+ProjectReferers=หมายวัตถุ
+SearchAProject=ค้นหาโครงการ
+ProjectMustBeValidatedFirst=โครงการจะต้องผ่านการตรวจสอบครั้งแรก
+ProjectDraft=ร่างโครงการ
+FirstAddRessourceToAllocateTime=เชื่อมโยงทรัพยากรที่จัดสรรเวลา
+InputPerDay=การป้อนข้อมูลต่อวัน
+InputPerWeek=การป้อนข้อมูลต่อสัปดาห์
+InputPerAction=การป้อนข้อมูลต่อการกระทำ
+TimeAlreadyRecorded=เวลาที่อยู่ในใช้เวลาบันทึกไว้แล้วสำหรับงานนี้วัน / และใช้งาน% s
+ProjectsWithThisUserAsContact=โครงการที่มีผู้ใช้เป็นการติดต่อนี้
+TasksWithThisUserAsContact=Tasks ได้รับมอบหมายให้ผู้ใช้รายนี้
+ResourceNotAssignedToProject=ไม่ได้กำหนดโครงการ
+ResourceNotAssignedToTask=ไม่ได้กำหนดให้กับงาน
+AssignTaskToMe=มอบหมายงานให้ฉัน
+AssignTask=กำหนด
+ProjectOverview=ภาพรวม
diff --git a/htdocs/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
index 8970d1eb2df..b865c2ffff8 100644
--- a/htdocs/langs/th_TH/propal.lang
+++ b/htdocs/langs/th_TH/propal.lang
@@ -1,102 +1,101 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Commercial proposals
-Proposal=Commercial proposal
-ProposalShort=Proposal
-ProposalsDraft=Draft commercial proposals
-ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
-Prop=Commercial proposals
-CommercialProposal=Commercial proposal
-CommercialProposals=Commercial proposals
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewProposal=New commercial proposal
-NewPropal=New proposal
-Prospect=Prospect
-ProspectList=Prospect list
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Add proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-LastPropals=Last %s proposals
-LastClosedProposals=Last %s closed proposals
-LastModifiedProposals=Last %s modified proposals
-AllPropals=All proposals
-LastProposals=Last proposals
-SearchAProposal=Search a proposal
-ProposalsStatistics=Commercial proposal's statistics
-NumberOfProposalsByMonth=Number by month
-AmountOfProposalsByMonthHT=Amount by month (net of tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
-PropalsDraft=Drafts
-PropalsOpened=Opened
-PropalsNotBilled=Closed not billed
-PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusOpened=Validated (proposal is open)
-PropalStatusClosed=Closed
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
-PropalStatusBilled=Billed
-PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
-PropalStatusClosedShort=Closed
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
-PropalStatusBilledShort=Billed
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
-AssociatedDocuments=Documents associated with the proposal:
-ErrorCantOpenDir=Can't open directory
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-DateEndPropalShort=Date end
-ValidityDuration=Validity duration
-CloseAs=Close with status
-ClassifyBilled=Classify billed
-BuildBill=Build invoice
-ErrorPropalNotFound=Propal %s not found
-Estimate=Estimate :
-EstimateShort=Estimate
-OtherPropals=Other proposals
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-ClonePropal=Clone commercial proposal
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
+Proposals=ข้อเสนอเชิงพาณิชย์
+Proposal=ข้อเสนอเชิงพาณิชย์
+ProposalShort=ข้อเสนอ
+ProposalsDraft=ข้อเสนอในเชิงพาณิชย์ร่าง
+ProposalDraft=ข้อเสนอในเชิงพาณิชย์ร่าง
+ProposalsOpened=ข้อเสนอในเชิงพาณิชย์เปิด
+Prop=ข้อเสนอเชิงพาณิชย์
+CommercialProposal=ข้อเสนอเชิงพาณิชย์
+CommercialProposals=ข้อเสนอเชิงพาณิชย์
+ProposalCard=การ์ดเสนอ
+NewProp=ข้อเสนอในเชิงพาณิชย์ใหม่
+NewProposal=ข้อเสนอในเชิงพาณิชย์ใหม่
+NewPropal=ข้อเสนอใหม่
+Prospect=โอกาส
+ProspectList=รายการ Prospect
+DeleteProp=ลบข้อเสนอในเชิงพาณิชย์
+ValidateProp=ตรวจสอบข้อเสนอในเชิงพาณิชย์
+AddProp=สร้างข้อเสนอ
+ConfirmDeleteProp=คุณแน่ใจว่าคุณต้องการลบข้อเสนอในเชิงพาณิชย์นี้หรือไม่?
+ConfirmValidateProp=<b>คุณแน่ใจหรือว่าต้องการตรวจสอบข้อเสนอเชิงพาณิชย์ภายใต้ชื่อ% s?</b>
+LastPropals=ข้อเสนอล่าสุดของ%
+LastClosedProposals=% s ข้อเสนอล่าสุดปิด
+LastModifiedProposals=% ล่าสุดของข้อเสนอการปรับเปลี่ยน
+AllPropals=ข้อเสนอทั้งหมด
+LastProposals=ข้อเสนอที่ผ่านมา
+SearchAProposal=ค้นหาข้อเสนอ
+ProposalsStatistics=สถิติข้อเสนอในเชิงพาณิชย์
+NumberOfProposalsByMonth=จำนวนเดือน
+AmountOfProposalsByMonthHT=จำนวนเดือน (สุทธิจากภาษี)
+NbOfProposals=จำนวนของข้อเสนอในเชิงพาณิชย์
+ShowPropal=แสดงข้อเสนอ
+PropalsDraft=ร่าง
+PropalsOpened=เปิด
+PropalsNotBilled=ปิดให้บริการเรียกเก็บเงินไม่ได้
+PropalStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
+PropalStatusValidated=การตรวจสอบ (ข้อเสนอเปิด)
+PropalStatusOpened=การตรวจสอบ (ข้อเสนอเปิด)
+PropalStatusClosed=ปิด
+PropalStatusSigned=ลงนาม (ความต้องการของการเรียกเก็บเงิน)
+PropalStatusNotSigned=ไม่ได้ลงชื่อ (ปิด)
+PropalStatusBilled=การเรียกเก็บเงิน
+PropalStatusDraftShort=ร่าง
+PropalStatusValidatedShort=ผ่านการตรวจสอบ
+PropalStatusOpenedShort=เปิด
+PropalStatusClosedShort=ปิด
+PropalStatusSignedShort=ลงนาม
+PropalStatusNotSignedShort=ไม่ได้ลงนาม
+PropalStatusBilledShort=การเรียกเก็บเงิน
+PropalsToClose=ข้อเสนอเชิงพาณิชย์ที่จะปิด
+PropalsToBill=ได้ลงนามในข้อเสนอในเชิงพาณิชย์เพื่อเรียกเก็บเงิน
+ListOfProposals=รายชื่อของข้อเสนอในเชิงพาณิชย์
+ActionsOnPropal=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับข้อเสนอ
+NoOpenedPropals=ไม่มีข้อเสนอในเชิงพาณิชย์เปิด
+NoOtherOpenedPropals=ไม่มีข้อเสนอในเชิงพาณิชย์อื่น ๆ ที่เปิด
+RefProposal=อ้างข้อเสนอในเชิงพาณิชย์
+SendPropalByMail=ส่งข้อเสนอในเชิงพาณิชย์โดยทางไปรษณีย์
+AssociatedDocuments=เอกสารที่เกี่ยวข้องกับข้อเสนอ:
+ErrorCantOpenDir=ไม่สามารถเปิดไดเรกทอรี
+DatePropal=วันของข้อเสนอ
+DateEndPropal=ตั้งแต่วันที่วันที่สิ้นสุด
+DateEndPropalShort=สิ้นสุดวันที่
+ValidityDuration=ระยะเวลาตั้งแต่วันที่
+CloseAs=ใกล้ชิดกับสถานะ
+ClassifyBilled=แบ่งประเภทเรียกเก็บเงิน
+BuildBill=สร้างใบแจ้งหนี้
+ErrorPropalNotFound=Propal% s ไม่พบ
+Estimate=ประมาณการ:
+EstimateShort=ประมาณการ
+OtherPropals=ข้อเสนออื่น ๆ
+AddToDraftProposals=เพิ่มลงในร่างข้อเสนอ
+NoDraftProposals=ไม่มีร่างข้อเสนอ
+CopyPropalFrom=สร้างข้อเสนอในเชิงพาณิชย์โดยการคัดลอกข้อเสนอที่มีอยู่
+CreateEmptyPropal=สร้างข้อเสนอในเชิงพาณิชย์ว่าง Vierge หรือจากรายการของผลิตภัณฑ์ / บริการ
+DefaultProposalDurationValidity=ระยะเวลาเริ่มต้นความถูกต้องข้อเสนอในเชิงพาณิชย์ (ในวัน)
+UseCustomerContactAsPropalRecipientIfExist=ใช้ที่อยู่การติดต่อกับลูกค้าถ้ากำหนดไว้แทนการที่อยู่ของบุคคลที่สามเป็นที่อยู่ของผู้รับข้อเสนอ
+ClonePropal=ข้อเสนอในเชิงพาณิชย์โคลน
+ConfirmClonePropal=<b>คุณแน่ใจหรือว่าต้องการโคลนข้อเสนอ% s</b> พาณิชย?
+ConfirmReOpenProp=<b>คุณแน่ใจหรือว่าต้องการที่จะเปิดกลับข้อเสนอของ% s</b> พาณิชย?
+ProposalsAndProposalsLines=ข้อเสนอเชิงพาณิชย์และสาย
+ProposalLine=โฆษณาข้อเสนอ
+AvailabilityPeriod=ความล่าช้าที่ว่าง
+SetAvailability=ความล่าช้าในการตั้งค่าความพร้อม
+AfterOrder=หลังจากที่สั่งซื้อ
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=ทันทีทันใด
+AvailabilityTypeAV_1W=1 สัปดาห์
+AvailabilityTypeAV_2W=2 สัปดาห์ที่ผ่านมา
+AvailabilityTypeAV_3W=3 สัปดาห์ที่ผ่านมา
+AvailabilityTypeAV_1M=1 เดือน
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Customer invoice contact
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=แทนข้อเสนอดังต่อไปนี้ขึ้น
+TypeContact_propal_external_BILLING=ติดต่อใบแจ้งหนี้ของลูกค้า
+TypeContact_propal_external_CUSTOMER=การติดต่อกับลูกค้าข้อเสนอดังต่อไปนี้ขึ้น
 # Document models
-DocModelAzurDescription=A complete proposal model (logo...)
-DocModelJauneDescription=Jaune proposal model
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=รูปแบบข้อเสนอฉบับสมบูรณ์ (โลโก้ ... )
+DocModelJauneDescription=รูปแบบข้อเสนอ Jaune
+DefaultModelPropalCreate=เริ่มต้นการสร้างแบบจำลอง
+DefaultModelPropalToBill=แม่แบบเริ่มต้นเมื่อปิดข้อเสนอทางธุรกิจ (ที่จะออกใบแจ้งหนี้)
+DefaultModelPropalClosed=แม่แบบเริ่มต้นเมื่อปิดข้อเสนอทางธุรกิจ (ยังไม่เรียกเก็บ)
+ProposalCustomerSignature=ยอมรับเขียนประทับ บริษัท วันและลายเซ็น
diff --git a/htdocs/langs/th_TH/resource.lang b/htdocs/langs/th_TH/resource.lang
index 32bdd92f884..c798592e2cb 100644
--- a/htdocs/langs/th_TH/resource.lang
+++ b/htdocs/langs/th_TH/resource.lang
@@ -1,34 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=ทรัพยากร
+MenuResourceAdd=ทรัพยากรใหม่
+MenuResourcePlanning=การวางแผนทรัพยากร
+DeleteResource=ลบทรัพยากร
+ConfirmDeleteResourceElement=ยืนยันการลบทรัพยากรสำหรับองค์ประกอบนี้
+NoResourceInDatabase=ไม่มีทรัพยากรในฐานข้อมูล
+NoResourceLinked=ทรัพยากรที่ไม่มีการเชื่อมโยง
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=รายการทรัพยากร
+ResourceSingular=ทรัพยากร
+ResourceCard=บัตรทรัพยากร
+AddResource=สร้างทรัพยากร
+ResourceFormLabel_ref=ชื่อทรัพยากร
+ResourceType=ประเภททรัพยากร
+ResourceFormLabel_description=คำอธิบายทรัพยากร
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=ทรัพยากรที่เชื่อมโยงกับองค์ประกอบ
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=แสดงการวางแผนทรัพยากร
+GotoDate=ไปยังวันที่
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=ทรัพยากรธาตุ
+ResourceCreatedWithSuccess=ทรัพยากรสร้างเสร็จเรียบร้อยแล้ว
+RessourceLineSuccessfullyDeleted=สายทรัพยากรลบเรียบร้อยแล้ว
+RessourceLineSuccessfullyUpdated=สายทรัพยากรปรับปรุงเรียบร้อยแล้ว
+ResourceLinkedWithSuccess=ทรัพยากรที่เชื่อมโยงกับความสำเร็จ
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=บัตรทรัพยากร
+ConfirmDeleteResource=ยืนยันการลบทรัพยากรนี้
+RessourceSuccessfullyDeleted=ทรัพยากรลบเรียบร้อยแล้ว
+DictionaryResourceType=ประเภทของทรัพยากร
 
-SelectResource=Select resource
+SelectResource=ทรัพยากรที่เลือก
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index 28c21adfad3..18351b208e4 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -1,13 +1,15 @@
 # Dolibarr language file - Source file is en_US - users
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
-CurrentSalary=Current salary
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=รหัสบัญชีสำหรับการชำระเงินเงินเดือน
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=รหัสบัญชีสำหรับค่าใช้จ่ายทางการเงิน
+Salary=เงินเดือน
+Salaries=เงินเดือน
+Employee=ลูกจ้าง
+NewSalaryPayment=การชำระเงินเงินเดือนใหม่
+SalaryPayment=การชำระเงินเงินเดือน
+SalariesPayments=การชำระเงินเงินเดือน
+ShowSalaryPayment=แสดงการชำระเงินเงินเดือน
+THM=ราคาเฉลี่ยรายชั่วโมง
+TJM=ราคาเฉลี่ยรายวัน
+CurrentSalary=เงินเดือนปัจจุบัน
+THMDescription=ค่านี้อาจจะใช้ในการคำนวณค่าใช้จ่ายของเวลาที่ใช้ในโครงการที่ป้อนโดยผู้ใช้หากโครงการโมดูลถูกนำมาใช้
+TJMDescription=ค่านี้เป็นในปัจจุบันเป็นข้อมูลเท่านั้นและไม่ได้ใช้ในการคำนวณใด ๆ
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 84088c3e023..63d8ec4cd6d 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -1,86 +1,86 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Shipment
-Sendings=Shipments
-AllSendings=All Shipments
-Shipment=Shipment
-Shipments=Shipments
-ShowSending=Show Sending
-Receivings=Receipts
-SendingsArea=Shipments area
-ListOfSendings=List of shipments
-SendingMethod=Shipping method
-SendingReceipt=Shipping receipt
-LastSendings=Last %s shipments
-SearchASending=Search for shipment
-StatisticsOfSendings=Statistics for shipments
-NbOfSendings=Number of shipments
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=New shipment
-CreateASending=Create a shipment
-CreateSending=Create shipment
-QtyOrdered=Qty ordered
-QtyShipped=Qty shipped
-QtyToShip=Qty to ship
-QtyReceived=Qty received
-KeepToShip=Remain to ship
-OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
-SendingsForSameOrder=Shipments for this order
-SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-SendingsToValidate=Shipments to validate
-StatusSendingCanceled=Canceled
-StatusSendingDraft=Draft
-StatusSendingValidated=Validated (products to ship or already shipped)
-StatusSendingProcessed=Processed
-StatusSendingCanceledShort=Canceled
-StatusSendingDraftShort=Draft
-StatusSendingValidatedShort=Validated
-StatusSendingProcessedShort=Processed
-SendingSheet=Shipment sheet
-Carriers=Carriers
-Carrier=Carrier
-CarriersArea=Carriers area
-NewCarrier=New carrier
-ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-GenericTransport=Generic transport
-Enlevement=Gotten by customer
-DocumentModelSimple=Simple document model
-DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
-DateReceived=Date delivery received
-SendShippingByEMail=Send shipment by EMail
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Events on shipment
-LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-RelatedShippings=Related shipments
-ShipmentLine=Shipment line
-CarrierList=List of transporters
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+RefSending=อ้าง การส่งสินค้า
+Sending=การส่งสินค้า
+Sendings=การจัดส่ง
+AllSendings=ทั้งหมดจัดส่ง
+Shipment=การส่งสินค้า
+Shipments=การจัดส่ง
+ShowSending=แสดงการส่ง
+Receivings=รายรับ
+SendingsArea=พื้นที่การจัดส่ง
+ListOfSendings=รายชื่อของการจัดส่ง
+SendingMethod=วิธีการจัดส่งสินค้า
+SendingReceipt=ได้รับการจัดส่งสินค้า
+LastSendings=% ล่าสุดของการจัดส่ง
+SearchASending=ค้นหาสำหรับการจัดส่ง
+StatisticsOfSendings=สถิติสำหรับการจัดส่ง
+NbOfSendings=จำนวนการจัดส่ง
+NumberOfShipmentsByMonth=จำนวนการจัดส่งโดย
+SendingCard=การจัดส่งบัตร
+NewSending=การจัดส่งใหม่
+CreateASending=สร้างการจัดส่ง
+CreateSending=สร้างการจัดส่ง
+QtyOrdered=จำนวนที่สั่งซื้อ
+QtyShipped=จำนวนการจัดส่ง
+QtyToShip=จำนวนที่จะจัดส่ง
+QtyReceived=จำนวนที่ได้รับ
+KeepToShip=ยังคงอยู่ในการจัดส่ง
+OtherSendingsForSameOrder=การจัดส่งอื่น ๆ สำหรับการสั่งซื้อนี้
+DateSending=วันที่ส่งคำสั่งซื้อ
+DateSendingShort=วันที่ส่งคำสั่งซื้อ
+SendingsForSameOrder=การจัดส่งสำหรับการสั่งซื้อนี้
+SendingsAndReceivingForSameOrder=การจัดส่งและ Receivings สำหรับการสั่งซื้อนี้
+SendingsToValidate=ในการตรวจสอบการจัดส่ง
+StatusSendingCanceled=ยกเลิก
+StatusSendingDraft=ร่าง
+StatusSendingValidated=การตรวจสอบ (สินค้าจะจัดส่งหรือจัดส่งแล้ว)
+StatusSendingProcessed=การประมวลผล
+StatusSendingCanceledShort=ยกเลิก
+StatusSendingDraftShort=ร่าง
+StatusSendingValidatedShort=ผ่านการตรวจสอบ
+StatusSendingProcessedShort=การประมวลผล
+SendingSheet=แผ่นจัดส่ง
+Carriers=ผู้ให้บริการ
+Carrier=พาหะ
+CarriersArea=พื้นที่ให้บริการ
+NewCarrier=ผู้ให้บริการใหม่
+ConfirmDeleteSending=คุณแน่ใจว่าคุณต้องการลบการจัดส่งนี้หรือไม่?
+ConfirmValidateSending=<b>คุณแน่ใจหรือว่าต้องการตรวจสอบการจัดส่งกับ% s</b> อ้างอิงนี้หรือไม่?
+ConfirmCancelSending=คุณแน่ใจว่าคุณต้องการที่จะยกเลิกการจัดส่งนี้หรือไม่?
+GenericTransport=การขนส่งทั่วไป
+Enlevement=อากาศโดยลูกค้า
+DocumentModelSimple=รูปแบบเอกสารอย่างง่าย
+DocumentModelMerou=Merou A5 รูปแบบ
+WarningNoQtyLeftToSend=คำเตือนผลิตภัณฑ์ไม่มีการรอคอยที่จะส่ง
+StatsOnShipmentsOnlyValidated=สถิติดำเนินการในการตรวจสอบการจัดส่งเท่านั้น วันที่นำมาใช้คือวันของการตรวจสอบการจัดส่งของ (วันที่ส่งมอบวางแผนไม่เป็นที่รู้จักเสมอ)
+DateDeliveryPlanned=วันที่มีการวางแผนในการส่งสินค้า
+DateReceived=วันที่ได้รับการส่งมอบ
+SendShippingByEMail=ส่งจัดส่งทางอีเมล
+SendShippingRef=การส่งของการขนส่ง% s
+ActionsOnShipping=เหตุการณ์ที่เกิดขึ้นในการจัดส่ง
+LinkToTrackYourPackage=เชื่อมโยงไปยังติดตามแพคเกจของคุณ
+ShipmentCreationIsDoneFromOrder=สำหรับช่วงเวลาที่การสร้างการจัดส่งใหม่จะทำจากการ์ดสั่งซื้อ
+RelatedShippings=การจัดส่งที่เกี่ยวข้อง
+ShipmentLine=สายการจัดส่ง
+CarrierList=รายชื่อขนส่ง
+SendingRunning=สินค้าจากการสั่งซื้อของลูกค้าที่สั่งซื้อ
+SuppliersReceiptRunning=คำสั่งซื้อสินค้าจากซัพพลายเออร์ที่ได้รับคำสั่ง
+ProductQtyInCustomersOrdersRunning=ปริมาณสินค้าเข้าเปิดคำสั่งซื้อของลูกค้า
+ProductQtyInSuppliersOrdersRunning=ปริมาณสินค้าลงในคำสั่งเปิดซัพพลายเออร์
+ProductQtyInShipmentAlreadySent=ปริมาณสินค้าจากการสั่งซื้อของลูกค้าที่เปิดส่งแล้ว
+ProductQtyInSuppliersShipmentAlreadyRecevied=ปริมาณการสั่งซื้อสินค้าจากซัพพลายเออร์ที่เปิดรับอยู่แล้ว
 
 # Sending methods
-SendingMethodCATCH=Catch by customer
+SendingMethodCATCH=จับลูกค้า
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
 # ModelDocument
-DocumentModelSirocco=Simple document model for delivery receipts
-DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+DocumentModelSirocco=รูปแบบเอกสารอย่างง่ายสำหรับการจัดส่งใบเสร็จรับเงิน
+DocumentModelTyphon=รูปแบบเอกสารที่สมบูรณ์มากขึ้นสำหรับการจัดส่งใบเสร็จรับเงิน (โลโก้ ... )
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER คงที่ไม่ได้กำหนดไว้
+SumOfProductVolumes=ผลรวมของปริมาณสินค้า
+SumOfProductWeights=ผลรวมของน้ำหนักสินค้า
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= รายละเอียดคลังสินค้า
+DetailWarehouseFormat= W:% s (จำนวน:% d)
diff --git a/htdocs/langs/th_TH/sms.lang b/htdocs/langs/th_TH/sms.lang
index 4e89bb24730..946f0f823aa 100644
--- a/htdocs/langs/th_TH/sms.lang
+++ b/htdocs/langs/th_TH/sms.lang
@@ -1,53 +1,53 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
-SmsSetup=Sms setup
-SmsDesc=This page allows you to define globals options on SMS features
-SmsCard=SMS Card
-AllSms=All SMS campains
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
-SmsTitle=Description
-SmsFrom=Sender
-SmsTo=Target
-SmsTopic=Topic of SMS
-SmsText=Message
-SmsMessage=SMS Message
-ShowSms=Show Sms
-ListOfSms=List SMS campains
-NewSms=New SMS campain
-EditSms=Edit Sms
-ResetSms=New sending
-DeleteSms=Delete Sms campain
-DeleteASms=Remove a Sms campain
+SmsSetup=การติดตั้ง sms
+SmsDesc=หน้านี้จะช่วยให้คุณสามารถกำหนดตัวเลือก Globals เกี่ยวกับคุณลักษณะ SMS
+SmsCard=บัตร SMS
+AllSms=ทั้งหมด SMS แคมเปญ
+SmsTargets=เป้าหมาย
+SmsRecipients=เป้าหมาย
+SmsRecipient=เป้า
+SmsTitle=ลักษณะ
+SmsFrom=ผู้ส่ง
+SmsTo=เป้า
+SmsTopic=หัวข้อ SMS
+SmsText=ข่าวสาร
+SmsMessage=ข้อความ SMS
+ShowSms=แสดง Sms
+ListOfSms=SMS รายชื่อแคมเปญ
+NewSms=ใหม่ campain SMS
+EditSms=แก้ไข Sms
+ResetSms=ส่งใหม่
+DeleteSms=ลบ campain Sms
+DeleteASms=ลบ campain Sms
 PreviewSms=Previuw Sms
-PrepareSms=Prepare Sms
-CreateSms=Create Sms
-SmsResult=Result of Sms sending
-TestSms=Test Sms
-ValidSms=Validate Sms
-ApproveSms=Approve Sms
-SmsStatusDraft=Draft
-SmsStatusValidated=Validated
-SmsStatusApproved=Approved
-SmsStatusSent=Sent
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
-SmsStatusError=Error
-SmsStatusNotSent=Not sent
-SmsSuccessfulySent=Sms correctly sent (from %s to %s)
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campain ?
-ConfirmResetMailing=Warning, if you make a reinit of Sms campain <b>%s</b>, you will allow to make a mass sending of it a second time. Is it really what you wan to do ?
-ConfirmDeleteMailing=Do you confirm removing of campain ?
-NbOfRecipients=Number of targets
-NbOfUniqueSms=Nb dof unique phone numbers
-NbOfSms=Nbre of phon numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=Nb of remaining characters
-SmsInfoNumero= (format international ie : +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+PrepareSms=เตรียม Sms
+CreateSms=สร้าง Sms
+SmsResult=ผลมาจากการส่ง SMS
+TestSms=ทดสอบ Sms
+ValidSms=ตรวจสอบ Sms
+ApproveSms=อนุมัติ Sms
+SmsStatusDraft=ร่าง
+SmsStatusValidated=ผ่านการตรวจสอบ
+SmsStatusApproved=ได้รับการอนุมัติ
+SmsStatusSent=ส่ง
+SmsStatusSentPartialy=ส่งบางส่วน
+SmsStatusSentCompletely=ส่งสมบูรณ์
+SmsStatusError=ความผิดพลาด
+SmsStatusNotSent=ส่งไม่ได้
+SmsSuccessfulySent=ส่ง sms ได้อย่างถูกต้อง (จาก% s% s)
+ErrorSmsRecipientIsEmpty=จำนวนเป้าหมายเป็นที่ว่างเปล่า
+WarningNoSmsAdded=ไม่มีหมายเลขโทรศัพท์ใหม่เพื่อเพิ่มรายชื่อในการกำหนดเป้​​าหมาย
+ConfirmValidSms=คุณยืนยันการตรวจสอบของ campain นี้หรือไม่?
+ConfirmResetMailing=คำเตือนถ้าคุณทำ reinit ของ Sms <b>campain% s</b> คุณจะช่วยให้ที่จะทำให้การส่งมวลของมันเป็นครั้งที่สอง มันเป็นจริงสิ่งที่คุณ wan จะทำอย่างไร?
+ConfirmDeleteMailing=คุณยืนยันการลบของ campain?
+NbOfRecipients=จำนวนเป้าหมาย
+NbOfUniqueSms=nb อานนท์หมายเลขโทรศัพท์ที่ไม่ซ้ำกัน
+NbOfSms=Nbre ของตัวเลขพล
+ThisIsATestMessage=นี่คือข้อความทดสอบ
+SendSms=ส่งข้อความ
+SmsInfoCharRemain=nb ของอักขระที่เหลืออยู่
+SmsInfoNumero= (รูปแบบเช่นระหว่างประเทศ: 33899701761)
+DelayBeforeSending=หน่วงเวลาก่อนที่จะส่ง (นาที)
+SmsNoPossibleRecipientFound=ไม่มีเป้าหมาย ตรวจสอบการตั้งค่าของผู้ให้บริการ SMS ของคุณ
 
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index c2b432d7f9b..7ac5a613a68 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -1,139 +1,140 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-NewWarehouse=New warehouse / Stock area
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
-WarehouseClosed=Warehouse closed
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
-WarehouseTarget=Target warehouse
-ValidateSending=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
-Stock=Stock
-Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
-Movement=Movement
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ErrorWarehouseLabelRequired=Warehouse label is required
-CorrectStock=Correct stock
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
-StocksArea=Warehouses area
-Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
-NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
-Units=Units
-Unit=Unit
-StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
-LabelMovement=Movement label
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-TotalStock=Total in stock
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit
-EnhancedValue=Value
-PMPValue=Weighted average price
+WarehouseCard=บัตรคลังสินค้า
+Warehouse=คลังสินค้า
+Warehouses=โกดัง
+NewWarehouse=คลังสินค้าใหม่ / พื้นที่สต็อก
+WarehouseEdit=แก้ไขคลังสินค้า
+MenuNewWarehouse=คลังสินค้าใหม่
+WarehouseOpened=เปิดคลังสินค้า
+WarehouseClosed=คลังสินค้าปิด
+WarehouseSource=คลังสินค้าที่มา
+WarehouseSourceNotDefined=ไม่มีคลังสินค้าที่กำหนดไว้
+AddOne=เพิ่มอีกหนึ่ง
+WarehouseTarget=คลังสินค้าเป้าหมาย
+ValidateSending=ลบส่ง
+CancelSending=ยกเลิกการส่ง
+DeleteSending=ลบส่ง
+Stock=สต็อกสินค้า
+Stocks=หุ้น
+StocksByLotSerial=หุ้นโดยจัดสรร / อนุกรม
+Movement=การเคลื่อนไหว
+Movements=การเคลื่อนไหว
+ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
+ErrorWarehouseLabelRequired=ฉลากคลังสินค้าจะต้อง
+CorrectStock=หุ้นที่ถูกต้อง
+ListOfWarehouses=รายชื่อของคลังสินค้า
+ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
+StocksArea=พื้นที่โกดัง
+Location=สถานที่
+LocationSummary=ที่ตั้งชื่อสั้น
+NumberOfDifferentProducts=จำนวนของผลิตภัณฑ์ที่แตกต่างกัน
+NumberOfProducts=จำนวนของผลิตภัณฑ์
+LastMovement=ความเคลื่อนไหวล่าสุด
+LastMovements=ความเคลื่อนไหวล่าสุด
+Units=หน่วย
+Unit=หน่วย
+StockCorrection=หุ้นที่ถูกต้อง
+StockTransfer=การโอนหุ้น
+StockMovement=โอน
+StockMovements=การโอนหุ้น
+LabelMovement=ป้ายเคลื่อนไหว
+NumberOfUnit=จำนวนหน่วย
+UnitPurchaseValue=ราคาซื้อหน่วย
+TotalStock=รวมในสต็อก
+StockTooLow=หุ้นต่ำเกินไป
+StockLowerThanLimit=หุ้นต่ำกว่าขีด จำกัด ของการแจ้งเตือน
+EnhancedValue=มูลค่า
+PMPValue=ราคาเฉลี่ยถ่วงน้ำหนัก
 PMPValueShort=WAP
-EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
-IndependantSubProductStock=Product stock and subproduct stock are independant
-QtyDispatched=Quantity dispatched
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving
-ReStockOnDeleteInvoice=Increase real stocks on invoice deletion
-OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-PhysicalStock=Physical stock
-RealStock=Real Stock
-VirtualStock=Virtual stock
-MininumStock=Minimum stock
-StockUp=Stock up
-MininumStockShort=Stock min
-StockUpShort=Stock up
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b> ?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-NoStockAction=No stock action
-LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
-AlertOnly= Alerts only
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-MassStockMovement=Mass stock movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
-MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+EnhancedValueOfWarehouses=ค่าโกดัง
+UserWarehouseAutoCreate=สร้างคลังสินค้าโดยอัตโนมัติเมื่อมีการสร้างผู้ใช้
+IndependantSubProductStock=สต็อกสินค้าและสต็อก subproduct เป็นอิสระ
+QtyDispatched=ปริมาณส่ง
+QtyDispatchedShort=จำนวนส่ง
+QtyToDispatchShort=จำนวนการจัดส่ง
+OrderDispatch=หุ้นเยี่ยงอย่าง
+RuleForStockManagementDecrease=กฎการลดบริหารสต็อก
+RuleForStockManagementIncrease=กฎสำหรับการเพิ่มขึ้นบริหารสต็อก
+DeStockOnBill=ลดหุ้นที่แท้จริงในใบแจ้งหนี้ลูกค้า / บันทึกการตรวจสอบเครดิต
+DeStockOnValidateOrder=ลดหุ้นที่แท้จริงในการตรวจสอบการสั่งซื้อของลูกค้า
+DeStockOnShipment=ลดหุ้นที่แท้จริงในการตรวจสอบการจัดส่ง
+ReStockOnBill=เพิ่มหุ้นที่แท้จริงในใบแจ้งหนี้ซัพพลายเออร์ / บันทึกการตรวจสอบเครดิต
+ReStockOnValidateOrder=เพิ่มหุ้นที่แท้จริงในการอนุมัติคำสั่งซัพพลายเออร์
+ReStockOnDispatchOrder=เพิ่มหุ้นที่แท้จริงในคู่มือการฝึกอบรมออกเป็นโกดังหลังจากที่สั่งซื้อผู้จัดจำหน่ายที่ได้รับ
+ReStockOnDeleteInvoice=เพิ่มหุ้นที่แท้จริงในการลบใบแจ้งหนี้
+OrderStatusNotReadyToDispatch=การสั่งซื้อที่ยังไม่ได้มีหรือไม่ขึ้นสถานะที่ช่วยให้การจัดส่งสินค้าในคลังสินค้าหุ้น
+StockDiffPhysicTeoric=ชี้แจงความแตกต่างระหว่างหุ้นทางกายภาพและทางทฤษฎี
+NoPredefinedProductToDispatch=ไม่มีสินค้าที่กำหนดไว้ล่วงหน้าสำหรับวัตถุนี้ จึงไม่มีการฝึกอบรมในสต็อกจะต้อง
+DispatchVerb=ฆ่า
+StockLimitShort=จำกัด สำหรับการแจ้งเตือน
+StockLimit=ขีด จำกัด ของสต็อกสำหรับการแจ้งเตือน
+PhysicalStock=หุ้นทางกายภาพ
+RealStock=หุ้นจริง
+VirtualStock=หุ้นเสมือนจริง
+MininumStock=หุ้นขั้นต่ำ
+StockUp=ตุน
+MininumStockShort=หุ้นนาที
+StockUpShort=ตุน
+IdWarehouse=คลังสินค้า Id
+DescWareHouse=คลังสินค้ารายละเอียด
+LieuWareHouse=คลังสินค้าภาษาท้องถิ่น
+WarehousesAndProducts=โกดังและผลิตภัณฑ์
+WarehousesAndProductsBatchDetail=โกดังและผลิตภัณฑ์ (ที่มีรายละเอียดมากต่อ / อนุกรม)
+AverageUnitPricePMPShort=ถ่วงน้ำหนักราคานำเข้าเฉลี่ย
+AverageUnitPricePMP=ถ่วงน้ำหนักราคานำเข้าเฉลี่ย
+SellPriceMin=ราคาขายต่อหน่วย
+EstimatedStockValueSellShort=มูลค่าที่จะขาย
+EstimatedStockValueSell=มูลค่าการขาย
+EstimatedStockValueShort=ป้อนข้อมูลมูลค่าหุ้น
+EstimatedStockValue=ป้อนข้อมูลมูลค่าหุ้น
+DeleteAWarehouse=ลบคลังสินค้า
+ConfirmDeleteWarehouse=<b>คุณแน่ใจหรือว่าต้องการลบคลังสินค้า% s?</b>
+PersonalStock=ส่วนตัวหุ้น% s
+ThisWarehouseIsPersonalStock=คลังสินค้านี้เป็นหุ้นส่วนบุคคล% s% s
+SelectWarehouseForStockDecrease=เลือกคลังสินค้าที่จะใช้สำหรับการลดลงของหุ้น
+SelectWarehouseForStockIncrease=เลือกคลังสินค้าที่จะใช้สำหรับการเพิ่มขึ้นของหุ้น
+NoStockAction=ไม่มีการกระทำหุ้น
+LastWaitingSupplierOrders=คำสั่งซื้อที่รอการรับรองแขก
+DesiredStock=หุ้นขั้นต่ำที่ต้องการ
+DesiredMaxStock=หุ้นสูงสุดที่ต้องการ
+StockToBuy=ต้องการสั่งซื้อ
+Replenishment=การเสริมกำลัง
+ReplenishmentOrders=คำสั่งการเติมเต็ม
+VirtualDiffersFromPhysical=ตามการเพิ่ม / ลดตัวเลือกหุ้นหุ้นหุ้นทางกายภาพและเสมือน (คำสั่งซื้อในปัจจุบันทางกายภาพ +) อาจแตกต่างกัน
+UseVirtualStockByDefault=ใช้หุ้นเสมือนโดยค่าเริ่มต้นแทนหุ้นทางกายภาพสำหรับคุณลักษณะการเติมเต็ม
+UseVirtualStock=ใช้หุ้นเสมือนจริง
+UsePhysicalStock=ใช้หุ้นทางกายภาพ
+CurentSelectionMode=โหมดการเลือกปัจจุบัน
+CurentlyUsingVirtualStock=หุ้นเสมือนจริง
+CurentlyUsingPhysicalStock=หุ้นทางกายภาพ
+RuleForStockReplenishment=กฎสำหรับหุ้นการเติมเต็ม
+SelectProductWithNotNullQty=เลือกผลิตภัณฑ์อย่างน้อยหนึ่งที่มีจำนวนไม่เป็นโมฆะและผู้จัดจำหน่าย
+AlertOnly= การแจ้งเตือนเท่านั้น
+WarehouseForStockDecrease=<b>s คลังสินค้า%</b> จะใช้สำหรับการลดลงของหุ้น
+WarehouseForStockIncrease=<b>คลังสินค้า% s</b> จะใช้สำหรับการเพิ่มขึ้นของหุ้น
+ForThisWarehouse=สำหรับคลังสินค้านี้
+ReplenishmentStatusDesc=นี่คือรายการของผลิตภัณฑ์ทั้งหมดที่มีหุ้นต่ำกว่าหุ้นที่ต้องการ (หรือต่ำกว่ามูลค่าการแจ้งเตือนหากช่อง "การแจ้งเตือนเท่านั้น" มีการตรวจสอบ) และขอแนะนำให้คุณสามารถสร้างคำสั่งซัพพลายเออร์ที่จะเติมความแตกต่าง
+ReplenishmentOrdersDesc=นี่คือรายการของคำสั่งซัพพลายเออร์ที่เปิดอยู่ทั้งหมดรวมถึงผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า เปิดคำสั่งเท่านั้นที่มีผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้าเพื่อให้คำสั่งที่อาจส่งผลกระทบต่อหุ้นจะมองเห็นได้ที่นี่
+Replenishments=replenishments
+NbOfProductBeforePeriod=ปริมาณของ% s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (<% s)
+NbOfProductAfterPeriod=จำนวนของผลิตภัณฑ์% s ในสต็อกหลังจากระยะเวลาที่เลือก (>% s)
+MassMovement=การเคลื่อนไหวมวลชน
+MassStockMovement=การเคลื่อนไหวของหุ้นมวล
+SelectProductInAndOutWareHouse=เลือกผลิตภัณฑ์ปริมาณโกดังแหล่งที่มาและคลังสินค้าเป้าหมายจากนั้นคลิก "% s" ครั้งนี้จะทำสำหรับการเคลื่อนไหวที่จำเป็นทั้งหมดคลิกไปยัง "% s"
+RecordMovement=โอนบันทึก
+ReceivingForSameOrder=ใบเสร็จรับเงินสำหรับการสั่งซื้อนี้
+StockMovementRecorded=การเคลื่อนไหวของหุ้นที่บันทึกไว้
+RuleForStockAvailability=หลักเกณฑ์ในการความต้องการหุ้น
+StockMustBeEnoughForInvoice=ระดับหุ้นจะต้องพอที่จะเพิ่มสินค้า / บริการใบแจ้งหนี้
+StockMustBeEnoughForOrder=ระดับหุ้นจะต้องพอที่จะเพิ่มสินค้า / บริการที่จะสั่งซื้อ
+StockMustBeEnoughForShipment= ระดับหุ้นจะต้องพอที่จะเพิ่มสินค้า / บริการให้กับการจัดส่ง
+MovementLabel=ป้ายของการเคลื่อนไหว
+InventoryCode=การเคลื่อนไหวหรือรหัสสินค้าคงคลัง
+IsInPackage=เป็นแพคเกจที่มีอยู่
+ShowWarehouse=แสดงคลังสินค้า
+MovementCorrectStock=แก้ไขหุ้นสำหรับผลิตภัณฑ์% s
+MovementTransferStock=การโอนหุ้นของผลิตภัณฑ์% s เข้าไปในโกดังอีก
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=คลังสินค้าที่มาจะต้องกำหนดที่นี่เมื่อ "มากผลิตภัณฑ์" ที่อยู่ในโมดูล มันจะถูกใช้เพื่อแสดงรายการชจัดสรร / อนุกรมสามารถใช้ได้สำหรับสินค้าที่จำเป็นต้องใช้จำนวนมาก / ข้อมูลแบบอนุกรมสำหรับการเคลื่อนไหว หากคุณต้องการที่จะส่งสินค้าจากคลังสินค้าที่แตกต่างกันเพียงแค่ทำให้การจัดส่งเข้ามาในหลายขั้นตอน
+InventoryCodeShort=Inv. / Mov รหัส
+NoPendingReceptionOnSupplierOrder=ไม่มีการรับสัญญาณอยู่ระหว่างการพิจารณากำหนดจะเปิดเพื่อจัดจำหน่าย
+ThisSerialAlreadyExistWithDifferentDate=จำนวนมากนี้ / หมายเลขประจำเครื่อง <strong>(% s)</strong> อยู่แล้ว แต่ด้วยความแตกต่างกันหรือ eatby วัน sellby <strong>(ที่พบ% s แต่คุณป้อน% s)</strong>
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index e0552c064e8..80974ef312a 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-AddSupplier=Create a supplier
-SupplierRemoved=Supplier removed
-SuppliersInvoice=Suppliers invoice
-NewSupplier=New supplier
-History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
-OrderDate=Order date
-BuyingPrice=Buying price
-BuyingPriceMin=Minimum buying price
-BuyingPriceMinShort=Min buying price
-TotalBuyingPriceMin=Total of subproducts buying prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
-Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
-ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-AddCustomerOrder=Create customer order
-AddCustomerInvoice=Create customer invoice
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
+Suppliers=ซัพพลายเออร์
+AddSupplier=สร้างผู้จัดจำหน่าย
+SupplierRemoved=ผู้ผลิตลบออก
+SuppliersInvoice=ซัพพลายเออร์ใบแจ้งหนี้
+NewSupplier=ผู้จัดจำหน่ายใหม่
+History=ประวัติศาสตร์
+ListOfSuppliers=รายชื่อของซัพพลายเออร์
+ShowSupplier=แสดงผู้จัดจำหน่าย
+OrderDate=วันที่สั่งซื้อ
+BuyingPrice=ราคาที่ซื้อ
+BuyingPriceMin=ราคารับซื้อขั้นต่ำ
+BuyingPriceMinShort=นาทีราคาซื้อ
+TotalBuyingPriceMin=รวม subproducts ซื้อราคา
+SomeSubProductHaveNoPrices=บางผลิตภัณฑ์ย่อยได้ไม่มีราคาที่กำหนดไว้
+AddSupplierPrice=เพิ่มราคาผู้ผลิต
+ChangeSupplierPrice=การเปลี่ยนแปลงของราคาผู้ผลิต
+ErrorQtyTooLowForThisSupplier=ปริมาณต่ำเกินไปสำหรับผู้จัดหาสินค้านี้ไม่มีหรือราคาที่กำหนดไว้เกี่ยวกับผลิตภัณฑ์นี้สำหรับผู้จัดหาสินค้านี้
+ErrorSupplierCountryIsNotDefined=ประเทศผู้ผลิตนี้ไม่ได้ถูกกำหนด แก้ไขปัญหานี้เป็นครั้งแรก
+ProductHasAlreadyReferenceInThisSupplier=สินค้านี้มีอยู่แล้วในการอ้างอิงผู้จัดหาสินค้านี้
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=ผู้จัดจำหน่ายอ้างอิงนี้จะเชื่อมโยงกับการอ้างอิง:% s
+NoRecordedSuppliers=ซัพพลายเออร์ที่ไม่มีการบันทึกไว้
+SupplierPayment=การชำระเงินผู้ผลิต
+SuppliersArea=พื้นที่ซัพพลายเออร์
+RefSupplierShort=อ้าง ผู้จัดจำหน่าย
+Availability=ห้องว่าง
+ExportDataset_fournisseur_1=ผู้ผลิตรายการใบแจ้งหนี้และเส้นใบแจ้งหนี้
+ExportDataset_fournisseur_2=ผู้ผลิตใบแจ้งหนี้และการชำระเงิน
+ExportDataset_fournisseur_3=คำสั่งผู้ผลิตและสายการสั่งซื้อ
+ApproveThisOrder=อนุมัติคำสั่งนี้
+ConfirmApproveThisOrder=<b>คุณแน่ใจหรือว่าต้องการที่จะอนุมัติคำสั่งซื้อ% s?</b>
+DenyingThisOrder=ปฏิเสธคำสั่งนี้
+ConfirmDenyingThisOrder=<b>คุณแน่ใจหรือว่าต้องการที่จะปฏิเสธ% s</b> สั่งซื้อนี้?
+ConfirmCancelThisOrder=<b>คุณแน่ใจหรือว่าต้องการยกเลิก% s</b> สั่งซื้อนี้?
+AddCustomerOrder=สร้างคำสั่งของลูกค้า
+AddCustomerInvoice=สร้างใบแจ้งหนี้ลูกค้า
+AddSupplierOrder=เพื่อสร้างผู้จัดจำหน่าย
+AddSupplierInvoice=สร้างใบแจ้งหนี้จัดจำหน่าย
+ListOfSupplierProductForSupplier=<b>รายการของผลิตภัณฑ์และราคาสำหรับผู้จัดจำหน่าย% s</b>
+NoneOrBatchFileNeverRan=<b>ไม่มีหรือชุด% s</b> ไม่วิ่งไปเมื่อเร็ว ๆ นี้
+SentToSuppliers=ส่งไปยังซัพพลายเออร์
+ListOfSupplierOrders=รายชื่อผู้จัดจำหน่ายของการสั่งซื้อ
+MenuOrdersSupplierToBill=คำสั่งผู้ผลิตใบแจ้งหนี้
+NbDaysToDelivery=ความล่าช้าในการจัดส่งสินค้าในวันที่
+DescNbDaysToDelivery=ที่ใหญ่ที่สุดของการส่งมอบล่าช้าของผลิตภัณฑ์ที่ได้จากคำสั่งนี้
+UseDoubleApproval=ใช้การอนุมัติคู่ (ได้รับการอนุมัติที่สองสามารถทำได้โดยการใช้ใด ๆ กับการได้รับอนุญาตโดยเฉพาะ)
diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang
index 76b214abdb7..70b11197095 100644
--- a/htdocs/langs/th_TH/trips.lang
+++ b/htdocs/langs/th_TH/trips.lang
@@ -1,102 +1,102 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
-ListOfFees=List of fees
-NewTrip=New expense report
-CompanyVisited=Company/foundation visited
-Kilometers=Kilometers
-FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
-ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripSalarie=Informations user
-TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
-TF_OTHER=Other
-TF_TRANSPORTATION=Transportation
-TF_LUNCH=Lunch
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
-TF_TAXI=Taxi
+ExpenseReport=รายงานค่าใช้จ่าย
+ExpenseReports=รายงานค่าใช้จ่าย
+Trip=รายงานค่าใช้จ่าย
+Trips=รายงานค่าใช้จ่าย
+TripsAndExpenses=รายงานค่าใช้จ่าย
+TripsAndExpensesStatistics=รายงานค่าใช้จ่ายสถิติ
+TripCard=บัตรรายงานค่าใช้จ่าย
+AddTrip=สร้างรายงานค่าใช้จ่าย
+ListOfTrips=รายชื่อของรายงานค่าใช้จ่าย
+ListOfFees=รายการค่าใช้จ่าย
+NewTrip=รายงานค่าใช้จ่ายใหม่
+CompanyVisited=บริษัท / มูลนิธิเข้าเยี่ยมชม
+Kilometers=กิโลเมตร
+FeesKilometersOrAmout=จำนวนเงินหรือกิโลเมตร
+DeleteTrip=ลบรายงานค่าใช้จ่าย
+ConfirmDeleteTrip=คุณแน่ใจหรือว่าต้องการลบรายงานค่าใช้จ่ายนี้หรือไม่?
+ListTripsAndExpenses=รายชื่อของรายงานค่าใช้จ่าย
+ListToApprove=รอการอนุมัติ
+ExpensesArea=ค่าใช้จ่ายในพื้นที่รายงาน
+SearchATripAndExpense=ค้นหารายงานค่าใช้จ่าย
+ClassifyRefunded=จำแนก 'คืนเงิน'
+ExpenseReportWaitingForApproval=รายงานค่าใช้จ่ายใหม่ได้รับการส่งเพื่อขออนุมัติ
+ExpenseReportWaitingForApprovalMessage=รายงานค่าใช้จ่ายใหม่ได้รับการส่งและกำลังรอการอนุมัติ - ผู้ใช้:% s - ระยะเวลา:% s คลิกที่นี่เพื่อตรวจสอบ:% s
+TripId=รายงานค่าใช้จ่าย Id
+AnyOtherInThisListCanValidate=คนที่จะแจ้งให้สำหรับการตรวจสอบ
+TripSociete=ข้อมูล บริษัท
+TripSalarie=ผู้ใช้ข้อมูล
+TripNDF=ข้อมูลรายงานค่าใช้จ่าย
+DeleteLine=ลบเส้นของการรายงานค่าใช้จ่าย
+ConfirmDeleteLine=คุณแน่ใจหรือว่าต้องการลบบรรทัดนี้หรือไม่?
+PDFStandardExpenseReports=แม่แบบมาตรฐานในการสร้างเอกสาร PDF สำหรับรายงานค่าใช้จ่าย
+ExpenseReportLine=รายงานค่าใช้จ่ายสาย
+TF_OTHER=อื่น ๆ
+TF_TRANSPORTATION=การขนส่ง
+TF_LUNCH=อาหารกลางวัน
+TF_METRO=รถไฟฟ้าใต้ดิน
+TF_TRAIN=รถไฟ
+TF_BUS=รถบัส
+TF_CAR=รถ
+TF_PEAGE=โทร
+TF_ESSENCE=เชื้อเพลิง
+TF_HOTEL=โรงแรม
+TF_TAXI=แท็กซี่
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
-AddLine=Add a line
-AddLineMini=Add
+ErrorDoubleDeclaration=คุณได้ประกาศรายงานค่าใช้จ่ายอื่นเข้ามาในช่วงวันที่ที่คล้ายกัน
+AucuneNDF=ไม่มีรายงานค่าใช้จ่ายพบว่าเกณฑ์นี้
+AucuneLigne=มีรายงานค่าใช้จ่ายไม่มีการประกาศความเป็นส่วนตัว
+AddLine=เพิ่มบรรทัด
+AddLineMini=เพิ่ม
 
-Date_DEBUT=Period date start
-Date_FIN=Period date end
-ModePaiement=Payment mode
-Note=Note
-Project=Project
+Date_DEBUT=ระยะเวลาเริ่มต้นวันที่
+Date_FIN=ระยะเวลาสิ้นสุดวันที่
+ModePaiement=โหมดการชำระเงิน
+Note=บันทึก
+Project=โครงการ
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=ผู้รับผิดชอบในการอนุมัติ
+VALIDOR=อนุมัติโดย
+AUTHOR=บันทึกโดย
+AUTHORPAIEMENT=จ่ายโดย
+REFUSEUR=ปฏิเสธโดย
+CANCEL_USER=ลบโดย
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=เหตุผล
+MOTIF_CANCEL=เหตุผล
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=ปฏิเสธวัน
+DATE_SAVE=วันที่ตรวจสอบ
+DATE_VALIDE=วันที่ตรวจสอบ
+DATE_CANCEL=วันที่ยกเลิก
+DATE_PAIEMENT=วันที่ชำระเงิน
 
-TO_PAID=Pay
-BROUILLONNER=Reopen
-SendToValid=Sent to approve
-ModifyInfoGen=Edit
-ValidateAndSubmit=Validate and submit for approval
+TO_PAID=จ่ายเงิน
+BROUILLONNER=เปิดใหม่
+SendToValid=ส่งความเห็นชอบ
+ModifyInfoGen=แก้ไข
+ValidateAndSubmit=ตรวจสอบและส่งเพื่อขออนุมัติ
+ValidatedWaitingApproval=การตรวจสอบ (รอการอนุมัติ)
 
-NOT_VALIDATOR=You are not allowed to approve this expense report
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_VALIDATOR=คุณยังไม่ได้รับอนุญาตให้อนุมัติรายงานค่าใช้จ่ายนี้
+NOT_AUTHOR=คุณไม่ได้เป็นผู้เขียนรายงานค่าใช้จ่ายนี้ การดำเนินงานที่ยกเลิก
 
-RefuseTrip=Deny an expense report
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+RefuseTrip=ปฏิเสธรายงานค่าใช้จ่าย
+ConfirmRefuseTrip=คุณแน่ใจหรือว่าต้องการที่จะปฏิเสธรายงานค่าใช้จ่ายนี้หรือไม่?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=อนุมัติรายงานค่าใช้จ่าย
+ConfirmValideTrip=คุณแน่ใจหรือว่าต้องการที่จะอนุมัติรายงานค่าใช้จ่ายนี้หรือไม่?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=จ่ายรายงานค่าใช้จ่าย
+ConfirmPaidTrip=คุณแน่ใจหรือว่าต้องการที่จะเปลี่ยนสถานะของรายงานค่าใช้จ่ายนี้เพื่อ "ชำระเงิน"?
 
-CancelTrip=Cancel an expense report
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+CancelTrip=ยกเลิกรายงานค่าใช้จ่าย
+ConfirmCancelTrip=คุณแน่ใจหรือว่าต้องการที่จะยกเลิกการรายงานค่าใช้จ่ายนี้หรือไม่?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=ย้ายกลับไปรายงานค่าใช้จ่ายสถานะ "ร่าง"
+ConfirmBrouillonnerTrip=คุณแน่ใจหรือว่าต้องการที่จะย้ายรายงานค่าใช้จ่ายนี้สถานะ "ร่าง"?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=ตรวจสอบรายงานค่าใช้จ่าย
+ConfirmSaveTrip=คุณแน่ใจหรือว่าต้องการตรวจสอบรายงานค่าใช้จ่ายนี้หรือไม่?
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=ไม่มีรายงานค่าใช้จ่ายในการส่งออกในช่วงเวลานี้
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index baf209f9d1c..3bc48a8d3d3 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -1,122 +1,123 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=User card
-ContactCard=Contact card
-GroupCard=Group card
-NoContactCard=No card among contacts
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
-ReinitPassword=Regenerate password
-PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for Dolibarr
-AvailableRights=Available permissions
-OwnedRights=Owned permissions
-GroupRights=Group permissions
-UserRights=User permissions
-UserGUISetup=User display setup
-DisableUser=Disable
-DisableAUser=Disable a user
-DeleteUser=Delete
-DeleteAUser=Delete a user
-DisableGroup=Disable
-DisableAGroup=Disable a group
-EnableAUser=Enable a user
-EnableAGroup=Enable a group
-DeleteGroup=Delete
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b> ?
-ConfirmDisableGroup=Are you sure you want to disable group <b>%s</b> ?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b> ?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b> ?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b> ?
-ConfirmEnableGroup=Are you sure you want to enable group <b>%s</b> ?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b> ?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b> ?
-NewUser=New user
-CreateUser=Create user
-SearchAGroup=Search a group
-SearchAUser=Search a user
-LoginNotDefined=Login is not defined.
-NameNotDefined=Name is not defined.
-ListOfUsers=List of users
-Administrator=Administrator
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
-AdministratorDesc=Administrator's entity
-DefaultRights=Default permissions
-DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
-DolibarrUsers=Dolibarr users
-LastName=Name
-FirstName=First name
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-RemoveFromGroup=Remove from group
-PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
-PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
-MenuUsersAndGroups=Users & Groups
-LastGroupsCreated=Last %s created groups
-LastUsersCreated=Last %s users created
-ShowGroup=Show group
-ShowUser=Show user
-NonAffectedUsers=Non assigned users
-UserModified=User modified successfully
-PhotoFile=Photo file
-UserWithDolibarrAccess=User with Dolibarr access
-ListOfUsersInGroup=List of users in this group
-ListOfGroupsForUser=List of groups for this user
-UsersToAdd=Users to add to this group
-GroupsToAdd=Groups to add to this user
-NoLogin=No login
-LinkToCompanyContact=Link to third party / contact
-LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to Dolibarr user
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
-CreateDolibarrLogin=Create a user
-CreateDolibarrThirdParty=Create a third party
-LoginAccountDisable=Account disabled, put a new login to activate it.
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
-LoginAccountDisableInLdap=Account disabled in the domain.
-UsePersonalValue=Use personal value
-GuiLanguage=Interface language
-InternalUser=Internal user
-MyInformations=My data
-ExportDataset_user_1=Dolibarr's users and properties
-DomainUser=Domain user %s
-Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/foundation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
-PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
-Inherited=Inherited
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
-IdPhoneCaller=Id phone caller
-UserLogged=User %s login
-UserLogoff=User %s logout
-NewUserCreated=User %s created
-NewUserPassword=Password change for %s
-EventUserModified=User %s modified
-UserDisabled=User %s disabled
-UserEnabled=User %s activated
-UserDeleted=User %s removed
-NewGroupCreated=Group %s created
-GroupModified=Group %s modified
-GroupDeleted=Group %s removed
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ?
-LoginToCreate=Login to create
-NameToCreate=Name of third party to create
-YourRole=Your roles
-YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=Nb of users
-DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
-OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
+HRMArea=พื้นที่การบริหารทรัพยากรมนุษย์
+UserCard=ผู้ใช้บัตร
+ContactCard=บัตรรายชื่อ
+GroupCard=การ์ดกลุ่ม
+NoContactCard=บัตรในหมู่ผู้ติดต่อไม่มี
+Permission=การอนุญาต
+Permissions=สิทธิ์
+EditPassword=แก้ไขรหัสผ่าน
+SendNewPassword=สร้างรหัสผ่านใหม่และส่งรหัสผ่าน
+ReinitPassword=สร้างรหัสผ่านใหม่
+PasswordChangedTo=เปลี่ยนรหัสผ่านในการ:% s
+SubjectNewPassword=รหัสผ่านใหม่ของคุณสำหรับ Dolibarr
+AvailableRights=สิทธิ์ที่มีจำหน่าย
+OwnedRights=สิทธิ์ในการเป็นเจ้าของ
+GroupRights=สิทธิ์ของกลุ่ม
+UserRights=สิทธิ์ของผู้ใช้
+UserGUISetup=หน้าจอที่ใช้ติดตั้ง
+DisableUser=ปิดการใช้งาน
+DisableAUser=ปิดการใช้งานของผู้ใช้
+DeleteUser=ลบ
+DeleteAUser=ลบผู้ใช้
+DisableGroup=ปิดการใช้งาน
+DisableAGroup=ปิดการใช้งานกลุ่ม
+EnableAUser=เปิดการใช้งานของผู้ใช้
+EnableAGroup=เปิดใช้งานกลุ่ม
+DeleteGroup=ลบ
+DeleteAGroup=ลบกลุ่ม
+ConfirmDisableUser=<b>คุณแน่ใจหรือว่าต้องการที่จะปิดการใช้งานของผู้ใช้% s?</b>
+ConfirmDisableGroup=<b>คุณแน่ใจหรือว่าต้องการที่จะปิดการใช้งานกลุ่ม% s?</b>
+ConfirmDeleteUser=<b>คุณแน่ใจหรือว่าต้องการลบผู้ใช้% s?</b>
+ConfirmDeleteGroup=<b>คุณแน่ใจหรือว่าต้องการลบกลุ่ม% s?</b>
+ConfirmEnableUser=<b>คุณแน่ใจหรือว่าต้องการที่จะช่วยให้ผู้ใช้% s?</b>
+ConfirmEnableGroup=<b>คุณแน่ใจหรือว่าต้องการเปิดใช้งานกลุ่ม% s?</b>
+ConfirmReinitPassword=<b>คุณแน่ใจหรือว่าต้องการที่จะสร้างรหัสผ่านใหม่สำหรับผู้ใช้% s?</b>
+ConfirmSendNewPassword=<b>คุณแน่ใจหรือว่าต้องการที่จะสร้างและส่งรหัสผ่านใหม่สำหรับผู้ใช้% s?</b>
+NewUser=ผู้ใช้ใหม่
+CreateUser=สร้างผู้ใช้
+SearchAGroup=ค้นหากลุ่ม
+SearchAUser=ค้นหาผู้ใช้
+LoginNotDefined=เข้าสู่ระบบไม่ได้กำหนดไว้
+NameNotDefined=ชื่อไม่ได้กำหนดไว้
+ListOfUsers=รายการของผู้ใช้
+Administrator=ผู้บริหาร
+SuperAdministrator=ผู้ดูแลระบบซูเปอร์
+SuperAdministratorDesc=ผู้ดูแลระบบทั่วโลก
+AdministratorDesc=นิติบุคคลของผู้ดูแลระบบ
+DefaultRights=สิทธิ์เริ่มต้น
+DefaultRightsDesc=<u>ที่นี่กำหนดสิทธิ์เริ่มต้นที่จะได้รับโดยอัตโนมัติไปยังผู้ใช้ที่สร้างใหม่</u> (ไปในบัตรผู้ใช้สามารถเปลี่ยนได้รับอนุญาตจากผู้ใช้ที่มีอยู่)
+DolibarrUsers=ผู้ใช้ Dolibarr
+LastName=ชื่อ
+FirstName=ชื่อแรก
+ListOfGroups=รายชื่อของกลุ่ม
+NewGroup=กลุ่มใหม่
+CreateGroup=สร้างกลุ่ม
+RemoveFromGroup=ลบออกจากกลุ่ม
+PasswordChangedAndSentTo=<b>เปลี่ยนรหัสผ่านและส่งไปยัง%</b> s
+PasswordChangeRequestSent=<b>ขอเปลี่ยนรหัสผ่านสำหรับ% s ส่งไปยัง%</b> s
+MenuUsersAndGroups=ผู้ใช้และกลุ่ม
+MenuMyUserCard=บัตรผู้ใช้ของฉัน
+LastGroupsCreated=% s ล่าสุดสร้างกลุ่ม
+LastUsersCreated=ผู้ใช้% s ล่าสุดที่สร้างขึ้น
+ShowGroup=แสดงกลุ่ม
+ShowUser=แสดงผู้ใช้
+NonAffectedUsers=ผู้ใช้ที่ได้รับมอบหมายไม่
+UserModified=ผู้ประสบความสำเร็จในการปรับเปลี่ยน
+PhotoFile=ไฟล์ภาพ
+UserWithDolibarrAccess=ผู้ใช้ที่มีการเข้าถึง Dolibarr
+ListOfUsersInGroup=รายการของผู้ใช้ในกลุ่มนี้
+ListOfGroupsForUser=รายชื่อของกลุ่มสำหรับผู้ใช้นี้
+UsersToAdd=ผู้ใช้สามารถเพิ่มไปยังกลุ่มนี้
+GroupsToAdd=กลุ่มที่จะเพิ่มผู้ใช้รายนี้
+NoLogin=เข้าสู่ระบบไม่
+LinkToCompanyContact=เชื่อมโยงไปยังบุคคลที่สาม / ติดต่อ
+LinkedToDolibarrMember=เชื่อมโยงไปยังสมาชิก
+LinkedToDolibarrUser=เชื่อมโยงไปยังผู้ใช้ Dolibarr
+LinkedToDolibarrThirdParty=เชื่อมโยงไปยังบุคคลที่สาม Dolibarr
+CreateDolibarrLogin=สร้างผู้ใช้
+CreateDolibarrThirdParty=สร้างของบุคคลที่สาม
+LoginAccountDisable=บัญชีผู้พิการ, นำเข้าสู่ระบบใหม่ที่จะเปิดใช้งานได้
+LoginAccountDisableInDolibarr=บัญชีปิดใช้งานใน Dolibarr
+LoginAccountDisableInLdap=บัญชีปิดการใช้งานในโดเมน
+UsePersonalValue=ใช้ค่าส่วนบุคคล
+GuiLanguage=อินเตอร์เฟซภาษา
+InternalUser=ผู้ใช้งานภายใน
+MyInformations=ข้อมูลของฉัน
+ExportDataset_user_1=ผู้ใช้ Dolibarr และคุณสมบัติ
+DomainUser=โดเมนของผู้ใช้% s
+Reactivate=ฟื้นฟู
+CreateInternalUserDesc=รูปแบบนี้จะช่วยให้คุณสามารถสร้างผู้ใช้ภายใน บริษัท ของคุณ / มูลนิธิ ในการสร้างผู้ใช้ภายนอก (ลูกค้าผู้จัดจำหน่าย, ... ) ใช้ปุ่ม 'สร้างผู้ใช้ Dolibarr จากบัตรรายชื่อของบุคคลที่สาม
+InternalExternalDesc=<b>ผู้ใช้งานภายในเป็นผู้ใช้ที่เป็นส่วนหนึ่งของ</b> บริษัท ของคุณ / มูลนิธิ <br> <b>ผู้ใช้ภายนอกเป็นลูกค้าซัพพลายเออร์หรืออื่น</b> ๆ <br><br> ในทั้งสองกรณีสิทธิ์กำหนดสิทธิใน Dolibarr ผู้ใช้ภายนอกยังสามารถมีผู้จัดการเมนูที่แตกต่างจากผู้ใช้ภายใน (ดูหน้าแรก - การติดตั้ง - จอแสดงผล)
+PermissionInheritedFromAGroup=ได้รับอนุญาตเพราะรับมาจากหนึ่งในกลุ่มของผู้ใช้
+Inherited=ที่สืบทอด
+UserWillBeInternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้งานภายใน (เพราะไม่เชื่อมโยงกับบุคคลที่สามโดยเฉพาะ)
+UserWillBeExternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้ภายนอก (เพราะเชื่อมโยงกับบุคคลที่สามโดยเฉพาะ)
+IdPhoneCaller=id โทรโทรศัพท์
+UserLogged=ผู้ใช้% s เข้าสู่ระบบ
+UserLogoff=ผู้ใช้% s ออกจากระบบ
+NewUserCreated=% s ผู้ใช้สร้างขึ้น
+NewUserPassword=เปลี่ยนรหัสผ่านสำหรับ% s
+EventUserModified=% s ผู้ใช้ปรับเปลี่ยน
+UserDisabled=ผู้ใช้% s พิการ
+UserEnabled=% s ผู้ใช้เปิดใช้งาน
+UserDeleted=ผู้ใช้% s ลบออก
+NewGroupCreated=s% กลุ่มที่สร้างขึ้น
+GroupModified=กลุ่ม% s การแก้ไข
+GroupDeleted=กลุ่ม% s ลบออก
+ConfirmCreateContact=คุณแน่ใจว่าคุณต้องการที่จะสร้างบัญชี Dolibarr ติดต่อนี้หรือไม่?
+ConfirmCreateLogin=คุณแน่ใจว่าคุณต้องการที่จะสร้างบัญชี Dolibarr สมาชิกนี้?
+ConfirmCreateThirdParty=คุณแน่ใจว่าคุณต้องการที่จะสร้างบุคคลที่สามของสมาชิกนี้?
+LoginToCreate=เข้าสู่ระบบที่จะสร้าง
+NameToCreate=ชื่อของบุคคลที่สามในการสร้าง
+YourRole=บทบาทของคุณ
+YourQuotaOfUsersIsReached=โควต้าของคุณของผู้ใช้ที่ใช้งานถึง!
+NbOfUsers=nb ของผู้ใช้
+DontDowngradeSuperAdmin=เพียง superadmin สามารถปรับลด superadmin
+HierarchicalResponsible=ผู้ดูแล
+HierarchicView=มุมมองลำดับชั้น
+UseTypeFieldToChange=ใช้ประเภทเพื่อเปลี่ยน
+OpenIDURL=URL OpenID
+LoginUsingOpenID=ใช้ OpenID เข้าสู่ระบบ
+WeeklyHours=สัปดาห์ชั่วโมง
+ColorUser=สีของผู้ใช้
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index c36ffbf025a..9b51737611b 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -1,97 +1,102 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-StandingOrdersArea=Standing orders area
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
-StandingOrderToProcess=To process
-StandingOrderProcessed=Processed
-Withdrawals=Withdrawals
-Withdrawal=Withdrawal
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-WithdrawalReceiptShort=Receipt
-LastWithdrawalReceipts=Last %s withdrawal receipts
-WithdrawedBills=Withdrawn invoices
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-CustomersStandingOrders=Customer standing orders
-CustomerStandingOrder=Customer standing order
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
-AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
-NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
-ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Last %s withdrawing receipts
-MakeWithdrawRequest=Make a withdraw request
-ThirdPartyBankCode=Third party bank code
-ThirdPartyDeskCode=Third party desk code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
-ClassCredited=Classify credited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-TransMetod=Transmission method
-Send=Send
-Lines=Lines
-StandingOrderReject=Issue a rejection
-WithdrawalRefused=Withdrawal refused
-WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
-RefusedData=Date of rejection
-RefusedReason=Reason for rejection
-RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-Status=Status
-StatusUnknown=Unknown
-StatusWaiting=Waiting
-StatusTrans=Sent
-StatusCredited=Credited
-StatusRefused=Refused
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
-StatusMotif4=Customer Order
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
-CreateAll=Withdraw all
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyEmision=Withdrawal Emission
-NotifyCredit=Withdrawal Credit
-NumeroNationalEmetter=National Transmitter Number
-PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw
-WithBankUsingRIB=For bank accounts using RIB
-WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive withdraws
-CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
-StatisticsByLineStatus=Statistics by status of lines
+StandingOrdersArea=พื้นที่ยืนคำสั่งซื้อ
+CustomersStandingOrdersArea=ลูกค้าที่ยืนอยู่ในพื้นที่การสั่งซื้อ
+StandingOrders=ยืนคำสั่งซื้อ
+StandingOrder=ยืนคำสั่งซื้อ
+NewStandingOrder=เพื่อยืนใหม่
+StandingOrderToProcess=ในการประมวลผล
+StandingOrderProcessed=การประมวลผล
+Withdrawals=การถอนเงิน
+Withdrawal=การถอนตัว
+WithdrawalsReceipts=ใบเสร็จรับเงินการถอนเงิน
+WithdrawalReceipt=ใบเสร็จรับเงินการถอนเงิน
+WithdrawalReceiptShort=ใบเสร็จรับเงิน
+LastWithdrawalReceipts=% ล่าสุดของใบเสร็จรับเงินการเบิกถอน
+WithdrawedBills=ใบแจ้งหนี้การถอดถอน
+WithdrawalsLines=การถอนเส้น
+RequestStandingOrderToTreat=ขอยืนคำสั่งในการประมวลผล
+RequestStandingOrderTreated=ขอยืนสั่งการประมวลผล
+NotPossibleForThisStatusOfWithdrawReceiptORLine=ยังไม่ได้เป็นไปได้ สถานะถอนจะต้องตั้งค่า 'เครดิต' ก่อนที่จะประกาศปฏิเสธสายที่เฉพาะเจาะจง
+CustomersStandingOrders=ยืนสั่งของลูกค้า
+CustomerStandingOrder=ลูกค้าเพื่อยืน
+NbOfInvoiceToWithdraw=nb ของใบแจ้งหนี้ถอนคำขอ
+NbOfInvoiceToWithdrawWithInfo=nb ของใบแจ้งหนี้ถอนคำขอสำหรับลูกค้าที่มีข้อมูลบัญชีธนาคารที่กำหนดไว้
+InvoiceWaitingWithdraw=ใบแจ้งหนี้รอให้ถอนตัว
+AmountToWithdraw=จำนวนเงินที่จะถอนตัว
+WithdrawsRefused=ปฏิเสธที่จะถอนตัวออก
+NoInvoiceToWithdraw=ไม่มีใบแจ้งหนี้ลูกค้าในโหมดการชำระเงิน "ถอนตัว" กำลังรอ ไปที่แท็บ 'ถอน' บนการ์ดใบแจ้งหนี้ที่จะทำให้การร้องขอ
+ResponsibleUser=ผู้ใช้ที่มีความรับผิดชอบ
+WithdrawalsSetup=การถอนการติดตั้ง
+WithdrawStatistics=ถอนสถิติ
+WithdrawRejectStatistics=ถอนสถิติปฏิเสธของ
+LastWithdrawalReceipt=% s ล่าสุดถอนใบเสร็จรับเงิน
+MakeWithdrawRequest=จะขอถอนตัว
+ThirdPartyBankCode=รหัสธนาคารของบุคคลที่สาม
+ThirdPartyDeskCode=รหัสแผนกบุคคลที่สาม
+NoInvoiceCouldBeWithdrawed=ใบแจ้งหนี้ไม่มี withdrawed กับความสำเร็จ ตรวจสอบใบแจ้งหนี้ที่อยู่ใน บริษัท ที่มีบ้านที่ถูกต้อง
+ClassCredited=จำแนกเครดิต
+ClassCreditedConfirm=คุณแน่ใจว่าคุณต้องการที่จะจำแนกได้รับการถอนนี้เป็นเครดิตในบัญชีธนาคารของคุณ?
+TransData=วันที่ส่ง
+TransMetod=วิธีการส่ง
+Send=ส่ง
+Lines=เส้น
+StandingOrderReject=ออกปฏิเสธ
+WithdrawalRefused=ปฏิเสธการถอนเงิน
+WithdrawalRefusedConfirm=คุณแน่ใจหรือว่าต้องการที่จะเข้าสู่การปฏิเสธการถอนสังคม
+RefusedData=วันที่ของการปฏิเสธ
+RefusedReason=เหตุผลในการปฏิเสธ
+RefusedInvoicing=การเรียกเก็บเงินการปฏิเสธ
+NoInvoiceRefused=ไม่คิดค่าบริการการปฏิเสธ
+InvoiceRefused=ใบแจ้งหนี้ไม่ยอม (ชาร์จปฏิเสธให้กับลูกค้า)
+Status=สถานะ
+StatusUnknown=ไม่ทราบ
+StatusWaiting=ที่รอ
+StatusTrans=ส่ง
+StatusCredited=เครดิต
+StatusRefused=ปฏิเสธ
+StatusMotif0=ยังไม่ระบุ
+StatusMotif1=เงินไม่เพียงพอ
+StatusMotif2=ขอเข้าร่วมแข่งขัน
+StatusMotif3=ไม่มีการถอนคำสั่ง
+StatusMotif4=สั่งซื้อของลูกค้า
+StatusMotif5=RIB ใช้ไม่ได้
+StatusMotif6=บัญชีโดยไม่สมดุล
+StatusMotif7=การตัดสินใจการพิจารณาคดี
+StatusMotif8=เหตุผลอื่น ๆ
+CreateAll=ถอนทั้งหมด
+CreateGuichet=สำนักงานเท่านั้น
+CreateBanque=เฉพาะธนาคาร
+OrderWaiting=กำลังรอการรักษา
+NotifyTransmision=การถอนตัวส่ง
+NotifyEmision=การถอนการปล่อย
+NotifyCredit=การถอนเครดิต
+NumeroNationalEmetter=จำนวนเครื่องส่งสัญญาณแห่งชาติ
+PleaseSelectCustomerBankBANToWithdraw=เลือกข้อมูลเกี่ยวกับบัญชีธนาคารของลูกค้าที่จะถอนตัว
+WithBankUsingRIB=สำหรับบัญชีเงินฝากธนาคารโดยใช้ RIB
+WithBankUsingBANBIC=สำหรับบัญชีเงินฝากธนาคารโดยใช้ IBAN / BIC / SWIFT
+BankToReceiveWithdraw=บัญชีธนาคารที่จะได้รับถอนตัว
+CreditDate=เกี่ยวกับบัตรเครดิต
+WithdrawalFileNotCapable=ไม่สามารถสร้างไฟล์ใบเสร็จรับเงินการถอนเงินสำหรับประเทศ% s ของคุณ (ประเทศของคุณไม่ได้รับการสนับสนุน)
+ShowWithdraw=แสดงถอน
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=แต่ถ้าใบแจ้งหนี้ที่มีอย่างน้อยหนึ่งการชำระเงินการถอนเงินยังไม่ได้ดำเนินการก็จะไม่ได้รับการกำหนดให้เป็นจ่ายเพื่อให้การจัดการถอนก่อน
+DoStandingOrdersBeforePayments=แท็บนี้จะช่วยให้คุณสามารถที่จะขอคำสั่งยืน เมื่อเสร็จแล้วให้ไปที่เมนู Bank-> การถอนตัวในการจัดการคำสั่งยืน เมื่อยืนอยู่เพื่อที่จะปิดการชำระเงินในใบแจ้งหนี้จะถูกบันทึกไว้โดยอัตโนมัติและใบแจ้งหนี้ที่เหลือถ้าปิดจะจ่ายเป็นโมฆะ
+WithdrawalFile=ไฟล์ถอนเงิน
+SetToStatusSent=ตั้งสถานะ "แฟ้มส่ง"
+ThisWillAlsoAddPaymentOnInvoice=นอกจากนี้ยังจะใช้การชำระเงินให้กับใบแจ้งหนี้และจะจัดให้เป็น "การชำระเงิน"
+StatisticsByLineStatus=สถิติตามสถานะของสาย
+RUM=รัม
+RUMWillBeGenerated=จำนวนรัมจะถูกสร้างขึ้นครั้งเดียวข้อมูลบัญชีธนาคารจะถูกบันทึกไว้
+WithdrawMode=ถอนโหมด (frst หรือเกิดขึ้นอีก)
+WithdrawRequestAmount=จำนวนเงินที่ถอนคำขอ:
+WithdrawRequestErrorNilAmount=ไม่สามารถสร้างถอนการร้องขอสำหรับจำนวนเงินที่ศูนย์
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoFoot=This is an automated message sent by Dolibarr
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
-ModeWarning=Option for real mode was not set, we stop after this simulation
+InfoCreditSubject=การชำระเงินเพื่อการยืน% s โดยธนาคาร
+InfoCreditMessage=เพื่อยืน% s ได้รับการชำระเงินจากธนาคาร <br> ข้อมูลการชำระเงิน:% s
+InfoTransSubject=การส่งคำสั่งยืน% s ไปที่ธนาคาร
+InfoTransMessage=เพื่อยืน% s ได้ถูกส่งไปยังธนาคารโดย% s% s <br><br>
+InfoTransData=จำนวนเงิน:% s <br> วิธีการ:% s <br> วันที่:% s
+InfoFoot=นี่คือข้อความที่ถูกส่งโดยอัตโนมัติ Dolibarr
+InfoRejectSubject=เพื่อยืนปฏิเสธ
+InfoRejectMessage=สวัสดี <br><br> เพื่อยืนใบแจ้งหนี้% s ที่เกี่ยวข้องกับ บริษัท % s ที่มีปริมาณของ% s ได้รับการปฏิเสธจากธนาคาร <br><br> - <br> % s
+ModeWarning=ตัวเลือกสำหรับโหมดจริงไม่ได้ตั้งค่าเราหยุดหลังจากจำลองนี้
diff --git a/htdocs/langs/th_TH/workflow.lang b/htdocs/langs/th_TH/workflow.lang
index 17c8dd3aafa..517d4e9655e 100644
--- a/htdocs/langs/th_TH/workflow.lang
+++ b/htdocs/langs/th_TH/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
-WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+WorkflowSetup=เวิร์กโฟลว์การติดตั้งโมดูล
+WorkflowDesc=โมดูลนี้ถูกออกแบบมาเพื่อปรับเปลี่ยนพฤติกรรมของการกระทำโดยอัตโนมัติลงในใบสมัคร โดยค่าเริ่มต้นขั้นตอนการทำงานจะเปิด (คุณสามารถทำสิ่งที่อยู่ในลำดับที่คุณต้องการ) คุณสามารถเปิดใช้การกระทำโดยอัตโนมัติคุณมีความสนใจใน
+ThereIsNoWorkflowToModify=ไม่มีการปรับเปลี่ยนขั้นตอนการทำงานที่มีอยู่กับโมดูลเปิดใช้งานคือ
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=โดยอัตโนมัติสร้างคำสั่งของลูกค้าหลังจากที่ข้อเสนอในเชิงพาณิชย์มีการลงนาม
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically สร้างใบแจ้งหนี้ลูกค้าหลังจากที่ข้อเสนอในเชิงพาณิชย์มีการลงนาม
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically สร้างใบแจ้งหนี้ลูกค้าหลังจากที่สัญญาจะถูกตรวจสอบ
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically สร้างใบแจ้งหนี้ลูกค้าหลังจากที่สั่งซื้อของลูกค้าจะถูกปิด
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=จำแนกข้อเสนอแหล่งที่มาเชื่อมโยงกับการเรียกเก็บเงินเมื่อสั่งซื้อของลูกค้ามีการตั้งค่าที่จะจ่ายเงิน
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=จำแนกแหล่งที่มาสั่งซื้อของลูกค้าที่เชื่อมโยง (s) เพื่อเรียกเก็บเงินเมื่อใบแจ้งหนี้ลูกค้าถูกตั้งค่าให้จ่าย
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=จำแนกแหล่งที่มาสั่งซื้อของลูกค้าที่เชื่อมโยง (s) เพื่อเรียกเก็บเงินเมื่อใบแจ้งหนี้ของลูกค้าจะถูกตรวจสอบ
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index c44f2e423b1..ea96949d2dd 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Dışaaktarma dosyası için sütun ayırıcısı
+ACCOUNTING_EXPORT_DATE=Dışaaktarma dosyası için tarih biçimi
+ACCOUNTING_EXPORT_PIECE=Dışaaktarılacak parça sayısı ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Genel hesapla mı dışaaktarılsın?
+ACCOUNTING_EXPORT_LABEL=Etiket dışaaktarılsın mı?
+ACCOUNTING_EXPORT_AMOUNT=Tutar dışaaktarılsın mı?
+ACCOUNTING_EXPORT_DEVISE=Aygıt dışaaktarılsın mı?
 
 Accounting=Muhasebe
 Globalparameters=Genel parametreler
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Üçüncü parti hesaplarının uzunluğu
 
 ACCOUNTING_SELL_JOURNAL=Satış günlüğü
 ACCOUNTING_PURCHASE_JOURNAL=Alış günlüğü
-ACCOUNTING_BANK_JOURNAL=Banka günlüğü
-ACCOUNTING_CASH_JOURNAL=Kasa günlüğü
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Çeşitli günlük
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Rapor günlüğü dışaaktarılsın mı?
 ACCOUNTING_SOCIAL_JOURNAL=Sosyal günlük
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Transfer hesabı
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 0ecef063e94..a6213fcbe39 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Kullanıcı menüsü
 LangFile=.lang dosyası
 System=Sistem
 SystemInfo=Sistem bilgileri
-SystemTools=Sistem araçları
 SystemToolsArea=Sistem araçları alanı
 SystemToolsAreaDesc=Bu alan yönetimsel özellikler sağlar. Aradığınız özelliği seçmek için menüyü kullanın.
 Purge=Temizleme
@@ -232,8 +231,8 @@ Security=Güvenlik
 Passwords=Parolalar
 DoNotStoreClearPassword=Parolaları veritabanında saklamayın silin, yalnızca şifreli değerleri saklayın (Etkinleştirme önerilir)
 MainDbPasswordFileConfEncrypted=Veritabanı parolaları conf.php de şifrelendirilmiştir. (Etkinleştirme önerilir)
-InstrucToEncodePass=Parolaları <b>conf.php</b> dosyasına şifrelendirilmek için <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="şifrelendi:%s"</b> satırını değiştirin
-InstrucToClearPass=Parolaları <b>conf.php</b> dosyasına çözmek için <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="şifrelendi:%s"</b> satırını değiştirin
+InstrucToEncodePass=Parolayı <b>conf.php</b> dosyasına kodlamak için <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b> satırını değiştirin
+InstrucToClearPass=Parolayı <b>conf.php</b> dosyasına kodlamak (temiz) için <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b> satırını değiştirin
 ProtectAndEncryptPdfFiles=Oluşturulan pdf dosyalarının korunması (Etkinleştirme önerilmez) toplu pdf oluşumunu bozar
 ProtectAndEncryptPdfFilesDesc=Bir PDF belgesinin korunması dosyanın herhangi bir PDF tarayıcısında okunmasını ve yazdırılmasını sağlar. Bundan düzenleme ve kopyalama olanaksızdır. Bu özelliği kulanmanın çalışmayan genel kümülatif pdf oluşturduğuna dikkat edin (ödenmemiş faturalar gibi).
 Feature=Özellik
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Bu ayarlama işlemidir:
 ThisIsAlternativeProcessToFollow=Bu bir alternatif işlem ayarıdır:
 StepNb=Adım %s
 FindPackageFromWebSite=İstediğiniz özelliği sağlayan bir paket bulun (örneğin; resmi web sitesinden %s).
-DownloadPackageFromWebSite=%s Paketini indir.
-UnpackPackageInDolibarrRoot=Paket dosyasını dış modüllere ayrılmış dizin içine aç: <b>%s</b>
+DownloadPackageFromWebSite=Paketi indir (örneğin resmi web sitesinden %s).
+UnpackPackageInDolibarrRoot=Dosya paketini dış modüllere adanmış Dolibarr sunucusu dizinin içine ayıklayın: <b>%s</b>
 SetupIsReadyForUse=Kurma işlemi bitmiştir ve Dolibarr bu yeni bileşeni ile kullanıma hazırdır.
 NotExistsDirect=Alternatif kök dizin tanımlanmamış.<br>
 InfDirAlt=Sürüm 3 ten beri bir alternatif kök dizin tanımlanabiliyor. Bu sizin bir miktar boşluk, eklentiler ve özel şablonlar depolamanızı sağlar.<br>Yalnızca Dolibarr kökünde bir dizin oluşturun (örn. özel).<br>
 InfDirExample=<br>Sonra bunu conf.php dosyasında belirtin<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Bu satırlar "#" karakteri ile yorumlanır, yorumu kaldırmak için sadece bu karakteri kaldırın.
-YouCanSubmitFile=Modül seç:
+YouCanSubmitFile=Bu adımda paketi göndermek için kullanacağınız araç: Modül dosyasını seç
 CurrentVersion=Dolibarr geçerli sürümü
 CallUpdatePage=Veritabanı yapısını ve verileri güncelleyen sayfaya git: %s.
 LastStableVersion=Son kararlı sürüm
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parametre listesi bir tablodan gelir<br>Sözdizimi :
 ExtrafieldParamHelpchkbxlst=Parametre listesi bir tablodan gelir<br>Sözdizimi : table_name:label_field:id_field::filter<br>Örnek: c_typent:libelle:id::filter<br><br>süzgeç yalnızca etkin değeri gösteren (eg active=1) basit bir test olabilir <br> daha çok alanda süzecekseniz bu söz dizimini kullanın extra.fieldcode=... (burada kod ek alanın kodudur)<br><br>Başkasına dayalı listeyi almak için :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Bazı ülkelerde her fatura satırına 2 ya da 3 tane vergi uygulanır. Böyle bir durum varsa, ikinci ve üçüncü vergi türünü ve oranını seçin. Olası türler:<br>1 : ürün ve hizmetlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv siz olarak hesaplanır))<br>2 : ürün ve hizmetlere kdv dahil olarak hesaplanan yerel vergi (yerel vergi tutar + ana vergi üzerinden hesaplanır)<br>3 : ürünlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv hariç hesaplanır))<br>4 : yerel vergi ürünlerde kdv dahil uygulanır (kdv tutar + ana kdv üzerinden hesaplanır)<br>5 : yerel vergi ürünlerde kdv siz olarak uygulanır (yerel vergi tutar üzerinden kdv siz olarak hesaplanır)<br>6 : yerel vergi hizmetlere kdv dahil uygulanır (yeel vergi tutar + vergi üzerinden hesaplanır)
+LocalTaxDesc=Bazı ülkelerde her fatura satırına 2 ya da 3 tane vergi uygulanır. Böyle bir durum varsa, ikinci ve üçüncü vergi türünü ve oranını seçin. Olası türler:<br>1 : ürün ve hizmetlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv siz olarak hesaplanır))&lt;br>2 : ürün ve hizmetlere kdv dahil olarak hesaplanan yerel vergi (yerel vergi tutar + ana vergi üzerinden hesaplanır)<br>3 : ürünlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv hariç hesaplanır)<br>4 : yerel vergi ürünlerde kdv dahil uygulanır (kdv tutar + ana kdv üzerinden hesaplanır)<br>5 : yerel vergi ürünlerde kdv siz olarak uygulanır (yerel vergi tutar üzerinden kdv siz olarak hesaplanır)<br>6 : yerel vergi hizmetlere kdv dahil uygulanır (yeel vergi tutar + vergi üzerinden hesaplanır)
 SMS=SMS
 LinkToTestClickToDial=Kullanıcı <strong>%s</strong> için ClickTodial url denemesi yapmak üzere gösterilecek bağlantıyı aramak için bir telefon numarası gir
 RefreshPhoneLink=Bağlantıyı yenile
@@ -430,8 +429,8 @@ Module20Name=Teklifler
 Module20Desc=Teklif yönetimi
 Module22Name=Toplu E-postalar
 Module22Desc=Toplu E-postaların yönetimi
-Module23Name= Enerji
-Module23Desc= Enerji tüketimlerinin izlenmesi
+Module23Name=Enerji
+Module23Desc=Enerji tüketimlerinin izlenmesi
 Module25Name=Müşteri Siparişleri
 Module25Desc=Müşteri siparişleri yönetimi
 Module30Name=Faturalar
@@ -492,8 +491,8 @@ Module400Name=Projeler/Fırsatlar/Adaylar
 Module400Desc=Projlerin, fırsatların ve adayların yönetimi. Daha sonra bir projeye herhangi bir unsur (fatura, sipariş, teklif, müdahale, ...) atayabilirsiniz ve proje görünümünde bir çapraz bir görünüm elde edebilirsiniz.
 Module410Name=Web Takvimi
 Module410Desc=WebT akvimi entegrasyonu
-Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler)
-Module500Desc=Vergiler, sosyal katkı payları, temettüler ve maaşlar gibi özel giderlerin yönetimi
+Module500Name=Özel giderler
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Ücretler
 Module510Desc=Çalışanların maaş ve ödeme yönetimi
 Module520Name=Borç
@@ -502,7 +501,7 @@ Module600Name=Duyurlar
 Module600Desc=Üçüncü parti kişilerine bazı Dolibarr iş etkinlikleriyle ilgili Eposta bildirimleri gönderin (her üçüncü parti için ayarlar tanımlanmıştır)
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
-Module770Name=Gider Raporu
+Module770Name=Expense reports
 Module770Desc=Yönetim ve şikayet gider raporları )nakliye, yemek, ...)
 Module1120Name=Tedarikçi teklifi
 Module1120Desc=Tedarikçi teklifi ve fiyatlarını iste
@@ -524,8 +523,10 @@ Module2400Name=Gündem
 Module2400Desc=Etkinlikler/görevler ve gündem yönetimi
 Module2500Name=Elektronik İçerik Yönetimi
 Module2500Desc=Belgeleri saklayın ve yönetin
-Module2600Name=Web Hizmetleri
-Module2600Desc=Dolibarr web hizmetleri sunucusunu etkinleştirin
+Module2600Name=API hizmetleri (SOAP web hizmetleri)
+Module2600Desc=API hizmetlerini sağlayan Dolibarr SOAP sunucusunu etkinleştir
+Module2610Name=API hizmetleri (REST Web hizmetleri)
+Module2610Desc=API hizmetlerini sağlayan Dolibarr REST sunucusunu etkinleştir
 Module2650Name=WebHizmetleri (istemci)
 Module2650Desc=Dolibarr web hizmetleri istemcisini etkinleştir (Dış sunuculara veri/istek iteklemek için kullanılabilir. Tedarikçi siparişleri yalnızca anında desteklenir
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Ürün oluştur/düzenle
 Permission34=Ürün sil
 Permission36=Gizli ürünleri gör/yönet
 Permission38=Ürün dışaaktar
-Permission41=Proje oku (paylaşılan projeler ve ilgilisi olduğum projeler)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Proje oluştur/düzenle (paylaşılan projeler ve ilgilisi olduğum projeler)
 Permission44=Proje sil (paylaşılan projeler ve ilgilisi olduğum projeler)
 Permission61=Müdahale oku
@@ -599,10 +600,10 @@ Permission86=Müşteri siparişi gönder
 Permission87=Müşteri siparişi kapat
 Permission88=Müşteri siparişi iptal et
 Permission89=Müşteri siparişi sil
-Permission91=Sosyal katkı payı ve KDV oku
-Permission92=Sosyal katkı payı ve KDV oluştur/düzenle
-Permission93=Sosyal katkı payı ve KDV sil
-Permission94=Sosyal katkı payı dışaaktar
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Rapor oku
 Permission101=Gönderilenleri oku
 Permission102=Gönderilenleri oluştur/düzenle
@@ -620,9 +621,9 @@ Permission121=Kullanıcıya bağlı üçüncü partileri oku
 Permission122=Kullanıcıya bağlı üçüncü parti oluştur/değiştir
 Permission125=Kullanıcıya bağlı üçüncü partileri sil
 Permission126=Üçüncü partileri dışaaktar
-Permission141=Proje oku (benim ilişkide olmadığım özel olanları da)
-Permission142=Proje oluştur/değiştir (benim ilişkide olmadığım Özel olanları da)
-Permission144=Proje sil (benim ilişkide olmadığım özel olanları da)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Sağlayıcıları oku
 Permission147=İstatistikleri oku
 Permission151=Ödeme talimatlarını oku
@@ -800,7 +801,7 @@ DictionaryCountry=Ülkeler
 DictionaryCurrency=Para birimleri
 DictionaryCivility=Hitap başlıkları
 DictionaryActions=Gündem etkinlik türleri
-DictionarySocialContributions=Sosyal katkı türleri
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=KDV Oranları veya Satış Vergisi Oranları
 DictionaryRevenueStamp=Damga vergisi tutarı
 DictionaryPaymentConditions=Ödeme koşulları
@@ -817,6 +818,9 @@ DictionarySource=Teklifin/siparişin kökeni
 DictionaryAccountancyplan=Hesap planı
 DictionaryAccountancysystem=Hesap planı modelleri
 DictionaryEMailTemplates=Eposta şablonları
+DictionaryUnits=Birimler
+DictionaryProspectStatus=Aday durumu
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Kurulum kaydedildi
 BackToModuleList=Modül listesine geri git
 BackToDictionaryList=Sözlük listesine dön
@@ -936,13 +940,14 @@ CompanyZip=Posta Kodu
 CompanyTown=İlçesi
 CompanyCountry=Ülkesi
 CompanyCurrency=Ana para birimi
+CompanyObject=Firmaya ait öğe
 Logo=Logo
 DoNotShow=Gösterme
 DoNotSuggestPaymentMode=Önerme
 NoActiveBankAccountDefined=Tanımlı etkin banka hesabı yok
 OwnerOfBankAccount=Banka hesabı sahibi %s
 BankModuleNotActive=Banka hesapları modülü etkin değil
-ShowBugTrackLink=”Hata bildir” bağlantısını göster
+ShowBugTrackLink=Bu bağlantıyı göster "<strong>%s</strong>"
 ShowWorkBoard=Çalışma tezgahını ana sayfada göster
 Alerts=Uyarılar
 Delays=Süreler
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Birim fiyatlar için ençok ondalık
 MAIN_MAX_DECIMALS_TOT=Toplam fiyatlar için ençok ondalık
 MAIN_MAX_DECIMALS_SHOWN=Fiyatlar için ençok ondalık ekranda görüntülenir (isterseniz bu sayıdan sonra görmek istediğiniz kırpılmış <b>...</b> ekleyin)
 MAIN_DISABLE_PDF_COMPRESSION=Oluşturulan PDF dosyaları için PDF sıkıştırması kullanın.
-MAIN_ROUNDING_RULE_TOT= Yuvarlama aralığı Boyutu (nadir ülkelerde 10 tabanından başka yuvarlama yapılır)
+MAIN_ROUNDING_RULE_TOT=Yuvarlama oranı basamağı (10 tabanından farklı yuvarlama ülkeler için. Örneğin eğer yuvarlama 0.05 olacaksa 0.05 koyun)
 UnitPriceOfProduct=Bir ürünün net birim fiyatı
 TotalPriceAfterRounding=Yuvarlama sonrası toplam fiyat (net/KDV/vergi dahil)
 ParameterActiveForNextInputOnly=Yalnız sonraki giriş için etkili Parametre
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Toplam etkin özel modül sayısı: <b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Sınıf %s PHP youlnda bulunamadı
 YesInSummer=Yazın evet
-OnlyFollowingModulesAreOpenedToExternalUsers=Not, yalnızca aşağıdaki modüller dış kullanıcılara açıktır (bu tür kullanıcıların izinleri ne olursa olsun):
+OnlyFollowingModulesAreOpenedToExternalUsers=Not, yalnızca aşağıdaki modüller dış kullanıcılara açıktır (böyle kullanıcıların izinleri ne olursa olsun):
 SuhosinSessionEncrypt=Oturum depolaması Suhosin tarafından şifrelendi
 ConditionIsCurrently=Koşul şu anda %s durumunda
 YouUseBestDriver=Kullandığınız sürücü %s şu anda en iyi sürücüdür.
@@ -1298,11 +1303,11 @@ LDAPSetupForVersion3=LDAP sunucusu sürüm 3 için yapılandırılmış
 LDAPSetupForVersion2=LDAP sunucusu sürüm 2 için yapılandırılmış
 LDAPDolibarrMapping=Dolibarr Eşleme
 LDAPLdapMapping=LDAP Eşleme
-LDAPFieldLoginUnix=Oturum açma (Unix)
+LDAPFieldLoginUnix=Oturum aç (Unix)
 LDAPFieldLoginExample=Örnek: uid
 LDAPFilterConnection=Arama süzgeçi
 LDAPFilterConnectionExample=Örnek: &(objectClass = InetOrgPerson)
-LDAPFieldLoginSamba=Oturum açma (samba, activedirectory)
+LDAPFieldLoginSamba=Oturum aç (samba, activedirectory)
 LDAPFieldLoginSambaExample=Örnek: sAMAccountName
 LDAPFieldFullname=İlk Adı
 LDAPFieldFullnameExample=Örnek: cn
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Açılır seçim (combo) listelerindeki ençok ürü
 ConfirmDeleteProductLineAbility=Formlardan ürün satırı silerken onaylama
 ModifyProductDescAbility=Formlarda ürün tanımlamalarının kişiselleştirilmesi
 ViewProductDescInFormAbility=Formlarda ürün tanımlarının görselleştirilmesi (aksi durumda açılır araç ipucu olarak)
+MergePropalProductCard=Eğer ürün/hizmet teklifte varsa Ekli Dosyalar sekmesinde ürün/hizmet seçeneğini etkinleştirin, böylece ürün PDF belgesini PDF azur teklifine birleştirirsiniz
 ViewProductDescInThirdpartyLanguageAbility=Ürün açıklamalarının üçüncü partilerin dilinde gösterilmesi
 UseSearchToSelectProductTooltip=Ayrıca çok fazla sayıda ürününüz varsa (>100 000), Kurulum->Diğer den PRODUCT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectProduct=Bir ürün seçmek için arama formu kullanın (liste kutusu yerine).
 UseEcoTaxeAbility=Eko-Vergi Desteği (WEEE)
 SetDefaultBarcodeTypeProducts=Ürünler için kullanılacak varsayılan barkod türü
 SetDefaultBarcodeTypeThirdParties=Üçüncü partiler için kullanılacak varsayılan barkod tipi
+UseUnits=Birimleri destekler
 ProductCodeChecker= Ürün kodu oluşturma ve denetimi modülü (ürün ya da hizmet)
 ProductOtherConf= Ürün / Hizmet yapılandırma
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barkod türü UPC
 BarcodeDescISBN=Barkod türü ISBN
 BarcodeDescC39=Barkod türü C39
 BarcodeDescC128=Barkod türü C128
+BarcodeDescDATAMATRIX=Datamatrix türü barkod
+BarcodeDescQRCODE=QR kodu türü barkod
 GenbarcodeLocation=Bar kodu oluşturma komut satırı aracı (bazı bar kodu türleri için iç motor tarafından kullanılır). "genbarcode" ile uyumlu olmalıdır.<br>Örneğin: /usr/local/bin/genbarcode
 BarcodeInternalEngine=İç motor
 BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Menü girişi <b>%s</b> i silmek istediğinizden emin misiniz?
 DeleteLine=Satır sil
 ConfirmDeleteLine=Bu satırı silmek istediğinizden emin misiniz?
 ##### Tax #####
-TaxSetup=Vergi, sosyal güvenlik primi ve temettü modülü kurulumu
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=KDV nedeniyle
 OptionVATDefault=Nakit temelli
 OptionVATDebitOption=Tahakkuk temelli
@@ -1552,6 +1561,15 @@ WebServicesSetup=WebHizmetleri modülü kurulumu
 WebServicesDesc=Bu modül etkinleştirilrek, Dolibarr’ın çeşitli web servisleri sağlayan bir web hizmeti sunucusu haline gelmesi sağlanır.
 WSDLCanBeDownloadedHere=Servis sağlayıcılarına ait WSDL tanımlayıcı dosyaları buradan indirebilirsiniz
 EndPointIs=SOAP istemcileri isteklerini URL de varolan Dolibarr uç noktasına göndermelidir.
+##### API ####
+ApiSetup=API modül ayarları
+ApiDesc=Bu modül etkinleştirilerek Dolibarr çeşitli web hizmetlerini sağlayan bir REST sunucusu haline getirilir.
+KeyForApiAccess=API kullanmak için anahtar (parametre "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=API erişimi için url 
+ApiExporerIs=API incelemesi için url 
+OnlyActiveElementsAreExposed=Yalnızca etkin modüllerdeki öğeler gösterilir
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Banka modülü kurulumu
 FreeLegalTextOnChequeReceipts=Çek makbuzlarının üzerinde serbest metin
@@ -1581,6 +1599,7 @@ ProjectsSetup=Proje modülü kurulumu
 ProjectsModelModule=Proje raporu belge modeli
 TasksNumberingModules=Görev numaralandırma modülü
 TaskModelModule=Görev raporu belge modeli
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED ayarları
 ECMAutoTree = Otomatik klasör ve belge ağacı
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Açık mali yıl
 CloseFiscalYear=Kapalı mali yıl
 DeleteFiscalYear=Mali yıl sil
 ConfirmDeleteFiscalYear=Bu mali yılın silmek istediğinizden emin misiniz?
-Opened=Açık
+Opened=Aç
 Closed=Kapalı
 AlwaysEditable=Her zaman düzenlenebilir
 MAIN_APPLICATION_TITLE=Uygulamanın görünür adına zorla (uyarı: burada kendi adınızı ayarlamanız, DoliDoid mobil uygulamasını kullanırken, kullanıcı adını oto doldur özelliğini durdurabilir)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu a
 SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada anlatılan yükseltme işlemi yalnızca ayrıcalıklı bir kullanıcın elle atacağı adımlardır.
 InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan <strong>%s</strong> dosyasını kaldırmasını istemelisiniz.
 ConfFileMuseContainCustom=Uygulama içerisinden dış modül kurarken modül dosyalarını  <strong>%s</strong> dizini içinde kaydedin. Bu dizinin Dolibarr tarafından işlenebilmesi için <strong>conf/conf.php</strong> nizi ayarlayın <br>- <strong>$dolibarr_main_url_root_alt</strong> seçeneğini elde etmek için değeri buna <strong>$dolibarr_main_url_root_alt="/custom"</strong> etkinleştirin <br>- <strong>$dolibarr_main_document_root_alt</strong> değerini ise <strong>"%s/custom"</strong> a etkinleştirin.
+HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
+PressF5AfterChangingThis=Bu değeri değiştirdikten sonra etkin olması için klavyede F5 tuşuna basın
+NotSupportedByAllThemes=Yalnızca eldy teması ile çalışır ancak tüm temalar tarafından desteklenmez
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 2df600befe4..2dd0af1b57b 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=%s Sınıfı sipariş faturalandı
 OrderApprovedInDolibarr=%s Siparişi onayladı
 OrderRefusedInDolibarr=Reddedilen teklif %s
 OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür
-OrderCanceledInDolibarr=%s Siparişi iptal edildi
 ProposalSentByEMail=%s Teklifi Eposta ile gönderildi
 OrderSentByEMail=%s Müşteri siparişi Eposta ile gönderildi
 InvoiceSentByEMail=%s Müşteri faturası Eposta ile gönderildi
@@ -96,3 +95,5 @@ AddEvent=Etkinlik oluştur
 MyAvailability=Uygunluğum
 ActionType=Etkinlik türü
 DateActionBegin=Etkinlik başlangıç tarihi
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 6c21db8419d..dcd37d4c898 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Uzlaştır
 Conciliation=Uzlaşma
 ConciliationForAccount=Bu hesabı uzlaştır
 IncludeClosedAccount=Kapalı hesapları içer
-OnlyOpenedAccount=Sadece açık hesapları
+OnlyOpenedAccount=Yalnızca açık hesaplar
 AccountToCredit=Alacak hesabı
 AccountToDebit=Borç hesabı
 DisableConciliation=Bu hesap için uzlaşma özelliğini engelle
 ConciliationDisabled=Uzlaşma özelliği engelli
-StatusAccountOpened=Açık
+StatusAccountOpened=Aç
 StatusAccountClosed=Kapalı
 AccountIdShort=Numarası
 EditBankRecord=Kayıt düzenle
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Müşteri ödemesi
 CustomerInvoicePaymentBack=Müşteri geri ödemesi
 SupplierInvoicePayment=Tedarikçi ödemesi
 WithdrawalPayment=Para çekme ödemesi
-SocialContributionPayment=Sosyal güvenlik primi ödemesi
+SocialContributionPayment=Sosyal/mali vergi ödemesi
 FinancialAccountJournal=Ticari hesap günlüğü
 BankTransfer=Banka havalesi
 BankTransfers=Banka havaleleri
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index d639e2bd563..4a4d13b4a97 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Fatura sayısı
 NumberOfBillsByMonth=Aylık fatura sayısı
 AmountOfBills=Faturaların tutarı
 AmountOfBillsByMonthHT=Aylık fatura tutarı (vergisiz net)
-ShowSocialContribution=Sosyal katkı payını göster
+ShowSocialContribution=Sosyal/mali vergi göster
 ShowBill=Fatura göster
 ShowInvoice=Fatura göster
 ShowInvoiceReplace=Değiştirilen faturayı göster
@@ -270,7 +270,7 @@ BillAddress=Fatura adresi
 HelpEscompte=Bu indirim, vadesinden önce ödeme yapıldığından dolayı müşteriye verilir.
 HelpAbandonBadCustomer=Bu tutardan vazgeçilmiştir (müşteri kötü bir müşteri olarak kabul edildiğinden dolayı) ve istisnai bir kayıp olarak kabul edilir.
 HelpAbandonOther=Bir hata olduğundan dolayı bu tutardan vazgeçilmiştir (örneğin yanlış müşteri ya da bir faturanın başka faturayla değiştirilmesi durumu gibi)
-IdSocialContribution=Sosyal güvenlik no
+IdSocialContribution=Sosyal/mali vergi ödeme kimliği
 PaymentId=Ödeme no
 InvoiceId=Fatura no
 InvoiceRef=Fatura ref.
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 36df7f25b96..6ce44bc77ea 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Son %s üye
 BoxTitleLastFicheInter=Değiştirilen son %s müdahale
 BoxTitleOldestUnpaidCustomerBills=En eski ödenmemiş %s müşteri faturası
 BoxTitleOldestUnpaidSupplierBills=En eski ödenmemiş %s tedarikçi faturası
-BoxTitleCurrentAccounts=Açık hesabın bakiyesi
+BoxTitleCurrentAccounts=Açık hesap bakiyeleri
 BoxTitleSalesTurnover=Satış cirosu
 BoxTitleTotalUnpaidCustomerBills=Ödenmemiş müşteri faturaları
 BoxTitleTotalUnpaidSuppliersBills=Ödenmemiş tedarikçi faturaları
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index a7b45308d55..8c7a11b5cd0 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Etiketin/kategorinin eklenmesi olanaksız
 ImpossibleAssociateCategory=Etiketin/kategorinin şununla ilişkilendirilmesi olanaksız:
 WasAddedSuccessfully=<b>%s</b> başarıyla eklendi.
 ObjectAlreadyLinkedToCategory=Öğe zaten bu etiketle/kategoriyle ilişkilendirilmiş
-CategorySuccessfullyCreated=Bu etiket/kategori %s başarıyla eklendi
-ProductIsInCategories=Ürün/hizmet bu etikete/kategoriye sahiptir
-SupplierIsInCategories=Üçüncü parti bu tedarikçi etiketine/kategorisine sahip
-CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/aday etiketlerine/kategorilerine sahiptir
-CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi etiketlerine/kategorilerine sahiptir
-MemberIsInCategories=Bu üye aşağıdaki üye etiketlerine/kategorilerine sahiptir
-ContactIsInCategories=Bu kişi şu etiketlere/kategorilere sahip
+CategorySuccessfullyCreated=%s etiketi/kategorisi başarıyla eklendi.
+ProductIsInCategories=Ürün/hizmet aşağıdaki etiketlere/kategorilere bağlantılandı
+SupplierIsInCategories=Üçüncü parti bu aşağıdaki tedarikçi etiketlerine/kategorilerine bağlantılandı
+CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/aday etiketlerine/kategorilerine bağlantılandı
+CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi etiketlerine/kategorilerine bağlantılandı
+MemberIsInCategories=Bu üye aşağıdaki üye etiketlerine/kategorilerine bağlantılandı
+ContactIsInCategories=Bu kişi aşağıdaki kişi etiketlerine/kategorilerine bağlantılı
 ProductHasNoCategory=Bu ürün/hizmet hiçbir etikette/kategoride yoktur
 SupplierHasNoCategory=Bu tedarikçi hiçbir etikette/kategoride yoktur
-CompanyHasNoCategory=Bu firma hiçbir etikette/kategoride yoktur
+CompanyHasNoCategory=Bu üçüncü parti hiç bir  etikette/kategoride yok
 MemberHasNoCategory=Bu üye hiçbir etikette/kategoride yoktur
 ContactHasNoCategory=Bu kişi hiçbir etikette/kategoride yok
-ClassifyInCategory=Etikette/kategoride sınıflandır
+ClassifyInCategory=Etikete/kategoriye ekle
 NoneCategory=Hiçbiri
 NotCategorized=Etiketsiz/kategorisiz
 CategoryExistsAtSameLevel=Bu kategori zaten bu ilgi ile var
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=İçerik herkes tarafından görülemez
 CategoriesTree=Etiket/kategori ağacı
 DeleteCategory=Etiket/kategori sil
 ConfirmDeleteCategory=Bu etiketi/kategoriyi silmek istediğinizden emin misiniz?
-RemoveFromCategory=Bağlantıyı etiketi/kategorisi ile birlikte kaldır
-RemoveFromCategoryConfirm=İşlem ve etiket/kategori arasındaki bağlantıyı kaldırmak istediğinizden emin misiniz?
+RemoveFromCategory=Etiket/kategori bağlantısını kaldır
+RemoveFromCategoryConfirm=İşlemin etiket/kategori bağlantısını kaldırmak istediğinizden emin misiniz?
 NoCategoriesDefined=Tanımlı etiket/kategori yok
-SuppliersCategoryShort=Tedarikçi etiketleri/kategorisi
-CustomersCategoryShort=Müşteri etiketleri/kategorisi
-ProductsCategoryShort=Ürün etiketleri/kategorisi
-MembersCategoryShort=Üye etiketleri/kategorisi
+SuppliersCategoryShort=Tedarikçi etiketi/kategorisi
+CustomersCategoryShort=Müşteri etiketi/kategorisi
+ProductsCategoryShort=Ürün etiketi/kategorisi
+MembersCategoryShort=Üye etiketi/kategorisi
 SuppliersCategoriesShort=Tedarikçi etiketleri/kategorileri
 CustomersCategoriesShort=Müşteri etiketleri/kategorileri
 CustomersProspectsCategoriesShort=Müşt./aday kategorileri
@@ -94,7 +94,7 @@ CatSupList=Tedarikçi etiketleri/kategorileri listesi
 CatCusList=Müşteri/aday etiketleri/kategorileri listesi
 CatProdList=Ürün etiketleri/kategorileri listesi
 CatMemberList=Üye etiketleri/kategorileri listesi
-CatContactList=Kişi etiketleri/kategorileri ve kişi listesi
+CatContactList=Kişi etiketleri/kategorileri listesi
 CatSupLinks=Tedarikçiler ve etiketler/kategoriler arasındaki bağlantılar
 CatCusLinks=Müşteriler/adaylar ve etiketler/kategoriler arasındaki bağlantılar
 CatProdLinks=Ürünler/hizmetler ve etiketler/kategoriler arasındaki bağlantılar
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 6666aa25183..11d7368c400 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Ticaret
-CommercialArea=Ticaret alanı
-CommercialCard=Ticaret kartı
+Commercial=Ticari
+CommercialArea=Ticari alan
+CommercialCard=Ticari kart
 CustomerArea=Müşteriler alanı
 Customer=Müşteri
 Customers=Müşteriler
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 41110ac4357..368d6ebc244 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Üçüncü parti kişisi/adresi
 StatusContactValidated=Kişi/adres durumu
 Company=Firma
 CompanyName=Firma adı
+AliasNames=Rumuz adları (ticari, marka, ...)
 Companies=Firmalar
 CountryIsInEEC=Ülke, Avrupa Ekonomik Topluluğu içindedir
 ThirdPartyName=Üçüncü parti adı
@@ -365,7 +366,7 @@ NoParentCompany=Hiçbiri
 ExportImport=İçeaktar-Dışaaktar
 ExportCardToFormat=Biçimlenip dışaaktarılacak kart
 ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil
-DolibarrLogin=Dolibarr oturumu açma
+DolibarrLogin=Dolibarr kullanıcı adı
 NoDolibarrAccess=Dolibarr erişimi yok
 ExportDataset_company_1=Üçüncü partiler (Firmalar/dernekler/kişiler) ve özellikleri
 ExportDataset_company_2=Kişiler ve özellikleri
@@ -412,3 +413,8 @@ LeopardNumRefModelDesc=Müşteri/tedarikçi kodu serbesttir. Bu kod herhangi bir
 ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...)
 SearchThirdparty=Üçüncü parti ara
 SearchContact=Kişi ara
+MergeOriginThirdparty=Çifte üçüncü parti (silmek istediğiniz üçüncü parti)
+MergeThirdparties=Üçüncü partileri birleştir
+ConfirmMergeThirdparties=Bu üçüncü partiyi geçerli olanla birleştirmek istediğinizden emin misiniz? Bütün bağlantılı öğeler (faturalar, siparişler, ...) geçerli olan üçüncü partiye taşınacaktır, böylece ikinciyi silebileceksiniz.
+ThirdpartiesMergeSuccess=Üçüncü partiler birleştirilmiştir
+ErrorThirdpartiesMerge=Üçüncü partiler silinirken bir hata oluştu. Lütfen günlüğü denetleyin. Değişiklikler ger, geri dönüştürülmüştür.
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 73afcbe1d13..fcc9131b04f 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -56,23 +56,23 @@ VATCollected=KDV alınan
 ToPay=Ödenecek
 ToGet=Geri alınacak
 SpecialExpensesArea=Tüm özel ödemeler alanı
-TaxAndDividendsArea=Vergi, sosyal katkı payları ve kar payları alanı
-SocialContribution=Sosyal katkı payı
-SocialContributions=Sosyal katkı payı
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Özel giderler
 MenuTaxAndDividends=Vergiler ve kar payları
 MenuSalaries=Ücretler
-MenuSocialContributions=Sosyal katkı payı
-MenuNewSocialContribution=Yeni katkı payı
-NewSocialContribution=Yeni sosyal katkı payı
-ContributionsToPay=Ödenecek katkı payları
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Muhasebe/Maliye alanı
 AccountancySetup=Muhasebe ayarları
 NewPayment=Yeni ödeme
 Payments=Ödemeler
 PaymentCustomerInvoice=Müşteri fatura ödemesi
 PaymentSupplierInvoice=Tedarikçi fatura ödemesi
-PaymentSocialContribution=Sosyal gkatkı payı ödeme
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=KDV ödeme
 PaymentSalary=Ücret ödemesi
 ListPayment=Ödemeler listesi
@@ -91,7 +91,7 @@ LT1PaymentES=RE Ödeme
 LT1PaymentsES=RE Ödemesi
 VATPayment=KDV Ödemesi
 VATPayments=KDV Ödemeleri
-SocialContributionsPayments=Sosyal katkı payı ödemeleri
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=KDV ödemesi göster
 TotalToPay=Ödenecek toplam
 TotalVATReceived=Alınan toplam KDV
@@ -116,11 +116,11 @@ NewCheckDepositOn=Bu hesap için makbuz oluştur: %s
 NoWaitingChecks=Hesaba işlenmeyi bekleyen çek yok.
 DateChequeReceived=Çek giriş tarihi
 NbOfCheques=Çek sayısı
-PaySocialContribution=Bir sosyal katkı payı öde
-ConfirmPaySocialContribution=Bu sosyal katkı payını ödendi olarak sınıflandırmak istediğinizden emin misiniz?
-DeleteSocialContribution=Sosyal katkı payı sil
-ConfirmDeleteSocialContribution=Bu sosyal katkı payını silmek istediğinizden emin misiniz?
-ExportDataset_tax_1=Sosyal katkı payları ve ödemeleri
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
 CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
 CalcModeDebt=Mod <b>%sAlacaklar-Borçlar%s</b>, <b>Taahhüt hesabı içindir</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kulla
 TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
 CalculationMode=Hesaplama modu
 AccountancyJournal=Muhasebe kodu günlüğü
-ACCOUNTING_VAT_ACCOUNT=Alınan KDV için varsayılan muhasebe kodu
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Ödenen KDV için varsayılan muhasebe kodu
 ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partiler için varsayılan muhasebe kodu
 ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partiler için varsayılan muhasebe kodu
-CloneTax=Bir sosyal katkı payı kopyala
-ConfirmCloneTax=Bir sosyal katkı payı kopyalanmasını onayla
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Sonraki aya kopyala
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index e42fd7a0d57..b1c4b840ac6 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -4,10 +4,10 @@ About = Hakkında
 CronAbout = Cron hakkında
 CronAboutPage = Cron hakkında sayfası
 # Right
-Permission23101 = Planlı görev oku
-Permission23102 = Planlı görev oluştur/güncelle
-Permission23103 = Planlı görev sil
-Permission23104 = Planlı görev yürüt
+Permission23101 = Planlı işleri oku
+Permission23102 = Planlı iş oluştur/güncelle
+Permission23103 = Planlı iş sil
+Permission23104 = Planlı iş yürüt
 # Admin
 CronSetup= Planlı iş yönetimi ayarları
 URLToLaunchCronJobs=Gerekliyse, Cron işlerini denetleyen ve başlatan İnternet adresi
@@ -26,11 +26,11 @@ CronLastOutput=Son çalıştırma çıktısı
 CronLastResult=Son sonuç kodu
 CronListOfCronJobs=Planlı işler listesi
 CronCommand=Komut
-CronList=Planlı iş
+CronList=Planlı işler
 CronDelete=Planlı işleri sil
-CronConfirmDelete=Bu planlı işi silmek istediğinizden emin misiniz?
+CronConfirmDelete=Bu planlı işleri silmek istediğinizden emin misiniz?
 CronExecute=Planlı işleri yükle
-CronConfirmExecute=Bu planlı işi şimdi yürütmek istediğinizden emin misiniz?
+CronConfirmExecute=Bu planlı işleri şimdi yürütmek istediğinizden emin misiniz?
 CronInfo=Planlı iş modülü planlanmış işlerin yürütülmesini sağlar
 CronWaitingJobs=İş bekliyor
 CronTask=İş
@@ -55,9 +55,9 @@ CronEach=Her
 JobFinished=İş başlatıldı ve bitirildi
 #Page card
 CronAdd= İş ekle
-CronHourStart= Görevin başlama saati ve tarihi
-CronEvery= Ve her işi yürüt
-CronObject= Oluşturulacak durum/nesne
+CronHourStart= İşin başlama saati ve tarihi
+CronEvery=İş yürütme zamanı
+CronObject=Oluşturulacak durum/nesne
 CronArgs=Parametreler
 CronSaveSucess=Kayıt başarılı
 CronNote=Yorum
@@ -76,13 +76,14 @@ CronMethodHelp=Çalıştırılacak nesne yöntemi. <BR> Örneğin; Dolibarr Ür
 CronArgsHelp=Yöntem parametreleri. <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, parametre değerleri <i>0, ProductRef</i> olabilir
 CronCommandHelp=Yürütülecek sistem komut satırı.
 CronCreateJob=Yeni Planlı İş oluştur
+CronFrom=From
 # Info
 CronInfoPage=Bilgi
 # Common
-CronType=Görev türü
+CronType=İş türü
 CronType_method=Dolibarr Sınıfı çağırma yöntemi
 CronType_command=Kabuk komutu
 CronMenu=Kron
 CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor
 UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Modül araçları - İş listesi" menüsüne gidin.
-TaskDisabled=Görev engellendi
+TaskDisabled=İş engellendi
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 94b1faf2fba..b5d9152c99a 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Nesneye göre ara
 ECMSectionOfDocuments=Belgelerin dizinleri
 ECMTypeManual=Manuel
 ECMTypeAuto=Otomatik
-ECMDocsBySocialContributions=Sosyal gkatkı paylarıi ile bağlantılı belgeler
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Üçüncü partiler ile bağlantılı belgeler
 ECMDocsByProposals=Teklifler ile bağlantılı belgeler
 ECMDocsByOrders=Müşteri siparişleri ile bağlantılı belgeler
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index becb10f7a43..f5a19133065 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP istemcisinde '%s' hatası
 ErrorGlobalVariableUpdater5=Seçilmiş genel değişken yok
 ErrorFieldMustBeANumeric=<b>%s</b> alanı sayısal bir değer olmalıdır
 ErrorFieldMustBeAnInteger=<b>%s</b> alanı tamsayı olmalıdır
+ErrorMandatoryParametersNotProvided=Zorunlu parametre(ler) girilmemiş
 
 # Warnings
 WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
@@ -190,3 +191,4 @@ WarningNotRelevant=Bu veri kümesi için alakasız işlem
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Bu özellik, ekran görme engelliler için ya da metin tarayıcılar için ayarlandığında devre dışı kalır.
 WarningPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) daha önce, bu fatura için %s.
 WarningTooManyDataPleaseUseMoreFilters=Çok fazla veri. Lütfen daha çok süzgeç kullanın
+WarningSomeLinesWithNullHourlyRate=Saatlik ücretleri tanımlanmadığında bazen kullanıcılar tarafından kayıt edilir. 0 Değeri kullanılmıştır ancak harcanan sürenin yanlış değerlendirilmesine neden olabilir.
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 7dbeba5d859..7427da079fb 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -3,7 +3,7 @@ HRM=IK
 Holidays=İzinler
 CPTitreMenu=İzinler
 MenuReportMonth=Aylık özet
-MenuAddCP=Bir izin isteği yap
+MenuAddCP=New leave request
 NotActiveModCP=Bu sayfayı görmek için İzinler modülünü etkinleştirmelisiniz
 NotConfigModCP=Bu sayfayı görmeniz için İzinler modülünü yapılandırmalısınız. Bunu yapmak için <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> bağlantısına tıklayın </ a>.
 NoCPforUser=Hiç uygun gününüz yok.
@@ -71,7 +71,7 @@ MotifCP=Neden
 UserCP=Kullanıcı
 ErrorAddEventToUserCP=Özel izin eklenirken hata oluştu.
 AddEventToUserOkCP=Özel izin eklenmesi tamamlanmıştır.
-MenuLogCP=İzin isteği kayıtlarına bak
+MenuLogCP=View change logs
 LogCP=Uygun tatil günlerinin güncellenme kayıtı
 ActionByCP=Uygulayan
 UserUpdateCP=Kullanıcı için
@@ -93,6 +93,7 @@ ValueOptionCP=Değer
 GroupToValidateCP=İzin isteklerini olabilirliğine göre gruplandır
 ConfirmConfigCP=Yapılandırmayı onayla
 LastUpdateCP=İzin tahsislerini otomatik güncelle
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Güncelleme başarılı
 ErrorUpdateConfCP=Güncelleme sırasında bir hata oluştu, lütfen yeniden deneyin.
 AddCPforUsers=Kullanıcıların izin tahsisleri bakiyelerini  <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">yoluyla eklemek için buraya tıklayın</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=Eposta gönderilirken bir hata oluştu:
 NoCPforMonth=Bu ay hiç izin yok.
 nbJours=Gün sayısı
 TitleAdminCP=İzinlerin Yapılandırılması
+NoticePeriod=Notice period
 #Messages
 Hello=Merhaba
 HolidaysToValidate=İzin isteği doğrula
@@ -139,10 +141,11 @@ HolidaysRefused=İstek reddedildi
 HolidaysRefusedBody=%s - %s arası izin isteğiniz aşağıdaki nedenden dolayı reddedilmiştir:
 HolidaysCanceled=İptal edilen izin istekleri
 HolidaysCanceledBody=%s - %s arası izin isteğiniz iptal edilmiştir.
-Permission20000=Kendi izin isteklerini oku
-Permission20001=İzin isteklerinizi oluşturun/düzenleyin
-Permission20002=Herkes için izin isteği oluştur/düzenle
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=İzin isteği sil
-Permission20004=Kullanıcıların uygun tatil günlerini ayarla
-Permission20005=Değiştirilmiş izin izin istekleri kayıtlarını incele
-Permission20006=Aylık izin raporu oku
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/tr_TR/incoterm.lang b/htdocs/langs/tr_TR/incoterm.lang
index 2396d2acb0e..51edecfc108 100644
--- a/htdocs/langs/tr_TR/incoterm.lang
+++ b/htdocs/langs/tr_TR/incoterm.lang
@@ -1,7 +1,7 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
-IncotermSetupTitle1=Feature
-IncotermSetupTitle2=Status
-IncotermSetup=Setup of module Incoterm
-IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
+Module62000Name=Uluslararası ticari terimleri
+Module62000Desc=Uluslararası ticari terimleri yönetmek için özellik ekle
+IncotermLabel=Uluslararası Ticaret Terimleri
+IncotermSetupTitle1=Özellik
+IncotermSetupTitle2=Durum
+IncotermSetup=Uluslararası Ticaret Terimi modülü Ayarları
+IncotermFunctionDesc=Uluslararası Ticaret Terimi özelliğini etkinleştir (Üçüncü parti, Teklif, Müşteri Siparişi, Müşteri Faturası, Sevkiyat, Tedarikçi siparişi)
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 4fdb366c95d..11978483527 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -53,8 +53,8 @@ ServerPortDescription=Veritabanı sunucusu bağlantı noktası. Eğer bilinmiyor
 DatabaseServer=Veritabanı sunucusu
 DatabaseName=Veritabanı adı
 DatabasePrefix=Veritabanı tablo öneki
-Login=Oturum açma
-AdminLogin=Dolibarr veritabanı oturum açma.
+Login=Kullanıcı adı
+AdminLogin=Dolibarr veritabanı kullanıcı adı.
 Password=Parola
 PasswordAgain=Parolayı ikinci kez yeniden yaz
 AdminPassword=Dolibarr veritabanı sahibi parolası.
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Veritabanı sunucusu - süperkullanıcı erişimi
 CheckToCreateDatabase=Eğer veritabanı yoksa ve oluşturulması gerekiyorsa kutuyu işaretleyin.<br>Bu durumda, bu sayfanın altına süperkullanıcı hesabı için kullanıcı adı/parola girmelisiniz.
 CheckToCreateUser=Veritabanı sahibi yoksa ve oluşturulması gerekiyorsa kutuyu işaretleyin.<br>Bu durumda, kullanıcı adı ve parola seçmelisiniz ve bu sayfanın altına süperkullanıcı hesabı için kullanıcı adı/parola girmelisiniz. Bu kutu işaretlenmemiş ise, veritabanı sahibi ve parolaları vardır.
 Experimental=(deneysel)
+Deprecated=(artık kullanılmayan)
 DatabaseRootLoginDescription=Yeni veritabanı ve yeni kullanıcı oluşturabilecek kullanıcı girişi, veritabanınız ve veritabanı girişiniz zaten varsa gereksizdir (sanki bir web sağlayıcı tarafından barındırılıyor gibi).
 KeepEmptyIfNoPassword=Eğer kullanıcının herhangi bir parolası yoksa boş bırakın (bundan kaçının)
 SaveConfigurationFile=Değerleri saklayın
@@ -140,7 +141,7 @@ FieldRenamed=Alan yeniden adlandırıldı
 IfLoginDoesNotExistsCheckCreateUser=Eğer kullanıcı adı henüz yoksa , "kullanıcı oluştur" seçeneğini işaretlemelisiniz
 ErrorConnection=Sunucu "<b>%s</b>" veritabanı adı "<b>%s</b>", kullanıcı adı "<b>%s</b>" ya da veritabanı parolası yanlış olabilir ya da PHP istemci sürümü veritabanı sürümüne göre çok eski olabilir.
 InstallChoiceRecommanded=<b>%s</b> Geçerli sürümünüzden  <b>%s</b> sürümünü kurmak için önerilen seçim
-InstallChoiceSuggested=<b>Kurulumcu tarafından önerilen seçimi kurun</b>.
+InstallChoiceSuggested=<b>Kurulum tarafından önerilen seçimi kur</b>.
 MigrateIsDoneStepByStep=Hedeflenen sürümde (%s) çeşitli sürüm boşlukları var, bu nedenle sihirbaz bunun tamamlanması için geri dönecektir.
 CheckThatDatabasenameIsCorrect=Veritabanı adı "<b>%s</b>" nin doğruluğunu denetleyin.
 IfAlreadyExistsCheckOption=Eğer bu isim doğru ise ve veritabanı henüz mevcut değilse, "Veritabanı oluştur" seçeneğini işaretlemelisiniz.
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index 8d8a07b3553..7da23b21844 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arapça
 Language_ar_SA=Arapça
+Language_bn_BD=Bengalce
 Language_bg_BG=Bulgarca
 Language_bs_BA=Boşnakça
 Language_ca_ES=Katalanca
@@ -21,9 +22,10 @@ Language_en_SA=İngilizce (Suudi Arabistan)
 Language_en_US=İngilizce (ABD)
 Language_en_ZA=İngilizce (Güney Afrika)
 Language_es_ES=İspanyolca
-Language_es_DO=İspanyolca (Dominik Cumhuriyeti)
 Language_es_AR=İspanyolca (Arjantin)
 Language_es_CL=İspanyolca (Şilil)
+Language_es_CO=İspanyolca (Kolombiya)
+Language_es_DO=İspanyolca (Dominik Cumhuriyeti)
 Language_es_HN=İspanyolca (Honduras)
 Language_es_MX=İspanyolca (Meksika)
 Language_es_PY=İspanyolca (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Endonezca
 Language_is_IS=İzlandaca
 Language_it_IT=İtalyanca
 Language_ja_JP=Japonca
+Language_ka_GE=Gürcüce
+Language_kn_IN=Kannadaca
 Language_ko_KR=Korece
+Language_lo_LA=Laoca
 Language_lt_LT=Litvanyaca
 Language_lv_LV=Letonyaca
 Language_mk_MK=Makedonca
@@ -64,6 +69,7 @@ Language_sv_SV=İsveçce
 Language_sv_SE=İsveçce
 Language_sq_AL=Arnavutça
 Language_sk_SK=Slovakça
+Language_sw_SW=Kisvahilice
 Language_th_TH=Taice
 Language_uk_UA=Ukraynaca
 Language_uz_UZ=Özbek
diff --git a/htdocs/langs/tr_TR/loan.lang b/htdocs/langs/tr_TR/loan.lang
new file mode 100644
index 00000000000..33bb6bd62ce
--- /dev/null
+++ b/htdocs/langs/tr_TR/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Kredi
+Loans=Krediler
+NewLoan=Yeni Kredi
+ShowLoan=Kredi Göster
+PaymentLoan=Kredi ödemesi
+ShowLoanPayment=Kredi Ödemesi Göster
+Capital=Sermaye
+Insurance=Sigorta
+Interest=Faiz
+Nbterms=Koşul sayısı
+LoanAccountancyCapitalCode=Sermaye hesap kodu
+LoanAccountancyInsuranceCode=Sigorta hesap kodu
+LoanAccountancyInterestCode=Faiz hesap kodu
+LoanPayment=Kredi ödemesi
+ConfirmDeleteLoan=Bu kredinin silinmesini onayla
+LoanDeleted=Kredi Başarıyla Silindi
+ConfirmPayLoan=Bu krediyi ödendi olarak sınıflandırmayı onayla
+LoanPaid=Kredi Ödendi
+ErrorLoanCapital=Kredi tutarı sayısal ve sıfırdan büyük olmalı.
+ErrorLoanLength=Kredi süresi sayısal ve sıfırdan büyük olmalı.
+ErrorLoanInterest=Yıllık faiz sayısal ve sıfırdan büyük olmalı.
+# Calc
+LoanCalc=Banka Kredisi Hesaplayıcısı
+PurchaseFinanceInfo=Alış & Finansman Bilgisi
+SalePriceOfAsset=Varlığın Satış Fiyatı
+PercentageDown=Peşinat Yüzdesi
+LengthOfMortgage=İpotek Süresi
+AnnualInterestRate=Yıllık Faiz Oranı
+ExplainCalculations=Hesaplama Açıklaması
+ShowMeCalculationsAndAmortization=Hesaplamaları ve amortismanı göster bana
+MortgagePaymentInformation=İpotek Kredisi Ödeme Bilgisi
+DownPayment=Peşinat
+DownPaymentDesc=<b>Peşinat ödemesi</b> = Evin fiyatı, peşinat yüzdesinin 100 e bölünmüş değeri ile çarpılır (%5 için peşinat 5/100 ya da 0.05)
+InterestRateDesc=<b>Faiz oranı</b> = Yıllık faiz yüzdesinin 100 e bölünmesi
+MonthlyFactorDesc=<b>Aylık katsayı</b> = Aşağıdaki formülün sonucu
+MonthlyInterestRateDesc=<bAylık faiz oranı</b> = Yıllık faiz oranı 12 ye bölünür (yılda 12 ay olduğuna göre)
+MonthTermDesc=Kredinin ay olarak <b>ay sayısı</b>  = Krediyi aldığınız yıl sayısı çarpı 12
+MonthlyPaymentDesc=Aylık ödeme aşağıdaki formül kullanılarak bulunur
+AmortizationPaymentDesc=<a href="#amortization">amortisman</a> aylık ödemelerinizin ne kadarının banka faizine gittiğini ve ne kadarının ana para ödemesine gittiğini ayrıştırır.
+AmountFinanced=Finanse edilen tutar
+AmortizationMonthlyPaymentOverYears=Aylık Ödeme Amortismanı:  <b>%s</b>  %s yılın üzerinde
+Totalsforyear=Toplamı alınan yıl
+MonthlyPayment=Aylık Ödeme
+LoanCalcDesc=Bu <b>ipotek hesaplayıcısı</b> evin satış fiyatına, istenilen kredinin süresine, alıcının peşinat oranına ve kredinin faizine dayalı olarak bir ipotek kredisinin aylık ödemelerinin belirlenmesinde kullanılır.<br> Bu hesaplayıcı, peşin ödemesi 20%  den düşük olan krediler için ÖİS (Özel İpotek Sigortası) komisyonunu belirler. Aynı zamanda yerel emlak vergileri ve toplam aylık ipotek ödemelerine olan etkisini de dikkate alır.<br>
+GoToInterest=%s FAİZE gidecek
+GoToPrincipal=%s ANA PARAYA gidecek
+YouWillSpend=Eviniz için %s tutarındaki parayı %s yılda harcayacaksınız
+# Admin
+ConfigLoan=Kredi modülünün yapılandırılması
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Varsayılan sermaye muhasebe kodu
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Varsayılan faiz muhasebe kodu
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Varsayılan sigorta muhasebe kodu
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index d2e5c102f2c..b867bbda180 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Okundu bilgisi
 YourMailUnsubcribeOK=<b>%s</b> Epostası postalama listesinden başarıyla çıkarıldı
 MailtoEMail=Eposta hiper bağlantısı
 ActivateCheckRead="Alıcı oku" izleyicisini ve "Aboneliği kaldır" linkinin kullanılmasına izin ver
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey="Okuma Alındısı" ve "Abonelik İptali" için kullanılan URL şifrelemesi içi Anahtar
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> alıcılar listesine eklendi
 EachInvoiceWillBeAttachedToEmail=Varsayılan fatura belgesi şablonu kullanan bir belge oluşturulacak ve her epostaya eklenecektir.
@@ -128,6 +128,7 @@ TagCheckMail=Eposta açılışlarını izle
 TagUnsubscribe=Aboneliğini kaldır bağlantısı
 TagSignature=Gönderen kullanıcı imzası
 TagMailtoEmail=Alıcı epostası
+NoEmailSentBadSenderOrRecipientEmail=Gönderilen eposta yok. Hatalı gönderici ya da alıcı epostası. Kullanıcı profilini doğrula.
 # Module Notifications
 Notifications=Bildirimler
 NoNotificationsWillBeSent=Bu etkinlik ve firma için hiçbir Eposta bildirimi planlanmamış
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index bb53436d74f..f452184f818 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Bazı hatalar bulundu. Değişikler geri a
 ErrorConfigParameterNotDefined=Parametre <b>%s</b> Dolibarr yapılandırma dosyasında <b>conf.php</b> tanımlı değil.
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarr veritabanında kullanıcı <b>%s</b> bulunamadı.
 ErrorNoVATRateDefinedForSellerCountry=Hata, ülke '%s' için herhangi bir KDV oranı tanımlanmamış.
-ErrorNoSocialContributionForSellerCountry=Hata, ülke %s için herhangi bir sosyal güvenlik primi türü tanımlanmış.
+ErrorNoSocialContributionForSellerCountry=Hata, '%s' ülkesi için sosyal/mali vergi tipi tanımlanmamış.
 ErrorFailedToSaveFile=Hata, dosya kaydedilemedi.
 SetDate=Ayar tarihi
 SelectDate=Bir tarih seç
@@ -66,7 +66,7 @@ SeeHere=Buraya bak
 BackgroundColorByDefault=Varsayılan arkaplan rengi
 FileNotUploaded=Dosya yüklenmemiş
 FileUploaded=Dosya yüklemesi başarılı
-FileWasNotUploaded=Bu ekleme için bir dosya seçildi ama henüz gönderilmedi. Bunun için “Dosya ekle�? ye tıklayın.
+FileWasNotUploaded=Bu ekleme için bir dosya seçildi ama henüz gönderilmedi. Bunun için “Dosya ekle” ye tıklayın.
 NbOfEntries=Kayıt sayısı
 GoToWikiHelpPage=Çevrimiçi yardım oku (Internet erişimi gerekir)
 GoToHelpPage=Yardım oku
@@ -301,8 +301,8 @@ UnitPriceHT=Birim fiyat (net)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
-AskPriceSupplierUHT=P.U. HT Gerekiyor
-PriceUTTC=B.F.
+AskPriceSupplierUHT=İstenen U.P. ağı
+PriceUTTC=U.P. (inc. tax)
 Amount=Tutar
 AmountInvoice=Fatura tutarı
 AmountPayment=Ödeme tutarı
@@ -339,6 +339,7 @@ IncludedVAT=KDV dahil
 HT=KDV hariç
 TTC=KDV dahil
 VAT=KDV
+VATs=Satış vergisi
 LT1ES=RE
 LT2ES=IRPF
 VATRate=KDV Oranı
@@ -413,6 +414,8 @@ Qty=Mik
 ChangedBy=Değiştiren
 ApprovedBy=Onaylayan
 ApprovedBy2=Onaylayan (ikinci onay)
+Approved=Onaylı
+Refused=Reddedildi
 ReCalculate=Yeniden hesapla
 ResultOk=Başarılı
 ResultKo=Başarısız
@@ -421,7 +424,7 @@ Reportings=Raporlama
 Draft=Taslak
 Drafts=Taslaklar
 Validated=Doğrulanmış
-Opened=Açık
+Opened=Aç
 New=Yeni
 Discount=İndirim
 Unknown=Bilinmeyen
@@ -638,7 +641,7 @@ CoreErrorTitle=Sistem hatası
 CoreErrorMessage=Üzgünüz, bir hata oluştu. Günlükleri kontrol edin veya sistem yöneticinize başvurun.
 CreditCard=Kredi kartı
 FieldsWithAreMandatory=<b>%s</b> olan alanları zorunludur
-FieldsWithIsForPublic=Üyelerin genel listelerinde <b>%s</b> olan alanlar gösterilir. Bunu istemiyorsanız, “genel�? kutusundan işareti kaldırın.
+FieldsWithIsForPublic=Üyelerin genel listelerinde <b>%s</b> olan alanlar gösterilir. Bunu istemiyorsanız, “genel” kutusundan işareti kaldırın.
 AccordingToGeoIPDatabase=(GeoIP dönüşümüne göre)
 Line=Satır
 NotSupported=Desteklenmez
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Belirli bir kullanıcı kişisine bağlantılı
 DeleteAFile=Bir dosya sil
 ConfirmDeleteAFile=Dosya silmek istediğinizden emin misiniz
 NoResults=Sonuç yok
+SystemTools=Sistem araçları
 ModulesSystemTools=Modül araçları
 Test=Deneme
 Element=Unsur
@@ -703,6 +707,9 @@ ShowTransaction=İşlemi göster
 GoIntoSetupToChangeLogo=Logoyu değiştirmek için Giriş - Ayarlar - Firma menüsüne ya da gizlemek için Giriş - Ayarlar - Görünüm menüsüne git.
 Deny=Ret
 Denied=Reddedildi
+ListOfTemplates=Şablon listesi
+Genderman=Adam
+Genderwoman=Kadın
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
@@ -732,3 +739,4 @@ ShortThursday=Pe
 ShortFriday=Cu
 ShortSaturday=Ct
 ShortSunday=Pa
+SelectMailModel=Eposta şablonu seç
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 44e74af7fa6..c6faf09089f 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -199,7 +199,8 @@ Entreprises=Firmalar
 DOLIBARRFOUNDATION_PAYMENT_FORM=Banka havalesi ile abonelik ödemenizi yapmak için bu sayfaya bakın <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>Krdei Kart ya da Paypal ile ödemek için bu sayfanın altındaki düğmeye tıklayın.<br>
 ByProperties=Özelliklere göre
 MembersStatisticsByProperties=Özelliklere göre üye istatistikleri
-MembersByNature=Doğal üyeler
+MembersByNature=Bu ekran doğaya göre üye istatistiklerini gösterir.
+MembersByRegion=Bu ekran bölgeye göre üye istatistiklerini gösterir.
 VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı
 NoVatOnSubscription=Abonelikler için KDV yok
 MEMBER_PAYONLINE_SENDEMAIL=Dolibarr'ın bir doğrulanmış abonelik ödeme onayını almasıyla gönderilecek uyarı epostası
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index daacf401314..99e06c2824e 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -17,10 +17,10 @@ SuppliersOrders=Tedarikçi siparişleri
 SuppliersOrdersRunning=Mevcut tedarikçi siparişleri
 CustomerOrder=Müşteri siparişi
 CustomersOrders=Müşteri siparişleri
-CustomersOrdersRunning=Mevcut müşteri siparişleri
+CustomersOrdersRunning=Geçerli müşteri siparişleri
 CustomersOrdersAndOrdersLines=Müşteri siparişleri ve sipariş kalemleri
 OrdersToValid=Doğrulanacak müşteri siparişleri
-OrdersToBill=Sevkedilen müşteri siparişleri
+OrdersToBill=Teslim edilecek müşteri siparişleri
 OrdersInProcess=İşlemde olan müşteri siparişleri
 OrdersToProcess=İşlenecek müşteri siparişleri
 SuppliersOrdersToProcess=İşlenecek tedarikçi siparişleri
@@ -75,6 +75,7 @@ AddToMyOrders=Siparişlerime ekle
 AddToOtherOrders=Diğer siparişlere ekle
 AddToDraftOrders=Taslak siparişe ekle
 ShowOrder=Siparişi göster
+OrdersOpened=İşlenecek siparişler
 NoOpenedOrders=Açık sipariş yok
 NoOtherOpenedOrders=Başka açık sipariş yok
 NoDraftOrders=Taslak sipariş yok
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 2791df31cfc..fbbc07c0371 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Müdahale doğrulandı
 Notify_FICHINTER_SENTBYMAIL=Müdahale posta ile gönderildi
 Notify_BILL_VALIDATE=Müşteri faturası onaylandı
 Notify_BILL_UNVALIDATE=Müşteri faturasından doğrulama kaldırıldı
+Notify_ORDER_SUPPLIER_VALIDATE=Tedarikçi siparişi kaydedildi.
 Notify_ORDER_SUPPLIER_APPROVE=Tedarikçi siparişi onaylandı
 Notify_ORDER_SUPPLIER_REFUSE=Tedarikçi siparişi reddedildi
 Notify_ORDER_VALIDATE=Müşteri siparişi onaylandı
@@ -203,6 +204,7 @@ ClickHereToGoTo=%s e gitmek için buraya tıkla
 YouMustClickToChange=Ancak önce bu şifre değiştirmeyi doğrulamak için aşağıdaki linke tıklamanız gerekir
 ForgetIfNothing=Bu değiştirmeyi istemediyseniz, bu epostayı unutun. Kimlik bilgilerinizi güvenli tutulur.
 IfAmountHigherThan=Eğer tutar <strong>%s</strong> den büyükse
+SourcesRepository=Kaynaklar için havuz
 
 ##### Calendar common #####
 AddCalendarEntry=% Takvimine giriş ekleyin
diff --git a/htdocs/langs/tr_TR/printing.lang b/htdocs/langs/tr_TR/printing.lang
index 087b9d2a8a4..9b45394f8e4 100644
--- a/htdocs/langs/tr_TR/printing.lang
+++ b/htdocs/langs/tr_TR/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Doğrudan yazdırma
-Module112000Desc=Doğrudan Yazdırma Sistemini Engelle
+Module64000Name=Doğrudan Yazdırma
+Module64000Desc=Doğrudan Yazdırma Sistemini etkinleştir
 PrintingSetup=Doğrudan Yazdırma Sistemi Ayarları
 PrintingDesc=Bu modül, çeşitli modüllerde belgeleri doğrudan yazıcıya göndermek için bir Yazdırma tuşu ekler (belge uygulamada açılmadan) 
 ModuleDriverSetup=Modül Sürücüsü Ayarları
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Oturum açma
 PRINTIPP_PASSWORD=Parola
 NoPrinterFound=Yazıcı bulunamadı (CUPS ayarlarınızı denetleyin)
-FileWasSentToPrinter=%s Dosyası yazıcıya gönderilmiştir
 NoDefaultPrinterDefined=Tanımlı varsayılan yazıcı yok
 DefaultPrinter=Varsayılan yazıcı
 Printer=Yazıcı
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index 2c25b7e592b..0ac7a112fac 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Mik: %d
 AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle
 BatchDefaultNumber=Tanımlanmamış
 WhenProductBatchModuleOnOptionAreForced=Parti/Seri modülü açıkken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler isteğinize göre düzenlenebilir.
-ProductDoesNotUseBatchSerial=Bu ürün parti/seri numarası kullanmaz
+ProductDoesNotUseBatchSerial=Bu ürün parti/seri numarası kullanmıyor
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index d49a3fffe8d..b86c794dd5d 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Ürün veya Hizmet
 ProductsAndServices=Ürünler ve Hizmetler
 ProductsOrServices=Ürünler veya hizmetler
 ProductsAndServicesOnSell=Satılır ya da alınır Ürünler ve Hizmetler
-ProductsAndServicesNotOnSell=Satış dışı Ürünler ve Hizmetler
+ProductsAndServicesNotOnSell=Satılık olmayan Ürünler ve Hizmetler
 ProductsAndServicesStatistics=Ürün ve Hizme istatistikleri
 ProductsStatistics=Ürün istatistikleri
-ProductsOnSell=Satılır ya da satınalınır ürün
-ProductsNotOnSell=Satılmaz ya da alınmaz ürün
+ProductsOnSell=Satılır ya da satın alınır ürün
+ProductsNotOnSell=Satılık olmayan ve satın alınmayan ürün
 ProductsOnSellAndOnBuy=Satılır ve alınır ürünler
 ServicesOnSell=Satılır veya alınır Hizmetler
-ServicesNotOnSell=Satılmayan hizmetler
+ServicesNotOnSell=Satılık olmayan hizmetler
 ServicesOnSellAndOnBuy=Satılır ve alınır hizmetler
 InternalRef=İç referans
 LastRecorded=Satışta kaydedilen son ürünler/hizmetler
@@ -72,20 +72,20 @@ PublicPrice=Perakende fiyatı
 CurrentPrice=Güncel fiyat
 NewPrice=Yeni fiyat
 MinPrice=Enaz satış fiyatı
-MinPriceHT=Minimum satış tutarı (vergi hariç)
-MinPriceTTC=Minimum satış tutarı (vergi dahil)
+MinPriceHT=Enaz satış fiyatı (vergisiz net)
+MinPriceTTC=Enaz satış fiyatı (vergi dahil)
 CantBeLessThanMinPrice=Satış fiyatı bu ürün için izin verilenden enaz fiyattan düşük olamaz (%s vergi hariç). Bu mesaj, çok fazla indirim yazarsanız da belirir.
 ContractStatus=Sözleşme durumu
 ContractStatusClosed=Kapalı
-ContractStatusRunning=Yürürlükte
+ContractStatusRunning=Sürüyor
 ContractStatusExpired=süresi doldu
-ContractStatusOnHold=Yürürlükte değil
-ContractStatusToRun=Yürülüğe alınacak
-ContractNotRunning=Bu sözleşme çalışmıyor
+ContractStatusOnHold=Beklemede
+ContractStatusToRun=Sürüyor yap
+ContractNotRunning=Bu sözleşme sürmüyor
 ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var.
 ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer.
 ErrorProductClone=Ürün ya da hizmetin klonlanmasına çalışılırken bir sorun oluştu.
-ErrorPriceCantBeLowerThanMinPrice=Hata! Fiyat Enaz Fiyattan düşük olamaz
+ErrorPriceCantBeLowerThanMinPrice=Hata, fiyat enaz fiyattan daha düşük olamaz.
 Suppliers=Tedarikçiler
 SupplierRef=Tedarikçi ürün ref.
 ShowProduct=Ürün Göster
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Eğer ürün sınırlı süreli bir hizmetse:
 MultiPricesAbility=Ürünler/hizmetler için çok seviyeli fiyat
 MultiPricesNumPrices=Fiyat sayısı
 MultiPriceLevelsName=Fiyat kategorileri
-AssociatedProductsAbility=Sanal paket özelliğini etkinleştir
+AssociatedProductsAbility=Paket özelliğini etkinleştir
 AssociatedProducts=Paket ürün
-AssociatedProductsNumber=Bu sanal paket ürünü oluşturan ürün sayısı
+AssociatedProductsNumber=Bu ürün paketini oluşturan ürün sayısı
 ParentProductsNumber=Ana paket ürünü sayısı
-IfZeroItIsNotAVirtualProduct=Eğer 0 ise, bu ürün bir sanal paket ürünü değildir
-IfZeroItIsNotUsedByVirtualProduct=Eğer 0 ise, bu ürün her hangi bir sanal paket ürünü tarafından kullanılmaz
+IfZeroItIsNotAVirtualProduct=Sıfırsa, bu ürün bir paket ürünü değil
+IfZeroItIsNotUsedByVirtualProduct=Sıfırsa, bu ürün hiçbir ürün paketi tarafından kullanılmamaktadır
 EditAssociate=Ilişkilendir
 Translation=Çeviri
 KeywordFilter=Anahtar kelime süzgeçi
@@ -131,7 +131,7 @@ ProductToAddSearch=Eklemek için ürün ara
 AddDel=Ekle/Sil
 Quantity=Miktar
 NoMatchFound=Eşleşme bulunamadı
-ProductAssociationList=İlgili ürün/hizmet listesi: ürün/hizmet adı (miktar etkilenir)
+ProductAssociationList=Bu sanal ürünü/paketin bileşeni olan ürünler/hizmetler listesi
 ProductParentList=Bu ürünü bir bileşen olarak kullanan ürünlerin/hizmetlerin listesi
 ErrorAssociationIsFatherOfThis=Seçilen üründen biri güncel ürünün üstü konumundadır
 DeleteProduct=Bir ürün/hizmet sil
@@ -179,16 +179,41 @@ CloneProduct=Ürün veya hizmet klonla
 ConfirmCloneProduct=Ürün veya hizmet klonlamak istediğinizden emin misiniz <b>%s</b> ?
 CloneContentProduct=Ürünün/hizmet bütün temel bilgilerini klonla
 ClonePricesProduct=Ana bilgileri ve fiyatları klonla
-CloneCompositionProduct=Paket ürünü/hizmeti kopyala
+CloneCompositionProduct=Paketlenmiş ürünü/hizmeti kopyala
 ProductIsUsed=Bu ürün kullanılır.
 NewRefForClone=Yeni ürün/hizmet ref.
 CustomerPrices=Müşteri fiyatları
-SuppliersPrices=Tedarikçi Fiyatları
-SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürünlerin veya servislerin)
+SuppliersPrices=Tedarikçi fiyatları
+SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürünlerin ya da hizmetlerin)
 CustomCode=Özel kod
 CountryOrigin=Menşei ülke
 HiddenIntoCombo=Seçme listeleri içine gizle
 Nature=Niteliği
+ShortLabel=Kısa etiket
+Unit=Birim
+p=b.
+set=takım
+se=takım
+second=saniye
+s=sn
+hour=saat
+h=s
+day=gün
+d=g
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=metre
+m=m
+linear metre=lineer metre
+lm=lm
+square metre=metre kare
+m2=m²
+cubic metre=metre küp
+m3=m³
+liter=litre
+l=L
 ProductCodeModel=Ürün ref şablonu
 ServiceCodeModel=Hizmet ref şablonu
 AddThisProductCard=Ürün kartı oluştur
@@ -214,7 +239,7 @@ CostPmpHT=Net toplam HAOF
 ProductUsedForBuild=Üretim tarafından kendiliğinden tüketilir
 ProductBuilded=Üretim tamamlandı
 ProductsMultiPrice=Ürün çoklu fiyatı
-ProductsOrServiceMultiPrice=Müşteri fiyatları (ürünlerin veya servislerin , çoklu-fiyatlar)
+ProductsOrServiceMultiPrice=Müşteri fiyatları (ürünlerin ya da hizmetlerin, çoklu fiyatlar)
 ProductSellByQuarterHT=Ürün üç aylık cirosu HAOF
 ServiceSellByQuarterHT=Hizmet üç aylık cirosu HAOF
 Quarter1=1. Çeyrek
@@ -237,7 +262,7 @@ ResetBarcodeForAllRecords=Bütün kayıtlar için barkod değeri tanımla (bu i
 PriceByCustomer=Her müşteri için farklı fiyat
 PriceCatalogue=Ürün/Servis için birim fiyat
 PricingRule=Müşteri fiyatları kuralları
-AddCustomerPrice=Müşteriler için fiyat ekle
+AddCustomerPrice=Müşteriye göre fiyat ekle
 ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
 PriceByCustomerLog=Müşteri fiyat günlüğü
 MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=biçimi {"URL": "http://example.com/urlofws", "
 UpdateInterval=Güncelleme aralığı (dakika)
 LastUpdated=Son güncelleme
 CorrectlyUpdated=Doru olarak güncellendi
+PropalMergePdfProductActualFile=PDF Azur'a eklenmek için kullanılacak dosya/lar
+PropalMergePdfProductChooseFile=PDF dosyası seç
+IncludingProductWithTag=Etiketli ürünleri içerir
+DefaultPriceRealPriceMayDependOnCustomer=Varsayılan fiyat, gerçek fiyat müşteriye bağlı olabilir
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 72ee08ba710..5145aea626f 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
 ProjectsPublicTaskDesc=Bu görünüm, okumanıza izin verilen tüm proje ve görevleri sunar.
 ProjectsDesc=Bu görünüm tüm projeleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 MyTasksDesc=Bu görünüm ilgilisi olduğunuz projelerle ya da görevlerle sınırlıdır (türü ne olursa olsun).
-OnlyOpenedProject=Yalnızca açık projeler görünürdür (taslak ya da kapalı durumdaki projeler görünmez)
+OnlyOpenedProject=Yalnızca açık projeler görünür (taslak ya da kapalı durumdaki projeler görünmez)
 TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir.
 TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
-AllTaskVisibleButEditIfYouAreAssigned=Böyle bir proje için tüm görevler görünürdür, ama yalnızca atanmış olduğunuz görev için zaman girişi yapabilirsiniz.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projeler alanı
 NewProject=Yeni proje
 AddProject=Proje oluştur
@@ -29,7 +30,7 @@ ProjectsList=Proje listesi
 ShowProject=Proje göster
 SetProject=Proje ayarla
 NoProject=Tanımlı ya da sahip olunan hiçbir proje yok
-NbOpenTasks=Açık görev sayısı
+NbOpenTasks=Açık olan görev sayısı
 NbOfProjects=Proje sayısı
 TimeSpent=Harcanan süre
 TimeSpentByYou=Tarafınızdan harcanan süre
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
 ListExpenseReportsAssociatedProject=Bu proje ile ilişkili gider raporları listesi
 ListDonationsAssociatedProject=Bu proje ile ilişkilendirilmiş bağış listesi
 ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi
+ListTaskTimeUserProject=Projelere harcanan sürelerin listesi
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Projede bu haftaki etkinlik
 ActivityOnProjectThisMonth=Projede bu ayki etkinlik
 ActivityOnProjectThisYear=Projede bu yılki etkinlik
@@ -135,11 +138,19 @@ DocumentModelBaleine=Eksiksiz bir proje rapor modeli (logo. ..)
 PlannedWorkload=Planlı işyükü
 PlannedWorkloadShort=İşyükü
 WorkloadOccupation=İşyükü ataması
+ProjectReferers=Yönlendirme nesneleri
 SearchAProject=Bir proje ara
 ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
 ProjectDraft=Taslak projeler
-FirstAddRessourceToAllocateTime=Zaman ayırmak için bir kaynak ilişkilendirin
+FirstAddRessourceToAllocateTime=Zaman tahsisi için bir kaynak ilişkilendir
 InputPerDay=Günlük giriş
 InputPerWeek=Haftalık giriş
 InputPerAction=Eylem başına giriş
 TimeAlreadyRecorded=Bu görev ve kullanıcı %s için harcanan süre zaten kayıtlı
+ProjectsWithThisUserAsContact=İlgili olarak bu kullanıcı olan projeler
+TasksWithThisUserAsContact=Bu kullanıcıya atanmış görevler
+ResourceNotAssignedToProject=Projeye atanmamış
+ResourceNotAssignedToTask=Göreve atanmamış
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index d06f3c3525b..e277d5357b3 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -16,7 +16,7 @@ Prospect=Aday
 ProspectList=Aday listesi
 DeleteProp=Teklif sil
 ValidateProp=Teklif doğrula
-AddProp=Teklif ekle
+AddProp=Teklif oluştur
 ConfirmDeleteProp=Bu teklifi silmek istediğinizden emin misiniz?
 ConfirmValidateProp=Bu teklifi doğrulamak istediğinizden emin misiniz?
 LastPropals=Son %s teklif
@@ -24,14 +24,14 @@ LastClosedProposals=Son %s kapalı teklif
 LastModifiedProposals=Değiştirilen son %s  teklif
 AllPropals=Tüm teklifler
 LastProposals=Son teklifler
-SearchAProposal=Bir teklif ara
+SearchAProposal=Teklif ara
 ProposalsStatistics=Teklif istatistikleri
 NumberOfProposalsByMonth=Aylara göre sayısı
 AmountOfProposalsByMonthHT=Aylık tutar (vergi hariç)
 NbOfProposals=Teklif sayısı
 ShowPropal=Teklif göster
 PropalsDraft=Taslaklar
-PropalsOpened=Açık
+PropalsOpened=Aç
 PropalsNotBilled=Kapalı faturalanmamış
 PropalStatusDraft=Taslak (doğrulanması gerekir)
 PropalStatusValidated=Onaylı (teklif açık)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=İmzalanmamış (kapalı)
 PropalStatusBilled=Faturalanmış
 PropalStatusDraftShort=Taslak
 PropalStatusValidatedShort=Doğrulanmış
-PropalStatusOpenedShort=Açık
+PropalStatusOpenedShort=Aç
 PropalStatusClosedShort=Kapalı
 PropalStatusSignedShort=İmzalı
 PropalStatusNotSignedShort=İmzalanmamış
@@ -50,13 +50,11 @@ PropalStatusBilledShort=Faturalanmış
 PropalsToClose=Kapatılacak teklifler
 PropalsToBill=Faturalanacak imzalı teklifler
 ListOfProposals=Teklif listesi
-ActionsOnPropal=Tekliler için yapılan eylemler
+ActionsOnPropal=Tekliler için yapılan etkinlikler
 NoOpenedPropals=Açık teklif yok
-NoOtherOpenedPropals=Başka hiçbir açık teklif yok
+NoOtherOpenedPropals=Başka açık teklif yok
 RefProposal=Teklif ref
 SendPropalByMail=Teklifi postayla gönder
-FileNotUploaded=Dosya yüklenemedi
-FileUploaded=Dosya başarıyla yüklendi
 AssociatedDocuments=Bu teklif ile ilişkili belgeler:
 ErrorCantOpenDir=Dizin açılamıyor
 DatePropal=Teklif tarihi
@@ -100,3 +98,4 @@ DocModelJauneDescription=Jaune teklif modeli
 DefaultModelPropalCreate=Varsayılan model oluşturma
 DefaultModelPropalToBill=Bir teklifi kapatma sırasında varsayılan şablon (faturalanacak)
 DefaultModelPropalClosed=Bir teklifi kapatma sırasında varsayılan şablon (faturalanmamış)
+ProposalCustomerSignature=Yazılı kabul, firma kaşesi, tarih ve imza
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 4bc47248b7f..0f8326dfbc0 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Ücret ödemesi göster
 THM=Ortalama saat ücreti
 TJM=Ortalama günlük ücret
 CurrentSalary=Güncel maaş
+THMDescription=Bu değer, eğer proje modülü kullanılıyorsa kullanıcılar tarafından girilen bir projede tüketilen sürenin maliyetinin hesaplanması için kullanılır
+TJMDescription=Bu değer yalnızca bilgi amaçlı olup hiçbir hesaplamada kulanılmaz
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 3881d64ef9b..a394748b645 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Basit belge modeli
 DocumentModelMerou=Merou A5 modeli
 WarningNoQtyLeftToSend=Uyarı, sevkiyat için bekleyen herhangi bir ürün yok.
 StatsOnShipmentsOnlyValidated=İstatistikler yalnızca doğrulanmış sevkiyatlarda yapılmıştır. Kullanılan tarih sevkiyat doğrulama tarihidir (planlanan teslim tarihi her zaman bilinemez)
-DateDeliveryPlanned=Planlanan teslim tarihi
+DateDeliveryPlanned=Teslimat için planlanan tarih
 DateReceived=Teslim alınan tarih
 SendShippingByEMail=Sevkiyatı EPostayla gönder
 SendShippingRef=% Nakliyatının yapılması
@@ -67,7 +67,7 @@ SendingRunning=Sipariş edilmiş müşteri sparişindeki ürün
 SuppliersReceiptRunning=Sipariş edilmiş tedarikçi sparişindeki ürün
 ProductQtyInCustomersOrdersRunning=Açık müşteri siparişlerindeki ürün miktarı
 ProductQtyInSuppliersOrdersRunning=Açık tedarikçi siparişlerindeki ürün miktarı
-ProductQtyInShipmentAlreadySent=Açık müşteri siparişlerindeki halihazırda gönderilmiş ürün miktarı
+ProductQtyInShipmentAlreadySent=Gönderilmiş olan ve açık durumdaki müşteri siparişindeki miktar
 ProductQtyInSuppliersShipmentAlreadyRecevied=Açık tedarikçi siparişlerindeki halihazırda teslim alınmış ürün miktarı
 
 # Sending methods
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 5ab213a1ed3..3e2f63963b7 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Stok azaltılması için kullanmak üzere depo s
 SelectWarehouseForStockIncrease=Stok artışı için kullanılacak depo seçin
 NoStockAction=Stok işlemi yok
 LastWaitingSupplierOrders=Kabul için bekleyen siparişler
-DesiredStock=İstenen stok
+DesiredStock=İstenen enaz stok
+DesiredMaxStock=İstenen ençok stok
 StockToBuy=Sipariş edilecek
 Replenishment=İkmal
 ReplenishmentOrders=İkmal siparişleri
-VirtualDiffersFromPhysical=Stok arttırma/azaltma seçeneklerine göre fiziksel stok ve sanal stok (fiziksel + mevcut siparişler) farklılık gösterebilir
+VirtualDiffersFromPhysical=Stok arttırma/eksiltme seçeneklerine göre, fiziksel stok ve sanal stok (fiziksel + geçerli siparişler) farklı olmalı
 UseVirtualStockByDefault=Tamamlama özelliği için fiziksel stok yerine varsayıla olarak sanal stok kullanın
 UseVirtualStock=Sanal stok kullan
 UsePhysicalStock=Fiziksel stok kullan
-CurentSelectionMode=Geçerli seçim biçimi
+CurentSelectionMode=Geçerli seçim modu
 CurentlyUsingVirtualStock=Sanal stok
 CurentlyUsingPhysicalStock=Fiziksel stok
 RuleForStockReplenishment=Stok ikmal kuralı
@@ -112,8 +113,8 @@ AlertOnly= Yalnızca uyarılar
 WarehouseForStockDecrease=<b>%s</b> deposu stok eksiltme için kullanılacaktır
 WarehouseForStockIncrease=<b>%s</b> deposu stok arttırma için kullanılacaktır
 ForThisWarehouse=Bu depo için
-ReplenishmentStatusDesc=Bu liste istenen stoktan daha az stoklu bütün ürünler içindir (ya da eğer onay kutusunda "yalnızca uyarı" işaretliyse, uyarı değerinden az olan) ve bu farkı kapatmanız için tedarikçi siparişi oluşturmanızı önerir.
-ReplenishmentOrdersDesc=Bu, öntanımlı ürünleri de içeren tüm açık tedarikçi siparişleri listesidir. Burada yalnızca öntanımlı ürünleri içeren açık siparişler, stokları etkileyebilir, görünür.
+ReplenishmentStatusDesc=Bu, istenen stoktan daha az stoklu ürünlerin bir listesidir (ya da uyarı değerinden daha düşük, eğer onay kutusunda "yalnızca uyar" işaretliyse), ve size farkı doldurmak üzere tedarikçi siparişi oluşturmanızı önerir.
+ReplenishmentOrdersDesc=Bu, öntanımlı ürünleri içeren tüm açık tedarikçi siparişlerinin bir listesidir. Yalnızca öntanımlı ürünlü açık siparişler burada görünür, yani stokları etkileyen siparişler. 
 Replenishments=İkmal
 NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır
 NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır
@@ -124,16 +125,16 @@ RecordMovement=Kayıt aktarımı
 ReceivingForSameOrder=Bu siparişten yapılan kabuller
 StockMovementRecorded=Stok hareketleri kaydedildi
 RuleForStockAvailability=Stok gereksinimi kuralları
-StockMustBeEnoughForInvoice=Faturaya ürün/hizmet eklemek için stok düzeyi yeterli olmalıdır
-StockMustBeEnoughForOrder=Siparişe ürün/hizmet eklemek için stok düzeyi yeterli olmalıdır
-StockMustBeEnoughForShipment= Sevkiyata ürün/hizmet eklemek için stok düzeyi yeterli olmalıdır
+StockMustBeEnoughForInvoice=Stok düzeyi faturaya ürün/hizmet eklemeye yeterli olmalı
+StockMustBeEnoughForOrder=Stok düzeyi siparişe ürün/hizmet eklemeye yeterli olmalı
+StockMustBeEnoughForShipment= Stok düzeyi sevkiyata ürün/hizmet eklemeye yeterli olmalı
 MovementLabel=Hareket etiketi
 InventoryCode=Hareket veya stok kodu
 IsInPackage=Pakette içerilir
 ShowWarehouse=Depo göster
-MovementCorrectStock=%s ürünü için stok içeriği düzeltmesi
+MovementCorrectStock=Stok düzeltme yapılacak ürün %s
 MovementTransferStock=%s ürününün başka bir depoya stok aktarılması
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn="ürün partisi" açıkken kaynak depo burada tanımlanmalıdır. Hareket için parti/seri gerektiren ürün için hangi partinin/serinin uygun olduğunun listelenmesi için kullanılacaktır. Farklı depolardan ürün göndermek isterseniz yalnızca bir kaç adımda sevkiyat yapın.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn="Ürün partisi" modülü açık ise kaynak depo burada tanımlanmalıdır. Hareket için parti/seri gerektiren ürün için hangi partinin/serinin uygun olduğunun listelenmesi için kullanılacaktır. Farklı depolardan ürün göndermek isterseniz bir kaç adımda sevkiyat yapın.
 InventoryCodeShort=Inv./Mov. kodu
-NoPendingReceptionOnSupplierOrder=Açılmış tedarikçi siparişi nedeniyle bekleyen kabul yok
+NoPendingReceptionOnSupplierOrder=Açık tedarikçi siparişlerinde bekleyen kabul yok
 ThisSerialAlreadyExistWithDifferentDate=Bu parti/seri numarası (<strong>%s</strong>) zaten var fakat farklı tüketme ya da satma tarihli bulundu (<strong>%s</strong> ama sizin girdiğiniz bu <strong>%s</strong>).
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index ccaf0938eee..eb16289ef76 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Tedarikçilere gönderilen
 ListOfSupplierOrders=Tedarikçi siparişleri listesi
 MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
 NbDaysToDelivery=Gün olarak teslim süresi
-DescNbDaysToDelivery=Sipariş ürün listesindeki en uzun teslim süresi
+DescNbDaysToDelivery=Bu siparişteki en büyük teslimat gecikmesi olan ürünler
 UseDoubleApproval=İkili onay kullanın (ikinci onay özel izinli herhangi bir kullanıcı tarafından yapılabilir)
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index a0b9a259ab9..f6b281892b7 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Giderler raporları
 TripsAndExpensesStatistics=Gider raporları istatistkleri
 TripCard=Gider raporu kartı
 AddTrip=Gider raporu oluştur
-ListOfTrips=Gider raporu listesi
+ListOfTrips=Gider raporları listesi
 ListOfFees=Ücretler listesi
 NewTrip=Yeni gider raporu
 CompanyVisited=Ziyaret edilen firma/kuruluş
@@ -40,11 +40,10 @@ TF_BUS=Otobüs
 TF_CAR=Araba
 TF_PEAGE=Geçiş parası
 TF_ESSENCE=Yakıt
-TF_HOTEL=Hostel
+TF_HOTEL=Otel
 TF_TAXI=Taksi
 
 ErrorDoubleDeclaration=Benzer bir tarih aralığı için başka bir gider raporu bildirdiniz.
-ListTripsAndExpenses=Giderler raporları listesi
 AucuneNDF=Bu kriter uyan hiç gider raporu bulunamadı
 AucuneLigne=Bildirilen hiç gider raporu yok
 AddLine=Satır ekle
@@ -56,12 +55,12 @@ ModePaiement=Ödeme biçimi
 Note=Not
 Project=Proje
 
-VALIDATOR=Onama için bilgilendirilecek kullanıcı
+VALIDATOR=Onaylama için sorumlu kişi
 VALIDOR=Onaylayan
 AUTHOR=Kaydeden
 AUTHORPAIEMENT=Ödeyen
 REFUSEUR=Reddeden
-CANCEL_USER=İptal eden
+CANCEL_USER=Silen
 
 MOTIF_REFUS=Neden
 MOTIF_CANCEL=Neden
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Ödeme tarihi
 
 TO_PAID=Öde
 BROUILLONNER=Yeniden aç
-SendToValid=Onay için gönder
+SendToValid=Onay üzerine gönderilmiş
 ModifyInfoGen=Düzenle
 ValidateAndSubmit=Doğrula ve onay için gönder
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=Bu gider raporunu onaylama yetiniz yok
 NOT_AUTHOR=Bu gider raporunu yazan siz değilsiniz. İşlem iptal edildi.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Bu gider raporunun durumunu "Ödendi" olarak değiştirmek isted
 CancelTrip=Bir gider raporu iptal et
 ConfirmCancelTrip=Bu gider raporunu iptal etmek istediğinizden emin misiniz?
 
-BrouillonnerTrip=Gider raporun geri "Taslak" durumuna döndür
+BrouillonnerTrip=Gider raporu durumunu yeniden "Taslak" durumuna getir
 ConfirmBrouillonnerTrip=Bu gider raporunu "Taslak" durumuna döndürmek istediğinizden emin misiniz?
 
 SaveTrip=Gider raporunu doğrula
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index fdecda7541b..19ef60b14d2 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Gruptan kaldır
 PasswordChangedAndSentTo=Parola değiştirildi ve <b>%s</b> e gönderildi.
 PasswordChangeRequestSent=Parola değiştirildi ve <b>%s</b> e gönderildi.
 MenuUsersAndGroups=Kullanıcılar ve Gruplar
+MenuMyUserCard=Kullanıcı kartım
 LastGroupsCreated=Son olarak %s grup oluşturuldu
 LastUsersCreated=Son olarak %s kullanıcı oluşturuldu
 ShowGroup=Grubu göster
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 29877b2cce6..11b72fe7b11 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Para çekme dosyası
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
 ThisWillAlsoAddPaymentOnInvoice=Bu aynı zamanda faturalara ödeme oluşturur ve onları "ödendi" olarak sınıflandırır
 StatisticsByLineStatus=Durum satırlarına göre istatistkler
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index e6d92e4ecda..d76b920a003 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=İş Akışı modülü kurulumu
-WorkflowDesc=Bu modül uygulamalardaki otomatik eylemlerin davranışlarını değiştirmek için tasarlanmıştır. Varsayılan olarak, iş akışı açılır (istediğiniz şeyleri yaparsınız). İlgi duyduğunuz otomatik eylemleri etkinleştirebilirsiniz.
-ThereIsNoWorkflowToModify=Etkinleştirdiğiniz bu modül için değişitirilebilecek bir iş akışı yok.
+WorkflowDesc=Bu modül, uygulamadaki otomatik eylemlerin davranışlarını değiştirilmek için tasarlanmıştır. Varsayılan olarak, iş akışı açıktır (işleri istediğiniz sıraya göre yapabilirsiniz). İlgilendiğiniz otomatik eylemleri etkinleştirebilirsiniz.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Bir teklif imzalandıktan sonra kendiliğinden müşteri siparişi oluşturulsun
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Bir teklif imzalandıktan sonra kendiliğinden müşteri faturası oluşturulsun
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Bir sözleşme onaylandıktan sonra kendiliğinden müşteri faturası oluşturulsun
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Bir müşteri siparişi kapatıldıktan sonra kendiliğinden müşteri faturası oluşturulsun
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically Bir teklif imzalandıktan sonra kendiliğinden müşteri faturası oluşturulsun
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically Bir sözleşme doğrulandıktan sonra kendiliğinden müşteri faturası oluşturulsun
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically Bir müşteri siparişi kapatıldıktan sonra kendiliğinden müşteri faturası oluşturulsun
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Bir müşteri siparişi ödenmiş olarak güncellendiğinde ilgili kaynak teklif faturalandı olarak dosyalansın
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Müşteri faturası ödendi olarak ayarlandığında bağlantılı kaynak sipariş(ler)ini faturalandı olarak sınıflandır
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Müşteri faturası doğrulandığında bağlantılı kaynak sipariş(ler)ini faturalandı olarak sınıflandır
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index a24e57c3336..ce9beb7eb51 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 65adcd2c421..4ddeec3746e 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 288f54be283..31549e89fb0 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=К-ть рахунків-фактур
 NumberOfBillsByMonth=К-ть рахунків-фактур по місяцях
 AmountOfBills=Сума рахунків-фактур
 AmountOfBillsByMonthHT=Сума рахунків-фактур за місяць (за вирахуванням податку)
-ShowSocialContribution=Показати соціальний внесок
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Показати рахунок-фактуру
 ShowInvoice=Показати рахунок-фактуру
 ShowInvoiceReplace=Показати замінюючий рахунок-фактуру
@@ -270,7 +270,7 @@ BillAddress=Адреса виставляння
 HelpEscompte=Ця знижка надана Покупцеві за достроковий платіж.
 HelpAbandonBadCustomer=Від цієї суми відмовився Покупець (вважається поганим клієнтом) і вона вважається надзвичайною втратою.
 HelpAbandonOther=Від цієї суми відмовилися через помилку (наприклад, неправильний клієнт або рахунок-фактура був замінений на іншій)
-IdSocialContribution=Код соціальних внесків
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Код платежу
 InvoiceId=Код рахунку-фактури
 InvoiceRef=Invoice ref.
@@ -430,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Фінальний і основний рахунок
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 6fd5e90e8c5..9c6803c4fcb 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Останні контракти
 BoxLastContacts=Останні контакти / адреси
 BoxLastMembers=Останні учасники
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Несплачені рахунки клієнта
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 5580d87b517..42a9a884c76 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +269,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/uk_UA/ecm.lang
+++ b/htdocs/langs/uk_UA/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/uk_UA/incoterm.lang b/htdocs/langs/uk_UA/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/uk_UA/incoterm.lang
+++ b/htdocs/langs/uk_UA/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
index 5d8cdfc0649..08be694db79 100644
--- a/htdocs/langs/uk_UA/languages.lang
+++ b/htdocs/langs/uk_UA/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Арабська
 Language_ar_SA=Арабська
+Language_bn_BD=Bengali
 Language_bg_BG=Болгарська
 Language_bs_BA=Боснійська
 Language_ca_ES=Каталонський
@@ -13,7 +14,7 @@ Language_de_AT=Німецька (Австрія)
 Language_de_CH=Німецька (Швейцарія)
 Language_el_GR=Грецький
 Language_en_AU=Англійська (Австралія)
-Language_en_CA=English (Canada)
+Language_en_CA=Англійська (Канада)
 Language_en_GB=Англійська (Великобританія)
 Language_en_IN=Англійська (Індія)
 Language_en_NZ=Англійська (Нова Зеландія)
@@ -21,9 +22,10 @@ Language_en_SA=Англійська (Саудівська Аравія)
 Language_en_US=Англійська (США)
 Language_en_ZA=Англійська (Південна Африка)
 Language_es_ES=Іспанська
-Language_es_DO=Іспанська (Домініканська Республіка)
 Language_es_AR=Іспанська (Аргентина)
 Language_es_CL=Іспанська (Чілі)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Іспанська (Домініканська Республіка)
 Language_es_HN=Іспанська (Гондурас)
 Language_es_MX=Іспанська (Мексика)
 Language_es_PY=Іспанська (Парагвай)
@@ -45,7 +47,10 @@ Language_id_ID=Індонезійська
 Language_is_IS=Ісландський
 Language_it_IT=Італійський
 Language_ja_JP=Японський
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Корейська
+Language_lo_LA=Lao
 Language_lt_LT=Литовський
 Language_lv_LV=Латвійська
 Language_mk_MK=Македонський
@@ -64,6 +69,7 @@ Language_sv_SV=Шведська
 Language_sv_SE=Шведська
 Language_sq_AL=Албанська
 Language_sk_SK=Словаччини
+Language_sw_SW=Kiswahili
 Language_th_TH=Тайська
 Language_uk_UA=Український
 Language_uz_UZ=Узбецький
diff --git a/htdocs/langs/uk_UA/loan.lang b/htdocs/langs/uk_UA/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/uk_UA/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 957c62b923c..21d782287f2 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Підпис відправника
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Оповіщення
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 13f82db52fd..b1403b29bca 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/uk_UA/printing.lang b/htdocs/langs/uk_UA/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/uk_UA/printing.lang
+++ b/htdocs/langs/uk_UA/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
index d17bc952b7d..d10dbb15122 100644
--- a/htdocs/langs/uk_UA/propal.lang
+++ b/htdocs/langs/uk_UA/propal.lang
@@ -1,102 +1,101 @@
 # Dolibarr language file - Source file is en_US - propal
-# Proposals=Commercial proposals
-# Proposal=Commercial proposal
-# ProposalShort=Proposal
-# ProposalsDraft=Draft commercial proposals
-# ProposalDraft=Draft commercial proposal
-# ProposalsOpened=Opened commercial proposals
-# Prop=Commercial proposals
-# CommercialProposal=Commercial proposal
-# CommercialProposals=Commercial proposals
-# ProposalCard=Proposal card
-# NewProp=New commercial proposal
-# NewProposal=New commercial proposal
-# NewPropal=New proposal
-# Prospect=Prospect
-# ProspectList=Prospect list
-# DeleteProp=Delete commercial proposal
-# ValidateProp=Validate commercial proposal
-# AddProp=Add proposal
-# ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-# ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-# LastPropals=Last %s proposals
-# LastClosedProposals=Last %s closed proposals
-# LastModifiedProposals=Last %s modified proposals
-# AllPropals=All proposals
-# LastProposals=Last proposals
-# SearchAProposal=Search a proposal
-# ProposalsStatistics=Commercial proposal's statistics
-# NumberOfProposalsByMonth=Number by month
-# AmountOfProposalsByMonthHT=Amount by month (net of tax)
-# NbOfProposals=Number of commercial proposals
-# ShowPropal=Show proposal
-# PropalsDraft=Drafts
-# PropalsOpened=Opened
-# PropalsNotBilled=Closed not billed
-# PropalStatusDraft=Draft (needs to be validated)
-# PropalStatusValidated=Validated (proposal is open)
-# PropalStatusOpened=Validated (proposal is open)
-# PropalStatusClosed=Closed
-# PropalStatusSigned=Signed (needs billing)
-# PropalStatusNotSigned=Not signed (closed)
-# PropalStatusBilled=Billed
-# PropalStatusDraftShort=Draft
-# PropalStatusValidatedShort=Validated
-# PropalStatusOpenedShort=Opened
-# PropalStatusClosedShort=Closed
-# PropalStatusSignedShort=Signed
-# PropalStatusNotSignedShort=Not signed
-# PropalStatusBilledShort=Billed
-# PropalsToClose=Commercial proposals to close
-# PropalsToBill=Signed commercial proposals to bill
-# ListOfProposals=List of commercial proposals
-# ActionsOnPropal=Events on proposal
-# NoOpenedPropals=No opened commercial proposals
-# NoOtherOpenedPropals=No other opened commercial proposals
-# RefProposal=Commercial proposal ref
-# SendPropalByMail=Send commercial proposal by mail
-# FileNotUploaded=The file was not uploaded
-# FileUploaded=The file was successfully uploaded
-# AssociatedDocuments=Documents associated with the proposal:
-# ErrorCantOpenDir=Can't open directory
-# DatePropal=Date of proposal
-# DateEndPropal=Validity ending date
-# DateEndPropalShort=Date end
-# ValidityDuration=Validity duration
-# CloseAs=Close with status
-# ClassifyBilled=Classify billed
-# BuildBill=Build invoice
-# ErrorPropalNotFound=Propal %s not found
-# Estimate=Estimate :
-# EstimateShort=Estimate
-# OtherPropals=Other proposals
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
-# CopyPropalFrom=Create commercial proposal by copying existing proposal
-# CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-# DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-# UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-# ClonePropal=Clone commercial proposal
-# ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-# ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-# ProposalsAndProposalsLines=Commercial proposal and lines
-# ProposalLine=Proposal line
-# AvailabilityPeriod=Availability delay
-# SetAvailability=Set availability delay
-# AfterOrder=after order
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalDraft=Draft commercial proposal
+ProposalsOpened=Open commercial proposals
+Prop=Commercial proposals
+CommercialProposal=Commercial proposal
+CommercialProposals=Commercial proposals
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewProposal=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+ProspectList=Prospect list
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
+LastPropals=Last %s proposals
+LastClosedProposals=Last %s closed proposals
+LastModifiedProposals=Last %s modified proposals
+AllPropals=All proposals
+LastProposals=Last proposals
+SearchAProposal=Search a proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (net of tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalsNotBilled=Closed not billed
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusOpened=Validated (proposal is open)
+PropalStatusClosed=Closed
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated
+PropalStatusOpenedShort=Open
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+AssociatedDocuments=Documents associated with the proposal:
+ErrorCantOpenDir=Can't open directory
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+DateEndPropalShort=Date end
+ValidityDuration=Validity duration
+CloseAs=Close with status
+ClassifyBilled=Classify billed
+BuildBill=Build invoice
+ErrorPropalNotFound=Propal %s not found
+Estimate=Estimate :
+EstimateShort=Estimate
+OtherPropals=Other proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+ClonePropal=Clone commercial proposal
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
 ##### Availability #####
-# AvailabilityTypeAV_NOW=Immediate
-# AvailabilityTypeAV_1W=1 week
-# AvailabilityTypeAV_2W=2 weeks
-# AvailabilityTypeAV_3W=3 weeks
-# AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
-# TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-# TypeContact_propal_external_BILLING=Customer invoice contact
-# TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 # Document models
-# DocModelAzurDescription=A complete proposal model (logo...)
-# DocModelJauneDescription=Jaune proposal model
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=A complete proposal model (logo...)
+DocModelJauneDescription=Jaune proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/uk_UA/trips.lang
+++ b/htdocs/langs/uk_UA/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/uk_UA/workflow.lang
+++ b/htdocs/langs/uk_UA/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index e823d364258..13f7eb7c6ec 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu for users
 LangFile=.lang file
 System=System
 SystemInfo=System information
-SystemTools=System tools
 SystemToolsArea=System tools area
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
@@ -232,8 +231,8 @@ Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Feature
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=This is setup to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
-Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects (shared project and projects i'm contact for)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission61=Read interventions
@@ -599,10 +600,10 @@ Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
 Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
-Permission94=Export social contributions
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
@@ -620,9 +621,9 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read standing orders
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Town
 CompanyCountry=Country
 CompanyCurrency=Main currency
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
 Delays=Delays
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
 MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
 ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=Webservices module setup
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1581,6 +1599,7 @@ ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 55fde86864b..3e8b2309f8f 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 72639883e1a..d12f45387d6 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Customer payment
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=Supplier payment
 WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Financial account journal
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 014996eee65..3210e0bf517 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
 AmountOfBills=Amount of invoices
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
 ShowInvoice=Show invoice
 ShowInvoiceReplace=Show replacing invoice
@@ -270,7 +270,7 @@ BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 InvoiceId=Invoice id
 InvoiceRef=Invoice ref.
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index c0180bebdaa..b61cf77019f 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 7c293065433..9c3a956727e 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 5580d87b517..42a9a884c76 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
 Company=Company
 CompanyName=Company name
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Companies
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +269,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +380,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 0d579a06ff1..2c7871101c9 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -56,23 +56,23 @@ VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 AccountancySetup=Accountancy setup
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 PaymentSalary=Salary payment
 ListPayment=List of payments
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 TotalVATReceived=Total VAT received
@@ -116,11 +116,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks waiting for deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 5adc428b628..bd85715642e 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -4,10 +4,10 @@ About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=Parameters
 CronSaveSucess=Save succesfully
 CronNote=Comment
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index 4a1931a3217..a9b0bdf97e5 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Documents linked to third parties
 ECMDocsByProposals=Documents linked to proposals
 ECMDocsByOrders=Documents linked to customers orders
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index dbafde2f6e5..89b073e4622 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index f5b87fefb08..e863e40710f 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=Value
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/uz_UZ/incoterm.lang b/htdocs/langs/uz_UZ/incoterm.lang
new file mode 100644
index 00000000000..3065894865e
--- /dev/null
+++ b/htdocs/langs/uz_UZ/incoterm.lang
@@ -0,0 +1,7 @@
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
+IncotermLabel=Incoterms
+IncotermSetupTitle1=Feature
+IncotermSetupTitle2=Status
+IncotermSetup=Setup of module Incoterm
+IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order)
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index dcd8df6e7db..64d14c6445d 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Database server - Superuser access
 CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
 CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
 Experimental=(experimental)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index d20aab00146..aaeeb235544 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Arabic
 Language_ar_SA=Arabic
+Language_bn_BD=Bengali
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=Spanish (Argentina)
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
 Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Korean
+Language_lo_LA=Lao
 Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Swedish
 Language_sv_SE=Swedish
 Language_sq_AL=Albanian
 Language_sk_SK=Slovakian
+Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/uz_UZ/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 89c71da9123..3bebb0c2aff 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index d87c45109c0..a74212167ff 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountPayment=Payment amount
@@ -339,6 +339,7 @@ IncludedVAT=Included tax
 HT=Net of tax
 TTC=Inc. tax
 VAT=Sales tax
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Tax Rate
@@ -413,6 +414,8 @@ Qty=Qty
 ChangedBy=Changed by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -421,7 +424,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -732,3 +739,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 40bca8e85fb..107397a5c49 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -199,7 +199,8 @@ Entreprises=Companies
 DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 044bcc0eb01..55802b4bb48 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,8 +75,9 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 819005d4f4a..c49606b8f75 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/uz_UZ/printing.lang b/htdocs/langs/uz_UZ/printing.lang
new file mode 100644
index 00000000000..b4956e59c01
--- /dev/null
+++ b/htdocs/langs/uz_UZ/printing.lang
@@ -0,0 +1,73 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
+ModuleDriverSetup=Setup Module Driver
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+NoActivePrintingModuleFound=No active module to print document
+PleaseSelectaDriverfromList=Please select a driver from list.
+SetupDriver=Driver setup
+TestDriver=Test
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP=Google Cloud Print
+PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PRINTGCP_LOGIN=Google Account Login
+PRINTGCP_PASSWORD=Google Account Password
+STATE_ONLINE=Online
+STATE_UNKNOWN=Unknown
+STATE_OFFLINE=Offline
+STATE_DORMANT=Offline for quite a while
+TYPE_GOOGLE=Google
+TYPE_HP=HP Printer
+TYPE_DOCS=DOCS
+TYPE_DRIVE=Google Drive
+TYPE_FEDEX=Fedex
+TYPE_ANDROID_CHROME_SNAPSHOT=Android
+TYPE_IOS_CHROME_SNAPSHOT=IOS
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PRINTIPP=PrintIPP Driver
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP.
+PrintTestDescprintipp=List of Printers for driver PrintIPP.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+STATE_IPP_idle=Idle
+STATE_IPP_stopped=Stopped
+STATE_IPP_paused=Paused
+STATE_IPP_toner-low-report=Low Toner
+STATE_IPP_none=None
+MEDIA_IPP_stationery=Stationery
+MEDIA_IPP_thermal=Thermal
+IPP_COLOR_print-black=BW Printer
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index c29232087b9..55b1d016827 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 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)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. 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
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add
 AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
-ProductAssociationList=List of related products/services: name of product/service (quantity affected)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
@@ -179,16 +179,41 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index eac0f41d321..7a2688a4461 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -95,7 +98,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 8970d1eb2df..d10dbb15122 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Prospect list
 DeleteProp=Delete commercial proposal
 ValidateProp=Validate commercial proposal
-AddProp=Add proposal
+AddProp=Create proposal
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
 ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
 LastPropals=Last %s proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,12 +51,10 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
 AssociatedDocuments=Documents associated with the proposal:
 ErrorCantOpenDir=Can't open directory
 DatePropal=Date of proposal
@@ -100,3 +98,4 @@ DocModelJauneDescription=Jaune proposal model
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index c2b432d7f9b..7aeef1c9641 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index e0552c064e8..5388a4867c7 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index 76b214abdb7..a5b2569942e 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index baf209f9d1c..b4df936bff7 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Users & Groups
+MenuMyUserCard=My user card
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index c36ffbf025a..bce1448d451 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 17c8dd3aafa..d90751a2a6b 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 9d0f82a4cb0..02b9d6320a3 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Kế toán
 Globalparameters=Các thông số toàn cầu
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Chiều dài của các tài khoản của bên thứ
 
 ACCOUNTING_SELL_JOURNAL=Bán tạp chí
 ACCOUNTING_PURCHASE_JOURNAL=Mua tạp chí
-ACCOUNTING_BANK_JOURNAL=Tạp chí Ngân hàng
-ACCOUNTING_CASH_JOURNAL=Tạp chí tiền mặt
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Linh tinh tạp chí
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Tạp chí Xã hội
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Tài khoản chuyển nhượng
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index bd5b3285f66..ff40075d158 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=Menu cho người dùng
 LangFile=tập tin .lang
 System=Hệ thống
 SystemInfo=Thông tin hệ thống
-SystemTools=Công cụ hệ thống
 SystemToolsArea=Khu vực công cụ hệ thống
 SystemToolsAreaDesc=Khu vực này cung cấp các tính năng quản trị. Sử dụng menu để chọn tính năng mà bạn đang muốn thao tác.
 Purge=Thanh lọc
@@ -232,8 +231,8 @@ Security=Bảo mật
 Passwords=Mật khẩu
 DoNotStoreClearPassword=Không chứa mật khẩu đã xóa trong cơ sở dữ liệu nhưng chỉ chứa giá trị được mã hóa (Đã kích hoạt được khuyến nghị)
 MainDbPasswordFileConfEncrypted=Cơ sở dữ liệu mật khẩu được mã hóa trong conf.php (Đã kích hoạt được Khuyến nghị)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
 Feature=Đặc tính
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=Đây là cài đặt cho quy trình:
 ThisIsAlternativeProcessToFollow=Đây là cài đặt thay thế cho quy trình:
 StepNb=Bước %s
 FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức %s).
-DownloadPackageFromWebSite=Gói tải về %s.
-UnpackPackageInDolibarrRoot=Giải nèn file gói dữ liệu vào thư mục được chỉ định vào module bên ngoài: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Cài đặt xong và Dolibarr đã sẵn sàng để sử dụng với thành phần mới này.
 NotExistsDirect=Các thư mục gốc thay thế không được định nghĩa. <br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Chọn module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Phiên bản hiện tại Dolibarr
 CallUpdatePage=Tới trang cập nhật các cấu trúc cơ sở dữ liệu và dữ liệu: %s.
 LastStableVersion=Phiên bản ổn định mới nhất
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Thư viện được sử dụng để xây dựng PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Làm mới liên kết
@@ -430,8 +429,8 @@ Module20Name=Đơn hàng đề xuất
 Module20Desc=Quản lý đơn hàng đề xuất
 Module22Name=Gửi Email hàng loạt
 Module22Desc=Quản lý gửi Email hàng loạt
-Module23Name= Năng lượng
-Module23Desc= Giám sát việc tiêu thụ năng lượng
+Module23Name=Năng lượng
+Module23Desc=Giám sát việc tiêu thụ năng lượng
 Module25Name=Đơn hàng khách hàng
 Module25Desc=Quản lý đơn hàng khách hàng
 Module30Name=Hoá đơn
@@ -492,8 +491,8 @@ Module400Name=Dự án/Cơ hội/Đầu mối
 Module400Desc=Quản lý dự án, cơ hội hoặc đầu mối. Bạn có thể chỉ định bất kỳ thành phần nào sau đó (hóa đơn, đơn hàng, đơn hàng đề xuất, intervention, ...) để dự án và hiển thị chiều ngang từ hiển thị dự án.
 Module410Name=Lịch trên web
 Module410Desc=Tích hợp lịch trên web
-Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức)
-Module500Desc=Quản lý chi phí đặc biệt như thuế, đóng góp xã hội, cổ tức và tiền lương
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Lương
 Module510Desc=Quản lý lương nhân viên và thanh toán
 Module520Name=Cho vay
@@ -502,7 +501,7 @@ Module600Name=Thông báo
 Module600Desc=Gửi thông báo EMail trên một số sự kiện kinh doanh Dolibarr để liên hệ của bên thứ ba (thiết lập được xác định trên mỗi thirdparty)
 Module700Name=Tài trợ
 Module700Desc=Quản lý tài trợ
-Module770Name=Báo cáo chi phí
+Module770Name=Expense reports
 Module770Desc=Báo cáo quản lý và claim chi phí (di chuyển, ăn uống, ...)
 Module1120Name=Đơn hàng đề xuất nhà cung cấp
 Module1120Desc=Yêu cầu giá và đơn hàng đề xuất nhà cung cấp
@@ -524,8 +523,10 @@ Module2400Name=Chương trình nghị sự
 Module2400Desc=Quản lý Sự kiện/Tác vụ và chương trình nghị sự
 Module2500Name=Quản lý nội dung điện tử
 Module2500Desc=Lưu và chia sẻ tài liệu
-Module2600Name=WebServices
-Module2600Desc=Cho phép các máy chủ dịch vụ web Dolibarr
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Kích hoạt các dịch vụ web Dolibarr client (có thể được sử dụng để đẩy dữ liệu / yêu cầu đến các máy chủ bên ngoài. Đơn hàng Nhà cung cấp chỉ được hỗ trợ cho thời điểm này)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=Tạo/chỉnh sửa sản phẩm
 Permission34=Xóa sản phẩm
 Permission36=Xem/quản lý sản phẩm ẩn
 Permission38=Xuất dữ liệu sản phẩm
-Permission41=Xem dự án (dự án được chia sẻ và các dự án tôi nằm trong liên lạc)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Tạo/chỉnh sửa dự án (dự án chung và các dự án tôi liên lạc)
 Permission44=Xóa dự án (dự án chia sẻ và các dự án tôi liên lạc)
 Permission61=Xem intervention
@@ -599,10 +600,10 @@ Permission86=Gửi đơn hàng khách hàng
 Permission87=Đóng đơn hàng khách hàng
 Permission88=Hủy bỏ đơn hàng khách hàng
 Permission89=Xóa đơn hàng khách hàng
-Permission91=Xem đóng góp xã hội và VAT
-Permission92=Tạo/chỉnh sửa đóng góp xã hội và VAT
-Permission93=Xóa đóng góp xã hội và VAT
-Permission94=Xuất dữ liệu đóng góp xã hội
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Xem báo cáo
 Permission101=Xem sendings
 Permission102=Tạo/chỉnh sửa sendings
@@ -620,9 +621,9 @@ Permission121=Xem bên thứ ba liên quan đến người dùng
 Permission122=Tạo/chỉnh sửa bên thứ ba liên quan đến người dùng
 Permission125=Xóa bên thứ ba liên quan đến người dùng
 Permission126=Xuất dữ liệu bên thứ ba
-Permission141=Xem dự án (cá nhân mà tôi không liên lạc với)
-Permission142=Tạo/chỉnh sửa dự án (cá nhân mà tôi không liên lạc với)
-Permission144=Xóa dự án (cá nhân mà tôi không liên lạc với)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Xem nhà cung cấp
 Permission147=Xem thống kê
 Permission151=Xem ủy nhiệm chi
@@ -800,7 +801,7 @@ DictionaryCountry=Quốc gia
 DictionaryCurrency=Tiền tệ
 DictionaryCivility=Civility title
 DictionaryActions=Loại sự kiện chương trình nghị sự
-DictionarySocialContributions=Loại đóng góp xã hội
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Tỉ suất VAT hoặc Tỉ xuất thuế bán hàng
 DictionaryRevenueStamp=Số tiền phiếu doanh thu
 DictionaryPaymentConditions=Điều khoản thanh toán
@@ -817,6 +818,9 @@ DictionarySource=Chứng từ gốc của đơn hàng đề xuất/đơn hàng
 DictionaryAccountancyplan=Biểu đồ tài khoản
 DictionaryAccountancysystem=Kiểu biểu đồ tài khoản
 DictionaryEMailTemplates=Mẫu email
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=Cài đặt đã lưu
 BackToModuleList=Trở lại danh sách module
 BackToDictionaryList=Trở lại danh sách từ điển
@@ -936,13 +940,14 @@ CompanyZip=Zip
 CompanyTown=Thành phố
 CompanyCountry=Quốc gia
 CompanyCurrency=Tiền tệ chính
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=Không hiển thị
 DoNotSuggestPaymentMode=Không đề nghị
 NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định
 OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng %s
 BankModuleNotActive=Module tài khoản ngân hàng chưa được mở
-ShowBugTrackLink=Hiển thị liên kết "Báo cáo lỗi"
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=Xem "workbench" trên trang chủ
 Alerts=Cảnh báo
 Delays=Trì hoãn
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=Số thập phân tối đa cho đơn giá
 MAIN_MAX_DECIMALS_TOT=Số thập phân tối đa cho tổng giá
 MAIN_MAX_DECIMALS_SHOWN=Max số thập phân cho giá được hiển thị trên màn hình (Add <b>...</b> sau khi con số này nếu bạn muốn xem <b>...</b> khi số là cắt ngắn khi hiển thị trên màn hình)
 MAIN_DISABLE_PDF_COMPRESSION=Sử dụng PDF nén các file PDF được tạo ra.
-MAIN_ROUNDING_RULE_TOT= Kích thước của phạm vi làm tròn (đối với các quốc gia hiếm hoi mà làm tròn được thực hiện trên một cái gì đó khác hơn so với cơ số 10)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Đơn giá chưa thuế của một sản phẩm
 TotalPriceAfterRounding=Tổng giá (chưa thuế/VAT/bao gồm thuế) sau khi làm tròn
 ParameterActiveForNextInputOnly=Thông số hiệu quả cho chỉ đầu vào kế tiếp
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
 ClassNotFoundIntoPathWarning=Lớp %s không tìm thấy con đường vào PHP
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, các mô-đun chỉ sau đây được mở cho người dùng bên ngoài (bất cứ điều gì có phân quyền của người dùng như vậy):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Điều kiện là hiện tại %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=Số lượng tối đa của sản phẩm trong dan
 ConfirmDeleteProductLineAbility=Xác nhận khi loại bỏ các dòng sản phẩm trong các biểu mẫu
 ModifyProductDescAbility=Cá nhân hóa mô tả sản phẩm trong các biểu mẫu
 ViewProductDescInFormAbility=Hình ảnh hóa của mô tả sản phẩm bằng trong các biểu mẫu (nếu không bật lên cửa sổ tooltip)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Hình ảnh hóa của mô tả sản phẩm trong ngôn ngữ của bên thứ ba
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Sử dụng một form tìm kiếm để chọn một sản phẩm (chứ không phải là một danh sách thả xuống).
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm
 SetDefaultBarcodeTypeThirdParties=Loại mã vạch mặc định để sử dụng cho các bên thứ ba
+UseUnits=Support units
 ProductCodeChecker= Module để sinh ra mã sản phẩm và kiểm tra (sản phẩm hoặc dịch vụ)
 ProductOtherConf= Cấu hình Sản phẩm / Dịch vụ
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Engine nội bộ
 BarCodeNumberManager=Quản lý số mã vạch xác định tự động
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=Bạn có chắc muốn xóa menu vào <b>%s</b> ?
 DeleteLine=Xóa dòng
 ConfirmDeleteLine=Bạn Bạn có chắc muốn xóa dòng này?
 ##### Tax #####
-TaxSetup=Cài đặt module Thuế, Đóng góp xã hội và Cổ tức
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
 OptionVATDefault=Dựa trên tiền mặt
 OptionVATDebitOption=Dựa trên cộng dồn
@@ -1552,6 +1561,15 @@ WebServicesSetup=Cài đặt module webservices
 WebServicesDesc=Bằng cách cho phép mô-đun này, Dolibarr trở thành một máy chủ dịch vụ web để cung cấp dịch vụ web linh tinh.
 WSDLCanBeDownloadedHere=Các tập tin mô tả WSDL của dịch vụ cung cấp có thể được tải về tại đây
 EndPointIs=SOAP khách hàng phải gửi yêu cầu tới các thiết bị đầu cuối Dolibarr tại Url
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Cài đặt module Ngân hàng
 FreeLegalTextOnChequeReceipts=Free text trên biên nhận Séc
@@ -1581,6 +1599,7 @@ ProjectsSetup=Cài đặt module dự án
 ProjectsModelModule=Kiểu chứng từ báo cáo dự án
 TasksNumberingModules=Module đánh số tác vụ
 TaskModelModule=Kiểu chứng từ báo cáo tác vụ
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = Cài đặt GED
 ECMAutoTree = Cây thư mục tự động và tài liệu
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Mở năm tài chính
 CloseFiscalYear=Đóng năm tài chính
 DeleteFiscalYear=Xóa năm tài chính
 ConfirmDeleteFiscalYear=Bạn chắc muốn xóa năm tài chính này?
-Opened=Đã mở
+Opened=Open
 Closed=Đã đóng
 AlwaysEditable=Luôn luôn có thể được chỉnh sửa
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không
 SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp để mô tả ở đây là chỉ là bước thủ công một người dùng có đặc quyền có thể làm.
 InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin <strong>%s</strong> để cho phép tính năng này.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index 54b83d5ce8d..dcf5c9efebf 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Thứ tự %s đã được phê duyệt
 OrderRefusedInDolibarr=Thứ tự %s từ chối
 OrderBackToDraftInDolibarr=Thứ tự %s trở lại trạng thái soạn thảo
-OrderCanceledInDolibarr=Thứ tự %s hủy bỏ
 ProposalSentByEMail=Đề nghị thương mại%s gửi bằng thư điện tử
 OrderSentByEMail=Đơn đặt hàng %s gửi Thư điện tử
 InvoiceSentByEMail=Hóa đơn của khách hàng %s gửi Thư điện tử
@@ -96,3 +95,5 @@ AddEvent=Tạo sự kiện
 MyAvailability=Sẵn có của tôi
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index c610b4fe77e..cdc759272f4 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Hòa giải
 Conciliation=Hòa giải
 ConciliationForAccount=Đối chiếu tài khoản này
 IncludeClosedAccount=Bao gồm các tài khoản đã đóng
-OnlyOpenedAccount=Chỉ có tài khoản mở
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Tài khoản tín dụng
 AccountToDebit=Tài khoản ghi nợ
 DisableConciliation=Vô hiệu hoá tính năng hòa giải cho tài khoản này
 ConciliationDisabled=Tính năng hòa giải bị vô hiệu hóa
-StatusAccountOpened=Mở
+StatusAccountOpened=Open
 StatusAccountClosed=Đóng
 AccountIdShort=Số
 EditBankRecord=Sửa kỷ lục
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Thanh toán của khách hàng
 CustomerInvoicePaymentBack=Lại thanh toán của khách hàng
 SupplierInvoicePayment=Thanh toán nhà cung cấp
 WithdrawalPayment=Thanh toán rút
-SocialContributionPayment=Thanh toán đóng góp xã hội
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=Tạp chí tài khoản tài chính
 BankTransfer=Chuyển khoản ngân hàng
 BankTransfers=Chuyển khoản ngân hàng
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index a0d6d23d904..89de58ae93a 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Nb của hoá đơn
 NumberOfBillsByMonth=Nb của hoá đơn theo tháng
 AmountOfBills=Số tiền của hóa đơn
 AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (có thuế)
-ShowSocialContribution=Hiển thị đóng góp xã hội
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=Hiện thị hóa đơn
 ShowInvoice=Hiển thị hóa đơn
 ShowInvoiceReplace=Hiển thị hóa đơn thay thế
@@ -270,7 +270,7 @@ BillAddress=Địa chỉ ra hóa đơn
 HelpEscompte=Giảm giá này được cấp cho các khách hàng bởi vì thanh toán của nó đã được thực hiện trước thời hạn.
 HelpAbandonBadCustomer=Số tiền này đã bị loại bỏ (khách hàng được cho là một khách hàng xấu) và được coi là một ngoại lệ .
 HelpAbandonOther=Số tiền này đã bị loại bỏ vì đó là một lỗi (ví dụ khách hàng sai hoặc hóa đơn được thay thế bằng hóa đơn khác)
-IdSocialContribution=ID đóng góp xã hội
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID thanh toán
 InvoiceId=ID hóa đơn
 InvoiceRef=Hóa đơn tham chiếu
@@ -430,5 +430,5 @@ NotLastInCycle=Hoá đơn này không phải là cuối cùng trong chu kỳ và
 DisabledBecauseNotLastInCycle=Tình huống tiếp theo đã tồn tại
 DisabledBecauseFinal=Tình huống này là cuối cùng
 CantBeLessThanMinPercent=Tiến trình này không thể nhỏ hơn giá trị của nó trong tình huống trước.
-NoSituations=Không có tình huống nào đã mở
+NoSituations=No open situations
 InvoiceSituationLast=Hóa đơn cuối cùng và tổng hợp
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index b8de141bfad..3ee363b9d13 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Hợp đồng cuối cùng
 BoxLastContacts=Địa chỉ liên lạc cuối cùng / địa chỉ
 BoxLastMembers=Thành viên cuối cùng
 BoxFicheInter=Can thiệp cuối cùng
-BoxCurrentAccounts=Mở tài khoản ngoại
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Doanh thu bán hàng
 BoxTotalUnpaidCustomerBills=Tổng số khách hàng chưa thanh toán hoá đơn của
 BoxTotalUnpaidSuppliersBills=Tổng số nhà cung cấp hoá đơn chưa thanh toán của
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Thành viên cuối %s
 BoxTitleLastFicheInter=Can thiệp đã sửa cuối cùng %s
 BoxTitleOldestUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng lâu đời nhất %s
 BoxTitleOldestUnpaidSupplierBills=Cũ nhất%s nhà cung cấp hoá đơn chưa thanh toán
-BoxTitleCurrentAccounts=Số dư tài khoản mở của
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Doanh thu bán hàng
 BoxTitleTotalUnpaidCustomerBills=Hóa đơn khách hàng chưa thanh toán
 BoxTitleTotalUnpaidSuppliersBills=Nhà cung cấp hoá đơn chưa thanh toán
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 329e7329918..156e7997436 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> đã được thêm thành công.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=Không
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Thể loại này đã tồn tại với ref này
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Nội dung không thể nhìn thấy bởi tất c
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. loại
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 914be1b57b8..88f4c0438fb 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=Liên lạc/địa chỉ bên thứ ba
 StatusContactValidated=Trạng thái liên lạc/địa chỉ
 Company=Công ty
 CompanyName=Tên công ty
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=Các công ty
 CountryIsInEEC=Quốc gia thuộc Cộng đồng Kinh tế châu Âu
 ThirdPartyName=Tên của bên thứ ba
@@ -410,5 +411,10 @@ OutstandingBillReached=Đã đạt công nợ tối đa
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Mã này tự do. Mã này có thể được sửa đổi bất cứ lúc nào.
 ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...)
-SearchThirdparty=Tìm kiếm bên thứ ba
+SearchThirdparty=Search third party
 SearchContact=Tìm kiếm liên lạc
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 14237f389b5..eba4dc1726c 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -56,23 +56,23 @@ VATCollected=Thu thuế GTGT
 ToPay=Để trả
 ToGet=Để quay trở lại
 SpecialExpensesArea=Khu vực dành cho tất cả các khoản thanh toán đặc biệt
-TaxAndDividendsArea=Thuế, xã hội đóng góp và cổ tức khu vực
-SocialContribution=Đóng góp xã hội
-SocialContributions=Đóng góp xã hội
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Chi phí đặc biệt
 MenuTaxAndDividends=Thuế và cổ tức
 MenuSalaries=Tiền lương
-MenuSocialContributions=Đóng góp xã hội
-MenuNewSocialContribution=Đóng góp mới
-NewSocialContribution=Đóng góp xã hội mới
-ContributionsToPay=Đóng góp để trả tiền
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Kế toán / Tài chính khu vực
 AccountancySetup=Thiết lập Kế toán
 NewPayment=Thanh toán mới
 Payments=Thanh toán
 PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng
 PaymentSupplierInvoice=Thanh toán hóa đơn nhà cung cấp
-PaymentSocialContribution=Thanh toán đóng góp xã hội
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Nộp thuế GTGT
 PaymentSalary=Thanh toán tiền lương
 ListPayment=Danh sách thanh toán
@@ -91,7 +91,7 @@ LT1PaymentES=RE Thanh toán
 LT1PaymentsES=RE Thanh toán
 VATPayment=Thanh toán thuế GTGT
 VATPayments=Thanh toán thuế GTGT
-SocialContributionsPayments=Đóng góp xã hội thanh toán
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Hiện nộp thuế GTGT
 TotalToPay=Tổng số trả
 TotalVATReceived=Tổng số thuế GTGT được
@@ -116,11 +116,11 @@ NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản: %s
 NoWaitingChecks=Không có kiểm tra chờ đợi tiền gửi.
 DateChequeReceived=Kiểm tra ngày tiếp nhận
 NbOfCheques=Nb kiểm tra
-PaySocialContribution=Trả khoản đóng góp xã hội
-ConfirmPaySocialContribution=Bạn có chắc chắn bạn muốn phân loại đóng góp xã hội này như thanh toán?
-DeleteSocialContribution=Xóa một đóng góp xã hội
-ConfirmDeleteSocialContribution=Bạn Bạn có chắc chắn muốn xóa đóng góp xã hội này?
-ExportDataset_tax_1=Đóng góp xã hội và thanh toán
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Chế độ <b>%sVAT về kế toán cam kết%s</b>.
 CalcModeVATEngagement=Chế độ <b>%sVAT đối với thu nhập-chi phí%s.</b>
 CalcModeDebt=Chế độ <b>%sClaims-Các khoản nợ%s</b> cho biết <b>kế toán cam kết.</b>
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=theo nhà cung cấp, lựa chọn phương pháp th
 TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ <b>kế toán tiền mặt</b> là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ <b>kế toán tham gia</b> (xem thiết lập của module kế toán).
 CalculationMode=Chế độ tính toán
 AccountancyJournal=Đang kế toán tạp chí
-ACCOUNTING_VAT_ACCOUNT=Kế toán mã mặc định cho thu thuế GTGT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Kế toán mã mặc định để nộp thuế GTGT
 ACCOUNTING_ACCOUNT_CUSTOMER=Kế toán mã bằng cách mặc định cho khách hàng thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Kế toán mã bằng cách mặc định cho nhà cung cấp thirdparties
-CloneTax=Sao chép một đóng góp xã hội
-ConfirmCloneTax=Xác nhận bản sao của một đóng góp xã hội
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Sao chép nó vào tháng tới
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 1698b670d91..6a8e32eddee 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -4,10 +4,10 @@ About = Về
 CronAbout = Về Cron
 CronAboutPage = Định kỳ về trang web
 # Right
-Permission23101 = Đọc nhiệm vụ theo lịch trình
-Permission23102 = Tạo / cập nhật theo lịch trình công việc
-Permission23103 = Xóa nhiệm vụ theo lịch trình
-Permission23104 = Thực hiện nhiệm vụ theo lịch trình
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Theo lịch trình thiết lập quản lý công việc
 URLToLaunchCronJobs=URL để kiểm tra và khởi động công việc cron nếu được yêu cầu
@@ -26,11 +26,11 @@ CronLastOutput=Bài đầu ra chạy
 CronLastResult=Cuối mã kết quả
 CronListOfCronJobs=Danh sách công việc dự kiến
 CronCommand=Lệnh
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Công việc
@@ -39,8 +39,8 @@ CronDtStart=Ngày bắt đầu
 CronDtEnd=Ngày kết thúc
 CronDtNextLaunch=Thực hiện tiếp theo
 CronDtLastLaunch=Thực hiện cuối
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Phương pháp
 CronModule=Mô-đun
 CronAction=Hành động
@@ -55,9 +55,9 @@ CronEach=Mỗi
 JobFinished=Việc đưa ra và hoàn thành
 #Page card
 CronAdd= Thêm công việc
-CronHourStart= Bắt đầu giờ và ngày nhiệm vụ
-CronEvery= Và thực hiện nhiệm vụ mỗi
-CronObject= Ví dụ / đối tượng để tạo ra
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Ví dụ / đối tượng để tạo ra
 CronArgs=Các thông số
 CronSaveSucess=Lưu thành công
 CronNote=Nhận xét
@@ -76,13 +76,14 @@ CronMethodHelp=Phương pháp đối tượng để khởi động. <BR> Đối
 CronArgsHelp=Các đối số phương pháp. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của paramters có thể là <i>0, ProductRef</i>
 CronCommandHelp=Các dòng lệnh hệ thống để thực thi.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Thông tin
 # Common
-CronType=Loại nhiệm vụ
+CronType=Job type
 CronType_method=Gọi phương thức của một lớp Dolibarr
 CronType_command=Shell lệnh
 CronMenu=Cron
 CronCannotLoadClass=Không thể tải lớp% s hoặc đối tượng% s
 UseMenuModuleToolsToAddCronJobs=Đi vào menu "Trang chủ - module công cụ - danh sách công việc" để xem và chỉnh sửa các công việc theo lịch trình.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index dbd28988cc3..ae531475af8 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Tìm kiếm theo đối tượng
 ECMSectionOfDocuments=Thư mục tài liệu
 ECMTypeManual=Hướng dẫn sử dụng
 ECMTypeAuto=Tự động
-ECMDocsBySocialContributions=Các tài liệu liên quan đến các khoản đóng góp xã hội
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=Các tài liệu liên quan đến các bên thứ ba
 ECMDocsByProposals=Các tài liệu liên quan đến đề xuất
 ECMDocsByOrders=Các tài liệu liên quan đến khách hàng các đơn đặt hàng
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 72d63d6336e..e483306c43a 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định
@@ -190,3 +191,4 @@ WarningNotRelevant=Hoạt động không thích hợp cho dữ liệu này
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Tính năng bị vô hiệu hóa khi thiết lập hiển thị được tối ưu hóa cho người mù hoặc văn bản trình duyệt.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index 78b2efdd9b6..6189ebf436c 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Nghỉ phép
 CPTitreMenu=Nghỉ phép
 MenuReportMonth=Báo cáo hàng tháng
-MenuAddCP=Thực hiện một yêu cầu nghỉ phép
+MenuAddCP=New leave request
 NotActiveModCP=Bạn phải kích hoạt Leaves mô đun để xem trang này.
 NotConfigModCP=Bạn phải cấu hình các module Nghỉ phép để xem trang này. Để làm điều này, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">nhấn vào đây</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
 NoCPforUser=Bạn không có bất kỳ ngày nào có sẵn.
@@ -71,7 +71,7 @@ MotifCP=Lý do
 UserCP=Người sử dụng
 ErrorAddEventToUserCP=Đã xảy ra lỗi khi thêm ngày nghỉ đặc biệt.
 AddEventToUserOkCP=Việc bổ sung nghỉ đặc biệt đã được hoàn thành.
-MenuLogCP=Xem nhật các yêu cầu nghỉ
+MenuLogCP=View change logs
 LogCP=Đăng cập nhật ngày nghỉ có sẵn
 ActionByCP=Thực hiện bởi
 UserUpdateCP=Đối với người sử dụng
@@ -93,6 +93,7 @@ ValueOptionCP=Giá trị
 GroupToValidateCP=Nhóm có khả năng chấp nhận các yêu cầu nghỉ phép
 ConfirmConfigCP=Xác nhận cấu hình
 LastUpdateCP=Cuối cùng tự động cập nhật giao nghỉ phép
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Cập nhật thành công.
 ErrorUpdateConfCP=Đã xảy ra lỗi trong quá trình cập nhật, vui lòng thử lại.
 AddCPforUsers=Xin vui lòng thêm số dư của nghỉ phép phân bổ của người sử dụng bằng <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cách nhấn vào đây</a> .
@@ -127,6 +128,7 @@ ErrorMailNotSend=Đã xảy ra lỗi trong khi gửi email:
 NoCPforMonth=Không để trong tháng này.
 nbJours=Số ngày
 TitleAdminCP=Cấu hình của Nghỉ phép
+NoticePeriod=Notice period
 #Messages
 Hello=Xin chào
 HolidaysToValidate=Xác nhận yêu cầu nghỉ phép
@@ -139,10 +141,11 @@ HolidaysRefused=Yêu cầu bị từ chối
 HolidaysRefusedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã bị từ chối vì lý do sau:
 HolidaysCanceled=Yêu cầu hủy bỏ nghỉ phép
 HolidaysCanceledBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được hủy bỏ.
-Permission20000=Đọc bạn sở hữu yêu cầu nghỉ
-Permission20001=Tạo / chỉnh sửa các yêu cầu nghỉ phép của bạn
-Permission20002=Tạo / chỉnh sửa các yêu cầu nghỉ phép cho tất cả mọi người
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Xóa yêu cầu nghỉ phép
-Permission20004=Người sử dụng thiết lập ngày nghỉ có sẵn
-Permission20005=Log xét các yêu cầu nghỉ phép biến đổi
-Permission20006=Đọc lại báo cáo hàng tháng
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/vi_VN/incoterm.lang b/htdocs/langs/vi_VN/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/vi_VN/incoterm.lang
+++ b/htdocs/langs/vi_VN/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index 168fcac4a45..2567bb2fb4c 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=Máy chủ cơ sở dữ liệu - truy cập superuser
 CheckToCreateDatabase=Kiểm tra hộp nếu cơ sở dữ liệu không tồn tại và phải được tạo ra. <br> Trong trường hợp này, bạn phải điền tên đăng nhập / mật khẩu cho tài khoản superuser ở dưới cùng của trang này.
 CheckToCreateUser=Kiểm tra hộp nếu chủ sở hữu cơ sở dữ liệu không tồn tại và phải được tạo ra. <br> Trong trường hợp này, bạn phải chọn tên đăng nhập và mật khẩu của mình và cũng có thể điền tên đăng nhập / mật khẩu cho tài khoản superuser ở dưới cùng của trang này. Nếu hộp này được đánh dấu, cơ sở dữ liệu và mật khẩu chủ sở hữu của nó phải tồn tại.
 Experimental=(Thử nghiệm)
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=Đăng nhập của người dùng được phép để tạo ra cơ sở dữ liệu mới hoặc người dùng mới, bắt buộc nếu cơ sở dữ liệu của bạn hoặc chủ sở hữu của nó không đã tồn tại.
 KeepEmptyIfNoPassword=Để trống nếu người dùng không có mật khẩu (tránh điều này)
 SaveConfigurationFile=Lưu giá trị
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index dda345c1b78..05a518b6b01 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=Ả Rập
 Language_ar_SA=Ả Rập
+Language_bn_BD=Bengali
 Language_bg_BG=Bungari
 Language_bs_BA=Bosnia
 Language_ca_ES=Catalan
@@ -21,9 +22,10 @@ Language_en_SA=Anh (Ả rập Saudi)
 Language_en_US=Anh (Hoa Kỳ)
 Language_en_ZA=Anh (Nam Phi)
 Language_es_ES=Tây Ban Nha
-Language_es_DO=Tây Ban Nha (Cộng hòa Dominica)
 Language_es_AR=Tây Ban Nha (Argentina)
 Language_es_CL=Tây Ban Nha (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Tây Ban Nha (Cộng hòa Dominica)
 Language_es_HN=Tây Ban Nha (Honduras)
 Language_es_MX=Tây Ban Nha (Mexico)
 Language_es_PY=Tây Ban Nha (Paraguay)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesia
 Language_is_IS=Iceland
 Language_it_IT=Ý
 Language_ja_JP=Nhật Bản
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=Hàn Quốc
+Language_lo_LA=Lao
 Language_lt_LT=Lithuania
 Language_lv_LV=Latvia
 Language_mk_MK=Macedonian
@@ -64,6 +69,7 @@ Language_sv_SV=Thụy Điển
 Language_sv_SE=Thụy Điển
 Language_sq_AL=Albania
 Language_sk_SK=Slovakia
+Language_sw_SW=Kiswahili
 Language_th_TH=Thái Lan
 Language_uk_UA=Ukraina
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/vi_VN/loan.lang b/htdocs/langs/vi_VN/loan.lang
new file mode 100644
index 00000000000..a87747aae82
--- /dev/null
+++ b/htdocs/langs/vi_VN/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Cho vay
+Loans=Cho vay
+NewLoan=Cho vay mới
+ShowLoan=Hiện khoản cho vay
+PaymentLoan=Phương thức trả nợ
+ShowLoanPayment=Hiện thị phương thức trả nợ
+Capital=Vốn
+Insurance=Bảo hiểm
+Interest=Lãi suất
+Nbterms=Số năm vay vốn
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Tổng số tài chính
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Tổng số theo năm
+MonthlyPayment=Thanh toán hàng tháng
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 3bec956d767..0b45d7bd106 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Đọc nhận
 YourMailUnsubcribeOK=Email <b>%s</b> là đúng unsubcribe từ danh sách gửi thư
 MailtoEMail=Siêu liên kết email
 ActivateCheckRead=Cho phép sử dụng "Unsubcribe" liên kết
-ActivateCheckReadKey=Sử dụng chìa khóa để sử dụng mã hóa URL cho "Đọc Tiếp nhận" và "Unsubcribe" tính năng
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=Thư điện tử gửi đến người nhận %s.
 XTargetsAdded=Người nhận <b>%s</b> thêm vào danh sách mục tiêu
 EachInvoiceWillBeAttachedToEmail=Một tài liệu mặc định sử dụng hóa đơn mẫu tài liệu sẽ được tạo ra và gắn liền với mỗi email.
@@ -128,6 +128,7 @@ TagCheckMail=Ca khúc mở đầu email
 TagUnsubscribe=Liên kết Hủy đăng ký
 TagSignature=Chữ ký gửi người sử dụng
 TagMailtoEmail=Người nhận thư điện tử
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Thông báo
 NoNotificationsWillBeSent=Không có thông báo email được lên kế hoạch cho sự kiện này và công ty
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 40fa0296d36..a2201b68835 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Một vài lỗi đã được tìm thấy
 ErrorConfigParameterNotDefined=Thông số <b>%s</b> không được định nghĩa bên trong tập tin cấu hình Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Không tìm thấy người dùng <b>%s</b> trong cơ sở dữ liệu Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Lỗi, không xác định tỉ lệ VAT cho quốc gia '%s'.
-ErrorNoSocialContributionForSellerCountry=Lỗi, không xác định loại đóng góp xã hội cho quốc gia '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Lỗi, lưu tập tin thất bại
 SetDate=Thiết lập ngày
 SelectDate=Chọn một ngày
@@ -301,8 +301,8 @@ UnitPriceHT=Đơn giá (chưa thuế)
 UnitPriceTTC=Đơn giá
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=U.P.
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=Số tiền
 AmountInvoice=Số tiền hóa đơn
 AmountPayment=Số tiền thanh toán
@@ -339,6 +339,7 @@ IncludedVAT=Đã gồm thuế
 HT=Chưa thuế
 TTC=Gồm thuế
 VAT=Thuế bán hàng
+VATs=Sales taxes
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Thuế suất
@@ -413,6 +414,8 @@ Qty=Số lượng
 ChangedBy=Thay đổi bằng
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Tính toán lại
 ResultOk=Thành công
 ResultKo=Thất bại
@@ -421,7 +424,7 @@ Reportings=Việc báo cáo
 Draft=Dự thảo
 Drafts=Dự thảo
 Validated=Đã xác nhận
-Opened=Đã mở
+Opened=Open
 New=Mới
 Discount=Giảm giá
 Unknown=Không biết
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Đã liên kết với một số liên lạc người dù
 DeleteAFile=Xóa một tập tin
 ConfirmDeleteAFile=Bạn có chắc muốn xóa tập tin
 NoResults=Không có kết quả
+SystemTools=System tools
 ModulesSystemTools=Module công cụ
 Test=Kiểm tra
 Element=Yếu tố
@@ -703,6 +707,9 @@ ShowTransaction=Hiển thị giao dịch
 GoIntoSetupToChangeLogo=Vào Nhà-Thiết lập-Công ty để đổi logo hoặc vào Nhà-Thiết lập-Hiển thị để ẩn.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=Thứ Hai
 Tuesday=Thứ Ba
@@ -732,3 +739,4 @@ ShortThursday=N
 ShortFriday=S
 ShortSaturday=B
 ShortSunday=C
+SelectMailModel=Select email template
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index eb2687751c6..b89889b9b59 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -199,7 +199,8 @@ Entreprises=Các công ty
 DOLIBARRFOUNDATION_PAYMENT_FORM=Để thực hiện thanh toán đăng ký của bạn bằng cách sử dụng chuyển khoản ngân hàng, xem trang <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Để thanh toán bằng cách sử dụng thẻ tín dụng hoặc Paypal, bấm vào nút ở dưới cùng của trang này. <br>
 ByProperties=Bởi đặc điểm
 MembersStatisticsByProperties=Thành viên thống kê theo các đặc điểm
-MembersByNature=Thành viên của tự nhiên
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho mô tả
 NoVatOnSubscription=Không TVA cho mô tả
 MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho mô tả
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 23623723cd2..429e10d9c5c 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Đơn hàng nhà cung cấp
 SuppliersOrders=Đơn hàng nhà cung cấp
 SuppliersOrdersRunning=Đơn hàng nhà cung cấp hiện tại
 CustomerOrder=Đơn hàng khách hàng
-CustomersOrders=Đơn hàng khách hàng
-CustomersOrdersRunning=Đơn hàng khách hàng hiện tại
-CustomersOrdersAndOrdersLines=Đơn hàng khách hàng và chi tiết đơn hàng
-OrdersToValid=Đơn hàng khách hàng cần xác nhận
-OrdersToBill=Đơn hàng khách hàng đã gửi
-OrdersInProcess=Đơn hàng khách hàng đang xử lý
-OrdersToProcess=Đơn hàng khách hàng để xử lý
-SuppliersOrdersToProcess=Đơn hàng nhà cung cấp để xử lý
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Đã hủy bỏ
 StatusOrderDraftShort=Dự thảo
 StatusOrderValidatedShort=Đã xác nhận
@@ -75,8 +75,9 @@ AddToMyOrders=Thêm vào đơn hàng của tôi
 AddToOtherOrders=Thêm vào đơn hàng khác
 AddToDraftOrders=Thêm vào đơn hàng dự thảo
 ShowOrder=Hiển thị đơn hàng
-NoOpenedOrders=Không có đơn hàng đã mở
-NoOtherOpenedOrders=Không có đơn hàng đã mở khác
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Không có đơn hàng dự thảo
 OtherOrders=Đơn hàng khác
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 63de4507754..9dc00dcec59 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Can thiệp xác nhận
 Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện
 Notify_BILL_VALIDATE=Hóa đơn khách hàng xác nhận
 Notify_BILL_UNVALIDATE=Hóa đơn của khách hàng unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Để nhà cung cấp đã được phê duyệt
 Notify_ORDER_SUPPLIER_REFUSE=Để nhà cung cấp từ chối
 Notify_ORDER_VALIDATE=Đơn đặt hàng được xác nhận
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click vào đây để đi đến% s
 YouMustClickToChange=Tuy nhiên, trước tiên bạn phải nhấp vào liên kết sau đây để xác nhận thay đổi mật khẩu này
 ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quên email này. Thông tin của bạn được lưu giữ an toàn.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=Thêm phần trong lịch% s
diff --git a/htdocs/langs/vi_VN/printing.lang b/htdocs/langs/vi_VN/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/vi_VN/printing.lang
+++ b/htdocs/langs/vi_VN/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 38902b9949b..afd1d6ab7f4 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -19,4 +19,4 @@ printQty=SL: %d
 AddDispatchBatchLine=Thêm 1 line cho Shelf Life dispatching
 BatchDefaultNumber=Không định nghĩa
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 45d964cbe14..da779d78e92 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Ref sản phẩm.
+ProductRef=Tham chiếu sản phẩm.
 ProductLabel=Nhãn sản phẩm
-ProductServiceCard=Sản phẩm / dịch vụ thẻ
+ProductServiceCard=Thẻ Sản phẩm/Dịch vụ
 Products=Sản phẩm
 Services=Dịch vụ
 Product=Sản phẩm
 Service=Dịch vụ
-ProductId=Số ID Sản phẩm/dịch vụ
+ProductId=Mã Sản phẩm/Dịch vụ
 Create=Tạo
 Reference=Tham chiếu
 NewProduct=Sản phẩm mới
@@ -14,256 +14,285 @@ NewService=Dịch vụ mới
 ProductCode=Mã sản phẩm
 ServiceCode=Mã dịch vụ
 ProductVatMassChange=Thay đổi thuế GTGT hàng loạt
-ProductVatMassChangeDesc=Trang này có thể được sử dụng để sửa đổi một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu.
-MassBarcodeInit=Khối lượng mã vạch init
-MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra trước đó thiết lập các mô-đun mã vạch hoàn tất.
+ProductVatMassChangeDesc=Trang này có thể được dùng để điều chỉnh một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu.
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra xem trước đó thiết lập các mô-đun mã vạch hoàn tất chưa.
 ProductAccountancyBuyCode=Mã kế toán (mua)
 ProductAccountancySellCode=Mã kế toán (bán)
 ProductOrService=Sản phẩm hoặc dịch vụ
 ProductsAndServices=Sản phẩm và dịch vụ
 ProductsOrServices=Sản phẩm hoặc dịch vụ
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesOnSell=Sản phẩm và Dịch vụ để bán hoặc mua
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Thống kê Sản phẩm và Dịch vụ
 ProductsStatistics=Thống kê Sản phẩm
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-InternalRef=Tham khảo nội bộ
-LastRecorded=Sản phẩm/dịch vụ được bán cuối cùng
-LastRecordedProductsAndServices=Sản phẩm/dịch vụ %s được ghi cuối cùng
-LastModifiedProductsAndServices=Sản phẩm/dịch vụ %s được sửa cuối cùng
-LastRecordedProducts=Sản phẩm %s cuối cùng được ghi
-LastRecordedServices=Dịch vụ %s cuối cùng được ghi
-LastProducts=Sản phẩm cuối cùng
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
+ProductsOnSellAndOnBuy=Sản phẩm để bán và mua
+ServicesOnSell=Dịch vụ để bán hoặc để mua
+ServicesNotOnSell=Services not for sale
+ServicesOnSellAndOnBuy=Dịch vụ để bán và mua
+InternalRef=Tham chiếu nội bộ
+LastRecorded=Sản phẩm/Dịch vụ bán được ghi nhận cuối
+LastRecordedProductsAndServices=%s Sản phẩm/Dịch vụ được ghi cuối
+LastModifiedProductsAndServices=%s Sản phẩm/Dịch vụ được điều chỉnh cuối
+LastRecordedProducts=% Sản phẩm được ghi cuối
+LastRecordedServices=%s Dịch vụ được ghi cuối
+LastProducts=Sản phẩm cuối
 CardProduct0=Thẻ Sản phẩm
 CardProduct1=Thẻ Dịch vụ
 CardContract=Thẻ Hợp đồng
-Warehouse=Kho
+Warehouse=Kho hàng
 Warehouses=Các kho hàng
-WarehouseOpened=Kho mở
-WarehouseClosed=Kho đóng
-Stock=tồn kho
-Stocks=tồn kho phiếu
+WarehouseOpened=Warehouse open
+WarehouseClosed=Kho đã đóng
+Stock=Tồn kho
+Stocks=Tồn kho
 Movement=Chuyển kho
 Movements=Danh sách chuyển kho
-Sell=Bán hàng
+Sell=Bán
 Buy=Mua
 OnSell=Để bán
-OnBuy=Để Mua
-NotOnSell=Không phải để bán
+OnBuy=Để mua
+NotOnSell=Không bán
 ProductStatusOnSell=Để bán
-ProductStatusNotOnSell=Không dành để bán
+ProductStatusNotOnSell=Không bán
 ProductStatusOnSellShort=Để bán
-ProductStatusNotOnSellShort=Không dành để bán
-ProductStatusOnBuy=Để Mua
-ProductStatusNotOnBuy=Không dành để Mua
-ProductStatusOnBuyShort=Để Mua
-ProductStatusNotOnBuyShort=Không dành để Mua
-UpdatePrice=Cập nhật Giá
+ProductStatusNotOnSellShort=Không bán
+ProductStatusOnBuy=Để mua
+ProductStatusNotOnBuy=Không mua
+ProductStatusOnBuyShort=Để mua
+ProductStatusNotOnBuyShort=Không mua
+UpdatePrice=Cập nhật giá
 AppliedPricesFrom=Giá áp dụng từ
 SellingPrice=Giá bán
-SellingPriceHT=Giá bán (đã trừ thuế)
-SellingPriceTTC=Giá bán (bao thuế.)
+SellingPriceHT=Giá bán (chưa thuế)
+SellingPriceTTC=Giá bán (đã có thuế.)
 PublicPrice=Giá niêm yết
 CurrentPrice=Giá hiện tại
 NewPrice=Giá mới
-MinPrice=Giá bán tối thiểu
-MinPriceHT=Giọt. giá bán (đã trừ thuế)
-MinPriceTTC=Giọt. giá bán (bao thuế.)
-CantBeLessThanMinPrice=Giá bán không thấp hơn mức cho phép cho sản phẩm này (%s không có thuế) tối thiểu. Thông báo này cũng có thể xuất hiện khi bạn nhập một giảm quá quan trọng.
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
+CantBeLessThanMinPrice=Giá bán không thấp hơn mức tối thiểu được cho phép của sản phẩm này (%s chưa thuế). Thông điệp này chỉ xuất hiện khi bạn nhập giảm giá quá lớn.
 ContractStatus=Tình trạng hợp đồng
 ContractStatusClosed=Đã đóng
-ContractStatusRunning=Đang chạy
+ContractStatusRunning=Ongoing
 ContractStatusExpired=Đã hết hạn
-ContractStatusOnHold=Không chạy
-ContractStatusToRun=Để được chạy
-ContractNotRunning=Hợp đồng này không hoạt động
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Một sản phẩm với tham chiếu %s đã tồn tại.
-ErrorProductBadRefOrLabel=Sai giá trị tham khảo hoặc nhãn
-ErrorProductClone=Có một vấn đề trong khi cố gắng để sao chép các sản phẩm hoặc dịch vụ.
-ErrorPriceCantBeLowerThanMinPrice=Lỗi giá không thể thấp hơn giá tối thiểu.
+ErrorProductBadRefOrLabel=Sai giá trị tham chiếu hoặc nhãn
+ErrorProductClone=Có một vấn đề trong khi cố sao chép sản phẩm hoặc dịch vụ.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Nhà cung cấp
-SupplierRef=Ref sản phẩm của nhà cung cấp.
+SupplierRef=Tham chiếu sản phẩm nhà cung cấp.
 ShowProduct=Hiện sản phẩm
 ShowService=Hiện dịch vụ
 ProductsAndServicesArea=Khu vực Sản phẩm và DỊch vụ
 ProductsArea=Khu vực sản phẩm
 ServicesArea=Khu vực dịch vụ
-AddToMyProposals=Thêm vào đề nghị của tôi
-AddToOtherProposals=Thêm vào các đề xuất khác
+AddToMyProposals=Thêm vào đề xuất của tôi
+AddToOtherProposals=Thêm vào đề xuất khác
 AddToMyBills=Thêm vào hóa đơn của tôi
 AddToOtherBills=Thêm vào hóa đơn khác
-CorrectStock=Chính xác tồn kho
+CorrectStock=Điều chỉnh tồn kho
 AddPhoto=Thêm hình ảnh
 ListOfStockMovements=Danh sách chuyển tồn kho
 BuyingPrice=Giá mua
-SupplierCard=Thẻ Nhà cung cấp
+SupplierCard=Thẻ nhà cung cấp
 CommercialCard=Thẻ Thương mại
 AllWays=Đường dẫn để tìm sản phẩm của bạn trong kho
-NoCat=Sản phẩm của bạn không có trong bất kỳ ngành nào
+NoCat=Sản phẩm của bạn không có trong bất kỳ phân nhóm nào
 PrimaryWay=Đường dẫn chính
-PriceRemoved=Giá đã bị xóa
+PriceRemoved=Giá đã xóa
 BarCode=Mã vạch
 BarcodeType=Loại mã vạch
-SetDefaultBarcodeType=Đặt mã vạch loại
+SetDefaultBarcodeType=Đặt loại mã vạch
 BarcodeValue=Giá trị mã vạch
-NoteNotVisibleOnBill=Lưu ý (không hiển thị trên hóa đơn, đề nghị ...)
+NoteNotVisibleOnBill=Ghi chú (không hiển thị trên hóa đơn, đơn hàng đề xuất ...)
 CreateCopy=Tạo bản sao
-ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ với thời gian hạn chế:
-MultiPricesAbility=Một số mức giá cho mỗi sản phẩm / dịch vụ
-MultiPricesNumPrices=Số của Giá
-MultiPriceLevelsName=Loại giá
-AssociatedProductsAbility=Kích hoạt tính năng bao bì ảo
-AssociatedProducts=Bao bì sản phẩm
-AssociatedProductsNumber=Số lượng sản phẩm được tạo bao bì ảo
-ParentProductsNumber=Số sản phẩm bao bì gốc
-IfZeroItIsNotAVirtualProduct=Nếu bằng 0, sản phẩm này không phải là một sản phẩm bao bì ảo
-IfZeroItIsNotUsedByVirtualProduct=Nếu bằng 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm bao bì ảo
-EditAssociate=Phụ kiện
+ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ có giới hạn thời gian:
+MultiPricesAbility=Nhiều mức giá cho một sản phẩm/dịch vụ
+MultiPricesNumPrices=Số lượng Giá
+MultiPriceLevelsName=Phân nhóm giá
+AssociatedProductsAbility=Activate the package feature
+AssociatedProducts=Gói sản phẩm
+AssociatedProductsNumber=Number of products composing this package product
+ParentProductsNumber=Số lượng của gói sản phẩm gốc
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
+EditAssociate=Liên kết
 Translation=Dịch
 KeywordFilter=Bộ lọc từ khóa
-CategoryFilter=Bộ lọc danh mục
+CategoryFilter=Bộ lọc phân nhóm
 ProductToAddSearch=Tìm kiếm sản phẩm để thêm
-AddDel=Thêm / Xóa
+AddDel=Thêm/Xóa
 Quantity=Số lượng
 NoMatchFound=Không tìm thấy
-ProductAssociationList=Danh sách sản phẩm/dịch vụ liên quan: tên của sản phẩm/dịch vụ (số lượng bị ảnh hưởng)
-ProductParentList=Danh sách bao bì sản phẩm/dịch vụ với sản phẩm này như là một thành phần
-ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là gốc của sản phẩm hiện tại
+ProductAssociationList=List of products/services that are component of this virtual product/package
+ProductParentList=Danh sách gói sản phẩm/dịch vụ mà sản phẩm này là một thành phần
+ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được chọn là gốc của sản phẩm hiện tại
 DeleteProduct=Xóa một sản phẩm/dịch vụ
-ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này/dịch vụ?
-ProductDeleted=Sản phẩm / dịch vụ "%s" sẽ bị xóa khỏi cơ sở dữ liệu.
+ConfirmDeleteProduct=Bạn có chắc muốn xóa sản phẩm/dịch vụ này ?
+ProductDeleted=Sản phẩm/Dịch vụ "%s" đã bị xóa khỏi cơ sở dữ liệu.
 DeletePicture=Xóa một hình
-ConfirmDeletePicture=Bạn có chắc chắn muốn xóa hình này?
+ConfirmDeletePicture=Bạn có chắc muốn xóa hình này?
 ExportDataset_produit_1=Sản phẩm
 ExportDataset_service_1=Dịch vụ
 ImportDataset_produit_1=Sản phẩm
 ImportDataset_service_1=Dịch vụ
 DeleteProductLine=Xóa dòng sản phẩm
 ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản phẩm này?
-NoProductMatching=Không có sản phẩm / dịch vụ phù hợp với tiêu chí của bạn
-MatchingProducts=Sản phẩm / dịch vụ trùng khớp
-NoStockForThisProduct=Không có tồn kho nào cho sản phẩm này
-NoStock=Không tồn kho
-Restock=Restock
+NoProductMatching=Không có sản phẩm/dịch vụ khớp với tiêu chí của bạn
+MatchingProducts=Khớp sản phẩm/dịch vụ
+NoStockForThisProduct=Không có tồn kho cho sản phẩm này
+NoStock=Không có tồn kho
+Restock=Trả lại tồn kho
 ProductSpecial=Đặc biệt
 QtyMin=Số lượng tối thiểu
 PriceQty=Giá cho số lượng này
-PriceQtyMin=Giá cho tối SL thiểu này (không giảm giá)
-VATRateForSupplierProduct=Tỷ lệ thuế GTGT (đối với nhà cung cấp / sản phẩm)
-DiscountQtyMin=Mặc định giảm giá cho SL
-NoPriceDefinedForThisSupplier=Không có giá / SL xác định cho nhà cung cấp / sản phẩm
-NoSupplierPriceDefinedForThisProduct=Không có giá nhà cung cấp / SL được xác định cho sản phẩm này
-RecordedProducts=Sản phẩm được ghi
-RecordedServices=Dịch vụ được ghi
-RecordedProductsAndServices=Sản phẩm / dịch vụ được ghi nhận
-PredefinedProductsToSell=Sản phẩm được xác định trước để bán
-PredefinedServicesToSell=Dịch vụ được xác định trước để bán
-PredefinedProductsAndServicesToSell=Sản phẩm được xác định trước / dịch vụ để bán
-PredefinedProductsToPurchase=Sản phẩm được xác định trước để mua hàng
-PredefinedServicesToPurchase=Dịch vụ được xác định trước để mua hàng
-PredefinedProductsAndServicesToPurchase=Sản phẩm được xác định trước / dịch vụ để puchase
-GenerateThumb=Generate thumb
-ProductCanvasAbility=Sử dụng phần mở rộng "canvas" đặc biệt
-ServiceNb=Dịch vụ #% s
-ListProductServiceByPopularity=Danh sách sản phẩm / dịch vụ phổ biến
+PriceQtyMin=Giá cho tối SL thiểu này (chưa giảm giá)
+VATRateForSupplierProduct=Tỷ lệ thuế GTGT (cho nhà cung cấp/sản phẩm)
+DiscountQtyMin=Giảm giá mặc định cho số lượng
+NoPriceDefinedForThisSupplier=Không có giá/số lượng đã xác định cho nhà cung cấp/sản phẩm
+NoSupplierPriceDefinedForThisProduct=Không có giá nhà cung cấp/số lượng đã xác định cho sản phẩm này
+RecordedProducts=Sản phẩm đã ghi
+RecordedServices=Dịch vụ đã ghi
+RecordedProductsAndServices=Sản phẩm/dịch vụ đã ghi
+PredefinedProductsToSell=Sản phẩm đã định sẵn để bán
+PredefinedServicesToSell=Dịch vụ đã định sẵn để bán
+PredefinedProductsAndServicesToSell=Sản phẩm/dịch vụ định sẵn để bán
+PredefinedProductsToPurchase=Sản phẩm đã định sẵn để mua hàng
+PredefinedServicesToPurchase=Dịch vụ định sẵn để mua hàng
+PredefinedProductsAndServicesToPurchase=Sản phẩm/dịch vụ đã định sẵn để puchase
+GenerateThumb=Xuất tạo thumb
+ProductCanvasAbility=Dụng phần mở rộng "canvas" đặc biệt
+ServiceNb=Dịch vụ #%s
+ListProductServiceByPopularity=Danh sách sản phẩm/dịch vụ phổ biến
 ListProductByPopularity=Danh sách sản phẩm phổ biến
 ListServiceByPopularity=Danh sách các dịch vụ phổ biến
-Finished=Sản phẩm sản xuất
+Finished=Thành phẩm
 RowMaterial=Nguyên liệu
 CloneProduct=Sao chép sản phẩm hoặc dịch vụ
-ConfirmCloneProduct=Bạn có chắc chắn bạn muốn sao chép sản phẩm hoặc dịch vụ <b>%s</b>?
-CloneContentProduct=Sao chép tất cả thông tin chính của sản phẩm / dịch vụ
-ClonePricesProduct=Sao chép Thông tin chính và giá cả
-CloneCompositionProduct=Sao chép bao bì sản phẩm/dịch vụ
-ProductIsUsed=Sản phẩm này được sử dụng
-NewRefForClone=Số tham chiếu các sản phẩm/dịch vụ mới
-CustomerPrices=Giá khách hàng
-SuppliersPrices=Giá nhà cung cấp
-SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (các sản phẩm hoặc dịch vụ)
+ConfirmCloneProduct=Bạn có chắc muốn sao chép sản phẩm hoặc dịch vụ <b>%s</b> ?
+CloneContentProduct=Sao chép tất cả thông tin chính của sản phẩm/dịch vụ
+ClonePricesProduct=Sao chép thông tin chính và giá cả
+CloneCompositionProduct=Clone packaged product/service
+ProductIsUsed=Sản phẩm này đã được dùng
+NewRefForClone=Tham chiếu sản phẩm/dịch vụ mới
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Mã hải quan
 CountryOrigin=Nước xuất xứ
 HiddenIntoCombo=Ẩn vào danh sách chọn
 Nature=Tự nhiên
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Mẫu tham chiếu Sản phẩm
-ServiceCodeModel=MẪu tham chiếu dịch vụ
+ServiceCodeModel=Mẫu tham chiếu dịch vụ
 AddThisProductCard=Tạo thẻ Sản phẩm
 HelpAddThisProductCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một sản phẩm nếu nó không tồn tại.
 AddThisServiceCard=Tạo thẻ Dịch vụ
 HelpAddThisServiceCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một dịch vụ nếu nó không tồn tại.
 CurrentProductPrice=Giá hiện tại
-AlwaysUseNewPrice=Luôn luôn sử dụng giá hiện tại của sản phẩm / dịch vụ
+AlwaysUseNewPrice=Luôn sử dụng giá hiện tại của sản phẩm / dịch vụ
 AlwaysUseFixedPrice=Sử dụng giá cố định
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Giá thay đổi theo số lượng
 PriceByQuantityRange=Phạm vi số lượng
 ProductsDashboard=Tóm tắt Sản phẩm / dịch vụ
-UpdateOriginalProductLabel=Sửa đổi nhãn gốc
-HelpUpdateOriginalProductLabel=Cho phép chỉnh sửa tên của sản phẩm
+UpdateOriginalProductLabel=Điều chỉnh nhãn gốc
+HelpUpdateOriginalProductLabel=Cho phép sửa tên của sản phẩm
 ### composition fabrication
-Building=Sản xuất và các mặt hàng điều phối
+Building=Sản xuất và điều phối các mặt hàng
 Build=Sản xuất
 BuildIt=Sản xuất & điều phối
-BuildindListInfo=Số lượng có sẵn để sản xuất mỗi kho (đặt nó là 0 nếu không có hành động tiếp theo)
+BuildindListInfo=Số lượng sẵn có để sản xuất cho mỗi kho hàng (đặt nó là 0 nếu không có hành động tiếp theo)
 QtyNeed=Số lượng
-UnitPmp=Đơn vị VWAP Net
-CostPmpHT=Tổng VWAP Net
-ProductUsedForBuild=Tự động tiêu thụ bởi sản xuất
+UnitPmp=Net unit VWAP
+CostPmpHT=Net total VWAP
+ProductUsedForBuild=Được tiêu thụ tự động bởi sản xuất
 ProductBuilded=Sản xuất hoàn thành
-ProductsMultiPrice=Sản phẩm đa giá
-ProductsOrServiceMultiPrice=Giá của khách hàng (những sản phẩm, dịch vụ, đa giá)
-ProductSellByQuarterHT=Sản phẩm doanh thu quý VWAP
-ServiceSellByQuarterHT=Dịch vụ doanh thu quý VWAP
+ProductsMultiPrice=Sản phẩm nhiều giá
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly VWAP
+ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=Quý 1
 Quarter2=Quý 2
 Quarter3=Quý 3
 Quarter4=Quý 4
 BarCodePrintsheet=In mã vạch
 PageToGenerateBarCodeSheets=Với công cụ này, bạn có thể in tờ dán mã vạch. Chọn định dạng của trang nhãn dán của bạn, loại mã vạch và giá trị của mã vạch, sau đó nhấn vào nút <b>%s</b>.
-NumberOfStickers=Số nhãn để in trên trang
+NumberOfStickers=Số lượng nhãn để in trên trang
 PrintsheetForOneBarCode=In nhiều nhãn cho một mã vạch
-BuildPageToPrint=Tạo trang in
+BuildPageToPrint=Xuất trang để in
 FillBarCodeTypeAndValueManually=Điền loại mã vạch và giá trị bằng tay.
 FillBarCodeTypeAndValueFromProduct=Điền loại mã vạch và giá trị từ mã vạch của sản phẩm.
 FillBarCodeTypeAndValueFromThirdParty=Điền loại mã vạch và giá trị từ mã vạch của một của bên thứ ba.
-DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho các sản phẩm %s.
+DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho sản phẩm %s.
 DefinitionOfBarCodeForThirdpartyNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không hoàn chỉnh cho %s của bên thứ ba.
 BarCodeDataForProduct=Thông tin mã vạch của sản phẩm %s:
 BarCodeDataForThirdparty=Thông tin mã vạch của bên thứ ba của %s:
-ResetBarcodeForAllRecords=Xác định giá trị mã vạch cho tất cả các hồ sơ (cũng sẽ thiết lập lại giá trị này đã được xác định mã vạch với các giá trị mới)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Giá duy nhất cho mỗi sản phẩm / dịch vụ
-PricingRule=Rules for customer prices
-AddCustomerPrice=Thêm giá của khách hàng
-ForceUpdateChildPriceSoc=Đặt giá trên cùng một công ty con của khách hàng
-PriceByCustomerLog=Giá bán của khách hàng đăng nhập
-MinimumPriceLimit=Giá tối thiểu không thấp hơn %s
-MinimumRecommendedPrice=Giá đề nghị tối thiểu là: %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
+ResetBarcodeForAllRecords=Xác định giá trị mã vạch cho tất cả các bản ghi (điều này cũng sẽ cài lại giá trị mã vạch đã xác định với các giá trị mới)
+PriceByCustomer=Nhiều giá cho mỗi khách hàng
+PriceCatalogue=Giá duy nhất cho mỗi sản phẩm/dịch vụ
+PricingRule=Quy tắc cho giá khách hàng
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Đặt giá giống nhau trên nhóm khách hàng phụ thuộc
+PriceByCustomerLog=Sổ ghi giá theo khách hàng
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Giá tối thiểu đề nghị là: %s
+PriceExpressionEditor=Soạn thảo biểu giá
+PriceExpressionSelected=Biểu giá được chọn
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
 PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-DynamicPriceConfiguration=Dynamic price configuration
-GlobalVariables=Global variables
-GlobalVariableUpdaters=Global variable updaters
+PriceExpressionEditorHelp5=Giá trị toàn cầu sẵn có:
+PriceMode=Chế độ giá
+PriceNumeric=Số
+DefaultPrice=giá mặc định
+ComposedProductIncDecStock=Tăng/Giảm tồn kho trên thay đổi gốc
+ComposedProduct=Sản phẩm con
+MinSupplierPrice=Giá tối thiểu nhà cung cấp
+DynamicPriceConfiguration=Cấu hình giá linh hoạt
+GlobalVariables=Biến toàn cầu
+GlobalVariableUpdaters=Cập nhật biến toàn cầu
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=WebService data
 GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
 GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
+UpdateInterval=Cập nhật khoảng thời gian (phút)
+LastUpdated=Đã cập nhật cuối
+CorrectlyUpdated=Đã cập nhật chính xác
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 79744e83f0f..2cf67a0986d 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=Phần xem này hiển thị tất cả các dự án mà b
 ProjectsPublicTaskDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
 ProjectsDesc=Phần xem này hiển thị tất cả các dự án (quyền người dùng cấp cho bạn được phép xem mọi thứ).
 MyTasksDesc=Phần xem này bị giới hạn với các dự án hoặc tác vụ mà bạn có mối liên hệ với (bất kỳ loại dự án nào).
-OnlyOpenedProject=Chỉ dự án đã mở mới hiển thị (dự án trạng thái dự thảo hoặc đã đóng thì không hiển thị).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
 TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (quyền người dùng của bạn hiện đang cho phép bạn xem tất cả thông tin).
-AllTaskVisibleButEditIfYouAreAssigned=Tất cả tác vụ cho dự án như vậy được hiển thị, nhưng bạn chỉ có thể nhập vào thời gian cho tác vụ mà bạn được giao.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=Khu vực dự án
 NewProject=Dự án mới
 AddProject=Tạo dự án
@@ -29,7 +30,7 @@ ProjectsList=Danh sách dự án
 ShowProject=Hiển thị dự án
 SetProject=Lập dự án
 NoProject=Không có dự án được xác định hoặc tự tạo
-NbOpenTasks=Nb của tác vụ được mở
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb của dự án
 TimeSpent=Thời gian đã qua
 TimeSpentByYou=Thời gian đã qua bởi bạn
@@ -41,7 +42,7 @@ TaskTimeSpent=Thời gian đã qua trên tác vụ
 TaskTimeUser=Người dùng
 TaskTimeNote=Ghi chú
 TaskTimeDate=Ngày
-TasksOnOpenedProject=Tác vụ đã mở trong dự án
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Khối lượng công việc chưa xác định
 NewTimeSpent=Thời gian đã qua mới
 MyTimeSpent=Thời gian đã qua của tôi
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=Danh sách các sự can thiệp được gắn v
 ListExpenseReportsAssociatedProject=Danh sách các báo cáo chi phí liên quan đến dự án
 ListDonationsAssociatedProject=Danh sách hiến tặng liên quan đến dự án
 ListActionsAssociatedProject=Danh sách các hoạt động được gắn với dự án
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=Hoạt động của dự án trong tuần này
 ActivityOnProjectThisMonth=Hoạt động của dự án trong tháng này
 ActivityOnProjectThisYear=Hoạt động của dự án trong năm này
@@ -95,7 +98,7 @@ DeleteATimeSpent=Xóa thời gian đã qua
 ConfirmDeleteATimeSpent=Bạn có chắc muốn xóa thời gian đã qua này?
 DoNotShowMyTasksOnly=Xem thêm tác vụ không được gán cho tôi
 ShowMyTasksOnly=Xem chỉ tác vụ được gán cho tôi
-TaskRessourceLinks=Tài nguyên
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này
 NoTasks=Không có tác vụ nào cho dự án này
 LinkedToAnotherCompany=Được liên kết đến các bên thứ ba
@@ -139,8 +142,15 @@ ProjectReferers=Các đối tượng tham chiếu
 SearchAProject=Tìm kiếm một dự án
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận trước
 ProjectDraft=Dự án dự thảo
-FirstAddRessourceToAllocateTime=Liên kết tài nguyên để phân bổ thời gian
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Đầu vào mỗi ngày
 InputPerWeek=Đầu vào mỗi tuần
 InputPerAction=Đầu vào mỗi hành động
 TimeAlreadyRecorded=Thời gian đã qua được ghi nhận cho tác vụ/ngày này và người dùng %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index f6fdefe90ce..aba3161bda5 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -4,7 +4,7 @@ Proposal=Đơn hàng đề xuất
 ProposalShort=Đơn hàng đề xuất
 ProposalsDraft=Dự thảo đơn hàng đề xuất
 ProposalDraft=Dự thảo đơn hàng đề xuất
-ProposalsOpened=Đơn hàng đề xuất đã mở
+ProposalsOpened=Open commercial proposals
 Prop=Đơn hàng đề xuất
 CommercialProposal=Đơn hàng đề xuất
 CommercialProposals=Đơn hàng đề xuất
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Số tiền theo tháng (chưa thuế)
 NbOfProposals=Số lượng đơn hàng đề xuất
 ShowPropal=Hiện đơn hàng đề xuất
 PropalsDraft=Dự thảo
-PropalsOpened=Đã mở
+PropalsOpened=Open
 PropalsNotBilled=Đã đóng chưa ra hóa đơn
 PropalStatusDraft=Dự thảo (cần được xác nhận)
 PropalStatusValidated=Xác nhận (đề xuất mở)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Không ký (đã đóng)
 PropalStatusBilled=Đã ra hóa đơn
 PropalStatusDraftShort=Dự thảo
 PropalStatusValidatedShort=Đã xác nhận
-PropalStatusOpenedShort=Đã mở
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Đã đóng
 PropalStatusSignedShort=Đã ký
 PropalStatusNotSignedShort=Không ký
@@ -51,8 +51,8 @@ PropalsToClose=Đơn hàng đề xuất đóng
 PropalsToBill=Đơn hàng đề xuất đã ký cần ra hóa đơn
 ListOfProposals=Danh sách các đơn hàng đề xuất
 ActionsOnPropal=Sự kiện về đơn hàng đề xuất
-NoOpenedPropals=Không có đơn hàng đề xuất đã mở
-NoOtherOpenedPropals=Không có đơn hàng đề xuất đã mở khác
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Đơn hàng đề xuất tham chiếu
 SendPropalByMail=Gửi đơn hàng đề xuất qua thư
 AssociatedDocuments=Chứng từ liên quan đến đơn hàng đề xuất:
@@ -98,3 +98,4 @@ DocModelJauneDescription=Mô hình đề nghị Jaune
 DefaultModelPropalCreate=Tạo mô hình mặc định
 DefaultModelPropalToBill=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (được lập hoá đơn)
 DefaultModelPropalClosed=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (chưa lập hoá đơn)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index 0568daa4efe..0ccf5ca5d62 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Hiện thanh toán tiền lương
 THM=Giá trung bình theo giờ
 TJM=Giá trung bình hàng ngày
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 567a4ba2f52..6728e0a8df3 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Mô hình tài liệu đơn giản
 DocumentModelMerou=Mô hình Merou A5
 WarningNoQtyLeftToSend=Cảnh báo, không có sản phẩm chờ đợi để được vận chuyển.
 StatsOnShipmentsOnlyValidated=Thống kê tiến hành với các chuyến hàng chỉ xác nhận. Ngày sử dụng là ngày xác nhận giao hàng (dự ngày giao hàng không phải luôn luôn được biết đến).
-DateDeliveryPlanned=Ngày quy hoạch giao hàng
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Ngày giao nhận
 SendShippingByEMail=Gửi hàng bằng thư điện tử
 SendShippingRef=Nộp hàng% s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 2954e893b45..67488654b3d 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Các kho hàng
 NewWarehouse=Kho mới / khu vực kho
 WarehouseEdit=Sửa kho
 MenuNewWarehouse=Kho mới
-WarehouseOpened=Kho mở
+WarehouseOpened=Warehouse open
 WarehouseClosed=Kho đóng
 WarehouseSource=Nguồn kho
 WarehouseSourceNotDefined=Không có kho được xác định,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho kho giảm
 SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho kho tăng
 NoStockAction=Không có hành động kho
 LastWaitingSupplierOrders=Đơn đặt hàng chờ đợi để tiếp khách
-DesiredStock=Tồn kho mong muốn
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=Để đặt hàng
 Replenishment=Bổ sung
 ReplenishmentOrders=Đơn đặt hàng bổ sung
-VirtualDiffersFromPhysical=Theo để tăng / giảm lựa chọn tồn kho, kho vật chất và kho ảo (vật lý + đơn đặt hàng hiện tại) có thể có khác nhau
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Sử dụng kho ảo theo mặc định, thay vì cổ vật lý, cho các tính năng bổ sung
 UseVirtualStock=Sử dụng kho ảo
 UsePhysicalStock=Sử dụng vật lý tồn kho
-CurentSelectionMode=Dòng định mức chế độ lựa chọn
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Tồn kho ảo
 CurentlyUsingPhysicalStock=Tồn kho vật lý
 RuleForStockReplenishment=Quy tắc cho tồn kho bổ sung
@@ -112,8 +113,8 @@ AlertOnly= Cảnh báo chỉ
 WarehouseForStockDecrease=<b>Kho% s</b> sẽ được sử dụng cho kho giảm
 WarehouseForStockIncrease=<b>Kho% s</b> sẽ được sử dụng cho kho tăng
 ForThisWarehouse=Đối với kho này
-ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một tồn kho thấp hơn so với tồn kho mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s)
 NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s)
@@ -124,16 +125,16 @@ RecordMovement=Ghi transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Chuyển động kho được ghi nhận
 RuleForStockAvailability=Quy định về yêu cầu kho
-StockMustBeEnoughForInvoice=Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào hóa đơn
-StockMustBeEnoughForOrder=Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào nề nếp
-StockMustBeEnoughForShipment= Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào lô hàng
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index d206fd52de7..fdaa269afa3 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Đã gửi đến nhà cung cấp
 ListOfSupplierOrders=Danh sách các đơn hàng nhà cung cấp
 MenuOrdersSupplierToBill=Chuyển các đơn hàng nhà cung cấp sang hóa đơn
 NbDaysToDelivery=Số ngày giao hàng
-DescNbDaysToDelivery=Thời gian chậm nhất được hiển thị trong danh sách sản phẩm đặt hàng
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
index f9c0f5dbaf0..8834a06e074 100644
--- a/htdocs/langs/vi_VN/trips.lang
+++ b/htdocs/langs/vi_VN/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=Danh sách phí
 NewTrip=New expense report
 CompanyVisited=Công ty / cơ sở thăm
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 632bfcf2d90..24f50f377fb 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=Xóa khỏi nhóm
 PasswordChangedAndSentTo=Mật khẩu thay đổi và gửi đến <b>%s</b>.
 PasswordChangeRequestSent=Yêu cầu thay đổi mật khẩu cho <b>%s</b> đã gửi đến <b>% s</b>.
 MenuUsersAndGroups=Người dùng & Nhóm
+MenuMyUserCard=My user card
 LastGroupsCreated=%s Nhóm được tạo ra cuối
 LastUsersCreated=%s người dùng được tạo ra cuối
 ShowGroup=Hiển thị nhóm
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 78957073466..68a6c190be3 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Thu hồi tập tin
 SetToStatusSent=Thiết lập để tình trạng "File gửi"
 ThisWillAlsoAddPaymentOnInvoice=Điều này cũng sẽ áp dụng chi trả cho các hóa đơn và sẽ phân loại là "Đã thanh toán"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=Thanh toán đứng thứ tự% s của ngân hàng
diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
index b54583b5294..54c5702b625 100644
--- a/htdocs/langs/vi_VN/workflow.lang
+++ b/htdocs/langs/vi_VN/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Thiết lập mô-đun công việc
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=Không có công việc, bạn có thể thay đổi cho mô-đun bạn đã kích hoạt.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tạo ra một đơn đặt hàng tự động sau một đề nghị thương mại được ký kết
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau một đề nghị thương mại được ký kết
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau khi hợp đồng được xác nhận
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau khi một đơn đặt hàng bị đóng
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Phân loại đề xuất nguồn liên quan đến hóa đơn khi đơn đặt hàng được thiết lập để trả
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Phân loại đơn đặt hàng nguồn liên kết (s) để tính tiền khi hóa đơn khách hàng được thiết lập để trả
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Phân loại theo thứ tự liên kết nguồn khách hàng (s) để tính tiền khi hóa đơn của khách hàng được xác nhận
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 47bd7f800b4..3a8b31c50f0 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=会计
 Globalparameters=全局参数
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=转账账户
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index bc56fe2e18e..99061f53970 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=用户菜单
 LangFile=.lang 文件
 System=系统
 SystemInfo=系统信息
-SystemTools=系统工具
 SystemToolsArea=系统工具区
 SystemToolsAreaDesc=此区域提供管理员功能。请点选菜单来管理你想要的内容。
 Purge=清空
@@ -232,8 +231,8 @@ Security=安全
 Passwords=密码
 DoNotStoreClearPassword=不在数据库中储存明文密码，只存储加密后的密码(建议启用)
 MainDbPasswordFileConfEncrypted=加密 conf.php 中的数据库密码(推荐启用)
-InstrucToEncodePass=要将 <b>conf.php</b> 文件中的密码加密，替换行 <br><b>$ dolibarr_main_db_pass="..."</b><br> 为 <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=要在<b>conf.php</b>文件中使用将明文密码，替换行<br><b>$ dolibarr_main_db_pass="crypted:..."</b><br>为<br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=保护生成的PDF文件(推荐*不*启用，影响PDF的批量生成)
 ProtectAndEncryptPdfFilesDesc=PDF保护允许在PDF浏览器中阅读和打印PDF，但无法编辑和复制内容。请注意，此功能让追加生成多页PDF的功能无法使用(例如未支付账单)。
 Feature=功能特色
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=以下为软体的安装过程：
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=第 %s 步骤
 FindPackageFromWebSite=搜索你需要的功能(例如在官方 %s )。
-DownloadPackageFromWebSite=下载包 %S。
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=安装完成，Dolibarr 已可以使用此新组件。
 NotExistsDirect=未设置可选备用根目录。<br>
 InfDirAlt=自 v3 开始，Dolibarr 可以定义备用根目录。这令您可以将插件和自定义模板保存至同一位置。<br>您只需在Dolibarr的根目录下创建一个目录(例如custom)。<br>
 InfDirExample=<br>然后在 conf.php 中声明它<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*这些行已存在，移除注释符"#"即可。
-YouCanSubmitFile=选择模块：
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr 当前版本
 CallUpdatePage=请到数据库的结构和数据更新页面：%s。
 LastStableVersion=最新的稳定版本
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=刷新链接
@@ -430,8 +429,8 @@ Module20Name=报价
 Module20Desc=报价单管理
 Module22Name=群发电邮
 Module22Desc=电子邮件群发的管理
-Module23Name= 能耗
-Module23Desc= 能耗监测
+Module23Name=能耗
+Module23Desc=能耗监测
 Module25Name=销售订单
 Module25Desc=销售订单管理
 Module30Name=账单
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
-Module500Name=特别费用（税，社会公益，股息）
-Module500Desc=特别费用如税收，社会公益，分红及工资管理
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=通知
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=捐赠
 Module700Desc=捐款的管理
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=日程
 Module2400Desc=事件/任务和日程管理
 Module2500Name=电子内容管理
 Module2500Desc=保存和共享文件
-Module2600Name=SOAP WebServices
-Module2600Desc=启用 Dolibarr Web 服务的服务器
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -578,7 +579,7 @@ Permission32=建立/修改产品信息
 Permission34=删除产品信息
 Permission36=查看/管理隐藏产品
 Permission38=导出产品信息
-Permission41=读取项目(共享项目和我参与的项目)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=建立/修改项目(共享项目和我参与的项目)
 Permission44=删除项目(共享项目和参与的项目)
 Permission61=阅读干预
@@ -599,10 +600,10 @@ Permission86=发送商业订单
 Permission87=关闭商业订单
 Permission88=取消商业订单
 Permission89=删除商业订单
-Permission91=了解社会的贡献和增值税
-Permission92=建立/修改的社会贡献和增值税
-Permission93=删除社会贡献和增值税
-Permission94=导出社会贡献
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=阅读报告
 Permission101=读取发货资讯
 Permission102=建立/修改发货单
@@ -620,9 +621,9 @@ Permission121=读取与用户相关联的第三方的信息
 Permission122=建立/修改与用户相关联的第三方的信息
 Permission125=删除与用户相关联的第三方的信息
 Permission126=导出第三方信息
-Permission141=阅读项目(以及用户未参与的个人项目)
-Permission142=建立/修改项目(以及用户未参与的个人项目)
-Permission144=删除任务(以及用户未参与的个人项目)
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=读取供应商
 Permission147=读统计
 Permission151=阅读常年订单
@@ -800,7 +801,7 @@ DictionaryCountry=国家
 DictionaryCurrency=货币
 DictionaryCivility=文明单位称号
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=社会公益类型
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=设定值已储存
 BackToModuleList=返回模块列表
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=邮编
 CompanyTown=城镇
 CompanyCountry=国家
 CompanyCurrency=主要货币
+CompanyObject=Object of the company
 Logo=标志
 DoNotShow=不显示
 DoNotSuggestPaymentMode=不提示
 NoActiveBankAccountDefined=没有定义有效的银行帐户
 OwnerOfBankAccount=银行帐户 %s 的户主
 BankModuleNotActive=银行账户模块没有启用
-ShowBugTrackLink=显示连结“报告错误”
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=主页面显示“工作台”
 Alerts=其他提醒
 Delays=延误
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=单价小数位
 MAIN_MAX_DECIMALS_TOT=总价小数位
 MAIN_MAX_DECIMALS_SHOWN=屏幕显示小数位(如果你希望系统内部数值显示时遇到小数位截断的情况下显示<b>...</b>，请在此数值后加上<b>...</b>)
 MAIN_DISABLE_PDF_COMPRESSION=压缩生成的 PDF 文件。
-MAIN_ROUNDING_RULE_TOT= 四舍五入的取舍值 (仅适用于个别不按10取舍的国家)
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=产品单价 (税前)
 TotalPriceAfterRounding=四舍五入的总价 (税前价/增值税/税后价)
 ParameterActiveForNextInputOnly=参数仅在下次输入数值起生效。
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=您必须至少启用 1 个模块
 ClassNotFoundIntoPathWarning=PHP 路径中未发现 类 %s
 YesInSummer=是(在夏天)
-OnlyFollowingModulesAreOpenedToExternalUsers=注意，仅如下模块向外部用户开放。(无论外部用户的权限如何)：
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密
 ConditionIsCurrently=当前条件为 %s
 YouUseBestDriver=你使用的驱动程序 %s 就是目前最佳驱动程式。
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=下拉菜单中的最大产品数量(0=无限制)
 ConfirmDeleteProductLineAbility=从表单中删除产品时要求确认
 ModifyProductDescAbility=允许更改表单中的产品说明
 ViewProductDescInFormAbility=表单中是否可以直接显示产品描述资讯(如果关闭则用弹出工具提示显示)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=是否可以直接显示其他语系的产品描述资讯
 UseSearchToSelectProductTooltip=此外，如果你有大量的产品（> 10万），你可以通过设置 - >其他不变PRODUCT_DONOTSEARCH_ANYWHERE设置为1，提高速度。搜索将被限制在开始的字符串。
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=支持生态附加税 (WEEE)
 SetDefaultBarcodeTypeProducts=默认的条码类型
 SetDefaultBarcodeTypeThirdParties=第三方用默认条码类型
+UseUnits=Support units
 ProductCodeChecker= 产品/服务编号的生成与检查模块
 ProductOtherConf= 产品/服务 配置
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=通用产品条码(UPC)
 BarcodeDescISBN=ISBN 书籍条码
 BarcodeDescC39=Code 39 条码
 BarcodeDescC128=Code 128 条码
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=内部引擎
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=你确定要删除菜单条目 <b>%s</b> 吗？
 DeleteLine=删除行
 ConfirmDeleteLine=你确定要删除此行吗？
 ##### Tax #####
-TaxSetup=税，社会贡献和红利模块设置
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=增值税到期
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=SOAP Webservice 模块设置
 WebServicesDesc=启用此模块，Dolibarr成为Web服务器提供其他Web服务。
 WSDLCanBeDownloadedHere=提供服务的 WSDL描述文件可以从此处下载
 EndPointIs=SOAP客户端发送请求至 Dolibarr 的必需通过链接
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=银行模块设置
 FreeLegalTextOnChequeReceipts=支票回执中的额外说明文本
@@ -1581,6 +1599,7 @@ ProjectsSetup=项目模块设置
 ProjectsModelModule=项目报告文档模板
 TasksNumberingModules=任务编号模块
 TaskModelModule=任务报告文档模型
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED 设置
 ECMAutoTree = 自动树形文件夹和文档
@@ -1594,7 +1613,7 @@ OpenFiscalYear=打开财务年度
 CloseFiscalYear=关闭财务年度
 DeleteFiscalYear=删除财务年度
 ConfirmDeleteFiscalYear=您确定要删除本财年？
-Opened=启动
+Opened=Open
 Closed=关闭
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index 34f59b5dd9e..66b096e8458 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=为了%s批准
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=为了%s回到草案状态
-OrderCanceledInDolibarr=为了%s取消
 ProposalSentByEMail=商业建议通过电子邮件发送%s
 OrderSentByEMail=客户订单通过电子邮件发送%s
 InvoiceSentByEMail=客户发票通过电子邮件发送%s
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 2174b43f498..274b5b4ff32 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -94,12 +94,12 @@ Conciliate=调和
 Conciliation=和解
 ConciliationForAccount=此帐户核对
 IncludeClosedAccount=包括关闭账户
-OnlyOpenedAccount=只有开立帐户
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=帐户信用
 AccountToDebit=帐户转帐
 DisableConciliation=此帐户的禁用和解功能
 ConciliationDisabled=和解功能禁用
-StatusAccountOpened=开业
+StatusAccountOpened=Open
 StatusAccountClosed=关闭
 AccountIdShort=数
 EditBankRecord=编辑记录
@@ -113,7 +113,7 @@ CustomerInvoicePayment=客户付款
 CustomerInvoicePaymentBack=客户付款回单
 SupplierInvoicePayment=供应商付款
 WithdrawalPayment=提款支付
-SocialContributionPayment=社会贡献付款
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=金融帐日记
 BankTransfer=银行汇款
 BankTransfers=银行转帐
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index aba7e1595c3..415452874cb 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=铌发票
 NumberOfBillsByMonth=铌，按月发票
 AmountOfBills=发票金额
 AmountOfBillsByMonthHT=通过一个月的发票金额（税后）
-ShowSocialContribution=显示社会贡献
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=显示发票
 ShowInvoice=显示发票
 ShowInvoiceReplace=显示发票取代
@@ -270,7 +270,7 @@ BillAddress=条例草案的报告
 HelpEscompte=这是给予客户优惠折扣，因为它的任期作出之前付款。
 HelpAbandonBadCustomer=这一数额已被放弃（客户说是一个坏的客户），并作为一个特殊的松散考虑。
 HelpAbandonOther=这一数额已被放弃，因为这是一个错误（错误的顾客或由其他替代例如发票）
-IdSocialContribution=社会贡献的id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=付款编号
 InvoiceId=发票编号
 InvoiceRef=发票编号。
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=即时
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 62e78b17bd0..a60c4dd19d7 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=最近的合同
 BoxLastContacts=最近的联系人/地址
 BoxLastMembers=最近的成员
 BoxFicheInter=最近的干预
-BoxCurrentAccounts=开户账号余额
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=销售营业额
 BoxTotalUnpaidCustomerBills=待收款的销售账单总额
 BoxTotalUnpaidSuppliersBills=待支付的采购账单总额
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=最近更新的 %s 个交易干预
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=销售营业额
 BoxTitleTotalUnpaidCustomerBills=客户未付发票
 BoxTitleTotalUnpaidSuppliersBills=未付供应商发票
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 69bd75a4ac8..8acab7ee890 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b>是添加成功。
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=无
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=此类别已存在此号
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=所有内容不可见
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp。类别
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index bef78d52342..18fde7c7030 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=第三方联系人
 StatusContactValidated=联系人/地址 状态
 Company=公司
 CompanyName=公司名称
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=公司
 CountryIsInEEC=国家是欧共体内
 ThirdPartyName=第三方的名称
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=绝对可用折扣
 DiscountNone=无
 Supplier=供应商
 CompanyList=，公司就名单
-AddContact=新增联络人/地址
-AddContactAddress=添加联系人/地址
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=编辑联系人/地址
 EditContactAddress=编辑联系人/地址
 Contact=联系
@@ -268,8 +269,8 @@ ContactsAddresses=联系方式/地址
 NoContactDefinedForThirdParty=这个第三方没有确定的联系人
 NoContactDefined=没有联系确定了这个第三方
 DefaultContact=默认接触
-AddCompany=添加公司
-AddThirdParty=添加第三方
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=删除公司
 PersonalInformations=个人资料
 AccountancyCode=会计代码
@@ -379,8 +380,8 @@ DeliveryAddressLabel=送货地址标签
 DeleteDeliveryAddress=删除一个送货地址
 ConfirmDeleteDeliveryAddress=你确定要删除这个送货地址？
 NewDeliveryAddress=新的送货地址
-AddDeliveryAddress=添加地址
-AddAddress=添加地址
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=没有办法送货地址定义
 SupplierCategory=供应商类别
 JuridicalStatus200=独立
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=返回格式%syymm为客户代码以及%syymm -○○○○供应商代码其中YY是年numero，MM是月，nnnn是一个没有休息，没有为0返回序列。
 LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随时修改。
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index efed455e7a9..e7a32bb241f 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -56,23 +56,23 @@ VATCollected=增值税征收
 ToPay=待支付
 ToGet=待取回
 SpecialExpensesArea=特殊支付区域
-TaxAndDividendsArea=税收，社会捐献和股息区
-SocialContribution=社会捐献
-SocialContributions=社会捐献
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=其他费用
 MenuTaxAndDividends=税和股息
 MenuSalaries=工资
-MenuSocialContributions=社会捐献
-MenuNewSocialContribution=新的捐献
-NewSocialContribution=新的社会捐献
-ContributionsToPay=待缴纳捐献
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=会计/库务区
 AccountancySetup=会计设置
 NewPayment=新的支付
 Payments=付款
 PaymentCustomerInvoice=客户发票付款
 PaymentSupplierInvoice=供应商发票付款
-PaymentSocialContribution=社会捐献付款
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=增值税纳税
 PaymentSalary=工资支付
 ListPayment=付款名单
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=增值税纳税
 VATPayments=增值税纳税
-SocialContributionsPayments=社会捐献付款
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=显示增值税纳税
 TotalToPay=共支付
 TotalVATReceived=共收到增值税
@@ -116,11 +116,11 @@ NewCheckDepositOn=创建于账户上的存款收据：%s的
 NoWaitingChecks=没有等待中的支票存款
 DateChequeReceived=支票接收日期
 NbOfCheques=支票数量
-PaySocialContribution=支付一笔社会捐献
-ConfirmPaySocialContribution=你确定要这样归类为支付社会捐献？
-DeleteSocialContribution=删除一个社会捐献
-ConfirmDeleteSocialContribution=你确定要删除这个社会捐献？
-ExportDataset_tax_1=社会捐献和付款
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=模式 <b>%s 增值税收入，支出 %s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=计算模式
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=第三方客户缺省会计代码
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 1d91917d229..a9186a3589e 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -4,10 +4,10 @@ About = 关于
 CronAbout = 关于cron
 CronAboutPage = cron的“关于”页面
 # Right
-Permission23101 = 阅读计划任务
-Permission23102 = 创建/更新计划任务
-Permission23103 = 删除计划任务
-Permission23104 = 执行计划任务
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=最后运行结果
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=命令
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=开始日期
 CronDtEnd=结束日期
 CronDtNextLaunch=接下来执行
 CronDtLastLaunch=最后执行
-CronFrequency=频率
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=方法
 CronModule=模
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=参数
 CronSaveSucess=保存成功
 CronNote=评论
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=信息
 # Common
-CronType=任务类型
+CronType=Job type
 CronType_method=一个Dolibarr类的调用方法
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index 49bfd7dedba..963c4869b2d 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=搜索对象
 ECMSectionOfDocuments=目录中的文件
 ECMTypeManual=手册
 ECMTypeAuto=自动
-ECMDocsBySocialContributions=文件关联到社会的贡献
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=文件链接到第三方
 ECMDocsByProposals=文件与建议
 ECMDocsByOrders=文件链接到客户的订单
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index f3c3a51c4e8..6750733b35d 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=强制设置参数尚未定义
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index ba28033c043..c3fdcb681d9 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -3,7 +3,7 @@ HRM=人力资源管理（HRM）
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=雷森
 UserCP=用户
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=值
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=验证配置
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=更新成功。
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=这个月无休。
 nbJours=天数
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/zh_CN/incoterm.lang b/htdocs/langs/zh_CN/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/zh_CN/incoterm.lang
+++ b/htdocs/langs/zh_CN/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 9b2b50d9249..5b608dd7c00 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=数据库服务器 - 超级用户
 CheckToCreateDatabase=检查中，如果数据库不存在，必须创建。 <br>在这种情况下，必须填写登录/密码为超级用户帐户在本页面底部。
 CheckToCreateUser=如果数据库所有者复选框不存在，必须创建。 <br>在这种情况下，必须选择自己的登录名和密码，并填写在本页面底部的登录/为超级用户帐户的密码。如果此框未被选中，业主数据库及其密码必须存在。
 Experimental=（实验）
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=允许创建新的数据库或新用户，无用的，如果你的数据库和数据库登录已经存在就像当你在一个网站举办的托管服务提供商是（用户登录）。
 KeepEmptyIfNoPassword=给空如果用户没有密码（避免这种情况）
 SaveConfigurationFile=保存价值
@@ -89,7 +90,7 @@ SystemIsUpgraded=Dolibarr已经升级成功。
 YouNeedToPersonalizeSetup=您需要配置Dolibarr以满足您的需求（外观，功能，...).要做到这一点，请按照以下链接：
 AdminLoginCreatedSuccessfuly=Dolibarr管理员登录<b>'%s'</b>的创建successfuly。
 GoToDolibarr=前往Dolibarr
-GoToSetupArea=前往Dolibarr（安装面积）
+GoToSetupArea=去dolibarr（设置区域）
 MigrationNotFinished=您的数据库的版本是不完全最新的，所以你必须再次运行升级过程。
 GoToUpgradePage=转到页再次升级
 Examples=范例
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index 9de9d6802f6..cf46fe5fdd0 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=阿拉伯语
 Language_ar_SA=阿拉伯语
+Language_bn_BD=Bengali
 Language_bg_BG=保加利亚语
 Language_bs_BA=波斯尼亚
 Language_ca_ES=加泰罗尼亚
@@ -21,9 +22,10 @@ Language_en_SA=英语（沙特阿拉伯）
 Language_en_US=英语（美国）
 Language_en_ZA=英语（南非）
 Language_es_ES=西班牙语
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=西班牙语（阿根廷）
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=西班牙语（洪都拉斯）
 Language_es_MX=西班牙语（墨西哥）
 Language_es_PY=西班牙语（巴拉圭）
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=冰岛
 Language_it_IT=意大利语
 Language_ja_JP=日语
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=韩国语
+Language_lo_LA=Lao
 Language_lt_LT=立陶宛
 Language_lv_LV=拉脱维亚
 Language_mk_MK=马其顿
@@ -64,6 +69,7 @@ Language_sv_SV=瑞典
 Language_sv_SE=瑞典
 Language_sq_AL=Albanian
 Language_sk_SK=斯洛伐克
+Language_sw_SW=Kiswahili
 Language_th_TH=泰国
 Language_uk_UA=乌克兰
 Language_uz_UZ=乌兹别克
diff --git a/htdocs/langs/zh_CN/loan.lang b/htdocs/langs/zh_CN/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/zh_CN/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index f285247cb51..b10fd359a77 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -77,7 +77,7 @@ CheckRead=已读回执
 YourMailUnsubcribeOK=电子邮件<b>%s</b>被正确地从邮件列表中退定
 MailtoEMail=超链接的电子邮件
 ActivateCheckRead=允许使用“取消订阅”链接
-ActivateCheckReadKey=“读回执”和“取消订阅”功能键用于加密URL使用
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=电子邮件发送到 %s 的收件人。
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=追踪邮件打开
 TagUnsubscribe=退订链接
 TagSignature=签名发送给用户
 TagMailtoEmail=收件人电子邮件
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=通知
 NoNotificationsWillBeSent=没有电子邮件通知此事件的计划和公司
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index fdbb167fc60..78e99d4599b 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=有些发现错误。我们回滚更改。
 ErrorConfigParameterNotDefined=参数<b>%s</b>是没有定义的配置文件里面Dolibarr <b>conf.php。</b>
 ErrorCantLoadUserFromDolibarrDatabase=无法找到用户<b>%s</b>在Dolibarr数据库。
 ErrorNoVATRateDefinedForSellerCountry=错误，没有增值税税率确定为国家'%s'的。
-ErrorNoSocialContributionForSellerCountry=错误，没有社会贡献类型定义为国家'%s'的。
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=错误，无法保存文件。
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=单位价格（净值）
 UnitPriceTTC=单价
 PriceU=向上
 PriceUHT=不含税价格
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=向上
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=金额
 AmountInvoice=发票金额
 AmountPayment=付款金额
@@ -339,6 +339,7 @@ IncludedVAT=含增值税
 HT=扣除税
 TTC=公司增值税
 VAT=增值税
+VATs=Sales taxes
 LT1ES=稀土
 LT2ES=IRPF
 VATRate=增值税率
@@ -413,6 +414,8 @@ Qty=数量
 ChangedBy=改变
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=重新计算
 ResultOk=成功
 ResultKo=失败
@@ -421,7 +424,7 @@ Reportings=报告
 Draft=草案
 Drafts=草稿
 Validated=验证
-Opened=开业
+Opened=Open
 New=新
 Discount=折扣
 Unknown=未知
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=链接到一个特定的用户
 DeleteAFile=删除文件
 ConfirmDeleteAFile=你确定要删除文件？
 NoResults=没有结果
+SystemTools=System tools
 ModulesSystemTools=模块工具
 Test=测试
 Element=元素
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -732,3 +739,4 @@ ShortThursday=Ŧ
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index c1f903270ce..43580a015e5 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -199,7 +199,8 @@ Entreprises=公司
 DOLIBARRFOUNDATION_PAYMENT_FORM=为了使您的订阅使用银行转帐支付，请参阅页<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> 。 <br>使用信用卡或PayPal支付，点击此页底部的按钮。 <br>
 ByProperties=按特征
 MembersStatisticsByProperties=按特性统计会员
-MembersByNature=会员按性质
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=增值税率，用于订阅
 NoVatOnSubscription=没有增值税订阅
 MEMBER_PAYONLINE_SENDEMAIL=通过电子邮件发送警告Dolibarr时收到一个确认的验证支付认购
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 0cf7849dc12..0fd370b2dd9 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=供应商的订单
 SuppliersOrders=供应商的订单
 SuppliersOrdersRunning=当前供应商的订单
 CustomerOrder=客户订单
-CustomersOrders=Customers orders
-CustomersOrdersRunning=当前客户的订单
-CustomersOrdersAndOrdersLines=客户订单和订单行
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=待处理供应商订单
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=已取消
 StatusOrderDraftShort=草案
 StatusOrderValidatedShort=已验证
@@ -75,8 +75,9 @@ AddToMyOrders=添加到我的订单
 AddToOtherOrders=添加到其他订单
 AddToDraftOrders=添加订单草案
 ShowOrder=显示订单
-NoOpenedOrders=没有打开的订单
-NoOtherOpenedOrders=没有其他打开的订单
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=没有订单草案
 OtherOrders=其他订单
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 3cb14b26008..e34b3180862 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=干预验证
 Notify_FICHINTER_SENTBYMAIL=通过邮件发送的干预
 Notify_BILL_VALIDATE=客户发票验证
 Notify_BILL_UNVALIDATE=未经验证客户发票
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=供应商为了批准
 Notify_ORDER_SUPPLIER_REFUSE=供应商的订单被拒绝
 Notify_ORDER_VALIDATE=验证客户订单
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=日历项中添加%s的
diff --git a/htdocs/langs/zh_CN/printing.lang b/htdocs/langs/zh_CN/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/zh_CN/printing.lang
+++ b/htdocs/langs/zh_CN/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 0f455e6b8a9..878e87ac441 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -23,14 +23,14 @@ ProductOrService=产品/服务
 ProductsAndServices=产品和服务
 ProductsOrServices=产品或服务
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=产品和服务统计
 ProductsStatistics=产品统计数据
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=内部编号
 LastRecorded=最近销售的产品/服务
@@ -44,7 +44,7 @@ CardProduct1=服务 信息卡
 CardContract=合同 信息卡
 Warehouse=仓库
 Warehouses=仓库
-WarehouseOpened=仓库已开放
+WarehouseOpened=Warehouse open
 WarehouseClosed=仓库已关闭
 Stock=库存
 Stocks=库存
@@ -71,21 +71,21 @@ SellingPriceTTC=售价(税后)
 PublicPrice=公开价格
 CurrentPrice=当前价格
 NewPrice=新增价格
-MinPrice=最低售价
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=售价不能低于此产品的最低价格 (%s 税前)。此消息也可能在您输入折扣巨大时出现
 ContractStatus=合同状态
 ContractStatusClosed=已关闭
-ContractStatusRunning=* 执行中/running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=已过期
-ContractStatusOnHold=* 未执行/running
-ContractStatusToRun=To get running
-ContractNotRunning=此合同目前未执行
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=编号为 %s 的产品已存在。
 ErrorProductBadRefOrLabel=输入的编号或标签无效，请输入符合要求的编号或标签。
 ErrorProductClone=试图同时克隆该产品或服务会有一个问题。
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=供应商
 SupplierRef=供应商的产品编号
 ShowProduct=显示产品
@@ -117,12 +117,12 @@ ServiceLimitedDuration=如果产品是有限期的服务：
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=价格个数
 MultiPriceLevelsName=价格分类
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=关联
 Translation=翻译
 KeywordFilter=关键词筛选
@@ -131,7 +131,7 @@ ProductToAddSearch=搜索要添加的产品
 AddDel=添加/删除
 Quantity=数量
 NoMatchFound=未发现匹配项目
-ProductAssociationList=相关产品/服务列表: 产品/服务名称 (按数量)
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父产品
 DeleteProduct=删除产品/服务
@@ -179,16 +179,41 @@ CloneProduct=复制产品/服务
 ConfirmCloneProduct=您确定要复制产品或服务 <b>%s</b> 吗?
 CloneContentProduct=复制产品/服务的所有主要信息
 ClonePricesProduct=复制主要信息/价格
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
-CustomerPrices=销售价格
-SuppliersPrices=采购价格
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=海关编码
 CountryOrigin=产地国
 HiddenIntoCombo=Hidden into select lists
 Nature=属性
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=创建产品信息卡
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=因生产自动消耗
 ProductBuilded=生产完成
 ProductsMultiPrice=产品多重价格
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=第1季度
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 8e07926c60a..8fef7423b3d 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=这种观点提出了所有你被允许阅读的项目。
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=这种观点提出的所有项目（你的用户权限批准你认为一切）。
 MyTasksDesc=这种观点是有限的项目或任务你是一个接触（不管是类型）。
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=这种观点提出的所有项目，您可阅读任务。
 TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准你认为一切）。
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=项目领域
 NewProject=新项目
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=项目名单
 ShowProject=显示项目
 SetProject=设置项目
 NoProject=没有项目或拥有的定义
-NbOpenTasks=铌打开任务
+NbOpenTasks=Nb of open tasks
 NbOfProjects=铌项目
 TimeSpent=花费的时间
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=新的时间
 MyTimeSpent=我的时间花
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=名单与项目相关的干预措施
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=名单与项目有关的行动
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=对项目活动周
 ActivityOnProjectThisMonth=本月初对项目活动
 ActivityOnProjectThisYear=今年对项目活动
@@ -95,7 +98,7 @@ DeleteATimeSpent=删除的时间
 ConfirmDeleteATimeSpent=你确定要删除这个花的时间？
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=资源的整合
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=这个项目致力于第三方
 NoTasks=该项目没有任务
 LinkedToAnotherCompany=链接到其他第三方
@@ -139,8 +142,15 @@ ProjectReferers=参考对象
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index f2cf63aebf5..d8d8578910a 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -4,7 +4,7 @@ Proposal=报价单
 ProposalShort=报价
 ProposalsDraft=起草报价单
 ProposalDraft=起草报价单
-ProposalsOpened=未关闭的报价单
+ProposalsOpened=Open commercial proposals
 Prop=报价单
 CommercialProposal=报价单
 CommercialProposals=报价单
@@ -16,7 +16,7 @@ Prospect=潜在客户
 ProspectList=潜在客户列表
 DeleteProp=删除报价单
 ValidateProp=确定报价单
-AddProp=添加报价
+AddProp=Create proposal
 ConfirmDeleteProp=您确定要删除此报价单吗？
 ConfirmValidateProp=您确定要制定报价<b>%s</b>吗？
 LastPropals=最近的 %s 个报价单
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=金额 (税前)/每月
 NbOfProposals=报价单数量
 ShowPropal=显示报价
 PropalsDraft=草稿
-PropalsOpened=已打开
+PropalsOpened=Open
 PropalsNotBilled=已关闭未付款
 PropalStatusDraft=草案（需要验证）
 PropalStatusValidated=已确定(打开的报价单)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=未签署(已关闭)
 PropalStatusBilled=已到账
 PropalStatusDraftShort=草稿
 PropalStatusValidatedShort=已确定
-PropalStatusOpenedShort=已打开
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=已关闭
 PropalStatusSignedShort=已签署
 PropalStatusNotSignedShort=未签署
@@ -51,12 +51,10 @@ PropalsToClose=待关闭的报价单
 PropalsToBill=待支付的已签订报价
 ListOfProposals=报价列表
 ActionsOnPropal=报价相关事件
-NoOpenedPropals=无未关闭的报价单
-NoOtherOpenedPropals=无其他未关闭的报价单
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=报价单编号
 SendPropalByMail=通过电邮发送报价单
-FileNotUploaded=文件上传失败
-FileUploaded=文件上传成功
 AssociatedDocuments=报价单关联的文档：
 ErrorCantOpenDir=无法打开目录
 DatePropal=报价日期
@@ -100,3 +98,4 @@ DocModelJauneDescription=Jaune 报价模板
 DefaultModelPropalCreate=设置默认模板
 DefaultModelPropalToBill=关闭订单时使用的默认模板(待生成账单)
 DefaultModelPropalClosed=关闭订单时使用的默认模板(待付款)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
index 1aab039ba50..7159127cf32 100644
--- a/htdocs/langs/zh_CN/salaries.lang
+++ b/htdocs/langs/zh_CN/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 875bb69e4a4..35a5cdf0f01 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=简单的文档模型
 DocumentModelMerou=梅鲁河五大模式
 WarningNoQtyLeftToSend=警告，没有产品等待装运。
 StatsOnShipmentsOnlyValidated=对货物进行统计验证。使用的数据的验证的装运日期(计划交货日期并不总是已知)。
-DateDeliveryPlanned=刨交货日期
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=交货日期收到
 SendShippingByEMail=通过电子邮件发送货物
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 472cff19161..cbb0fae57d9 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=仓库
 NewWarehouse=新仓库/库存区
 WarehouseEdit=修改仓库
 MenuNewWarehouse=新仓库
-WarehouseOpened=打开仓库
+WarehouseOpened=Warehouse open
 WarehouseClosed=仓库关闭
 WarehouseSource=来源仓库
 WarehouseSourceNotDefined=没有定义仓库，
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=选择仓库库存减少使用
 SelectWarehouseForStockIncrease=选择使用库存增加的仓库
 NoStockAction=暂无现货的行动
 LastWaitingSupplierOrders=订单等待招待会
-DesiredStock=所需库存
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=要订购
 Replenishment=补货
 ReplenishmentOrders=补货订单
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=库存补充规则
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 3985b1cdf67..b3dd7d3499c 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=发送到供应商
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index 2c0fc087aa7..437b1d59a3a 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=费用清单
 NewTrip=New expense report
 CompanyVisited=公司/基础访问
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index ba1a3ecec4d..5080f998b8f 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=从组中删除
 PasswordChangedAndSentTo=密码更改，发送到<b>%s。</b>
 PasswordChangeRequestSent=要求更改密码<b>的S%</b>发送到<b>%s。</b>
 MenuUsersAndGroups=用户和组
+MenuMyUserCard=My user card
 LastGroupsCreated=最后创建%s的团体
 LastUsersCreated=上次%s的用户创建
 ShowGroup=显示组
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index cc24d8029c4..d31165a5c8d 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=撤回文件
 SetToStatusSent=设置状态“发送的文件”
 ThisWillAlsoAddPaymentOnInvoice=这也将创造在付款发票上，将它们归类支付
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=由银行支付的长期订单%s
diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
index 8312fbfea84..31391ebbd36 100644
--- a/htdocs/langs/zh_CN/workflow.lang
+++ b/htdocs/langs/zh_CN/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=工作流模块的设置
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=没有工作流程，您可以修改你已激活的模块。
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=商业提案签署后自动创建一个客户订单
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=商业提案签署后自动创建一个客户发票
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=创建一个客户发票，合同验证后自动
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=创建一个客户发票，客户订单后自动关闭
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=分类链接来源建议，建立客户订单时设置支付
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index bb9b358c045..40e2b65db42 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece ?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account ?
+ACCOUNTING_EXPORT_LABEL=Export the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
 
 Accounting=Accounting
 Globalparameters=Global parameters
@@ -81,9 +88,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index bcb0dec0a34..46b5bbc9fc1 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -149,7 +149,6 @@ MenuForUsers=用戶菜單
 LangFile=文件。郎
 System=系統
 SystemInfo=系統資訊
-SystemTools=系統工具
 SystemToolsArea=系統工具區
 SystemToolsAreaDesc=此區提供了管理功能，請點選選單來管理你想要的內容。
 Purge=Purge
@@ -232,8 +231,8 @@ Security=安全
 Passwords=密碼
 DoNotStoreClearPassword=難道沒有明確的密碼存儲在數據庫，但只存儲加密值（活性炭推薦）
 MainDbPasswordFileConfEncrypted=數據庫密碼conf.php加密（活性炭推薦）
-InstrucToEncodePass=為了有密碼編碼到<b>conf.php</b>文件，替換行<br> <b>$ dolibarr_main_db_pass ="..."</b> <br>由<br> <b>$ dolibarr_main_db_pass =“加密的：%s的”</b>
-InstrucToClearPass=為了有密碼破譯（清除）到<b>conf.php</b>文件，替換行<br> <b>$ dolibarr_main_db_pass =“加密的:..."</b> <br>由<br> <b>$ dolibarr_main_db_pass =“%的”</b>
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=保護生成的PDF文件（活性不推薦，休息質量PDF生成）
 ProtectAndEncryptPdfFilesDesc=一個PDF文檔保護不斷提供給閲讀和打印任何的PDF瀏覽器。然而，編輯和複製是不可能的了。請注意，使用此功能使全球累計PDF格式的建設工作不喜歡未付發票（）。
 Feature=功能特色
@@ -300,13 +299,13 @@ ThisIsProcessToFollow=以下為軟體安裝的過程：
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=第 %s 步驟
 FindPackageFromWebSite=從網站尋找你想要擴充的主題、模組（可上 %s 網站參考）。
-DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Download package (for example from official web site %s).
+UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=安裝完成，此時此系統軟體已經可以開始使用擴充的部分。
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
+YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=此系統軟體(Dolibarr)目前版本
 CallUpdatePage=請到 %s 網頁更新資料庫結構及其資料。
 LastStableVersion=最新的穩定版本
@@ -398,7 +397,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (vat is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -430,8 +429,8 @@ Module20Name=建議
 Module20Desc=商業建議書的管理
 Module22Name=大眾電子郵購
 Module22Desc=大規模電子郵件發送的管理
-Module23Name= 能源
-Module23Desc= 監測的能源消費
+Module23Name=能源
+Module23Desc=監測的能源消費
 Module25Name=商業訂單
 Module25Desc=商業訂單的管理
 Module30Name=發票
@@ -492,8 +491,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar一體化
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Special expenses
+Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
@@ -502,7 +501,7 @@ Module600Name=通知
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=捐贈
 Module700Desc=捐款的管理
-Module770Name=Expense Report
+Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -524,8 +523,10 @@ Module2400Name=議程
 Module2400Desc=行動/任務和議程管理
 Module2500Name=電子內容管理
 Module2500Desc=保存和共享文件
-Module2600Name=的WebServices
-Module2600Desc=啟用Web服務的服務器Dolibarr
+Module2600Name=API services (Web services SOAP)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API services (Web services REST)
+Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2650Name=WebServices (client)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=的Gravatar
@@ -578,7 +579,7 @@ Permission32=建立/修改產品資訊
 Permission34=刪除產品資訊
 Permission36=查看/隱藏產品管理
 Permission38=匯出產品資訊
-Permission41=閲讀項目（共享的項目和項目我聯繫）
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=建立/修改項目（共享的項目和項目我聯繫）
 Permission44=刪除項目（共享的項目和項目我聯繫）
 Permission61=閲讀干預
@@ -599,10 +600,10 @@ Permission86=發送商業訂單
 Permission87=關閉商業訂單
 Permission88=取消商業訂單
 Permission89=刪除商業訂單
-Permission91=瞭解社會的貢獻和增值稅
-Permission92=建立/修改的社會貢獻和增值稅
-Permission93=刪除的社會貢獻和增值稅
-Permission94=出口社會貢獻
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=閲讀報告
 Permission101=讀取出貨資訊
 Permission102=建立/修改出貨單
@@ -620,9 +621,9 @@ Permission121=讀取連接到使用者的客戶/供應商/潛在資訊
 Permission122=建立/修改連接到使用者的客戶/供應商/潛在資訊
 Permission125=刪除連接到使用者的客戶/供應商/潛在資訊
 Permission126=匯出客戶/供應商/潛在資訊
-Permission141=閲讀任務
-Permission142=建立/修改任務
-Permission144=刪除任務
+Permission141=Read all projects and tasks (also private projects i am not contact for)
+Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=閲讀者
 Permission147=讀統計
 Permission151=閲讀常年訂單
@@ -800,7 +801,7 @@ DictionaryCountry=Countries
 DictionaryCurrency=Currencies
 DictionaryCivility=Civility title
 DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
@@ -817,6 +818,9 @@ DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
+DictionaryUnits=Units
+DictionaryProspectStatus=Prospection status
+DictionaryHolidayTypes=Type of leaves
 SetupSaved=設定值已儲存
 BackToModuleList=返回模組列表
 BackToDictionaryList=Back to dictionaries list
@@ -936,13 +940,14 @@ CompanyZip=郵遞區號
 CompanyTown=鎮
 CompanyCountry=國家
 CompanyCurrency=主要貨幣
+CompanyObject=Object of the company
 Logo=Logo
 DoNotShow=不顯示
 DoNotSuggestPaymentMode=不建議
 NoActiveBankAccountDefined=沒有定義有效的銀行帳戶
 OwnerOfBankAccount=銀行帳戶%342
 BankModuleNotActive=銀行模組沒有啟用
-ShowBugTrackLink=顯示連結“報告錯誤”
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 ShowWorkBoard=顯示“工作台”的網頁
 Alerts=其他快訊資訊
 Delays=延誤
@@ -1009,7 +1014,7 @@ MAIN_MAX_DECIMALS_UNIT=單位價格最高為小數
 MAIN_MAX_DECIMALS_TOT=總價格的最高位小數
 MAIN_MAX_DECIMALS_SHOWN=屏幕（最大顯示價格小數就新增<b>...</b>這個號碼後，如果你想看到<b>...</b>當數被截斷時，屏幕上顯示）
 MAIN_DISABLE_PDF_COMPRESSION=使用PDF壓縮生成的PDF文件。
-MAIN_ROUNDING_RULE_TOT= 四捨五入的範圍大小（如申請人是四捨五入的東西比其他10個基地進行罕見的國家）
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=一種產品的單位價格網
 TotalPriceAfterRounding=總價格（淨值/增值稅/含稅）後四捨五入
 ParameterActiveForNextInputOnly=下一個輸入參數才能有效
@@ -1077,7 +1082,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1384,12 +1389,14 @@ NumberOfProductShowInSelect=在 combos 選擇清單中，最大可供選擇的
 ConfirmDeleteProductLineAbility=當形式確認刪除產品線
 ModifyProductDescAbility=產品個性化的形式描述
 ViewProductDescInFormAbility=在表單上是否可以直接顯示產品描述資訊(如果關閉則採用彈出式訊息框方式顯示)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=是否可以直接顯示其他語系的產品描述資訊
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=支持生態附加稅（WEEE）的
 SetDefaultBarcodeTypeProducts=預設的條碼類型
 SetDefaultBarcodeTypeThirdParties=預設的條碼類型給客戶/供應商模組使用
+UseUnits=Support units
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
 ##### Syslog #####
@@ -1420,6 +1427,8 @@ BarcodeDescUPC=通用產品條碼(UPC)
 BarcodeDescISBN=書籍條碼類型
 BarcodeDescC39=Code 39 條碼
 BarcodeDescC128=Code 128 條碼
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
@@ -1502,7 +1511,7 @@ ConfirmDeleteMenu=你確定要刪除菜單條目<b>%s嗎</b> ？
 DeleteLine=刪除線
 ConfirmDeleteLine=你確定要刪除這條路線？
 ##### Tax #####
-TaxSetup=稅，社會貢獻和股息模組設置
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=由於營業稅
 OptionVATDefault=Cash basis
 OptionVATDebitOption=Accrual basis
@@ -1552,6 +1561,15 @@ WebServicesSetup=符模組設置
 WebServicesDesc=通過啟用這個模組，Dolibarr成為網絡服務的服務器，提供網絡服務的雜項。
 WSDLCanBeDownloadedHere=的WSDL描述文件提供serviceses可以從這裡下載
 EndPointIs=SOAP客戶端必須將他們的要求去Dolibarr端點可在網址
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
+ApiEndPointIs=You can access to the API at url
+ApiExporerIs=You can explore the API at url
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=銀行模組設置
 FreeLegalTextOnChequeReceipts=可在下面輸入額外的支票資訊
@@ -1581,6 +1599,7 @@ ProjectsSetup=項目模組設置
 ProjectsModelModule=項目的報告文檔模型
 TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
@@ -1594,7 +1613,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1622,3 +1641,12 @@ SomethingMakeInstallFromWebNotPossible=Installation of external module is not po
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
+NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for table title line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index bd5c1ee90eb..d954b04db01 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=為了%s批準
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=為了%s回到草案狀態
-OrderCanceledInDolibarr=為了%s取消
 ProposalSentByEMail=商業建議通過電子郵件發送%s
 OrderSentByEMail=客戶訂單通過電子郵件發送%s
 InvoiceSentByEMail=客戶發票通過電子郵件發送%s
@@ -96,3 +95,5 @@ AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
 DateActionBegin=Start event date
+CloneAction=Clone event
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 16fd2c0596c..ea3cc67c743 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -94,12 +94,12 @@ Conciliate=調和
 Conciliation=和解
 ConciliationForAccount=此帳戶核對
 IncludeClosedAccount=包括關閉賬戶
-OnlyOpenedAccount=只有開立帳戶
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=帳戶信用
 AccountToDebit=帳戶轉帳
 DisableConciliation=此帳戶的禁用和解功能
 ConciliationDisabled=和解功能禁用
-StatusAccountOpened=開業
+StatusAccountOpened=Open
 StatusAccountClosed=關閉
 AccountIdShort=數
 EditBankRecord=編輯記錄
@@ -113,7 +113,7 @@ CustomerInvoicePayment=客戶付款
 CustomerInvoicePaymentBack=Customer payment back
 SupplierInvoicePayment=供應商付款
 WithdrawalPayment=提款支付
-SocialContributionPayment=社會貢獻付款
+SocialContributionPayment=Social/fiscal tax payment
 FinancialAccountJournal=金融帳日記
 BankTransfer=銀行匯款
 BankTransfers=銀行轉帳
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index fc3b6fb731e..dc1ba71f7eb 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=發票數
 NumberOfBillsByMonth=每月發票(invoice)數
 AmountOfBills=發票金額
 AmountOfBillsByMonthHT=每月發票(invoice)金額（稅後）
-ShowSocialContribution=顯示社會貢獻
+ShowSocialContribution=Show social/fiscal tax
 ShowBill=顯示發票
 ShowInvoice=顯示發票
 ShowInvoiceReplace=顯示發票取代
@@ -270,7 +270,7 @@ BillAddress=條例草案的報告
 HelpEscompte=這是給予客戶優惠折扣，因為它的任期作出之前付款。
 HelpAbandonBadCustomer=這一數額已被放棄（客戶說是一個壞的客戶），並作為一個特殊的松散考慮。
 HelpAbandonOther=這一數額已被放棄，因為這是一個錯誤（錯誤的顧客或由其他替代例如發票）
-IdSocialContribution=社會貢獻的id
+IdSocialContribution=Social/fiscal tax payment id
 PaymentId=付款編號
 InvoiceId=發票編號
 InvoiceRef=發票編號。
@@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=即時
@@ -429,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index b05ea5dd81a..26400837345 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=最後更新的合同清單
 BoxLastContacts=最後接觸/地址
 BoxLastMembers=最後成員
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=銷售營業額
 BoxTotalUnpaidCustomerBills=共有未付客戶的發票
 BoxTotalUnpaidSuppliersBills=共有未付供應商的發票
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=銷售營業額
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 668b104c214..960c9342811 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b>是添加成功。
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.
-ProductIsInCategories=Product/service owns to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=無
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=此類別已存在此號
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=所有內容不可見
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
-CustomersCategoryShort=Customers tags/category
-ProductsCategoryShort=Products tags/category
-MembersCategoryShort=Members tags/category
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=客戶/潛在分類標籤
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 705df498d17..92693795652 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -30,6 +30,7 @@ ThirdPartyContact=客戶/供應商聯絡人
 StatusContactValidated=聯絡人狀態
 Company=公司
 CompanyName=公司名稱
+AliasNames=Alias names (commercial, trademark, ...)
 Companies=公司
 CountryIsInEEC=國家是歐共體內
 ThirdPartyName=客戶/供應商名稱
@@ -259,8 +260,8 @@ AvailableGlobalDiscounts=可用的全域折扣
 DiscountNone=無
 Supplier=供應商
 CompanyList=，公司就名單
-AddContact=新增聯絡人/地址
-AddContactAddress=新增聯絡人及地址
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=編輯聯絡人/地址
 EditContactAddress=Edit contact/address
 Contact=聯絡人
@@ -268,8 +269,8 @@ ContactsAddresses=聯系方式/地址
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=此客戶(供應商)沒有定義聯絡人
 DefaultContact=預設聯絡人
-AddCompany=新增公司
-AddThirdParty=新增
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=刪除公司
 PersonalInformations=個人資料
 AccountancyCode=會計代碼
@@ -379,8 +380,8 @@ DeliveryAddressLabel=送貨地址標簽
 DeleteDeliveryAddress=刪除一個送貨地址
 ConfirmDeleteDeliveryAddress=你確定要刪除這個送貨地址？
 NewDeliveryAddress=新的送貨地址
-AddDeliveryAddress=添加地址
-AddAddress=添加地址
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=沒有辦法送貨地址定義
 SupplierCategory=供應商類別
 JuridicalStatus200=獨立
@@ -410,5 +411,10 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=用以下固定的方式回傳編號:<br> %syymm-nnnn 為客戶編號生成格式。<br> %syymm-nnnn 為供應商編號生成格式。<br>   yy 是年、mm是月、nnnn是一個不為0的序號。
 LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可以隨時修改。(可開啟Elephant or Monkey模組來設定編碼規則)
 ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
+SearchThirdparty=Search third party
 SearchContact=Search contact
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 9df8ffc58d8..3129cfd1d55 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -56,23 +56,23 @@ VATCollected=增值稅征收
 ToPay=為了支付
 ToGet=取回
 SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=稅收，社會貢獻和股息地區
-SocialContribution=社會貢獻
-SocialContributions=社會貢獻
+TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=稅和股息
 MenuSalaries=Salaries
-MenuSocialContributions=社會貢獻
-MenuNewSocialContribution=新的貢獻
-NewSocialContribution=新的社會貢獻
-ContributionsToPay=繳納會費
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New tax payment
+NewSocialContribution=New social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=財務/會計區
 AccountancySetup=會計設置
 NewPayment=新的支付
 Payments=付款
 PaymentCustomerInvoice=客戶付款發票
 PaymentSupplierInvoice=供應商發票付款
-PaymentSocialContribution=社會貢獻付款
+PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=增值稅納稅
 PaymentSalary=Salary payment
 ListPayment=金名單
@@ -91,7 +91,7 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 VATPayment=增值稅納稅
 VATPayments=增值稅付款
-SocialContributionsPayments=社會捐助金
+SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=顯示增值稅納稅
 TotalToPay=共支付
 TotalVATReceived=共收到增值稅
@@ -116,11 +116,11 @@ NewCheckDepositOn=創建於賬戶上的存款收據：%s的
 NoWaitingChecks=沒有支票存款等。
 DateChequeReceived=檢查接收輸入日期
 NbOfCheques=鈮檢查
-PaySocialContribution=支付的社會貢獻
-ConfirmPaySocialContribution=你確定要這樣歸類為社會付出的貢獻？
-DeleteSocialContribution=刪除的社會貢獻
-ConfirmDeleteSocialContribution=你確定要刪除這個社會的貢獻？
-ExportDataset_tax_1=社會捐款和付款
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -198,10 +198,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTax=Clone a social/fiscal tax
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index aac41414f2c..07c73c0f701 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -4,10 +4,10 @@ About = 關於
 CronAbout = About Cron
 CronAboutPage = Cron about page
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=開始日期
 CronDtEnd=結束日期
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=方法
 CronModule=模組
 CronAction=Action
@@ -55,9 +55,9 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Start hour and date of job
+CronEvery=Execute job each
+CronObject=Instance/Object to create
 CronArgs=參數清單
 CronSaveSucess=Save succesfully
 CronNote=註解
@@ -76,13 +76,14 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
+CronFrom=From
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index a0514fe5b9e..735e0baf146 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=搜尋對象
 ECMSectionOfDocuments=目錄中的文件
 ECMTypeManual=手冊
 ECMTypeAuto=自動
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
 ECMDocsByThirdParties=文件鏈接到第三方
 ECMDocsByProposals=文件與建議
 ECMDocsByOrders=文件鏈接到客戶的訂單
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 739ca19c920..e54fb6d0a89 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -170,6 +170,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -190,3 +191,4 @@ WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 2bddf36550d..1c853212eca 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -3,7 +3,7 @@ HRM=HRM
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
+MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
@@ -71,7 +71,7 @@ MotifCP=雷森
 UserCP=用戶
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=View change logs
 LogCP=Log of updates of available vacation days
 ActionByCP=Performed by
 UserUpdateCP=For the user
@@ -93,6 +93,7 @@ ValueOptionCP=價值
 GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
 LastUpdateCP=Last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
 AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
@@ -127,6 +128,7 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Leaves
+NoticePeriod=Notice period
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate leave requests
@@ -139,10 +141,11 @@ HolidaysRefused=Request denied
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
+Permission20001=Read you own leave requests
+Permission20002=Create/modify your leave requests
 Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20004=Read leave requests for everybody
+Permission20005=Create/modify leave requests for everybody
+Permission20006=Admin leave requests (setup and update balance)
+NewByMonth=Added per month
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/zh_TW/incoterm.lang b/htdocs/langs/zh_TW/incoterm.lang
index 2396d2acb0e..3065894865e 100644
--- a/htdocs/langs/zh_TW/incoterm.lang
+++ b/htdocs/langs/zh_TW/incoterm.lang
@@ -1,5 +1,5 @@
-Module210009Name=Incoterm
-Module210009Desc=Add features to manage Incoterm
+Module62000Name=Incoterm
+Module62000Desc=Add features to manage Incoterm
 IncotermLabel=Incoterms
 IncotermSetupTitle1=Feature
 IncotermSetupTitle2=Status
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 0d8db02acc2..25efa36020d 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -64,6 +64,7 @@ DatabaseSuperUserAccess=數據庫服務器 - 超級用戶
 CheckToCreateDatabase=檢查中，如果數據庫不存在，必須創建。 <br>在這種情況下，必須填寫登錄/密碼為超級用戶帳戶在本頁面底部。
 CheckToCreateUser=如果數據庫所有者復選框不存在，必須創建。 <br>在這種情況下，必須選擇自己的登錄名和密碼，並填寫在本頁面底部的登錄/為超級用戶帳戶的密碼。如果此框未被選中，業主數據庫及其密碼必須存在。
 Experimental=（實驗）
+Deprecated=(deprecated)
 DatabaseRootLoginDescription=允許創建新的數據庫或新用戶，無用的，如果你的數據庫和數據庫登錄已經存在就像當你在一個網站舉辦的托管服務提供商是（用戶登錄）。
 KeepEmptyIfNoPassword=給空如果用戶沒有密碼（避免這種情況）
 SaveConfigurationFile=保存價值
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 9ab32a535dd..0a18282b39a 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -2,6 +2,7 @@
 
 Language_ar_AR=阿拉伯語
 Language_ar_SA=阿拉伯語
+Language_bn_BD=Bengali
 Language_bg_BG=保加利亚语
 Language_bs_BA=波斯尼亚
 Language_ca_ES=加泰羅尼亞
@@ -21,9 +22,10 @@ Language_en_SA=英语 (沙特阿拉伯)
 Language_en_US=英語（美國）
 Language_en_ZA=英语 (南非)
 Language_es_ES=西班牙語
-Language_es_DO=Spanish (Dominican Republic)
 Language_es_AR=西班牙語（阿根廷）
 Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
 Language_es_HN=西班牙語（洪都拉斯）
 Language_es_MX=西班牙語（墨西哥）
 Language_es_PY=西班牙语 (巴拉圭)
@@ -45,7 +47,10 @@ Language_id_ID=Indonesian
 Language_is_IS=冰島
 Language_it_IT=意大利語
 Language_ja_JP=日語
+Language_ka_GE=Georgian
+Language_kn_IN=Kannada
 Language_ko_KR=韩国
+Language_lo_LA=Lao
 Language_lt_LT=立陶宛
 Language_lv_LV=拉脱维亚
 Language_mk_MK=马其顿
@@ -64,6 +69,7 @@ Language_sv_SV=瑞典
 Language_sv_SE=瑞典
 Language_sq_AL=Albanian
 Language_sk_SK=斯洛伐克
+Language_sw_SW=Kiswahili
 Language_th_TH=泰国
 Language_uk_UA=乌克兰
 Language_uz_UZ=乌兹别克
diff --git a/htdocs/langs/zh_TW/loan.lang b/htdocs/langs/zh_TW/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/zh_TW/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
+MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 31cd73cca94..20fe9d374cd 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -77,7 +77,7 @@ CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
 ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
@@ -128,6 +128,7 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=通知
 NoNotificationsWillBeSent=沒有電子郵件通知此事件的計劃和公司
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index cad6b50defb..ffac379b6bd 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -57,7 +57,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=有些發現錯誤。我們回滾更改。
 ErrorConfigParameterNotDefined=參數<b>%s</b>是沒有定義的配置文件裏面Dolibarr <b>conf.php。</b>
 ErrorCantLoadUserFromDolibarrDatabase=無法找到用戶<b>%s</b>在Dolibarr數據庫。
 ErrorNoVATRateDefinedForSellerCountry=錯誤!沒有定義 '%s' 幣別的營業稅率。
-ErrorNoSocialContributionForSellerCountry=錯誤，沒有社會貢獻類型定義為國家'%s'的。
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=錯誤，無法保存文件。
 SetDate=Set date
 SelectDate=Select a date
@@ -301,8 +301,8 @@ UnitPriceHT=單位價格（凈值）
 UnitPriceTTC=單價
 PriceU=向上
 PriceUHT=不含稅價格
-AskPriceSupplierUHT=P.U. HT Requested
-PriceUTTC=向上
+AskPriceSupplierUHT=U.P. net Requested
+PriceUTTC=U.P. (inc. tax)
 Amount=總額
 AmountInvoice=發票金額
 AmountPayment=付款金額
@@ -339,6 +339,7 @@ IncludedVAT=含營業稅
 HT=不含稅
 TTC=含稅
 VAT=營業稅
+VATs=Sales taxes
 LT1ES=稀土
 LT2ES=IRPF
 VATRate=營業稅率
@@ -413,6 +414,8 @@ Qty=數量
 ChangedBy=修改 by
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
 ReCalculate=Recalculate
 ResultOk=成功
 ResultKo=失敗
@@ -421,7 +424,7 @@ Reportings=報表
 Draft=草案
 Drafts=草稿
 Validated=驗證
-Opened=已開啟
+Opened=Open
 New=新
 Discount=折扣
 Unknown=未知
@@ -678,6 +681,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
 Element=Element
@@ -703,6 +707,9 @@ ShowTransaction=Show transaction
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
+ListOfTemplates=List of templates
+Genderman=Man
+Genderwoman=Woman
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -732,3 +739,4 @@ ShortThursday=Ŧ
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 5caf80e18e8..da119cc3486 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -199,7 +199,8 @@ Entreprises=公司
 DOLIBARRFOUNDATION_PAYMENT_FORM=為了使您的訂閱使用銀行轉帳支付，請參閱頁<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> 。 <br>使用信用卡或PayPal支付，點擊此頁底部的按鈕。 <br>
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index bf16fa314b6..d4cc772b786 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=供應商訂單
 SuppliersOrders=供應商訂單
 SuppliersOrdersRunning=當前供應商的訂單
 CustomerOrder=客戶訂單
-CustomersOrders=Customers orders
-CustomersOrdersRunning=當前客戶的訂單
-CustomersOrdersAndOrdersLines=客戶的訂單，訂單的行
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=待處理的供應商的訂單
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=已取消
 StatusOrderDraftShort=草案階段
 StatusOrderValidatedShort=驗證階段
@@ -75,8 +75,9 @@ AddToMyOrders=新增我的訂單
 AddToOtherOrders=新增其他人的訂單
 AddToDraftOrders=Add to draft order
 ShowOrder=顯示訂單
-NoOpenedOrders=沒有打開訂單
-NoOtherOpenedOrders=沒有其他人已經新增的訂單
+OrdersOpened=Orders to process
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=其他命令
 LastOrders=Last %s customer orders
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index e2d017e24c2..acd7930df6e 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=幹預驗證
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=客戶發票驗證
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=供應商為了批準
 Notify_ORDER_SUPPLIER_REFUSE=供應商的訂單被拒絕
 Notify_ORDER_VALIDATE=驗證客戶訂單
@@ -203,6 +204,7 @@ ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
 
 ##### Calendar common #####
 AddCalendarEntry=日歷項中添加%s的
diff --git a/htdocs/langs/zh_TW/printing.lang b/htdocs/langs/zh_TW/printing.lang
index f0cd2a40292..b4956e59c01 100644
--- a/htdocs/langs/zh_TW/printing.lang
+++ b/htdocs/langs/zh_TW/printing.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - printing
-Module112000Name=Direct Printing
-Module112000Desc=Enable Direct Printing System
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
 ModuleDriverSetup=Setup Module Driver
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 85b1d27f3a6..37ceaa49b38 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -19,4 +19,4 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 756bdf38dc2..dd689b0f87a 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -23,14 +23,14 @@ ProductOrService=產品或服務
 ProductsAndServices=產品與服務
 ProductsOrServices=產品或服務
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=產品與服務的統計數字
 ProductsStatistics=產品統計
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=內部參考
 LastRecorded=最新產品/服務的銷售記錄
@@ -44,7 +44,7 @@ CardProduct1=服務卡
 CardContract=合同卡
 Warehouse=倉庫
 Warehouses=倉庫
-WarehouseOpened=打開倉庫
+WarehouseOpened=Warehouse open
 WarehouseClosed=關閉倉庫
 Stock=庫存
 Stocks=庫存
@@ -71,21 +71,21 @@ SellingPriceTTC=銷售價格（包括稅）
 PublicPrice=公眾價格
 CurrentPrice=時價
 NewPrice=新價格
-MinPrice=最低售價
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=售價不能超過該產品（%s的允許在沒有稅收的最低水平）
 ContractStatus=合同地位
 ContractStatusClosed=關閉
-ContractStatusRunning=運行
+ContractStatusRunning=Ongoing
 ContractStatusExpired=過期
-ContractStatusOnHold=不運行
-ContractStatusToRun=To get running
-ContractNotRunning=該合同未運行
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=一個產品的參考%s已經存在。
 ErrorProductBadRefOrLabel=錯誤的價值參考或標簽。
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=供應商
 SupplierRef=供應商代號:
 ShowProduct=顯示產品
@@ -117,12 +117,12 @@ ServiceLimitedDuration=如果產品是一種有期限的服務，請指定服務
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=多種價格的數量
 MultiPriceLevelsName=價格分類
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=編輯關聯性
 Translation=產品描述翻譯
 KeywordFilter=關鍵字過濾
@@ -131,7 +131,7 @@ ProductToAddSearch=利用搜尋產品來增加
 AddDel=新增或刪除
 Quantity=數量
 NoMatchFound=沒有找到匹配
-ProductAssociationList=以下為下階子產品(服務)清單，及所需下階數量和庫存數量
+ProductAssociationList=List of products/services that are component of this virtual product/package
 ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選定的產品之一，是家長與當前的產品
 DeleteProduct=刪除一個產品/服務
@@ -179,16 +179,41 @@ CloneProduct=複製產品/服務
 ConfirmCloneProduct=你確定要複製一份 <b>%s</b> 產品/服務單嗎 ？
 CloneContentProduct=複製此產品/服務的所有資訊內容
 ClonePricesProduct=複製此產品/服務的價格資訊
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=該產品是用於
 NewRefForClone=新的產品/服務編號
-CustomerPrices=銷售價格
-SuppliersPrices=採購價格
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=進出口報關海關代碼
 CountryOrigin=原產地
 HiddenIntoCombo=隱藏選擇列表
 Nature=類型
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+linear meter=linear meter
+lm=lm
+square meter=square meter
+m2=m²
+cubic meter=cubic meter
+m3=m³
+liter=liter
+l=L
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 AddThisProductCard=Create product card
@@ -214,7 +239,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +262,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -267,3 +292,7 @@ GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws",
 UpdateInterval=Update interval (minutes)
 LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index f5bf8fc7966..ac604b6aa15 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -11,10 +11,11 @@ ProjectsPublicDesc=這種觀點提出了所有你被允許閱讀的項目。
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=這種觀點提出的所有項目（你的用戶權限批準你認為一切）。
 MyTasksDesc=這種觀點是有限的項目或任務你是一個接觸（不管是類型）。
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=這種觀點提出的所有項目，您可閱讀任務。
 TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準你認為一切）。
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
 ProjectsArea=項目領域
 NewProject=新項目
 AddProject=Create project
@@ -29,7 +30,7 @@ ProjectsList=項目名單
 ShowProject=顯示項目
 SetProject=設置項目
 NoProject=沒有項目或擁有的定義
-NbOpenTasks=鈮打開任務
+NbOpenTasks=Nb of open tasks
 NbOfProjects=鈮項目
 TimeSpent=花費的時間
 TimeSpentByYou=Time spent by you
@@ -41,7 +42,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=新的時間
 MyTimeSpent=我的時間花
@@ -75,6 +76,8 @@ ListFichinterAssociatedProject=名單與項目相關的幹預措施
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=名單與項目有關的行動
+ListTaskTimeUserProject=List of time consumed on tasks of project
+TaskTimeUserProject=Time consumed on tasks of project
 ActivityOnProjectThisWeek=對項目活動周
 ActivityOnProjectThisMonth=本月初對項目活動
 ActivityOnProjectThisYear=今年對項目活動
@@ -95,7 +98,7 @@ DeleteATimeSpent=刪除的時間
 ConfirmDeleteATimeSpent=你確定要刪除這個花的時間？
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=資源的整合
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=這個項目致力於第三方
 NoTasks=該項目沒有任務
 LinkedToAnotherCompany=鏈接到其他第三方
@@ -139,8 +142,15 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
+ProjectOverview=Overview
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index cfd1c439c67..1c2d42758f9 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -4,7 +4,7 @@ Proposal=商業建議
 ProposalShort=建議
 ProposalsDraft=商業建議草案
 ProposalDraft=商業建議草案
-ProposalsOpened=新開張的商業建議
+ProposalsOpened=Open commercial proposals
 Prop=商業建議
 CommercialProposal=商業建議
 CommercialProposals=商業建議
@@ -16,7 +16,7 @@ Prospect=展望
 ProspectList=展望名單
 DeleteProp=商業建議刪除
 ValidateProp=驗證的商業建議
-AddProp=新增提案
+AddProp=Create proposal
 ConfirmDeleteProp=你確定要刪除這個商業建議？
 ConfirmValidateProp=你確定要驗證這個商業建議？
 LastPropals=最後%的提議
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=按月份金額（稅後）
 NbOfProposals=商業建議數
 ShowPropal=顯示建議
 PropalsDraft=草稿
-PropalsOpened=開業
+PropalsOpened=Open
 PropalsNotBilled=閉不計費
 PropalStatusDraft=草案（等待驗證）
 PropalStatusValidated=驗證（建議打開）
@@ -42,7 +42,7 @@ PropalStatusNotSigned=不簽署（非公開）
 PropalStatusBilled=帳單
 PropalStatusDraftShort=草案
 PropalStatusValidatedShort=驗證
-PropalStatusOpenedShort=開業
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=關閉
 PropalStatusSignedShort=簽名
 PropalStatusNotSignedShort=未簽署
@@ -51,12 +51,10 @@ PropalsToClose=商業建議關閉
 PropalsToBill=到法案簽署商業建議
 ListOfProposals=商業建議名單
 ActionsOnPropal=行動上的建議
-NoOpenedPropals=沒有開放的商業建議
-NoOtherOpenedPropals=沒有其他打開的商業建議
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=商業建議參考
 SendPropalByMail=通過郵件發送的商業建議
-FileNotUploaded=該文件沒有上載
-FileUploaded=該文件被成功上傳
 AssociatedDocuments=相關文件的建議：
 ErrorCantOpenDir=無法打開目錄
 DatePropal=日期的建議
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal%s不符合
 Estimate=估計：
 EstimateShort=估計
 OtherPropals=其他建議
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
 CopyPropalFrom=通過復制現有的商業建議提案
 CreateEmptyPropal=創建空的商業建議維耶熱或從產品/服務列表
 DefaultProposalDurationValidity=默認的商業建議有效期（天數）
@@ -97,6 +95,7 @@ TypeContact_propal_external_CUSTOMER=客戶聯系隨訪的建議
 # Document models
 DocModelAzurDescription=一個完整的方案模型（logo. ..）
 DocModelJauneDescription=特賈恩方案模型
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index 28c21adfad3..953a9c7540c 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -11,3 +11,5 @@ ShowSalaryPayment=Show salary payment
 THM=Average hourly price
 TJM=Average daily price
 CurrentSalary=Current salary
+THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently as information only and is not used for any calculation
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 9e6201c8bee..4186de38c3f 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=簡單的文件範本
 DocumentModelMerou=Merou A5 範本
 WarningNoQtyLeftToSend=警告，沒有產品等待裝運。
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=預計交貨日期
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=交貨收到日期
 SendShippingByEMail=通過電子郵件發送貨物
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 32d119b32bb..c257a2dfa9f 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=倉庫
 NewWarehouse=新倉庫/庫存區
 WarehouseEdit=修改倉庫
 MenuNewWarehouse=新倉庫
-WarehouseOpened=打開倉庫
+WarehouseOpened=Warehouse open
 WarehouseClosed=關閉倉庫
 WarehouseSource=來源倉庫
 WarehouseSourceNotDefined=No warehouse defined,
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=選擇倉庫庫存減少使用
 SelectWarehouseForStockIncrease=選擇使用庫存增加的倉庫
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -112,8 +113,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 91acd977504..f45d880c0f9 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
 ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index 6dc462f3cdf..6664b22f443 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=費用清單
 NewTrip=New expense report
 CompanyVisited=公司/基礎訪問
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -74,9 +73,10 @@ DATE_PAIEMENT=Payment date
 
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 9b4cf4f6f2e..458baa5b1ec 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -57,6 +57,7 @@ RemoveFromGroup=從組中刪除
 PasswordChangedAndSentTo=密碼更改，發送到<b>%s。</b>
 PasswordChangeRequestSent=要求更改密碼<b>的S%</b>發送到<b>%s。</b>
 MenuUsersAndGroups=用戶和群組
+MenuMyUserCard=My user card
 LastGroupsCreated=共建立 %s 群組
 LastUsersCreated=共建立 %s 位用戶
 ShowGroup=顯示群組
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 778eb334c4d..530cdaa6fff 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -84,6 +84,11 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
+RUM=RUM
+RUMWillBeGenerated=RUM number will be generated once bank account information are saved
+WithdrawMode=Withdraw mode (FRST or RECUR)
+WithdrawRequestAmount=Withdraw request amount:
+WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 
 ### Notifications
 InfoCreditSubject=由銀行支付的長期訂單%s
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index 940da38e45f..a9137557a8e 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=工作流模塊的設置
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=沒有工作流程，您可以修改你已激活的模塊。
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=商業提案簽署後自動創建一個客戶訂單
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=商業提案簽署後自動創建一個客戶發票
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=創建一個客戶發票，合同驗證後自動
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=創建一個客戶發票，客戶訂單後自動關閉
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index ad32f7b6ced..2eec1695887 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -46,7 +46,7 @@ $object = new Loan($db);
 /*
  * Actions
  */
- 
+
 // Classify paid
 if ($action == 'confirm_paid' && $confirm == 'yes')
 {
@@ -86,7 +86,7 @@ if ($action == 'add' && $user->rights->loan->write)
 	{
 		$datestart=@dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]);
 		$dateend=@dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
-		
+
 		if (! $datestart)
 		{
 			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors');
@@ -218,13 +218,13 @@ if ($action == 'create')
 	// Date Start
 	print "<tr>";
     print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
-    print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1);
+    print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1,1);
     print '</td></tr>';
 
 	// Date End
 	print "<tr>";
     print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
-    print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1);
+    print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1,1);
     print '</td></tr>';
 
 	// Number of terms
@@ -356,7 +356,7 @@ if ($id > 0)
 		print "<td>";
 		if ($action == 'edit')
 		{
-			print $form->select_date($object->datestart, 'start', 0, 0, 0, 'update', 1);
+			print $form->select_date($object->datestart, 'start', 0, 0, 0, 'update', 1, 0, 1);
 		}
 		else
 		{
@@ -369,7 +369,7 @@ if ($id > 0)
 		print "<td>";
 		if ($action == 'edit')
 		{
-			print $form->select_date($object->dateend, 'end', 0, 0, 0, 'update', 1);
+			print $form->select_date($object->dateend, 'end', 0, 0, 0, 'update', 1, 0, 1);
 		}
 		else
 		{
@@ -402,7 +402,7 @@ if ($id > 0)
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 			print '</form>';
-		} 
+		}
 
 		dol_fiche_end();
 
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 3831f73a7ea..41de056dce5 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -123,7 +123,7 @@ if ($object->id)
     print "<td>";
     if ($action == 'edit')
     {
-        print $form->select_date($object->datestart, 'start', 0, 0, 0, 'loan', 1);
+        print $form->select_date($object->datestart, 'start', 0, 0, 0, 'loan', 1, 0, 1);
     }
     else
     {
@@ -137,7 +137,7 @@ if ($object->id)
     print "<td>";
     if ($action == 'edit')
     {
-        print $form->select_date($object->dateend, 'end', 0, 0, 0, 'loan', 1);
+        print $form->select_date($object->dateend, 'end', 0, 0, 0, 'loan', 1, 0, 1);
     }
     else
     {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 234949272f0..57453328296 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -90,6 +90,7 @@ function test_sql_and_script_inject($val, $type)
         $sql_inj += preg_match('/union.+select/i', 	 $val);
         $sql_inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
         $sql_inj += preg_match('/(\.\.%2f)+/i',		 $val);
+        $sql_inj += preg_match('/onerror=/i', 	     $val);
     }
     // For XSS Injection done by adding javascript with script
     // This is all cases a browser consider text is javascript:
@@ -422,6 +423,15 @@ if (! defined('NOLOGIN'))
                     $error++;
                 }
                 // End Call of triggers
+
+                // Hooks on failed login
+		        $action='';
+		        $hookmanager->initHooks(array('login'));
+		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+		        if ($reshook < 0) $error++;
+
+		        // Note: exit is done later
             }
         }
 
@@ -479,6 +489,7 @@ if (! defined('NOLOGIN'))
                 // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
                 if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
 
+                // TODO We should use a hook afterLoginFailed here, not a trigger.
                 // Call of triggers
                 include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
                 $interface=new Interfaces($db);
@@ -487,6 +498,15 @@ if (! defined('NOLOGIN'))
                     $error++;
                 }
                 // End Call of triggers
+
+                // Hooks on failed login
+		        $action='';
+		        $hookmanager->initHooks(array('login'));
+		        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+		        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+		        if ($reshook < 0) $error++;
+
+		        // Note: exit is done in next chapter
             }
         }
 
@@ -521,7 +541,7 @@ if (! defined('NOLOGIN'))
                 $_SESSION["dol_loginmesg"]=$user->error;
             }
 
-            // TODO We should use a hook here, not a trigger.
+            // TODO We should use a hook afterLoginFailed here, not a trigger.
             // Call triggers
             include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
             $interface=new Interfaces($db);
@@ -531,6 +551,13 @@ if (! defined('NOLOGIN'))
             }
             // End call triggers
 
+	        // Hooks on failed login
+	        $action='';
+	        $hookmanager->initHooks(array('login'));
+	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+	        if ($reshook < 0) $error++;
+
             header('Location: '.DOL_URL_ROOT.'/index.php');
             exit;
         }
@@ -574,11 +601,18 @@ if (! defined('NOLOGIN'))
             }
             // End call triggers
 
+	        // Hooks on failed login
+	        $action='';
+	        $hookmanager->initHooks(array('login'));
+	        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+	        $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+	        if ($reshook < 0) $error++;
+
             header('Location: '.DOL_URL_ROOT.'/index.php');
             exit;
         }
         else
-       {
+        {
 	       // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 	       $hookmanager->initHooks(array('main'));
 
@@ -623,9 +657,11 @@ if (! defined('NOLOGIN'))
 
         $user->update_last_login_date();
 
-        $user->trigger_mesg = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
+        $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
 
-        // TODO We should use a hook here, not a trigger
+        $user->trigger_mesg = $loginfo;
+
+        // TODO We should use hook afterLogin here, not a trigger
         // Call triggers
         include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
         $interface=new Interfaces($db);
@@ -635,43 +671,24 @@ if (! defined('NOLOGIN'))
         }
         // End call triggers
 
+        // Hooks on successfull login
+        $action='';
+        $hookmanager->initHooks(array('login'));
+        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
+        $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+        if ($reshook < 0) $error++;
+
         if ($error)
         {
             $db->rollback();
             session_destroy();
-            dol_print_error($db,'Error in some triggers on action USER_LOGIN');
+            dol_print_error($db,'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
             exit;
         }
         else
-        {
+		{
             $db->commit();
         }
-
-        // Create entity cookie, just used for login page
-        // TODO Multicompany Move this into hook
-        if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED) && isset($_POST["entity"]))
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/class/cookie.class.php';
-
-            $entity = $_SESSION["dol_login"].'|'.$_POST["entity"];
-
-            $prefix=dol_getprefix();
-            $entityCookieName = 'DOLENTITYID_'.$prefix;
-            // TTL : is defined in the config page multicompany
-            $ttl = (! empty($conf->global->MULTICOMPANY_COOKIE_TTL) ? dol_now()+$conf->global->MULTICOMPANY_COOKIE_TTL : dol_now()+60*60*8 );
-            // Cryptkey : will be created randomly in the config page multicompany
-            $cryptkey = (! empty($conf->file->cookie_cryptkey) ? $conf->file->cookie_cryptkey : '' );
-
-            $entityCookie = new DolCookie($cryptkey);
-            $entityCookie->_setCookie($entityCookieName, $entity, $ttl);
-        }
-
-        // Hooks on successfull login
-        $action='';
-        $hookmanager->initHooks(array('login'));
-        $parameters=array('dol_authmode'=>$dol_authmode);
-        $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook < 0) $error++;
     }
 
 
@@ -831,18 +848,6 @@ else
 
 $heightforframes=52;
 
-// Switch to another entity
-// TODO Multicompany Remove this
-if (! empty($conf->multicompany->enabled) && GETPOST('action') == 'switchentity')
-{
-    if ($mc->switchEntity(GETPOST('entity','int')) > 0)
-    {
-        header("Location: ".DOL_URL_ROOT.'/');
-        exit;
-    }
-}
-
-
 // Init menu manager
 if (! defined('NOREQUIREMENU'))
 {
@@ -1442,6 +1447,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    $toprightmenu.=$user->getPhotoUrl(16,16,'loginphoto');
 	    $toprightmenu.='</div></div>';
 
+	    // Login name with tooltip
 		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">';
         $toprightmenu.=$user->getNomurl(0, '', true, 0, 11);
         $toprightmenu.='</div></div>';
@@ -1526,7 +1532,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
 	    {
 	        $langs->load("companies");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', $langs->trans("ThirdParties"), 'soc', 'socname', 'T', 'searchleftt', img_object('','company'));
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'socname', 'T', 'searchleftt', img_object('','company'));
 	    }
 
 	    if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
@@ -1555,6 +1561,12 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
 	    }
 
+    	if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
+	    {
+	        $langs->load("members");
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'M', 'searchleftproj', img_object('','projectpub'));
+	    }
+
 	    // Execute hook printSearchForm
 	    $parameters=array();
 	    $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 715bfe7b35b..9a0f55010ab 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -141,16 +141,28 @@ print '<td align="right">'.$langs->trans('MargeBrute');
 print ' <input type="radio" name="MARGIN_TYPE" value="1" ';
 if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')
 	print 'checked ';
-print '/><br/>'.$langs->trans('MargeNette');
+print '/><br>';
+/*print $langs->trans('MargeNette');
 print ' <input type="radio" name="MARGIN_TYPE" value="2" ';
 if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '2')
 	print 'checked ';
-print '/>';
+print '/>';*/
+// TODO Check that PMP is available when stock module is not enabled. If not, make this choice greyed when stock module disabled.
+//if (! empty($conf->stock->enabled))
+//{
+	print $langs->trans('MargeNette');
+	print ' <input type="radio" name="MARGIN_TYPE" value="pmp" ';
+	if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+		print 'checked ';
+	print '/>';
+//}
 print '</td>';
 print '<td>';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" class="button">';
 print '</td>';
-print '<td>'.$langs->trans('MARGIN_TYPE_DETAILS').'</td>';
+print '<td>'.$langs->trans('MARGIN_TYPE_DETAILS');
+print ' ('.$langs->trans("PMP").')';
+print '</td>';
 print '</tr>';
 print '</form>';
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 90f029b4d35..bd0d2cb8a51 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -287,7 +287,7 @@ print '</td></tr>';
 
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
-if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire');
+if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire',0,0,0,'',1,0,1);
 else print dol_print_date($object->date_fin,'day');
 print '</td></tr>';
 
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index d13c9884e89..cea060d75f4 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García       <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -93,10 +93,11 @@ print '<table class="liste">'."\n";
 print '<tr class="liste_titre">';
 print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.id_sondage",$param,"","",$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("Title"), $_SERVER["PHP_SELF"], "p.titre",$param,"","",$sortfield,$sortorder);
-print '<td>'. $langs->trans("Type") .'</td>';
+print_liste_field_titre($langs->trans("Type"));
 print_liste_field_titre($langs->trans("Author"), $_SERVER["PHP_SELF"], "u.".$fieldtosortuser,$param,"","",$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("NbOfVoters"));
 print_liste_field_titre($langs->trans("ExpireDate"), $_SERVER["PHP_SELF"], "p.date_fin",$param,"",'align="center"',$sortfield,$sortorder);
-print '<td align="center">'. $langs->trans("NbOfVoters") .'</td>';
+print_liste_field_titre('');
 print '</tr>'."\n";
 
 print '<tr class="liste_titre">';
@@ -104,6 +105,7 @@ print '<td></td>';
 print '<td><input type="text" name="surveytitle" value="'.dol_escape_htmltag($surveytitle).'"></td>';
 print '<td></td>';
 print '<td></td>';
+print '<td></td>';
 $arraystatus=array(''=>'&nbsp;','expired'=>$langs->trans("Expired"),'opened'=>$langs->trans("Opened"));
 print '<td align="center">'. $form->selectarray('status', $arraystatus, $status).'</td>';
 print '<td class="liste_titre" align="right">';
@@ -174,11 +176,13 @@ while ($i < min($num,$limit))
 
 	print '</td>';
 
+	print'<td align="center">'.$nbuser.'</td>'."\n";
+
 	print '<td align="center">'.dol_print_date($db->jdate($obj->date_fin),'day');
 	if ($db->jdate($obj->date_fin) < time()) { print ' ('.$langs->trans("Expired").')'; }
 	print '</td>';
 
-	print'<td align="center">'.$nbuser.'</td>'."\n";
+	print'<td align="center"></td>'."\n";
 
 	print '</tr>'."\n";
 	$i++;
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index ee19d321301..d9ef51b6a4a 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -458,7 +458,7 @@ print '</td></tr>';
 
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
-if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire');
+if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire',0,0,0,'',1,0,1);
 else print dol_print_date($object->date_fin,'day');
 print '</td></tr>';
 
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 9c5d27d070e..61c3cd6dff6 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -101,7 +101,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 	if (! $testdate) {
 		setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("ExpireDate")), 'errors');
 	}
-	
+
 	if ($titre && $testdate)
 	{
 		if (! empty($creation_sondage_date))
@@ -156,7 +156,7 @@ print '</tr>'."\n";
 
 print '<tr><td class="fieldrequired">'.  $langs->trans("ExpireDate")  .'</td><td>';
 
-print $form->select_date($champdatefin?$champdatefin:-1,'champdatefin','','','',"add",1,0);
+print $form->select_date($champdatefin?$champdatefin:-1,'champdatefin','','','',"add",1,0,1);
 
 print '</tr>'."\n";
 print '</table>'."\n";
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 5eb4549f0fa..a7b39cd5f34 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -69,7 +69,7 @@ function llxHeaderPaypal($title, $head = "")
 
 		// JQuery. Must be before other includes
 		print '<!-- Includes JS for JQuery -->'."\n";
-		print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
+		print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min'.$ext.'"></script>'."\n";
 		// jQuery jnotify
 		if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY))
 		{
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 08c391c11c4..ec60f691e05 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -878,7 +878,7 @@ else
         }
 
         // Description (used in invoice, propal...)
-        print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
 
         $doleditor = new DolEditor('desc', GETPOST('desc'), '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
         $doleditor->Create();
@@ -886,7 +886,7 @@ else
         print "</td></tr>";
 
         // Public URL
-        print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+        print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
 		print '<input type="text" name="url" size="90" value="'.GETPOST('url').'">';
         print '</td></tr>';
 
@@ -952,6 +952,15 @@ else
             print '</td></tr>';
         }
 
+        // Units
+	    if($conf->global->PRODUCT_USE_UNITS)
+	    {
+		    print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
+		    print '<td colspan="3">';
+		    print $form->selectUnits('','units');
+		    print '</td></tr>';
+	    }
+
         // Custom code
         if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
         {
@@ -972,7 +981,7 @@ else
         }
 
         // Note (private, no output on invoices, propales...)
-        print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+        print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
 
         // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
         $doleditor = new DolEditor('note', GETPOST('note'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 8, 70);
@@ -980,20 +989,13 @@ else
 
         print "</td></tr>";
 
-		// Categories
-		print '<tr><td valign="top">'.$langs->trans("Categories").'</td><td colspan="3">';
-		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
-		print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, 250);
-		print "</td></tr>";
-
-	    // Units
-	    if($conf->global->PRODUCT_USE_UNITS)
-	    {
-		    print '<tr><td>'.$langs->trans('Unit').'</td>';
-		    print '<td colspan="3">';
-		    print $form->selectUnits("units");
-		    print '</td></tr>';
-	    }
+		if($conf->categorie->enabled) {
+			// Categories
+			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
+			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print "</td></tr>";
+		}
 
         print '</table>';
 
@@ -1162,7 +1164,7 @@ else
 	        }
 
             // Description (used in invoice, propal...)
-            print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
 
             // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
             $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
@@ -1172,7 +1174,7 @@ else
             print "\n";
 
             // Public Url
-            print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
 			print '<input type="text" name="url" size="80" value="'.$object->url.'">';
             print '</td></tr>';
 
@@ -1221,7 +1223,7 @@ else
                 print '</td></tr>';
             }
             else
-            {
+			{
                 // Weight
                 print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
                 print '<input name="weight" size="5" value="'.$object->weight.'"> ';
@@ -1243,6 +1245,14 @@ else
                 print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);
                 print '</td></tr>';
             }
+        	// Units
+	        if($conf->global->PRODUCT_USE_UNITS)
+	        {
+		        print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
+		        print '<td colspan="3">';
+		        print $form->selectUnits($object->fk_unit, 'units');
+		        print '</td></tr>';
+	        }
 
 	        // Custom code
     	    if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
@@ -1264,32 +1274,25 @@ else
             }
 
             // Note
-            print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+            print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
 
             $doleditor = new DolEditor('note', $object->note, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
             $doleditor->Create();
 
             print "</td></tr>";
 
-			// Categories
-			print '<tr><td valign="top">'.$langs->trans("Categories").'</td><td colspan="3">';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
-			$c = new Categorie($db);
-			$cats = $c->containing($object->id,Categorie::TYPE_PRODUCT);
-			foreach($cats as $cat) {
-				$arrayselected[] = $cat->id;
+			if($conf->categorie->enabled) {
+				// Categories
+				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
+				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
+				$c = new Categorie($db);
+				$cats = $c->containing($object->id,Categorie::TYPE_PRODUCT);
+				foreach($cats as $cat) {
+					$arrayselected[] = $cat->id;
+				}
+				print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+				print "</td></tr>";
 			}
-			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
-			print "</td></tr>";
-
-	        // Units
-	        if($conf->global->PRODUCT_USE_UNITS)
-	        {
-		        print '<tr><td>'.$langs->trans('Unit').'</td>';
-		        print '<td colspan="3">';
-		        print $form->selectUnits($object->fk_unit);
-		        print '</td></tr>';
-	        }
 
             print '</table>';
 
@@ -1479,10 +1482,10 @@ else
             }
 
             // Description
-            print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';
+            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';
 
             // Public URL
-            print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="2">';
+            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';
 			print dol_print_url($object->url);
             print '</td></tr>';
 
@@ -1563,7 +1566,7 @@ else
 			{
 				$unit = $object->getLabelOfUnit();
 
-				print '<tr><td>'.$langs->trans('Unit').'</td><td>';
+				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td><td>';
 				if ($unit !== '') {
 					print $langs->trans($unit);
 				}
@@ -1589,13 +1592,15 @@ else
 
             // Note
             print '<!-- show Note --> '."\n";
-            print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>'."\n";
+            print '<tr><td class="tdtop">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>'."\n";
             print '<!-- End show Note --> '."\n";
 
 			// Categories
-			print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
-			print $form->showCategories($object->id,'product',1);
-			print "</td></tr>";
+			if($conf->categorie->enabled) {
+				print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
+				print $form->showCategories($object->id,'product',1);
+				print "</td></tr>";
+			}
 
             print "</table>\n";
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 90851b53e90..28af434d56a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -808,7 +808,8 @@ class Product extends CommonObject
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
-					$this->error=$langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref);
+					if (empty($conf->barcode->enabled)) $this->error=$langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref);
+					else $this->error=$langs->trans("Error")." : ".$langs->trans("ErrorProductBarCodeAlreadyExists",$this->barcode);
 					$this->db->rollback();
 					return -1;
 				}
@@ -2315,7 +2316,7 @@ class Product extends CommonObject
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->fournisseur->lire && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = d.fk_commande";
 		$sql.= " AND d.fk_product =".$this->id;
 		$sql.= " AND c.fk_soc = s.rowid";
@@ -3720,6 +3721,12 @@ class Product extends CommonObject
 			{
 				dol_delete_file($dirthumb.$photo_vignette);
 			}
+
+			$photo_vignette=preg_replace('/'.$regs[0].'/i','',$filename).'_mini'.$regs[0];
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
+			{
+				dol_delete_file($dirthumb.$photo_vignette);
+			}
 		}
 	}
 
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 62d9bb0a406..1bca4579070 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -232,9 +232,10 @@ class Productcustomerprice extends CommonObject
 	 * @param int $id object
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function fetch($id) {
-
+	function fetch($id)
+	{
 		global $langs;
+
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
@@ -293,18 +294,22 @@ class Productcustomerprice extends CommonObject
 	}
 
 	/**
-	 * Load all objects in memory from database
+	 * Load all customer prices in memory from database
 	 *
-	 * @param string $sortorder order
-	 * @param string $sortfield field
-	 * @param int $limit page
-	 * @param int $offset offset
-	 * @param array $filter output
-	 * @return int <0 if KO, >0 if OK
+	 * @param 	string 	$sortorder 	order
+	 * @param 	string 	$sortfield 	field
+	 * @param 	int 	$limit 		page
+	 * @param 	int 	$offset 	offset
+	 * @param 	array 	$filter 	Filter for select
+	 * @return 	int 				<0 if KO, >0 if OK
 	 */
-	function fetch_all($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array()) {
-
+	function fetch_all($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array())
+	{
 		global $langs;
+
+		if (! empty($sortfield)) $sortfield = "t.rowid";
+		if (! empty($sortorder)) $sortorder = "DESC";
+
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
@@ -347,12 +352,8 @@ class Productcustomerprice extends CommonObject
 			}
 		}
 
-		if (! empty($sortfield)) {
-			$sql .= " ORDER BY " . $sortfield . ' ' . $sortorder;
-		}
-		if (! empty($limit)) {
-			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
-		}
+		$sql.= $this->db->order($sortfield, $sortorder);
+		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 
 		dol_syslog(get_class($this) . "::fetch_all", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -400,16 +401,20 @@ class Productcustomerprice extends CommonObject
 	/**
 	 * Load all objects in memory from database
 	 *
-	 * @param string $sortorder order
-	 * @param string $sortfield field
-	 * @param int $limit page
-	 * @param int $offset offset
-	 * @param array $filter output
-	 * @return int <0 if KO, >0 if OK
+	 * @param 	string 	$sortorder 	order
+	 * @param 	string 	$sortfield 	field
+	 * @param 	int 	$limit 		page
+	 * @param 	int 	$offset 	offset
+	 * @param 	array 	$filter 	Filter for sql request
+	 * @return 	int 			<0 if KO, >0 if OK
 	 */
-	function fetch_all_log($sortorder, $sortfield, $limit, $offset, $filter = array()) {
-
+	function fetch_all_log($sortorder, $sortfield, $limit, $offset, $filter = array())
+	{
 		global $langs;
+
+		if (! empty($sortfield)) $sortfield = "t.rowid";
+		if (! empty($sortorder)) $sortorder = "DESC";
+
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
@@ -451,12 +456,8 @@ class Productcustomerprice extends CommonObject
 			}
 		}
 
-		if (! empty($sortfield)) {
-			$sql .= " ORDER BY " . $sortfield . ' ' . $sortorder;
-		}
-		if (! empty($limit)) {
-			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
-		}
+		$sql.= $this->db->order($sortfield, $sortorder);
+		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 
 		dol_syslog(get_class($this) . "::fetch_all_log", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 35d1b1080fb..cb174e5847e 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -87,10 +87,10 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
 	//Delete line if product propal merge is linked to a file
-	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+	{
 		if ($action == 'confirm_deletefile' && $confirm == 'yes')
 		{
-			print 'toto';
 			//extract file name
 			$urlfile = GETPOST('urlfile', 'alpha');
 			$filename = basename($urlfile);
@@ -109,7 +109,8 @@ if (empty($reshook))
 
 }
 
-if ($action=='filemerge') {
+if ($action=='filemerge')
+{
 	$is_refresh = GETPOST('refresh');
 	if (empty($is_refresh)) {
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 0b7e1b0c733..77e8373d2a7 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -324,8 +324,8 @@ else
     		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("PhysicalStock").'</td>';
     		print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
             print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder);
-            print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', $param, '');
-    		print "</tr>\n";
+            print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+			print "</tr>\n";
 
     		// Lignes des champs de filtre
     		print '<tr class="liste_titre">';
@@ -381,11 +381,11 @@ else
     			print '</td>';
     		}
 
-    		print '<td align="center">';
+    		print '<td class="liste_titre" align="center">';
             print $form->selectarray('tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')),$tosell,1);
             print '</td >';
 
-            print '<td align="center">';
+            print '<td class="liste_titre" align="center">';
             print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
             print '</td>';
 
@@ -393,6 +393,7 @@ else
     		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
     		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     		print '</td>';
+
     		print '</tr>';
 
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 915f1988843..5ea2ff538b0 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -829,7 +829,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 	}
 }
 
-// Liste des evolutions du prix
+// List of price changes (ordered by descending date)
 $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.recuperableonly,";
 $sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
 $sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
@@ -1156,7 +1156,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 	}
 	elseif ($action == 'showlog_customer_price')
 	{
-
 		$filter = array('t.fk_product' => $object->id,'t.fk_soc' => GETPOST('socid', 'int'));
 
 		// Count total nb of records
@@ -1199,6 +1198,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 			foreach ($prodcustprice->lines as $line)
 			{
+				$var = ! $var;
 				print "<tr ".$bc[$var].">";
 				// Date
 				$staticsoc = new Societe($db);
@@ -1237,7 +1237,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		// Count total nb of records
 		$nbtotalofrecords = 0;
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-			$nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+			$nbtotalofrecords = $prodcustprice->fetch_all($sortfield, $sortorder, 0, 0, $filter);
 		}
 
 		$result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 538a46cea90..22ed390bc8f 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -389,7 +389,7 @@ else
             if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("EstimatedStockValueSellShort"),"", "","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
 			if ($user->rights->stock->mouvement->creer) print_liste_field_titre('');
 			if ($user->rights->stock->creer)            print_liste_field_titre('');
-			print "</tr>";
+			print "</tr>\n";
 
 			$totalunit=0;
 			$totalvalue=$totalvaluesell=0;
@@ -518,6 +518,10 @@ else
 			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
+			$head = stock_prepare_head($object);
+
+			dol_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock');
+
 			print '<table class="border" width="100%">';
 
 			// Ref
@@ -559,7 +563,9 @@ else
 
 			print '</table>';
 
-			print '<br><div class="center">';
+			dol_fiche_end();
+
+			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 225a33a9483..2c48b4587a0 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -31,9 +31,10 @@ $langs->load("stocks");
 // Security check
 $result=restrictedArea($user,'stock');
 
-$sref=GETPOST("sref","alpha");
-$snom=GETPOST("snom","alpha");
+$search_ref=GETPOST("sref","alpha")?GETPOST("sref","alpha"):GETPOST("search_ref","alpha");
+$search_label=GETPOST("snom","alpha")?GETPOST("snom","alpha"):GETPOST("search_label","alpha");
 $sall=GETPOST("sall","alpha");
+$search_status=GETPOST("search_status","int");
 
 $sortfield = GETPOST("sortfield");
 $sortorder = GETPOST("sortorder");
@@ -52,6 +53,7 @@ $year = strftime("%Y",time());
  */
 
 $form=new Form($db);
+$warehouse=new Entrepot($db);
 
 $sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays,";
 $sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
@@ -59,22 +61,14 @@ $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
 $sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
-if ($sref)
-{
-    $sql.= " AND e.label LIKE '%".$db->escape($sref)."%'";
-}
-if ($sall)
-{
-    $sql.= " AND (e.label LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.description LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.address LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.town LIKE '%".$db->escape($sall)."%')";
-}
+if ($search_ref) $sql.= natural_search("e.label", $search_ref);			// ref
+if ($search_label) $sql.= natural_search("e.lieu", $search_label);		// label
+if ($search_status != '' && $search_status >= 0) $sql.= " AND e.statut = ".$search_status;
+if ($sall) $sql.= natural_search(array('e.label','e.description','e.lieu','e.address','e.town'), $sall);
 $sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
-
+print $sql;
 $result = $db->query($sql);
 if ($result)
 {
@@ -87,6 +81,12 @@ if ($result)
 
 	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder,'',$num);
 
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
 	print '<table class="noborder" width="100%">';
 
 	print "<tr class=\"liste_titre\">";
@@ -95,8 +95,34 @@ if ($result)
     print_liste_field_titre($langs->trans("EstimatedStockValue"), $_SERVER["PHP_SELF"], "e.valo_pmp",'','','align="right"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("EstimatedStockValueSell"), $_SERVER["PHP_SELF"], "",'','','align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "e.statut",'','','align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
+	// Lignes des champs de filtre
+	print '<tr class="liste_titre">';
+
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_ref" size="6" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_label" size="10" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
+
+	print '<td class="liste_titre" colspan="2">';
+	print '</td>';
+
+	print '<td class="liste_titre" align="right">';
+	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
+	print '</td>';
+
+	print '<td class="liste_titre nowrap" align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+
+	print '</tr>';
+
 	if ($num)
 	{
 		$entrepot=new Entrepot($db);
@@ -128,6 +154,9 @@ if ($result)
             print '</td>';
             // Status
             print '<td align="right">'.$entrepot->LibStatut($objp->statut,5).'</td>';
+
+            print '<td></td>';
+
             print "</tr>\n";
 
             $total += price2num($objp->estimatedvalue,'MU');
@@ -148,7 +177,8 @@ if ($result)
            	print $form->textwithtooltip($langs->trans("Variable"),$htmltext);
 		}
         print '</td>';
-        print '<td align="right">&nbsp;</td>';
+        print '<td></td>';
+        print '<td></td>';
         print "</tr>\n";
 	}
 
@@ -156,6 +186,7 @@ if ($result)
 
 	print "</table>";
 
+	print '</form>';
 }
 else
 {
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 82c8ded066f..a556798cdd1 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -501,12 +501,12 @@ if ($resql)
 
     print '<tr class="liste_titre">';
     print '<td class="liste_titre" valign="right">';
-    print $langs->trans('Month').': <input class="flat" type="text" size="2" maxlength="2" name="month" value="'.$month.'">';
+    print '<input class="flat" type="text" size="2" maxlength="2" placeholder="'.dol_escape_htmltag($langs->trans("Month")).'" name="month" value="'.$month.'">';
     if (empty($conf->productbatch->enabled)) print '&nbsp;';
-    else print '<br>';
-    print $langs->trans('Year').': ';
+    //else print '<br>';
     $syear = $year?$year:-1;
-    $formother->select_year($syear,'year',1, 20, 5);
+    print '<input class="flat" type="text" size="2" maxlength="4" placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" name="year" value="'.($syear > 0 ? $syear : '').'">';
+    //print $formother->selectyear($syear,'year',1, 20, 5);
     print '</td>';
     // Product Ref
     print '<td class="liste_titre" align="left">';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index f80050287e9..44b17cac98f 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -747,10 +747,10 @@ if ($resql)
 			        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST"><input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder" width="100%"><tr><td width="10%"></td>';
 			        print '<td align="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
 			        print '<td align="center" width="10%">';
-			        $form->select_date($pdluo->eatby,'eatby','','',1,"");
+			        $form->select_date($pdluo->eatby,'eatby','','',1,'',1,0,1);
 			        print '</td>';
 			        print '<td align="center" width="10%">';
-			        $form->select_date($pdluo->sellby,'sellby','','',1,"");
+			        $form->select_date($pdluo->sellby,'sellby','','',1,'',1,0,1);
 			        print '</td>';
 			        print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
 			        print '<td colspan="4"><input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 08da8fbcf6f..76bcb93e28b 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -458,8 +458,7 @@ print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], 'stock_physique', $pa
 print_liste_field_titre($langs->trans('Ordered'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans('StockToBuy'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans('Supplier'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
-
-print '</tr>';
+print "</tr>\n";
 
 // Lignes des champs de filtre
 print '<tr class="liste_titre">'.
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 75fd12e9d95..39f728263ad 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -49,6 +49,7 @@ $now = dol_now();
 
 $projectstatic=new Project($db);
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);  // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project
+$tasktmp=new Task($db);
 
 $title=$langs->trans("Activities");
 if ($mine) $title=$langs->trans("MyActivities");
@@ -68,13 +69,31 @@ else
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-print_projecttasks_array($db,$socid,$projectsListId,$mine,1);
+// Search task
+if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+{
+	$var=false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/projet/tasks/index.php">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="mode" value="'.$mine.'">';
+	print '<input type="hidden" name="search_status" value="-1">';	// All status
+	print '<table class="noborder nohover" width="100%">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchATask").'</td></tr>';
+	print '<tr '.$bc[$var].'>';
+	print '<td class="nowrap"><label for="sf_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_task_ref" id="sf_ref" size="18"></td>';
+	print '<td rowspan="3"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	//print '<tr '.$bc[$var].'><td class="nowrap"><label for="syear">'.$langs->trans("Year").'</label>:</td><td><input type="text" class="flat" name="search_year" id="search_year" size="18"></td>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="search_task_label" id="search_task_label" size="18"></td>';
+	print '</tr>';
+	print "</table></form>\n";
+	print "<br>\n";
+}
 
 
 /* Affichage de la liste des projets d'aujourd'hui */
 print '<br><table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td width="50%">'.$langs->trans('Today').'</td>';
+print '<td width="50%">'.$langs->trans('ActivityOnProjectToday').'</td>';
 print '<td width="50%" align="right">'.$langs->trans("Time").'</td>';
 print "</tr>\n";
 
@@ -127,67 +146,64 @@ print "</table>";
 if ($db->type != 'pgsql')
 {
 
-/* Affichage de la liste des projets d'hier */
-print '<br><table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans('Yesterday').'</td>';
-print '<td align="right">'.$langs->trans("Time").'</td>';
-print "</tr>\n";
+	/* Affichage de la liste des projets d'hier */
+	print '<br><table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans('ActivityOnProjectYesterday').'</td>';
+	print '<td align="right">'.$langs->trans("Time").'</td>';
+	print "</tr>\n";
 
-$sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb";
-$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
-$sql.= " WHERE t.fk_projet = p.rowid";
-$sql.= " AND p.entity = ".$conf->entity;
-$sql.= " AND tt.fk_task = t.rowid";
-$sql.= " AND tt.fk_user = ".$user->id;
-$sql.= " AND date_format(date_add(task_date, INTERVAL 1 DAY),'%y-%m-%d') = '".strftime("%y-%m-%d",$now)."'";
-$sql.= " AND p.rowid in (".$projectsListId.")";
-$sql.= " GROUP BY p.rowid, p.ref, p.title";
+	$sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb";
+	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+	$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
+	$sql.= " WHERE t.fk_projet = p.rowid";
+	$sql.= " AND p.entity = ".$conf->entity;
+	$sql.= " AND tt.fk_task = t.rowid";
+	$sql.= " AND tt.fk_user = ".$user->id;
+	$sql.= " AND date_format(date_add(task_date, INTERVAL 1 DAY),'%y-%m-%d') = '".strftime("%y-%m-%d",$now)."'";
+	$sql.= " AND p.rowid in (".$projectsListId.")";
+	$sql.= " GROUP BY p.rowid, p.ref, p.title";
 
-$resql = $db->query($sql);
-if ( $resql )
-{
-	$var=true;
-	$total=0;
-
-	while ($row = $db->fetch_object($resql))
+	$resql = $db->query($sql);
+	if ( $resql )
 	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		print '<td>';
-		$projectstatic->id=$row->rowid;
-		$projectstatic->ref=$row->ref;
-		$projectstatic->title=$row->title;
-		print $projectstatic->getNomUrl(1, '', 1);
-		print '</td>';
-		print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
-		print "</tr>\n";
-		$total += $row->nb;
+		$var=true;
+		$total=0;
+
+		while ($row = $db->fetch_object($resql))
+		{
+			$var=!$var;
+			print "<tr ".$bc[$var].">";
+			print '<td>';
+			$projectstatic->id=$row->rowid;
+			$projectstatic->ref=$row->ref;
+			$projectstatic->title=$row->title;
+			print $projectstatic->getNomUrl(1, '', 1);
+			print '</td>';
+			print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
+			print "</tr>\n";
+			$total += $row->nb;
+		}
+
+		$db->free($resql);
 	}
-
-	$db->free($resql);
+	else
+	{
+		dol_print_error($db);
+	}
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans('Total').'</td>';
+	print '<td align="right">'.convertSecondToTime($total).'</td>';
+	print "</tr>\n";
+	print "</table>";
 }
-else
-{
-	dol_print_error($db);
-}
-print '<tr class="liste_total">';
-print '<td>'.$langs->trans('Total').'</td>';
-print '<td align="right">'.convertSecondToTime($total).'</td>';
-print "</tr>\n";
-print "</table>";
-
-}
-
-
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // TODO Do not use week function to be compatible with all database
 if ($db->type != 'pgsql')
 {
+print '<br>';
 
 /* Affichage de la liste des projets de la semaine */
 print '<table class="noborder" width="100%">';
@@ -293,52 +309,190 @@ print "</tr>\n";
 print "</table>";
 
 /* Affichage de la liste des projets de l'annee */
-print '<br><table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).'</td>';
-print '<td align="right">'.$langs->trans("Time").'</td>';
-print "</tr>\n";
-
-$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
-$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
-$sql.= " WHERE t.fk_projet = p.rowid";
-$sql.= " AND p.entity = ".$conf->entity;
-$sql.= " AND tt.fk_task = t.rowid";
-$sql.= " AND tt.fk_user = ".$user->id;
-$sql.= " AND YEAR(task_date) = '".strftime("%Y",$now)."'";
-$sql.= " AND p.rowid in (".$projectsListId.")";
-$sql.= " GROUP BY p.rowid, p.ref, p.title";
-
-$var=false;
-$resql = $db->query($sql);
-if ( $resql )
+if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 {
-	while ($row = $db->fetch_object($resql))
+	print '<br><table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).'</td>';
+	print '<td align="right">'.$langs->trans("Time").'</td>';
+	print "</tr>\n";
+
+	$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
+	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+	$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
+	$sql.= " WHERE t.fk_projet = p.rowid";
+	$sql.= " AND p.entity = ".$conf->entity;
+	$sql.= " AND tt.fk_task = t.rowid";
+	$sql.= " AND tt.fk_user = ".$user->id;
+	$sql.= " AND YEAR(task_date) = '".strftime("%Y",$now)."'";
+	$sql.= " AND p.rowid in (".$projectsListId.")";
+	$sql.= " GROUP BY p.rowid, p.ref, p.title";
+
+	$var=false;
+	$resql = $db->query($sql);
+	if ( $resql )
 	{
-		print "<tr ".$bc[$var].">";
-		print '<td>';
-		$projectstatic->id=$row->rowid;
-		$projectstatic->ref=$row->ref;
-		$projectstatic->title=$row->title;
-		print $projectstatic->getNomUrl(1, '', 1);
-		print '</td>';
-		print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
-		print "</tr>\n";
-		$var=!$var;
+		while ($row = $db->fetch_object($resql))
+		{
+			print "<tr ".$bc[$var].">";
+			print '<td>';
+			$projectstatic->id=$row->rowid;
+			$projectstatic->ref=$row->ref;
+			$projectstatic->title=$row->title;
+			print $projectstatic->getNomUrl(1, '', 1);
+			print '</td>';
+			print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
+			print "</tr>\n";
+			$var=!$var;
+		}
+		$db->free($resql);
 	}
-	$db->free($resql);
+	else
+	{
+		dol_print_error($db);
+	}
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans('Total').'</td>';
+	print '<td align="right">'.convertSecondToTime($total).'</td>';
+	print "</tr>\n";
+	print "</table>";
 }
-else
+
+
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+if (empty($conf->global->PROJECT_HIDE_TASKS))
 {
-	dol_print_error($db);
+	// Tasks for all resources of all opened projects and time spent for each task/resource
+
+	$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
+
+	$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
+	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tasktime on tasktime.fk_task = t.rowid";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid";
+	$sql.= " WHERE p.entity = ".$conf->entity;
+	if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";
+	if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	$sql.= " AND p.fk_statut=1";
+	$sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
+	$sql.= " ORDER BY t.dateo desc, t.rowid desc, t.datee";
+	$sql.= $db->plimit($max+1);	// We want more to know if we have more than limit
+
+	$var=true;
+
+	dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ( $resql )
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		//print_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'<br>';
+
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		//print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
+		print '<th>'.$langs->trans('OpenedProjects').'</th>';
+		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) print '<th>'.$langs->trans('OpportunityStatus').'</th>';
+		print '<th>'.$langs->trans('Task').'</th>';
+		print '<th align="center">'.$langs->trans('DateStart').'</th>';
+		print '<th align="center">'.$langs->trans('DateEnd').'</th>';
+		print '<th align="right">'.$langs->trans('PlannedWorkload').'</th>';
+		print '<th align="right">'.$langs->trans("ProgressDeclared").'</td>';
+		print '<th align="right">'.$langs->trans('TimeSpent').'</th>';
+		print '<th align="right">'.$langs->trans("ProgressCalculated").'</td>';
+		print '</tr>';
+
+		while ($i < $num && $i < $max)
+		{
+			$obj = $db->fetch_object($resql);
+			$var=!$var;
+
+			$username='';
+			if ($obj->userid && $userstatic->id != $obj->userid)	// We have a user and it is not last loaded user
+			{
+				$result=$userstatic->fetch($obj->userid);
+				if (! $result) $userstatic->id=0;
+			}
+			if ($userstatic->id) $username = $userstatic->getNomUrl(0,0);
+
+			print "<tr ".$bc[$var].">";
+			//print '<td>'.$username.'</td>';
+			print '<td>';
+			$projectstatic->id=$obj->projectid;
+			$projectstatic->ref=$obj->ref;
+			$projectstatic->title=$obj->title;
+			print $projectstatic->getNomUrl(1,'',16,'','<br>');
+			//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$obj->projectid.'">'.$obj->title.'</a>';
+			print '</td>';
+			if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<td>';
+				$code = dol_getIdFromCode($db, $obj->opp_status, 'c_lead_status', 'rowid', 'code');
+        		if ($code) print $langs->trans("OppStatus".$code);
+				print '</td>';
+			}
+			print '<td>';
+			if (! empty($obj->taskid))
+			{
+				$tasktmp->id = $obj->taskid;
+				$tasktmp->ref = $obj->ref;
+				$tasktmp->label = $obj->label;
+				print $tasktmp->getNomUrl(1,'withproject','task',1,'<br>');
+			}
+			else print $langs->trans("NoTasks");
+			print '</td>';
+			print '<td align="center">'.dol_print_date($db->jdate($obj->dateo),'day').'</td>';
+			print '<td align="center">'.dol_print_date($db->jdate($obj->datee),'day').'</td>';
+			print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
+			print convertSecondToTime($obj->planned_workload, 'all');
+			print '</a></td>';
+			print '<td align="right">';
+			print ($obj->taskid>0)?$obj->progress.'%':'';
+			print '</td>';
+			print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
+			print convertSecondToTime($obj->timespent, 'all');
+			print '</a></td>';
+			print '<td align="right">';
+			if (! empty($obj->taskid))
+			{
+				if (empty($obj->planned_workload) > 0) {
+					$percentcompletion = $langs->trans("WorkloadNotDefined");
+				} else {
+					$percentcompletion = intval($obj->duration_effective*100/$obj->planned_workload).'%';
+				}
+			}
+			print $percentcompletion;
+			print '</td>';
+			print "</tr>\n";
+
+			$i++;
+		}
+
+		if ($num > $max)
+		{
+			$colspan=6;
+			if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $colspan++;
+			print '<tr><td colspan="'.$colspan.'">'.$langs->trans("WarningTooManyDataPleaseUseMoreFilters").'</td></tr>';
+		}
+
+		print "</table>";
+
+
+		$db->free($resql);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+
 }
-print '<tr class="liste_total">';
-print '<td>'.$langs->trans('Total').'</td>';
-print '<td align="right">'.convertSecondToTime($total).'</td>';
-print "</tr>\n";
-print "</table>";
 
 
 print '</div></div></div>';
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index ee50358bdc5..e018bc47446 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -63,8 +63,14 @@ $day=GETPOST('reday')?GETPOST('reday'):(GETPOST("day","int")?GETPOST("day","int"
 $day = (int) $day;
 $week=GETPOST("week","int")?GETPOST("week","int"):date("W");
 
+
+$monthofday=GETPOST('addtimemonth');
+$dayofday=GETPOST('addtimeday');
+$yearofday=GETPOST('addtimeyear');
+
 $daytoparse = $now;
-if ($year && $month && $day) $daytoparse=dol_mktime(0, 0, 0, $month, $day, $year);
+if ($yearofday && $monthofday && $dayofday) $daytoparse=dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday);	// xxxofday is value of day after submit action 'addtime'
+else if ($year && $month && $day) $daytoparse=dol_mktime(0, 0, 0, $month, $day, $year);							// this are value submited after submit of action 'submitdateselect'
 
 $object=new Task($db);
 
@@ -106,6 +112,7 @@ if ($action == 'assign')
 
 	if ($result < 0)
 	{
+		$error++;
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -117,6 +124,11 @@ if ($action == 'assign')
 		}
 	}
 
+	if (! $error)
+	{
+		setEventMessages($langs->trans("TaskAssignedToEnterTime"), null);
+	}
+
 	$action='';
 }
 
@@ -154,15 +166,25 @@ if ($action == 'addtime' && $user->rights->projet->creer)
 	        $object->timespent_fk_user = $user->id;
 	        if (GETPOST($key."hour") != '' && GETPOST($key."hour") >= 0)	// If hour was entered
 	        {
-	        	$object->timespent_date = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year"));
+	        	$object->timespent_date = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,$monthofday,$dayofday,$yearofday);
 	        	$object->timespent_withhour = 1;
 	        }
 	        else
 			{
-	        	$object->timespent_date = dol_mktime(12,0,0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year"));
+	        	$object->timespent_date = dol_mktime(12,0,0,$monthofday,$dayofday,$yearofday);
+			}
+
+			if ($object->timespent_date > 0)
+			{
+				$result=$object->addTimeSpent($user);
+			}
+			else
+			{
+				setEventMessages($langs->trans("ErrorBadDate"), null, 'errors');
+				$error++;
+				break;
 			}
 
-			$result=$object->addTimeSpent($user);
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -176,7 +198,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
 	    	setEventMessage($langs->trans("RecordSaved"));
 
     	    // Redirect to avoid submit twice on back
-        	header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:''));
+        	header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
         	exit;
     	}
     }
@@ -252,6 +274,10 @@ print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].($proje
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="addtime">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
+$tmp = dol_getdate($daytoparse);
+print '<input type="hidden" name="addtimeyear" value="'.$tmp['year'].'">';
+print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
+print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
 $head=project_timesheet_prepare_head($mode);
 dol_fiche_head($head, 'inputperday', '', 0, 'task');
@@ -351,7 +377,7 @@ print '<input type="hidden" name="year" value="'.$year.'">';
 print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="day" value="'.$day.'">';
 print $langs->trans("AssignTaskToMe").'<br>';
-$formproject->select_task($socid?$socid:-1, $taskid, 'taskid');
+$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
 print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 1);
 print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AssignTask").'">';
 print '</form>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 85874af86b9..6ffc38cfbe9 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -124,6 +124,7 @@ if ($action == 'assign')
 
 	if ($result < 0)
 	{
+		$error++;
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -135,6 +136,11 @@ if ($action == 'assign')
 		}
 	}
 
+	if (! $error)
+	{
+		setEventMessages($langs->trans("TaskAssignedToEnterTime"), null);
+	}
+
 	$action='';
 }
 
@@ -376,7 +382,7 @@ print '<input type="hidden" name="year" value="'.$year.'">';
 print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="day" value="'.$day.'">';
 print $langs->trans("AssignTaskToMe").'<br>';
-$formproject->select_task($socid?$socid:-1, $taskid, 'taskid');
+$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
 print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 1);
 print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AssignTask").'">';
 print '</form>';
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index e67e8bb3655..2b9097b8355 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -51,7 +51,16 @@ $type='project';
  * Actions
  */
 
-if ($action == 'updateMask')
+if ($action == 'setmainoptions')
+{
+	if (GETPOST('PROJECT_USE_OPPORTUNITIES')) dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES",GETPOST('PROJECT_USE_OPPORTUNITIES'),'chaine',0,'',$conf->entity);
+	else dolibarr_del_const($db, "PROJECT_USE_OPPORTUNITIES", $conf->entity);
+
+	if (GETPOST('PROJECT_USE_TASKS')) dolibarr_del_const($db, "PROJECT_HIDE_TASKS", $conf->entity);
+	else dolibarr_set_const($db, "PROJECT_HIDE_TASKS",1,'chaine',0,'',$conf->entity);
+}
+
+else if ($action == 'updateMask')
 {
 	$maskconstproject=GETPOST('maskconstproject','alpha');
 	$maskproject=GETPOST('maskproject','alpha');
@@ -281,10 +290,13 @@ else if ($action == 'setmodtask')
 
 	dolibarr_set_const($db, "PROJECT_TASK_ADDON",$value,'chaine',0,'',$conf->entity);
 }
-elseif ($action == 'updateoptions') {
-	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT')) {
+elseif ($action == 'updateoptions')
+{
+	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT'))
+	{
 		$companysearch = GETPOST('activate_PROJECT_USE_SEARCH_TO_SELECT', 'alpha');
-		if (dolibarr_set_const($db, "PROJECT_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity)) {
+		if (dolibarr_set_const($db, "PROJECT_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity))
+		{
 			$conf->global->PROJECT_USE_SEARCH_TO_SELECT = $companysearch;
 		}
 	}
@@ -308,6 +320,55 @@ $head=project_admin_prepare_head();
 
 dol_fiche_head($head, 'project', $langs->trans("Projects"), 0, 'project');
 
+
+
+// Main options
+$form=new Form($db);
+$var=true;
+
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="setmainoptions">';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print "<td>".$langs->trans("Parameters")."</td>\n";
+print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
+print '<td width="80">&nbsp;</td></tr>'."\n";
+
+
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td width="80%">'.$langs->trans("ManageOpportunitiesStatus").'</td>';
+print '<td width="60" align="right">';
+$arrval=array('0'=>$langs->trans("No"),
+	'1'=>$langs->trans("Yes"),
+);
+print $form->selectyesno('PROJECT_USE_OPPORTUNITIES', $conf->global->PROJECT_USE_OPPORTUNITIES, 1);
+print '</td><td align="right">';
+print '<input type="submit" class="button" name="modifyPROJECT_USE_OPPORTUNITIES" value="'.$langs->trans("Modify").'">';
+print "</td>";
+print '</tr>';
+
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td width="80%">'.$langs->trans("ManageTasks").'</td>';
+print '<td width="60" align="right">';
+$arrval=array('0'=>$langs->trans("No"),
+	'1'=>$langs->trans("Yes"),
+);
+print $form->selectyesno('PROJECT_USE_TASKS', empty($conf->global->PROJECT_HIDE_TASKS)?1:0, 1);
+print '</td><td align="right">';
+print '<input type="submit" class="button" name="modifyPROJECT_USE_TASKS" value="'.$langs->trans("Modify").'">';
+print "</td>";
+print '</tr>';
+
+print '</table></form>';
+
+print '<br>';
+
+
+
 /*
  * Projects Numbering model
  */
@@ -412,110 +473,115 @@ foreach ($dirmodels as $reldir)
 
 print '</table><br>';
 
-// Task numbering module
-print_titre($langs->trans("TasksNumberingModules"));
 
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td width="100">'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td>'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
-print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
-print "</tr>\n";
-
-clearstatcache();
-
-foreach ($dirmodels as $reldir)
+if (empty($conf->global->PROJECT_HIDE_TASKS))
 {
-	$dir = dol_buildpath($reldir."core/modules/project/task/");
+	// Task numbering module
+	print_titre($langs->trans("TasksNumberingModules"));
 
-	if (is_dir($dir))
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td width="100">'.$langs->trans("Name").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Example").'</td>';
+	print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
+	print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+	print "</tr>\n";
+
+	clearstatcache();
+
+	foreach ($dirmodels as $reldir)
 	{
-		$handle = opendir($dir);
-		if (is_resource($handle))
+		$dir = dol_buildpath($reldir."core/modules/project/task/");
+
+		if (is_dir($dir))
 		{
-			$var=true;
-
-			while (($file = readdir($handle))!==false)
+			$handle = opendir($dir);
+			if (is_resource($handle))
 			{
-				if (preg_match('/^(mod_.*)\.php$/i',$file,$reg))
+				$var=true;
+
+				while (($file = readdir($handle))!==false)
 				{
-					$file = $reg[1];
-					$classname = substr($file,4);
-
-					require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$file.'.php';
-
-					$module = new $file;
-
-					// Show modules according to features level
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
-					if ($module->isEnabled())
+					if (preg_match('/^(mod_.*)\.php$/i',$file,$reg))
 					{
-						$var=!$var;
-						print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
-						print $module->info();
-						print '</td>';
+						$file = $reg[1];
+						$classname = substr($file,4);
 
-						// Show example of numbering module
-						print '<td class="nowrap">';
-						$tmp=$module->getExample();
-						if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
-						print '</td>'."\n";
+						require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$file.'.php';
 
-						print '<td align="center">';
-						if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
+						$module = new $file;
+
+						// Show modules according to features level
+						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+						if ($module->isEnabled())
 						{
-							print img_picto($langs->trans("Activated"),'switch_on');
-						}
-						else
-						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-						}
-						print '</td>';
+							$var=!$var;
+							print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
+							print $module->info();
+							print '</td>';
 
-						$project=new Project($db);
-						$project->initAsSpecimen();
+							// Show example of numbering module
+							print '<td class="nowrap">';
+							$tmp=$module->getExample();
+							if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+							elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+							else print $tmp;
+							print '</td>'."\n";
 
-						// Info
-						$htmltooltip='';
-						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-						$nextval=$module->getNextValue($mysoc,$project);
-						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-						{
-							$htmltooltip.=''.$langs->trans("NextValue").': ';
-							if ($nextval)
+							print '<td align="center">';
+							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
 							{
-								$htmltooltip.=$nextval.'<br>';
+								print img_picto($langs->trans("Activated"),'switch_on');
 							}
 							else
 							{
-								$htmltooltip.=$langs->trans($module->error).'<br>';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 							}
+							print '</td>';
+
+							$project=new Project($db);
+							$project->initAsSpecimen();
+
+							// Info
+							$htmltooltip='';
+							$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval=$module->getNextValue($mysoc,$project);
+							if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
+							{
+								$htmltooltip.=''.$langs->trans("NextValue").': ';
+								if ($nextval)
+								{
+									$htmltooltip.=$nextval.'<br>';
+								}
+								else
+								{
+									$htmltooltip.=$langs->trans($module->error).'<br>';
+								}
+							}
+
+							print '<td align="center">';
+							print $form->textwithpicto('',$htmltooltip,1,0);
+							print '</td>';
+
+							print '</tr>';
 						}
-
-						print '<td align="center">';
-						print $form->textwithpicto('',$htmltooltip,1,0);
-						print '</td>';
-
-						print '</tr>';
 					}
 				}
+				closedir($handle);
 			}
-			closedir($handle);
 		}
 	}
+
+	print '</table><br>';
 }
 
-print '</table><br>';
 
 /*
  * Document templates generators
-*/
+ */
 
 print_titre($langs->trans("ProjectsModelModule"));
 
@@ -668,149 +734,154 @@ foreach ($dirmodels as $reldir)
 
 print '</table><br/>';
 
-/*
- * Modeles documents for Task
-*/
 
-print_titre($langs->trans("TaskModelModule"));
 
-// Defini tableau def de modele
-$type='project_task';
-$def = array();
-
-$sql = "SELECT nom";
-$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = '".$type."'";
-$sql.= " AND entity = ".$conf->entity;
-
-$resql=$db->query($sql);
-if ($resql)
+if (empty($conf->global->PROJECT_HIDE_TASKS))
 {
-	$i = 0;
-	$num_rows=$db->num_rows($resql);
-	while ($i < $num_rows)
+	/*
+	 * Modeles documents for Task
+	 */
+
+	print_titre($langs->trans("TaskModelModule"));
+
+	// Defini tableau def de modele
+	$type='project_task';
+	$def = array();
+
+	$sql = "SELECT nom";
+	$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+	$sql.= " WHERE type = '".$type."'";
+	$sql.= " AND entity = ".$conf->entity;
+
+	$resql=$db->query($sql);
+	if ($resql)
 	{
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
-		$i++;
-	}
-}
-else
-{
-	dol_print_error($db);
-}
-
-print "<table class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
-print '  <td width="100">'.$langs->trans("Name")."</td>\n";
-print "  <td>".$langs->trans("Description")."</td>\n";
-print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
-print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
-print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
-print "</tr>\n";
-
-clearstatcache();
-
-$var=true;
-foreach ($dirmodels as $reldir)
-{
-	foreach (array('','/doc') as $valdir)
-	{
-		$dir = dol_buildpath($reldir."core/modules/project/task/".$valdir);
-
-		if (is_dir($dir))
+		$i = 0;
+		$num_rows=$db->num_rows($resql);
+		while ($i < $num_rows)
 		{
-			$handle=opendir($dir);
-			if (is_resource($handle))
+			$array = $db->fetch_array($resql);
+			array_push($def, $array[0]);
+			$i++;
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+
+	print "<table class=\"noborder\" width=\"100%\">\n";
+	print "<tr class=\"liste_titre\">\n";
+	print '  <td width="100">'.$langs->trans("Name")."</td>\n";
+	print "  <td>".$langs->trans("Description")."</td>\n";
+	print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
+	print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+	print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+	print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+	print "</tr>\n";
+
+	clearstatcache();
+
+	$var=true;
+	foreach ($dirmodels as $reldir)
+	{
+		foreach (array('','/doc') as $valdir)
+		{
+			$dir = dol_buildpath($reldir."core/modules/project/task/".$valdir);
+
+			if (is_dir($dir))
 			{
-				while (($file = readdir($handle))!==false)
+				$handle=opendir($dir);
+				if (is_resource($handle))
 				{
-					$filelist[]=$file;
-				}
-				closedir($handle);
-				arsort($filelist);
-
-				foreach($filelist as $file)
-				{
-					if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+					while (($file = readdir($handle))!==false)
 					{
-						if (file_exists($dir.'/'.$file))
+						$filelist[]=$file;
+					}
+					closedir($handle);
+					arsort($filelist);
+
+					foreach($filelist as $file)
+					{
+						if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
 						{
-							$name = substr($file, 4, dol_strlen($file) -16);
-							$classname = substr($file, 0, dol_strlen($file) -12);
-
-							require_once $dir.'/'.$file;
-							$module = new $classname($db);
-
-							$modulequalified=1;
-							if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-
-							if ($modulequalified)
+							if (file_exists($dir.'/'.$file))
 							{
-								$var = !$var;
-								print '<tr '.$bc[$var].'><td width="100">';
-								print (empty($module->name)?$name:$module->name);
-								print "</td><td>\n";
-								if (method_exists($module,'info')) print $module->info($langs);
-								else print $module->description;
-								print "</td>\n";
+								$name = substr($file, 4, dol_strlen($file) -16);
+								$classname = substr($file, 0, dol_strlen($file) -12);
 
-								// Active
-								if (in_array($name, $def))
-								{
-									print "<td align=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-									print img_picto($langs->trans("Enabled"),'switch_on');
-									print '</a>';
-									print "</td>";
-								}
-								else
-								{
-									print "<td align=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-									print "</td>";
-								}
+								require_once $dir.'/'.$file;
+								$module = new $classname($db);
 
-								// Defaut
-								print "<td align=\"center\">";
-								if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
-								{
-									print img_picto($langs->trans("Default"),'on');
-								}
-								else
-								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-								}
-								print '</td>';
+								$modulequalified=1;
+								if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
 
-								// Info
-								$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-								$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-								if ($module->type == 'pdf')
+								if ($modulequalified)
 								{
-									$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-								}
-								$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-								$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+									$var = !$var;
+									print '<tr '.$bc[$var].'><td width="100">';
+									print (empty($module->name)?$name:$module->name);
+									print "</td><td>\n";
+									if (method_exists($module,'info')) print $module->info($langs);
+									else print $module->description;
+									print "</td>\n";
 
-								print '<td align="center">';
-								print $form->textwithpicto('',$htmltooltip,1,0);
-								print '</td>';
+									// Active
+									if (in_array($name, $def))
+									{
+										print "<td align=\"center\">\n";
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+										print img_picto($langs->trans("Enabled"),'switch_on');
+										print '</a>';
+										print "</td>";
+									}
+									else
+									{
+										print "<td align=\"center\">\n";
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+										print "</td>";
+									}
 
-								// Preview
-								print '<td align="center">';
-								if ($module->type == 'pdf')
-								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+									// Defaut
+									print "<td align=\"center\">";
+									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
+									{
+										print img_picto($langs->trans("Default"),'on');
+									}
+									else
+									{
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+									}
+									print '</td>';
+
+									// Info
+									$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+									$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+									if ($module->type == 'pdf')
+									{
+										$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+									}
+									$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+									$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+
+									print '<td align="center">';
+									print $form->textwithpicto('',$htmltooltip,1,0);
+									print '</td>';
+
+									// Preview
+									print '<td align="center">';
+									if ($module->type == 'pdf')
+									{
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+									}
+									else
+									{
+										print img_object($langs->trans("PreviewNotAvailable"),'generic');
+									}
+									print '</td>';
+									print "</tr>\n";
 								}
-								else
-								{
-									print img_object($langs->trans("PreviewNotAvailable"),'generic');
-								}
-								print '</td>';
-								print "</tr>\n";
 							}
 						}
 					}
@@ -818,9 +889,10 @@ foreach ($dirmodels as $reldir)
 			}
 		}
 	}
+
+	print '</table><br/>';
 }
 
-print '</table><br/>';
 
 print_titre($langs->trans("Other"));
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 860475c5596..fcd18840fba 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -27,6 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -40,6 +41,7 @@ $action=GETPOST('action','alpha');
 $backtopage=GETPOST('backtopage','alpha');
 $cancel=GETPOST('cancel','alpha');
 $status=GETPOST('status','int');
+$opp_status=GETPOST('opp_status','int');
 
 if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $action != "update" && ! $_POST["cancel"])) accessforbidden();
 
@@ -136,11 +138,13 @@ if (empty($reshook))
 	        $object->socid           = GETPOST('socid','int');
 	        $object->description     = GETPOST('description'); // Do not use 'alpha' here, we want field as it is
 	        $object->public          = GETPOST('public','alpha');
-	        $object->budget_amount   = GETPOST('budget_amount','int');
+	        $object->opp_amount      = price2num(GETPOST('opp_amount'));
+	        $object->budget_amount   = price2num(GETPOST('budget_amount'));
 	        $object->datec=dol_now();
 	        $object->date_start=$date_start;
 	        $object->date_end=$date_end;
 	        $object->statuts         = $status;
+	        $object->opp_status      = $opp_status;
 
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -223,15 +227,23 @@ if (empty($reshook))
 	        $object->socid        = GETPOST('socid','int');
 	        $object->description  = GETPOST('description');	// Do not use 'alpha' here, we want field as it is
 	        $object->public       = GETPOST('public','alpha');
-	        $object->budget_amount= GETPOST('budget_amount','int');
 	        $object->date_start   = empty($_POST["projectstart"])?'':$date_start;
 	        $object->date_end     = empty($_POST["projectend"])?'':$date_end;
+	        if (isset($_POST['opp_amount']))    $object->opp_amount   = price2num(GETPOST('opp_amount'));
+	        if (isset($_POST['budget_amount'])) $object->budget_amount= price2num(GETPOST('budget_amount'));
+	        if (isset($_POST['opp_status']))    $object->opp_status   = $opp_status;
 
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 			if ($ret < 0) $error++;
 	    }
 
+		if ($object->opp_amount && ($object->opp_status <= 0))
+	    {
+	       	$error++;
+	    	setEventMessage($langs->trans("ErrorOppStatusRequiredIfAmount"),'errors');
+	    }
+	    
 	    if (! $error)
 	    {
 	    	$result=$object->update($user);
@@ -379,6 +391,7 @@ if (empty($reshook))
 
 $form = new Form($db);
 $formfile = new FormFile($db);
+$formproject = new FormProjets($db);
 $userstatic = new User($db);
 
 $title=$langs->trans("Project").' - '.$object->ref.' '.$object->name;
@@ -471,21 +484,35 @@ if ($action == 'create' && $user->rights->projet->creer)
 
     // Date start
     print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-    print $form->select_date(($date_start?$date_start:''),'projectstart');
+    print $form->select_date(($date_start?$date_start:''),'projectstart',0,0,0,'',1,0,1);
     print '</td></tr>';
 
     // Date end
     print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-    print $form->select_date(($date_end?$date_end:-1),'projectend');
+    print $form->select_date(($date_end?$date_end:-1),'projectend',0,0,0,'',1,0,1);
     print '</td></tr>';
 
-    // Budget
-    print '<tr><td>'.$langs->trans("Budget").'</td>';
-    print '<td><input size="4" type="text" name="budget_amount" value="'.(GETPOST('budget_amount')!=''?price(GETPOST('budget_amount')):'').'"></td></tr>';
-    print '</td></tr>';
+    if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+    {
+	    // Opportunity status
+	    print '<tr><td>'.$langs->trans("OpportunityStatus").'</td>';
+	    print '<td>';
+	    print $formproject->selectOpportunityStatus('opp_status',$object->opp_status);
+	    print '</tr>';
+
+	    // Opportunity amount
+	    print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
+	    print '<td><input size="4" type="text" name="opp_amount" value="'.(GETPOST('opp_amount')!=''?price(GETPOST('opp_amount')):'').'"></td>';
+	    print '</tr>';
+    }
+
+	// Budget
+	print '<tr><td>'.$langs->trans("Budget").'</td>';
+	print '<td><input size="6" type="text" name="budget_amount" value="'.(GETPOST('budget_amount')!=''?price(GETPOST('budget_amount')):'').'"></td>';
+	print '</tr>';
 
     // Description
-    print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
+    print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
     print '<td>';
     print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$_POST["description"].'</textarea>';
     print '</td></tr>';
@@ -588,11 +615,11 @@ else
         print '<table class="border" width="100%">';
 
         // Ref
-        print '<tr><td width="30%">'.$langs->trans("Ref").'</td>';
+        print '<tr><td class="fieldrequired" width="30%">'.$langs->trans("Ref").'</td>';
         print '<td><input size="12" name="ref" value="'.$object->ref.'"></td></tr>';
 
         // Label
-        print '<tr><td>'.$langs->trans("Label").'</td>';
+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
         print '<td><input size="40" name="title" value="'.$object->title.'"></td></tr>';
 
         // Customer
@@ -610,12 +637,12 @@ else
         print $form->selectarray('public',$array,$object->public);
         print '</td></tr>';
 
-        // Statut
+        // Status
         print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
         // Date start
         print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-        print $form->select_date($object->date_start?$object->date_start:-1,'projectstart');
+        print $form->select_date($object->date_start?$object->date_start:-1,'projectstart',0,0,0,'',1,0,1);
         print ' &nbsp; &nbsp; <input type="checkbox" name="reportdate" value="yes" ';
         if ($comefromclone){print ' checked ';}
 		print '/> '. $langs->trans("ProjectReportDate");
@@ -623,15 +650,30 @@ else
 
         // Date end
         print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-        print $form->select_date($object->date_end?$object->date_end:-1,'projectend');
+        print $form->select_date($object->date_end?$object->date_end:-1,'projectend',0,0,0,'',1,0,1);
         print '</td></tr>';
 
+    	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	    {
+	        // Opportunity status
+		    print '<tr><td>'.$langs->trans("OpportunityStatus").'</td>';
+	    	print '<td>';
+		    print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1);
+		    print '</td>';
+		    print '</tr>';
+
+		    // Opportunity amount
+		    print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
+		    print '<td><input size="6" type="text" name="opp_amount" value="'.(isset($_POST['opp_amount'])?GETPOST('opp_amount'):(strcmp($object->opp_amount,'')?price($object->opp_amount):'')).'"></td>';
+		    print '</tr>';
+	    }
+
 	    // Budget
 	    print '<tr><td>'.$langs->trans("Budget").'</td>';
-	    print '<td><input size="4" type="text" name="budget_amount" value="'.(price(isset($_POST['budget_amount'])?GETPOST('budget_amount'):$object->budget_amount)).'"></td></tr>';
-	    print '</td></tr>';
+	    print '<td><input size="6" type="text" name="budget_amount" value="'.(isset($_POST['budget_amount'])?GETPOST('budget_amount'):(strcmp($object->budget_amount,'')?price($object->budget_amount):'')).'"></td>';
+	    print '</tr>';
 
-        // Description
+	    // Description
         print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
         print '<td>';
         print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$object->description.'</textarea>';
@@ -692,9 +734,23 @@ else
         print dol_print_date($object->date_end,'day');
         print '</td></tr>';
 
+    	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	    {
+	        // Opportunity status
+	        print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+	        $code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+	        if ($code) print $langs->trans("OppStatus".$code);
+	        print '</td></tr>';
+
+	        // Opportunity Amount
+	        print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency);
+	        print '</td></tr>';
+	    }
+
         // Budget
         print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-        if ($object->budget_amount != '') print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
+        if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
         print '</td></tr>';
 
         // Description
@@ -717,7 +773,7 @@ else
 	if ($action == 'edit' && $userWrite > 0)
 	{
 	    print '<div align="center">';
-    	print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    	print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'">&nbsp; &nbsp; &nbsp;';
     	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
     	print '</div>';
 	}
@@ -849,7 +905,6 @@ else
     // Hook to add more things on page
     $parameters=array();
     $reshook=$hookmanager->executeHooks('mainCardTabAddMore',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-
 }
 
 llxFooter();
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 4e505eb0910..0bf57ebb922 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -65,7 +65,10 @@ class Project extends CommonObject
     var $budget_amount;
 
     var $statuts_short;
-    var $statuts;			// 0=draft, 1=opened, 2=closed
+    var $statuts_long;
+
+    var $statut;			// 0=draft, 1=opened, 2=closed
+    var $opp_status;		// opportunity status, into table llx_c_lead_status
 
     var $oldcopy;
 
@@ -104,7 +107,7 @@ class Project extends CommonObject
         $this->db = $db;
 
         $this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
-        $this->statuts = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+        $this->statuts_long = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
     }
 
     /**
@@ -140,10 +143,12 @@ class Project extends CommonObject
         $sql.= ", fk_soc";
         $sql.= ", fk_user_creat";
         $sql.= ", fk_statut";
+        $sql.= ", fk_opp_status";
         $sql.= ", public";
         $sql.= ", datec";
         $sql.= ", dateo";
         $sql.= ", datee";
+        $sql.= ", opp_amount";
         $sql.= ", budget_amount";
         $sql.= ", entity";
         $sql.= ") VALUES (";
@@ -152,12 +157,14 @@ class Project extends CommonObject
         $sql.= ", '" . $this->db->escape($this->description) . "'";
         $sql.= ", " . ($this->socid > 0 ? $this->socid : "null");
         $sql.= ", " . $user->id;
-        $sql.= ", ".(is_numeric($this->statuts) ? $this->statuts : '0');
+        $sql.= ", ".(is_numeric($this->statut) ? $this->statut : '0');
+        $sql.= ", ".(is_numeric($this->opp_status) ? $this->opp_status : 'NULL');
         $sql.= ", " . ($this->public ? 1 : 0);
         $sql.= ", '".$this->db->idate($now)."'";
         $sql.= ", " . ($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
         $sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
-        $sql.= ", " . ($this->budget_amount != '' ? price2num($this->budget_amount) : 'null');
+        $sql.= ", " . (strcmp($this->opp_amount,'') ? price2num($this->opp_amount) : 'null');
+        $sql.= ", " . (strcmp($this->budget_amount,'') ? price2num($this->budget_amount) : 'null');
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
@@ -229,6 +236,7 @@ class Project extends CommonObject
         // Clean parameters
         $this->title = trim($this->title);
         $this->description = trim($this->description);
+		if ($this->opp_amount < 0) $this->opp_amount='';
 
         if (dol_strlen(trim($this->ref)) > 0)
         {
@@ -240,16 +248,18 @@ class Project extends CommonObject
             $sql.= ", description = '" . $this->db->escape($this->description) . "'";
             $sql.= ", fk_soc = " . ($this->socid > 0 ? $this->socid : "null");
             $sql.= ", fk_statut = " . $this->statut;
+            $sql.= ", fk_opp_status = " . ($this->opp_status > 0 ? $this->opp_status : 'null');
             $sql.= ", public = " . ($this->public ? 1 : 0);
             $sql.= ", datec=" . ($this->date_c != '' ? "'".$this->db->idate($this->date_c)."'" : 'null');
             $sql.= ", dateo=" . ($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
             $sql.= ", datee=" . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
             $sql.= ", date_close=" . ($this->date_close != '' ? "'".$this->db->idate($this->date_close)."'" : 'null');
             $sql.= ", fk_user_close=" . ($this->fk_user_close > 0 ? $this->fk_user_close : "null");
-            $sql.= ", budget_amount = " . ($this->budget_amount > 0 ? $this->budget_amount : "null");
+            $sql.= ", opp_amount = " . (strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
+            $sql.= ", budget_amount = " . (strcmp($this->budget_amount, '')  ? price2num($this->budget_amount) : "null");
             $sql.= " WHERE rowid = " . $this->id;
 
-            dol_syslog(get_class($this)."::Update", LOG_DEBUG);
+            dol_syslog(get_class($this)."::update", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -308,13 +318,13 @@ class Project extends CommonObject
                 $this->error = $this->db->lasterror();
                 $this->errors[] = $this->error;
                 $this->db->rollback();
-                dol_syslog(get_class($this)."::Update error -2 " . $this->error, LOG_ERR);
+                dol_syslog(get_class($this)."::update error -2 " . $this->error, LOG_ERR);
                 $result = -2;
             }
         }
         else
         {
-            dol_syslog(get_class($this)."::Update ref null");
+            dol_syslog(get_class($this)."::update ref null");
             $result = -1;
         }
 
@@ -332,8 +342,8 @@ class Project extends CommonObject
     {
         if (empty($id) && empty($ref)) return -1;
 
-        $sql = "SELECT rowid, ref, title, description, public, datec, budget_amount,";
-        $sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_close, fk_statut, note_private, note_public, model_pdf";
+        $sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
+        $sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_close, fk_statut, fk_opp_status, note_private, note_public, model_pdf";
         $sql.= " FROM " . MAIN_DB_PREFIX . "projet";
         if (! empty($id))
         {
@@ -372,6 +382,8 @@ class Project extends CommonObject
                 $this->user_close_id = $obj->fk_user_close;
                 $this->public = $obj->public;
                 $this->statut = $obj->fk_statut;
+                $this->opp_status = $obj->fk_opp_status;
+                $this->opp_amount	= $obj->opp_amount;
                 $this->budget_amount	= $obj->budget_amount;
                 $this->modelpdf	= $obj->model_pdf;
 
@@ -748,6 +760,11 @@ class Project extends CommonObject
             $sql.= " AND entity = " . $conf->entity;
             $sql.= " AND fk_statut = 1";
 
+            if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+            {
+            	// TODO What to do if fk_opp_status is not code 'WIN' or 'LOST'
+            }
+
             dol_syslog(get_class($this)."::setClose", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
@@ -804,7 +821,7 @@ class Project extends CommonObject
 
         if ($mode == 0)
         {
-            return $langs->trans($this->statuts[$statut]);
+            return $langs->trans($this->statuts_long[$statut]);
         }
         if ($mode == 1)
         {
@@ -813,38 +830,38 @@ class Project extends CommonObject
         if ($mode == 2)
         {
             if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
             if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
             if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
         }
         if ($mode == 3)
         {
             if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
             if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
             if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
         }
         if ($mode == 4)
         {
             if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_long[$statut]);
             if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_long[$statut]);
             if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_long[$statut]);
         }
         if ($mode == 5)
         {
             if ($statut == 0)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
+                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
             if ($statut == 1)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
             if ($statut == 2)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
         }
     }
 
@@ -854,10 +871,11 @@ class Project extends CommonObject
      * 	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
      * 	@param	string	$option			Variant ('', 'nolink')
      * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
-     *  @param	string	$moreinpopup	Text to add into popu
+     *  @param	string	$moreinpopup	Text to add into popup
+     *  @param	string	$sep			Separator between ref and label if option addlabel is set
      * 	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='')
+    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $sep=' - ')
     {
         global $langs;
 
@@ -888,7 +906,7 @@ class Project extends CommonObject
 
         if ($withpicto) $result.=($link . img_object($label, $picto, 'class="classfortooltip"') . $linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$link . $this->ref . $linkend . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+        if ($withpicto != 2) $result.=$link . $this->ref . $linkend . (($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
         return $result;
     }
 
@@ -914,6 +932,8 @@ class Project extends CommonObject
         $this->date_m = $now;
         $this->date_start = $now;
         $this->note_public = 'SPECIMEN';
+		$this->fk_ele = 20000;
+        $this->opp_amount = 20000;
         $this->budget_amount = 10000;
 
         /*
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
new file mode 100644
index 00000000000..b33305f4558
--- /dev/null
+++ b/htdocs/projet/class/projectstats.class.php
@@ -0,0 +1,460 @@
+<?php
+/* Lead
+ * Copyright (C) 2014-2015 Florian HENRY <florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+
+
+/**
+ * Class to manage statistics on projects
+ */
+class ProjectStats extends Stats
+{
+	protected $db;
+	private $project;
+	public $userid;
+	public $socid;
+	public $year;
+	
+	function __construct($db) 
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		require_once 'project.class.php';
+		$this->project = new Project($this->db);
+	}
+
+
+	/**
+	 * Return all leads grouped by status
+	 *
+	 * @param int $limit Limit results
+	 * @return array|int
+	 * @throws Exception
+	 */
+	function getAllProjectByStatus($limit = 5)
+	{
+		global $conf, $user, $langs;
+
+		$datay = array ();
+
+		$sql = "SELECT";
+		$sql .= " count(DISTINCT t.rowid), t.fk_opp_status";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		$sql .= $this->buildWhere();
+		$sql .= " AND t.fk_statut = 1";
+		$sql .= " GROUP BY t.fk_opp_status";
+
+		$result = array ();
+		$res = array ();
+
+		dol_syslog(get_class($this) . '::' . __METHOD__ . "", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			$other = 0;
+			while ( $i < $num ) {
+				$row = $this->db->fetch_row($resql);
+				if ($i < $limit || $num == $limit)
+					$result[$i] = array (
+							$this->projet->status[$row[1]] . '(' . $row[0] . ')',
+							$row[0]
+					);
+				else
+					$other += $row[1];
+				$i ++;
+			}
+			if ($num > $limit)
+				$result[$i] = array (
+						$langs->transnoentitiesnoconv("Other"),
+						$other
+				);
+			$this->db->free($resql);
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . '::' . __METHOD__ . ' ' . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Return count, and sum of products
+	 *
+	 * @return array of values
+	 */
+	function getAllByYear()
+	{
+		global $conf, $user, $langs;
+
+		$datay = array ();
+
+		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb, SUM(t.opp_amount) as total, AVG(t.opp_amount) as avg";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
+
+		return $this->_getAllByYear($sql);
+	}
+	
+	
+	/**
+	 * Build the where part
+	 * 
+	 * @return string
+	 */
+	public function buildWhere() 
+	{
+		$sqlwhere_str = '';
+		$sqlwhere = array();
+
+		$sqlwhere[] = ' t.entity IN (' . getEntity('project') . ')';
+
+		if (! empty($this->userid))
+			$sqlwhere[] = ' t.fk_user_resp=' . $this->userid;
+		if (! empty($this->socid))
+			$sqlwhere[] = ' t.fk_soc=' . $this->socid;
+		if (! empty($this->year) && empty($this->yearmonth))
+			$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->year . "'";
+		if (! empty($this->yearmonth))
+			$sqlwhere[] = " t.datec BETWEEN '" . $this->db->idate(dol_get_first_day($this->yearmonth)) . "' AND '" . $this->db->idate(dol_get_last_day($this->yearmonth)) . "'";
+
+		if (! empty($this->status))
+			$sqlwhere[] = " t.fk_opp_status IN (" . $this->status . ")";
+
+		if (count($sqlwhere) > 0) {
+			$sqlwhere_str = ' WHERE ' . implode(' AND ', $sqlwhere);
+		}
+
+		return $sqlwhere_str;
+	}
+
+	/**
+	 * Return Project number by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array of values
+	 */
+	function getNbByMonth($year) 
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(*) as nb";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$this->yearmonth=0;
+
+		$res = $this->_getNbByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}
+
+	/**
+	 * Return the Project amount by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array with amount by month
+	 */
+	function getAmountByMonth($year) 
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount)";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+		$this->yearmonth=0;
+
+		$res = $this->_getAmountByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}
+
+
+	/**
+	 * Return amount of elements by month for several years
+	 *
+	 * @param	int		$endyear		Start year
+	 * @param	int		$startyear		End year
+	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 * @return 	array					Array of values
+	 */
+	function getWeightedAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0)
+	{
+		global $conf,$user,$langs;
+
+        if ($startyear > $endyear) return -1;
+
+        $datay=array();
+
+        // Search into cache
+        if (! empty($cachedelay))
+        {
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+        }
+
+        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache';
+        $newmask='0644';
+
+        $nowgmt = dol_now();
+
+        $foundintocache=0;
+        if ($cachedelay > 0)
+        {
+        	$filedate=dol_filemtime($newpathofdestfile);
+        	if ($filedate >= ($nowgmt - $cachedelay))
+        	{
+        		$foundintocache=1;
+
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        	}
+        	else
+        	{
+        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+        	}
+        }
+
+        // Load file into $data
+        if ($foundintocache)    // Cache file found and is not too old
+        {
+        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        }
+        else
+		{
+			$year=$startyear;
+			while($year <= $endyear)
+			{
+				$datay[$year] = $this->getWeightedAmountByMonth($year);
+				$year++;
+			}
+
+			$data = array();
+			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
+			for ($i = 0 ; $i < 12 ; $i++)
+			{
+				$data[$i][]=$datay[$endyear][$i][0];	// set label
+				$year=$startyear;
+				while($year <= $endyear)
+				{
+					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+					$year++;
+				}
+			}
+		}
+
+		// Save cache file
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
+			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			$fp = fopen($newpathofdestfile, 'w');
+			if ($fp)
+			{
+				fwrite($fp, json_encode($data));
+				fclose($fp);
+				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				@chmod($newpathofdestfile, octdec($newmask));
+			}
+			else dol_syslog("Failed to write cache file", LOG_ERR);
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+		}
+
+		return $data;
+	}
+
+
+	/**
+	 * Return the Project weighted opp amount by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array with amount by month
+	 */
+	function getWeightedAmountByMonth($year) 
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount * ".$this->db->ifsql('cls.percent IS NULL', '0', 'cls.percent')." / 100)";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t LEFT JOIN ".MAIN_DB_PREFIX.'c_lead_status as cls ON t.fk_opp_status = cls.rowid';
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+		$this->yearmonth=0;
+
+		$res = $this->_getAmountByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}
+
+	/**
+	 * Return amount of elements by month for several years
+	 *
+	 * @param int $endyear		End year
+	 * @param int $startyear	Start year
+	 * @param int $cachedelay accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 * @return array of values
+	 */
+	function getTransformRateByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
+	{
+		global $conf, $user, $langs;
+
+		if ($startyear > $endyear) return - 1;
+
+		$datay = array();
+
+		// Search into cache
+		if (! empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/json.lib.php';
+		}
+
+		$newpathofdestfile = $conf->user->dir_temp . '/' . get_class($this) . '_' . __FUNCTION__ . '_' . (empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix . '_') . $langs->defaultlang . '_user' . $user->id . '.cache';
+		$newmask = '0644';
+
+		$nowgmt = dol_now();
+
+		$foundintocache = 0;
+		if ($cachedelay > 0) {
+			$filedate = dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay)) {
+				$foundintocache = 1;
+
+				$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $filedate;
+			} else {
+				dol_syslog(get_class($this) . '::' . __FUNCTION__ . " cache file " . $newpathofdestfile . " is not found or older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . ") so we can't use it.");
+			}
+		}
+
+		// Load file into $data
+		if ($foundintocache) // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
+			$data = dol_json_decode(file_get_contents($newpathofdestfile), true);
+		} else {
+			$year = $startyear;
+			while ( $year <= $endyear ) {
+				$datay[$year] = $this->getTransformRateByMonth($year);
+				$year ++;
+			}
+
+			$data = array ();
+			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
+			for($i = 0; $i < 12; $i ++) {
+				$data[$i][] = $datay[$endyear][$i][0]; // set label
+				$year = $startyear;
+				while ( $year <= $endyear ) {
+					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
+					$year ++;
+				}
+			}
+		}
+
+		// Save cache file
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
+			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " save cache file " . $newpathofdestfile . " onto disk.");
+			if (! dol_is_dir($conf->user->dir_temp))
+				dol_mkdir($conf->user->dir_temp);
+			$fp = fopen($newpathofdestfile, 'w');
+			fwrite($fp, dol_json_encode($data));
+			fclose($fp);
+			if (! empty($conf->global->MAIN_UMASK))
+				$newmask = $conf->global->MAIN_UMASK;
+			@chmod($newpathofdestfile, octdec($newmask));
+
+			$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $nowgmt;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Return the Project transformation rate by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array with amount by month
+	 */
+	function getTransformRateByMonth($year) 
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$res_total = $this->_getNbByMonth($year, $sql);
+
+		$this->status=6;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$this->status=0;
+		$this->yearmonth=0;
+
+		$res_only_wined = $this->_getNbByMonth($year, $sql);
+
+		$res=array();
+
+		foreach($res_total as $key=>$total_row) {
+			//var_dump($total_row);
+			if (!empty($total_row[1])) {
+				$res[$key]=array($total_row[0],(100*$res_only_wined[$key][1])/$total_row[1]);
+			} else {
+				$res[$key]=array($total_row[0],0);
+			}
+
+		}
+		// var_dump($res);print '<br>';
+		return $res;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 3b2caf30ad7..5bdbc4a1820 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -499,9 +499,11 @@ class Task extends CommonObject
      *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
      *	@param	string	$option			'withproject' or ''
      *  @param	string	$mode			Mode 'task', 'time', 'contact', 'note', document' define page to link to.
+     * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
+     *  @param	string	$sep			Separator between ref and label if option addlabel is set
      *	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$option='',$mode='task')
+    function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ')
     {
         global $langs;
 
@@ -525,7 +527,7 @@ class Task extends CommonObject
 
         if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+        if ($withpicto != 2) $result.=$link.$this->ref.$linkend . (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
         return $result;
     }
 
@@ -585,12 +587,14 @@ class Task extends CommonObject
             $sql.= " WHERE p.entity = ".$conf->entity;
             $sql.= " AND t.fk_projet = p.rowid";
         }
-        if ($mode == 1)
+        elseif ($mode == 1)
         {
             $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             $sql.= " WHERE p.entity = ".$conf->entity;
         }
+        else return 'BadValueForParameterMode';
+
         if ($filteronprojuser)
         {
 			// TODO
@@ -603,7 +607,7 @@ class Task extends CommonObject
         if ($projectid) $sql.= " AND p.rowid in (".$projectid.")";
         if ($filteronprojref) $sql.= " AND p.ref LIKE '%".$filteronprojref."%'";
         if ($filteronprojstatus > -1) $sql.= " AND p.fk_statut = ".$filteronprojstatus;
-        if ($morewherefilter) $sql.=" AND (".$morewherefilter.")";
+        if ($morewherefilter) $sql.=$morewherefilter;
         $sql.= " ORDER BY p.ref, t.rang, t.dateo";
 
         //print $sql;exit;
@@ -930,7 +934,7 @@ class Task extends CommonObject
         $result=array();
 
         $sql = "SELECT";
-        $sql.= " SUM(t.task_duration / 3600 * thm) as amount";
+        $sql.= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql.= " WHERE t.fk_task = ".$id;
         if (is_object($fuser) && $fuser->id > 0)
@@ -947,6 +951,7 @@ class Task extends CommonObject
 			$datefieldname="task_datehour";
 			$sql.=" AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
+		//print $sql;
 
         dol_syslog(get_class($this)."::getSumOfAmount", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -955,6 +960,7 @@ class Task extends CommonObject
             $obj = $this->db->fetch_object($resql);
 
             $result['amount'] = $obj->amount;
+            $result['nblinesnull'] = $obj->nblinesnull;
 
             $this->db->free($resql);
             return $result;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 9c3d5e61364..dc68dd973c5 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010      Regis Houssin       <regis.houssin@capnetworks.com>
- * Copyright (C) 2012-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2015 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -183,7 +183,7 @@ if ($id > 0 || ! empty($ref))
 	else print $langs->trans('PrivateProject');
 	print '</td></tr>';
 
-	// Statut
+	// Status
 	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
 	// Date start
@@ -196,6 +196,22 @@ if ($id > 0 || ! empty($ref))
 	print dol_print_date($object->date_end,'day');
 	print '</td></tr>';
 
+	// Opportunity status
+	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+	if ($code) print $langs->trans("OppStatus".$code);
+	print '</td></tr>';
+
+	// Opportunity Amount
+	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+	if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency);
+	print '</td></tr>';
+
+	// Budget
+	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+	if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
+	print '</td></tr>';
+
 	print "</table>";
 
 	print '</div>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index a9089673ae6..c37f206850a 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -157,6 +157,22 @@ print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
 print dol_print_date($object->date_end,'day');
 print '</td></tr>';
 
+// Opportunity status
+print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+if ($code) print $langs->trans("OppStatus".$code);
+print '</td></tr>';
+
+// Opportunity Amount
+print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency);
+print '</td></tr>';
+
+// Budget
+print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
+print '</td></tr>';
+
 print '</table>';
 
 dol_fiche_end();
@@ -293,7 +309,187 @@ if ($action=="addelement")
 
 $elementuser = new User($db);
 
+
+
 $showdatefilter=0;
+// Show the filter on date on top of element list
+if (! $showdatefilter)
+{
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
+	print '<input type="hidden" name="tablename" value="'.$tablename.'">';
+	print '<input type="hidden" name="action" value="view">';
+	print '<table><tr>';
+	print '<td>'.$langs->trans("From").' ';
+	print $form->select_date($dates,'dates',0,0,1,'',1,0,1);
+	print '</td>';
+	print '<td>'.$langs->trans("to").' ';
+	print $form->select_date($datee,'datee',0,0,1,'',1,0,1);
+	print '</td>';
+	print '<td>';
+	print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';
+	print '</td>';
+	print '</tr></table>';
+	print '</form>';
+
+	$showdatefilter++;
+}
+
+
+
+// Show balance for whole project
+
+$langs->load("suppliers");
+$langs->load("bills");
+$langs->load("orders");
+$langs->load("proposals");
+$langs->load("margins");
+
+//print load_fiche_titre($langs->trans("Profit"),'','title_accountancy');
+print '<div class="center">'.img_picto("", "title_accountancy").' '.$langs->trans("Profit").'</div><br>';
+
+print '<table class="noborder">';
+print '<tr class="liste_titre">';
+print '<td align="left" width="200">'.$langs->trans("Element").'</td>';
+print '<td align="right" width="100">'.$langs->trans("Number").'</td>';
+print '<td align="right" width="100">'.$langs->trans("AmountHT").'</td>';
+print '<td align="right" width="100">'.$langs->trans("AmountTTC").'</td>';
+print '</tr>';
+
+$var = false;
+
+foreach ($listofreferent as $key => $value)
+{
+	$name=$langs->trans($value['name']);
+	$title=$value['title'];
+	$classname=$value['class'];
+	$tablename=$value['table'];
+	$datefieldname=$value['datefieldname'];
+	$qualified=$value['test'];
+	$margin = $value['margin'];
+	if ($qualified && isset($margin))		// If this element must be included into profit calculation ($margin is 'minus' or 'plus')
+	{
+		$element = new $classname($db);
+
+		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
+		if (count($elementarray)>0 && is_array($elementarray))
+		{
+			$total_ht = 0;
+			$total_ttc = 0;
+
+			$num=count($elementarray);
+			for ($i = 0; $i < $num; $i++)
+			{
+				$tmp=explode('_',$elementarray[$i]);
+				$idofelement=$tmp[0];
+				$idofelementuser=$tmp[1];
+
+				$element->fetch($idofelement);
+				if ($idofelementuser) $elementuser->fetch($idofelementuser);
+
+				if ($tablename != 'expensereport_det') $element->fetch_thirdparty();
+
+				if ($tablename == 'don') $total_ht_by_line=$element->amount;
+				elseif ($tablename == 'projet_task')
+				{
+					if ($idofelementuser)
+					{
+						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
+						$total_ht_by_line = price2num($tmp['amount'],'MT');
+					}
+					else
+					{
+						$tmp = $element->getSumOfAmount('', $dates, $datee);
+						$total_ht_by_line = price2num($tmp['amount'],'MT');
+					}
+				}
+				else $total_ht_by_line=$element->total_ht;
+
+				$total_ht = $total_ht + $total_ht_by_line;
+
+				if ($tablename == 'don') $total_ttc_by_line=$element->amount;
+				elseif ($tablename == 'projet_task')
+				{
+					$defaultvat = get_default_tva($mysoc, $mysoc);
+					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)),'MT');
+				}
+				else $total_ttc_by_line=$element->total_ttc;
+
+				$total_ttc = $total_ttc + $total_ttc_by_line;
+			}
+
+			// Calculate margin
+			if ($margin=="add")
+			{
+				$balance_ht+= $total_ht;
+				$balance_ttc+= $total_ttc;
+			}
+			else
+			{
+				$balance_ht-= $total_ht;
+				$balance_ttc-= $total_ttc;
+			}
+
+			// Show $total_ht & $total_ttc -- add a minus when necessary
+			if ($margin!="add")
+			{
+				$total_ht = -$total_ht;
+				$total_ttc = -$total_ttc;
+			}
+
+			switch ($classname) {
+				case 'FactureFournisseur':
+					$newclassname = 'SupplierInvoice';
+					break;
+				case 'Facture':
+					$newclassname = 'Bill';
+					break;
+				case 'Propal':
+					$newclassname = 'CommercialProposal';
+					break;
+				case 'Commande':
+					$newclassname = 'Order';
+					break;
+				case 'Expedition':
+					$newclassname = 'Sending';
+					break;
+				case 'Contrat':
+					$newclassname = 'Contract';
+					break;
+				default:
+					$newclassname = $classname;
+			}
+
+			$var = ! $var;
+			print '<tr '.$bc[$var].'>';
+			// Module
+			print '<td align="left">'.$langs->trans($newclassname).'</td>';
+			// Nb
+			print '<td align="right">'.$i.'</td>';
+			// Amount HT
+			print '<td align="right">'.price($total_ht).'</td>';
+			// Amount TTC
+			print '<td align="right">'.price($total_ttc).'</td>';
+			print '</tr>';
+		}
+	}
+}
+// and the final balance
+print '<tr class="liste_total">';
+print '<td align="right" colspan=2 >'.$langs->trans("Total").'</td>';
+print '<td align="right" >'.price($balance_ht).'</td>';
+print '<td align="right" >'.price($balance_ttc).'</td>';
+print '</tr>';
+
+print "</table>";
+
+
+
+print '<br><br>';
+print '<br>';
+
+
+
+// Detail
 foreach ($listofreferent as $key => $value)
 {
 	$title=$value['title'];
@@ -307,53 +503,35 @@ foreach ($listofreferent as $key => $value)
 		// If we want the project task array to have details of users
 		//if ($key == 'project_task') $key = 'project_task_time';
 
-
 		$element = new $classname($db);
 
-		// Show the filter on date on top of element list
-		if (! $showdatefilter)
-		{
-			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
-			print '<input type="hidden" name="tablename" value="'.$tablename.'">';
-			print '<input type="hidden" name="action" value="view">';
-			print '<table><tr>';
-			print '<td>'.$langs->trans("From").' ';
-			print $form->select_date($dates,'dates',0,0,1);
-			print '</td>';
-			print '<td>'.$langs->trans("to").' ';
-			print $form->select_date($datee,'datee',0,0,1);
-			print '</td>';
-			print '<td>';
-			print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';
-			print '</td>';
-			print '</tr></table>';
-			print '</form><br>';
+		$addform='';
 
-			$showdatefilter++;
-		}
+		$idtofilterthirdparty=0;
+		if (! in_array($tablename, array('facture_fourn', 'commande_fourn'))) $idtofilterthirdparty=$object->thirdparty->id;
 
-		print '<br>';
-
-		print_titre($langs->trans($title));
-
-		$selectList=$formproject->select_element($tablename,$object->thirdparty->id);
+		$selectList=$formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth200');
 		if (! $selectList || ($selectList<0))
 		{
 			setEventMessages($formproject->error,$formproject->errors,'errors');
 		}
 		elseif($selectList)
 		{
-			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
-			print '<input type="hidden" name="tablename" value="'.$tablename.'">';
-			print '<input type="hidden" name="action" value="addelement">';
-			print '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates,'dayhourrfc').'">';
-			print '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee,'dayhourrfc').'">';
-			print '<table><tr><td>'.$langs->trans("SelectElement").'</td>';
-			print '<td>'.$selectList.'</td>';
-			print '<td><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("AddElement")).'"></td>';
-			print '</tr></table>';
-			print '</form>';
+			// Define form with the combo list of elements to link
+			$addform.='<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
+			$addform.='<input type="hidden" name="tablename" value="'.$tablename.'">';
+			$addform.='<input type="hidden" name="action" value="addelement">';
+			$addform.='<input type="hidden" name="datesrfc" value="'.dol_print_date($dates,'dayhourrfc').'">';
+			$addform.='<input type="hidden" name="dateerfc" value="'.dol_print_date($datee,'dayhourrfc').'">';
+			$addform.='<table><tr><td>'.$langs->trans("SelectElement").'</td>';
+			$addform.='<td>'.$selectList.'</td>';
+			$addform.='<td><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("AddElement")).'"></td>';
+			$addform.='</tr></table>';
+			$addform.='</form>';
 		}
+
+		print_fiche_titre($langs->trans($title), $addform, '');
+
 		print '<table class="noborder" width="100%">';
 
 		print '<tr class="liste_titre">';
@@ -463,7 +641,11 @@ foreach ($listofreferent as $key => $value)
 				}
 				else
 				{
-					if ($element instanceof Task) print $element->getNomUrl(1,'withproject','time');
+					if ($element instanceof Task)
+					{
+						print $element->getNomUrl(1,'withproject','time');
+						print ' - '.dol_trunc($element->label, 48);
+					}
 					else print $element->getNomUrl(1);
 
 					$element_doc = $element->element;
@@ -522,13 +704,19 @@ foreach ($listofreferent as $key => $value)
 				print '</td>';
 
                 // Amount without tax
+				$warning='';
 				if (empty($value['disableamount']))
 				{
 					if ($tablename == 'don') $total_ht_by_line=$element->amount;
 					elseif ($tablename == 'projet_task')
 					{
-						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
+						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);	// $element is a task. $elementuser may be empty
 						$total_ht_by_line = price2num($tmp['amount'],'MT');
+						if ($tmp['nblinesnull'] > 0)
+						{
+							$langs->load("errors");
+							$warning=$langs->trans("WarningSomeLinesWithNullHourlyRate");
+						}
 					}
 					else
 					{
@@ -538,6 +726,7 @@ foreach ($listofreferent as $key => $value)
 					if (! $qualifiedfortotal) print '<strike>';
 					print (isset($total_ht_by_line)?price($total_ht_by_line):'&nbsp;');
 					if (! $qualifiedfortotal) print '</strike>';
+					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
 				}
 				else print '<td></td>';
@@ -559,13 +748,18 @@ foreach ($listofreferent as $key => $value)
 					if (! $qualifiedfortotal) print '<strike>';
 					print (isset($total_ttc_by_line)?price($total_ttc_by_line):'&nbsp;');
 					if (! $qualifiedfortotal) print '</strike>';
+					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
 				}
 				else print '<td></td>';
 
 				// Status
 				print '<td align="right">';
-				if ($element instanceof CommonInvoice)
+				if ($tablename == 'expensereport_det')
+				{
+					print $expensereport->getLibStatut(5);
+				}
+				else if ($element instanceof CommonInvoice)
 				{
 					//This applies for Facture and FactureFournisseur
 					print $element->getLibStatut(5, $element->getSommePaiement());
@@ -633,191 +827,22 @@ foreach ($listofreferent as $key => $value)
 			print $elementarray;
 		}
 		print "</table>";
-
-
-		/*
-		 * Barre d'action
-		 */
-		print '<div class="tabsAction">';
-
-		if ($object->statut > 0)
-		{
-			if ($object->thirdparty->prospect || $object->thirdparty->client)
-			{
-				if ($key == 'propal' && ! empty($conf->propal->enabled) && $user->rights->propale->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$object->thirdparty->id.'&amp;action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'">'.$langs->trans("AddProp").'</a>';
-				}
-				if ($key == 'order' && ! empty($conf->commande->enabled) && $user->rights->commande->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->thirdparty->id.'&amp;action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'">'.$langs->trans("AddCustomerOrder").'</a>';
-				}
-				if ($key == 'invoice' && ! empty($conf->facture->enabled) && $user->rights->facture->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?socid='.$object->thirdparty->id.'&amp;action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'">'.$langs->trans("AddCustomerInvoice").'</a>';
-				}
-			}
-			if ($object->thirdparty->fournisseur)
-			{
-				if ($key == 'order_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?socid='.$project->thirdparty->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierOrder").'</a>';
-				}
-				if ($key == 'invoice_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?socid='.$project->thirdparty->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierInvoice").'</a>';
-				}
-			}
-		}
-
-		print '</div>';
+		print "<br>\n";
 	}
 }
 
-
-// Show profit summary for whole project
-
-$langs->load("suppliers");
-$langs->load("bills");
-$langs->load("orders");
-$langs->load("proposals");
-$langs->load("margins");
-
-//print load_fiche_titre($langs->trans("Profit"),'','title_accountancy');
-print '<br><div class="center">'.img_picto("", "title_accountancy").' '.$langs->trans("Profit").'</div><br>';
-
-print '<table class="noborder">';
-print '<tr class="liste_titre">';
-print '<td align="left" width="200">'.$langs->trans("Element").'</td>';
-print '<td align="right" width="100">'.$langs->trans("Number").'</td>';
-print '<td align="right" width="100">'.$langs->trans("AmountHT").'</td>';
-print '<td align="right" width="100">'.$langs->trans("AmountTTC").'</td>';
-print '</tr>';
-
-foreach ($listofreferent as $key => $value)
+// Enhance with select2
+$nodatarole='';
+if ($conf->use_javascript_ajax)
 {
-	$name=$langs->trans($value['name']);
-	$title=$value['title'];
-	$classname=$value['class'];
-	$tablename=$value['table'];
-	$datefieldname=$value['datefieldname'];
-	$qualified=$value['test'];
-	$margin = $value['margin'];
-	if ($qualified && isset($margin))		// If this element must be included into profit calculation ($margin is 'minus' or 'plus')
-	{
-		$element = new $classname($db);
+	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+	$comboenhancement = ajax_combobox('.elementselect');
+	$out.=$comboenhancement;
+	$nodatarole=($comboenhancement?' data-role="none"':'');
 
-		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
-		if (count($elementarray)>0 && is_array($elementarray))
-		{
-			$var=true;
-			$total_ht = 0;
-			$total_ttc = 0;
-
-			$num=count($elementarray);
-			for ($i = 0; $i < $num; $i++)
-			{
-				$tmp=explode('_',$elementarray[$i]);
-				$idofelement=$tmp[0];
-				$idofelementuser=$tmp[1];
-
-				$element->fetch($idofelement);
-				if ($idofelementuser) $elementuser->fetch($idofelementuser);
-
-				if ($tablename != 'expensereport_det') $element->fetch_thirdparty();
-
-				if ($tablename == 'don') $total_ht_by_line=$element->amount;
-				elseif ($tablename == 'projet_task')
-				{
-					if ($idofelementuser)
-					{
-						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
-						$total_ht_by_line = price2num($tmp['amount'],'MT');
-					}
-					else
-					{
-						$tmp = $element->getSumOfAmount('', $dates, $datee);
-						$total_ht_by_line = price2num($tmp['amount'],'MT');
-					}
-				}
-				else $total_ht_by_line=$element->total_ht;
-
-				$total_ht = $total_ht + $total_ht_by_line;
-
-				if ($tablename == 'don') $total_ttc_by_line=$element->amount;
-				elseif ($tablename == 'projet_task')
-				{
-					$defaultvat = get_default_tva($mysoc, $mysoc);
-					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)),'MT');
-				}
-				else $total_ttc_by_line=$element->total_ttc;
-
-				$total_ttc = $total_ttc + $total_ttc_by_line;
-			}
-
-			// Calculate margin
-			if ($margin=="add")
-			{
-				$margin_ht+= $total_ht;
-				$margin_ttc+= $total_ttc;
-			}
-			else
-			{
-				$margin_ht-= $total_ht;
-				$margin_ttc-= $total_ttc;
-			}
-
-			// Show $total_ht & $total_ttc -- add a minus when necessary
-			if ($margin!="add")
-			{
-				$total_ht = -$total_ht;
-				$total_ttc = -$total_ttc;
-			}
-
-			switch ($classname) {
-				case 'FactureFournisseur':
-					$newclassname = 'SupplierInvoice';
-					break;
-				case 'Facture':
-					$newclassname = 'Bill';
-					break;
-				case 'Propal':
-					$newclassname = 'CommercialProposal';
-					break;
-				case 'Commande':
-					$newclassname = 'Order';
-					break;
-				case 'Expedition':
-					$newclassname = 'Sending';
-					break;
-				case 'Contrat':
-					$newclassname = 'Contract';
-					break;
-				default:
-					$newclassname = $classname;
-			}
-
-			print '<tr>';
-			// Module
-			print '<td align="left">'.$langs->trans($newclassname).'</td>';
-			// Nb
-			print '<td align="right">'.$i.'</td>';
-			// Amount HT
-			print '<td align="right">'.price($total_ht).'</td>';
-			// Amount TTC
-			print '<td align="right">'.price($total_ttc).'</td>';
-			print '</tr>';
-		}
-	}
+	print $comboenhancement;
 }
-// and the margin amount total
-print '<tr class="liste_total">';
-print '<td align="right" colspan=2 >'.$langs->trans("Total").'</td>';
-print '<td align="right" >'.price($margin_ht).'</td>';
-print '<td align="right" >'.price($margin_ttc).'</td>';
-print '</tr>';
 
-print "</table>";
 
 
 llxFooter();
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 6528b5bfe3e..2625b1f8503 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $socstatic=new Societe($db);
 $projectstatic=new Project($db);
 $userstatic=new User($db);
-$tasktmp=new Task($db);
+$form=new Form($db);
 
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:(empty($user->rights->projet->all->lire)?0:2)),1);
 //var_dump($projectsListId);
@@ -73,6 +73,28 @@ else
 }
 
 
+// Get list of ponderated percent for each status
+$listofoppstatus=array(); $listofopplabel=array(); $listofoppcode=array();
+$sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
+$sql.= " FROM ".MAIN_DB_PREFIX."c_lead_status as cls";
+$resql = $db->query($sql);
+if ( $resql )
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($resql);
+		$listofoppstatus[$objp->rowid]=$objp->percent;
+		$listofopplabel[$objp->rowid]=$objp->label;
+		$listofoppcode[$objp->rowid]=$objp->code;
+		$i++;
+	}
+}
+else dol_print_error($db);
+
+
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
@@ -94,7 +116,99 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
 	print "<br>\n";
 }
 
-print_projecttasks_array($db,$socid,$projectsListId,0,0);
+
+/*
+ * Statistics
+ */
+
+if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+{
+	$sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, p.fk_opp_status as opp_status";
+	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql.= " WHERE p.entity = ".$conf->entity;
+	$sql.= " AND p.fk_statut = 1";
+	if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";
+	if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	$sql.= " GROUP BY p.fk_opp_status";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+	    $num = $db->num_rows($resql);
+	    $i = 0;
+
+	    $totalnb=0;
+	    $totalamount=0;
+	    $ponderated_opp_amount=0;
+	    $valsnb=array();
+	    $valsamount=array();
+	    $dataseries=array();
+	    // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
+	    while ($i < $num)
+	    {
+	        $obj = $db->fetch_object($resql);
+	        if ($obj)
+	        {
+	            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+	            {
+	                $valsnb[$obj->opp_status]=$obj->nb;
+	                $valsamount[$obj->opp_status]=$obj->opp_amount;
+	                $totalnb+=$obj->nb;
+	                $totalamount+=$obj->opp_amount;
+	                $ponderated_opp_amount = $ponderated_opp_amount + price2num($listofoppstatus[$obj->opp_status] * $obj->opp_amount / 100);
+	            }
+	            $total+=$row[0];
+	        }
+	        $i++;
+	    }
+	    $db->free($resql);
+
+	    print '<table class="noborder nohover" width="100%">';
+	    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</td></tr>'."\n";
+	    $var=true;
+	    $listofstatus=array_keys($listofoppstatus);
+	    foreach ($listofstatus as $status)
+	    {
+	    	$labelstatus = '';
+
+			$code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code');
+	        if ($code) $labelstatus = $langs->trans("OppStatus".$code);
+	        if (empty($labelstatus)) $labelstatus=$listofopplabel[$status];
+
+	        //$labelstatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
+	        $labelstatus .= ' - '.price2num($listofoppstatus[$status]).'%';
+
+	        $dataseries[]=array('label'=>$labelstatus,'data'=>(isset($valsamount[$status])?(float) $valsamount[$status]:0));
+	        if (! $conf->use_javascript_ajax)
+	        {
+	            $var=!$var;
+	            print "<tr ".$bc[$var].">";
+	            print '<td>'.$labelstatus.'</td>';
+	            print '<td align="right"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
+	            print "</tr>\n";
+	        }
+	    }
+	    if ($conf->use_javascript_ajax)
+	    {
+	        print '<tr class="impair"><td align="center" colspan="2">';
+	        $data=array('series'=>$dataseries);
+	        dol_print_graph('stats',400,180,$data,1,'pie',0,'');
+	        print '</td></tr>';
+	    }
+	    //if ($totalinprocess != $total)
+	    //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td align="right">'.$totalinprocess.'</td></tr>';
+	    print '<tr class="liste_total"><td>'.$langs->trans("OpportunityTotalAmount").'</td><td align="right">'.price($totalamount, 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
+	    print '<tr class="liste_total"><td>'.$langs->trans("OpportunityPonderatedAmount").'</td><td align="right">'.price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
+	    print "</table><br>";
+	}
+	else
+	{
+	    dol_print_error($db);
+	}
+}
+
+
+// List of draft projects
+print_projecttasks_array($db,$form,$socid,$projectsListId,0,0,$listofoppstatus);
 
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
@@ -102,15 +216,16 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("ThirdParties"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("OpenedProjectsByThirdparties"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right"',$sortfield,$sortorder);
 print "</tr>\n";
 
-$sql = "SELECT count(p.rowid) as nb";
+$sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
 $sql.= ", s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql.= " WHERE p.entity = ".$conf->entity;
+$sql.= " AND p.fk_statut = 1";
 if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";
 if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 $sql.= " GROUP BY s.nom, s.rowid";
@@ -139,7 +254,7 @@ if ( $resql )
 			print $langs->trans("OthersNotLinkedToThirdParty");
 		}
 		print '</td>';
-		print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/list.php?socid='.$obj->socid.'">'.$obj->nb.'</a></td>';
+		print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/list.php?socid='.$obj->socid.'&search_status=1">'.$obj->nb.'</a></td>';
 		print "</tr>\n";
 
 		$i++;
@@ -154,133 +269,16 @@ else
 print "</table>";
 
 
+print '<br>';
+
+
+print_projecttasks_array($db,$form,$socid,$projectsListId,0,1,$listofoppstatus);
+
+
+
 print '</div></div></div>';
 
 
-if (empty($conf->global->PROJECT_HIDE_TASKS))
-{
-	// Tasks for all resources of all opened projects and time spent for each task/resource
-	print '<div class="fichecenter">';
-
-	$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
-
-	$sql = "SELECT p.ref, p.title, p.rowid as projectid, t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
-	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tasktime on tasktime.fk_task = t.rowid";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid";
-	$sql.= " WHERE p.entity = ".$conf->entity;
-	if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-	$sql.= " AND p.fk_statut=1";
-	$sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
-	$sql.= " ORDER BY t.dateo desc, t.rowid desc, t.datee";
-	$sql.= $db->plimit($max+1);	// We want more to know if we have more than limit
-
-	$var=true;
-
-	dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG);
-	$resql = $db->query($sql);
-	if ( $resql )
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		print '<br>';
-
-		print_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'<br>';
-
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		//print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
-		print '<th>'.$langs->trans('Projects').'</th>';
-		print '<th>'.$langs->trans('Task').'</th>';
-		print '<th>'.$langs->trans('DateStart').'</th>';
-		print '<th>'.$langs->trans('DateEnd').'</th>';
-		print '<th align="right">'.$langs->trans('PlannedWorkload').'</th>';
-		print '<th align="right">'.$langs->trans("ProgressDeclared").'</td>';
-		print '<th align="right">'.$langs->trans('TimeSpent').'</th>';
-		print '<th align="right">'.$langs->trans("ProgressCalculated").'</td>';
-		print '</tr>';
-
-		while ($i < $num && $i < $max)
-		{
-			$obj = $db->fetch_object($resql);
-			$var=!$var;
-
-			$username='';
-			if ($obj->userid && $userstatic->id != $obj->userid)	// We have a user and it is not last loaded user
-			{
-				$result=$userstatic->fetch($obj->userid);
-				if (! $result) $userstatic->id=0;
-			}
-			if ($userstatic->id) $username = $userstatic->getNomUrl(0,0);
-
-			print "<tr ".$bc[$var].">";
-			//print '<td>'.$username.'</td>';
-			print '<td>';
-			$projectstatic->id=$obj->projectid;
-			$projectstatic->ref=$obj->ref;
-			$projectstatic->title=$obj->title;
-			print $projectstatic->getNomUrl(1,'',16);
-			//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$obj->projectid.'">'.$obj->title.'</a>';
-			print '</td>';
-			print '<td>';
-			if (! empty($obj->taskid))
-			{
-				$tasktmp->id = $obj->taskid;
-				$tasktmp->ref = $obj->label;
-				print $tasktmp->getNomUrl(1,'withproject');
-			}
-			else print $langs->trans("NoTasks");
-			print '</td>';
-			print '<td>'.dol_print_date($db->jdate($obj->dateo),'day').'</td>';
-			print '<td>'.dol_print_date($db->jdate($obj->datee),'day').'</td>';
-			print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
-			print convertSecondToTime($obj->planned_workload, 'all');
-			print '</a></td>';
-			print '<td align="right">';
-			print ($obj->taskid>0)?$obj->progress.'%':'';
-			print '</td>';
-			print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
-			print convertSecondToTime($obj->timespent, 'all');
-			print '</a></td>';
-			print '<td align="right">';
-			if (! empty($obj->taskid))
-			{
-				if (empty($obj->planned_workload) > 0) {
-					$percentcompletion = $langs->trans("WorkloadNotDefined");
-				} else {
-					$percentcompletion = intval($obj->duration_effective*100/$obj->planned_workload).'%';
-				}
-			}
-			print $percentcompletion;
-			print '</td>';
-			print "</tr>\n";
-
-			$i++;
-		}
-
-		if ($num > $max)
-		{
-			print '<tr><td colspan="6">'.$langs->trans("WarningTooManyDataPleaseUseMoreFilters").'</td></tr>';
-		}
-
-		print "</table>";
-
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	print '</div>';
-}
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 704b5413b4f..3ae7bfcb71c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -30,6 +30,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
 $langs->load('projects');
 
@@ -61,12 +62,14 @@ $pagenext = $page + 1;
 
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 
+$search_all=GETPOST("search_all");
 $search_ref=GETPOST("search_ref");
 $search_label=GETPOST("search_label");
 $search_societe=GETPOST("search_societe");
 $search_year=GETPOST("search_year");
 $search_all=GETPOST("search_all");
 $search_status=GETPOST("search_status",'int');
+$search_opp_status=GETPOST("search_opp_status",'int');
 $search_public=GETPOST("search_public",'int');
 $search_user=GETPOST('search_user','int');
 $search_sale=GETPOST('search_sale','int');
@@ -83,12 +86,13 @@ if ($search_status == '') $search_status=-1;	// -1 or 1
 // Purge criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
+	$search_all='';
 	$search_ref="";
 	$search_label="";
 	$search_societe="";
 	$search_year="";
-	$search_all=0;
 	$search_status=-1;
+	$search_opp_status=-1;
 	$search_public="";
 	$search_sale="";
 	$search_user='';
@@ -102,7 +106,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('projectlist'));
-
+$extrafields = new ExtraFields($db);
 
 
 
@@ -114,17 +118,26 @@ $projectstatic = new Project($db);
 $socstatic = new Societe($db);
 $form = new Form($db);
 $formother = new FormOther($db);
+$formproject = new FormProjets($db);
 
 llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
 
 
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:($user->rights->projet->all->lire?2:0)),1,$socid);
 
-$sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_statut, p.public, p.fk_user_creat";
+$sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat";
 $sql.= ", p.datec as date_create, p.dateo as date_start, p.datee as date_end";
 $sql.= ", s.nom as name, s.rowid as socid";
+$sql.= ", cls.code as opp_status_code";
+// Add fields for extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
 
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -139,18 +152,9 @@ if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$pro
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-if ($search_ref)
-{
-	$sql .= natural_search('p.ref', $search_ref);
-}
-if ($search_label)
-{
-	$sql .= natural_search('p.title', $search_label);
-}
-if ($search_societe)
-{
-	$sql .= natural_search('s.nom', $search_societe);
-}
+if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
+if ($search_label) $sql .= natural_search('p.title', $search_label);
+if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 if ($smonth > 0)
 {
     if ($syear > 0 && empty($sday))
@@ -177,18 +181,16 @@ else if ($year > 0)
 {
     $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
-if ($search_all)
-{
-	$sql .= natural_search(array('p.ref','p.title','s.nom'), $search_all);
-}
+if ($search_all) $sql .= natural_search(array('p.ref','p.title','s.nom'), $search_all);
 if ($search_status >= 0) $sql .= " AND p.fk_statut = ".$db->escape($search_status);
+if ($search_opp_status > 0) $sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
 if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
-if ($search_user > 0)
-{
-	$sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='project' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
-}
-
+if ($search_user > 0) $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='project' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit+1, $offset);
@@ -205,10 +207,12 @@ if ($resql)
 	$param='';
 	if ($month)              		$param.='&month='.$month;
 	if ($year)               		$param.='&year=' .$year;
+	if ($search_all != '') 			$param.='&search_all='.$search_all;
 	if ($search_ref != '') 			$param.='&search_ref='.$search_ref;
 	if ($search_label != '') 		$param.='&search_label='.$search_label;
 	if ($search_societe != '') 		$param.='&search_societe='.$search_societe;
 	if ($search_status >= 0) 		$param.='&search_status='.$search_status;
+	if ($search_opp_status >= 0) 	$param.='&search_opp_status='.$search_opp_status;
 	if ($search_public != '') 		$param.='&search_public='.$search_public;
 	if ($search_user > 0)    		$param.='&search_user='.$search_user;
 	if ($search_sale > 0)    		$param.='&search_sale='.$search_sale;
@@ -228,28 +232,38 @@ if ($resql)
 		else print $langs->trans("ProjectsPublicDesc").'<br><br>';
 	}
 
+	if ($search_all)
+	{
+		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Label")." ".$langs->trans("or")." ".$langs->trans("ThirdParty")."): ";
+		print '<strong>'.$search_all.'</strong>';
+	}
+
 	// If the user can view prospects other than his'
 	if ($user->rights->societe->client->voir || $socid)
 	{
 		$langs->load("commercial");
+		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
-		$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.='</div>';
 	}
 	// If the user can view prospects other than his'
 
 	if (($user->rights->societe->client->voir || $socid) && !$mine)
 	{
-		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-		$moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+		$moreforfilter.='<div class="divsearchfield">';
+		$moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ': ';
+		$moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		$moreforfilter.='</div>';
 	}
 	if (! empty($moreforfilter))
 	{
 		print '<div class="liste_titre">';
 		print $moreforfilter;
     	$parameters=array();
-    	$formconfirm=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-	    print '</div>';
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	print $hookmanager->resPrint;
+    	print '</div>';
 	}
 
 
@@ -260,13 +274,19 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("SalesRepresentative"),$_SERVER["PHP_SELF"],"","",$param,"",$sortfield,$sortorder);
-	if (! empty($conf->global->PROJECT_LIST_SHOW_STARTDATE)) print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"p.dateo","",$param,'align="center"',$sortfield,$sortorder);
+	if (empty($conf->global->PROJECT_LIST_HIDE_STARTDATE)) print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"p.dateo","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"p.datee","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Visibility"),$_SERVER["PHP_SELF"],"p.public","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-    $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) 
+    {
+    	print_liste_field_titre($langs->trans("OpportunityAmountShort"),$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("OpportunityStatusShort"),$_SERVER["PHP_SELF"],'p.fk_opp_status',"",$param,'',$sortfield,$sortorder);
+    }
+	$parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -282,7 +302,7 @@ if ($resql)
 	// Sale representative
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Start date
-	if (! empty($conf->global->PROJECT_LIST_SHOW_STARTDATE))
+	if (empty($conf->global->PROJECT_LIST_HIDE_STARTDATE))
 	{
 		print '<td class="liste_titre center">';
 		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="sday" value="'.$sday.'">';
@@ -302,15 +322,27 @@ if ($resql)
     print $form->selectarray('search_public',$array,$search_public);
     print '</td>';
 
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+
+    if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+    {
+		print '<td class="liste_titre nowrap">';
+	    print '</td>';
+    	print '<td class="liste_titre nowrap">';
+		print $formproject->selectOpportunityStatus('search_opp_status',$search_opp_status,1,1);
+	    print '</td>';
+    }
+
 	print '<td class="liste_titre nowrap" align="right">';
 	print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('Draft'),'1'=>$langs->trans('Opened'),'2'=>$langs->trans('Closed')),$search_status);
-    print '</td><td width="56">';
+    print '</td>';
+    print '<td>';
     print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
     print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print '</td>';
 
-    $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
     print '</tr>'."\n";
 
 
@@ -376,6 +408,7 @@ if ($resql)
     					$userstatic->id=$val['id'];
     					$userstatic->lastname=$val['lastname'];
     					$userstatic->firstname=$val['firstname'];
+    					$userstatic->email=$val['email'];
     					print $userstatic->getNomUrl(1);
     					$j++;
     					if ($j < $nbofsalesrepresentative) print ', ';
@@ -390,10 +423,13 @@ if ($resql)
     		print '</td>';
 
     		// Date start
-    		print '<td class="center">';
-    		print dol_print_date($db->jdate($objp->date_start),'day');
-    		print '</td>';
-
+			if (empty($conf->global->PROJECT_LIST_HIDE_STARTDATE)) 
+			{
+				print '<td class="center">';
+	    		print dol_print_date($db->jdate($objp->date_start),'day');
+	    		print '</td>';
+			}
+			
     		// Date end
     		print '<td class="center">';
     		print dol_print_date($db->jdate($objp->date_end),'day');
@@ -405,12 +441,26 @@ if ($resql)
     		else print $langs->trans('PrivateProject');
     		print '</td>';
 
+        	$parameters=array('obj' => $objp);
+        	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+		    print $hookmanager->resPrint;
+
+		    if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+    		{
+    			print '<td>';
+    			if ($objp->opp_status_code) print $langs->trans("OppAmount".$objp->opp_amount);
+    			print '</td>';
+    			
+    			print '<td>';
+    			if ($objp->opp_status_code) print $langs->trans("OppStatusShort".$objp->opp_status_code);
+    			print '</td>';
+    		}
+
     		// Status
     		$projectstatic->statut = $objp->fk_statut;
-    		print '<td align="right" colspan="2">'.$projectstatic->getLibStatut(5).'</td>';
+    		print '<td align="right">'.$projectstatic->getLibStatut(5).'</td>';
 
-        	$parameters=array('obj' => $objp);
-        	$formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+    		print '<td></td>';
 
     		print "</tr>\n";
 
@@ -422,7 +472,8 @@ if ($resql)
     $db->free($resql);
 
 	$parameters=array('sql' => $sql);
-	$formconfirm=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
 	print "</table>\n";
 	print "</form>\n";
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
new file mode 100644
index 00000000000..a93d23da7bb
--- /dev/null
+++ b/htdocs/projet/stats/index.php
@@ -0,0 +1,364 @@
+<?php
+/* Copyright (C) 2014-2015 Florian HENRY       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015      Laurent Destailleur <ldestailleur@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/projectstats.class.php';
+
+// Security check
+if (! $user->rights->projet->lire)
+	accessforbidden();
+
+
+$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+
+$userid=GETPOST('userid','int');
+$socid=GETPOST('socid','int');
+// Security check
+if ($user->societe_id > 0)
+{
+	$action = '';
+	$socid = $user->societe_id;
+}
+$nowyear=strftime("%Y", dol_now());
+$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+//$startyear=$year-2;
+$startyear=$year-1;
+$endyear=$year;
+
+$langs->load('projects');
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+$includeuserlist=array();
+
+
+llxHeader('', $langs->trans('Projects'));
+
+$title=$langs->trans("ProjectsStatistics");
+$dir=$conf->projet->dir_output.'/temp';
+
+print_fiche_titre($title,'','title_project.png');
+
+dol_mkdir($dir);
+
+
+$stats_project= new ProjectStats($db);
+if (!empty($userid) && $userid!=-1) $stats_project->userid=$userid;
+if (!empty($socid)  && $socid!=-1) $stats_project->socid=$socid;
+if (!empty($year)) $stats_project->year=$year;
+
+
+
+if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+{
+	$data1 = $stats_project->getAllProjectByStatus();
+	if (!is_array($data1) && $data1<0) {
+		setEventMessages($stats_project->error, null, 'errors');
+	}
+	if (empty($data1))
+	{
+		$showpointvalue=0;
+		$nocolor=1;
+		$data1=array(array(0=>$langs->trans("None"),1=>1));
+	}
+
+	$filenamenb = $conf->project->dir_output . "/stats/projectbystatus.png";
+	$fileurlnb = DOL_URL_ROOT . '/viewimage.php?modulepart=projectstats&amp;file=projectbystatus.png';
+	$px = new DolGraph();
+	$mesg = $px->isGraphKo();
+	if (empty($mesg)) {
+		$i=0;$tot=count($data1);$legend=array();
+		while ($i <= $tot)
+		{
+			$data1[$i][0]=$data1[$i][0];	// Required to avoid error "Could not draw pie with labels contained inside canvas"
+			$legend[]=$data1[$i][0];
+			$i++;
+		}
+		$px->SetData($data1);
+		unset($data1);
+
+		if ($nocolor)
+			$px->SetDataColor(array (
+					array (
+							220,
+							220,
+							220
+					)
+			));
+			$px->SetPrecisionY(0);
+			$px->SetLegend($legend);
+			$px->setShowLegend(0);
+			$px->setShowPointValue($showpointvalue);
+			$px->setShowPercent(1);
+			$px->SetMaxValue($px->GetCeilMaxValue());
+			$px->SetWidth(300);
+			$px->SetHeight(300);
+			$px->SetShading(3);
+			$px->SetHorizTickIncrement(1);
+			$px->SetCssPrefix("cssboxes");
+			$px->SetType(array (
+					'pie'
+			));
+			$px->SetTitle($langs->trans('ProjectOpenedProjectByOppStatus'));
+			$result=$px->draw($filenamenb, $fileurlnb);
+			if ($result<0) {
+				setEventMessages($px->error, null, 'errors');
+			}
+	} else {
+		setEventMessages(null, $mesgs, 'errors');
+	}
+}
+
+
+// Build graphic number of object
+// $data = array(array('Lib',val1,val2,val3),...)
+$data = $stats_project->getNbByMonthWithPrevYear($endyear,$startyear);
+//var_dump($data);
+
+$filenamenb = $conf->project->dir_output . "/stats/projectnbprevyear-".$year.".png";
+$fileurlnb = DOL_URL_ROOT . '/viewimage.php?modulepart=projectstats&amp;file=projectnbprevyear-'.$year.'.png';
+
+$px1 = new DolGraph();
+$mesg = $px1->isGraphKo();
+if (! $mesg)
+{
+	$px1->SetData($data);
+	$px1->SetPrecisionY(0);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear)
+	{
+		$legend[]=$i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("ProjectNbProject"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->SetPrecisionY(0);
+	$px1->mode='depth';
+	$px1->SetTitle($langs->trans("ProjectNbProjectByMonth"));
+
+	$px1->draw($filenamenb,$fileurlnb);
+}
+
+
+if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+{
+	// Build graphic amount of object
+	$data = $stats_project->getAmountByMonthWithPrevYear($endyear,$startyear);
+	//var_dump($data);
+	// $data = array(array('Lib',val1,val2,val3),...)
+
+	$filenamenb = $conf->project->dir_output . "/stats/projectamountprevyear-".$year.".png";
+	$fileurlnb = DOL_URL_ROOT . '/viewimage.php?modulepart=projectstats&amp;file=projectamountprevyear-'.$year.'.png';
+
+	$px2 = new DolGraph();
+	$mesg = $px2->isGraphKo();
+	if (! $mesg)
+	{
+		$px2->SetData($data);
+		$i=$startyear;$legend=array();
+		while ($i <= $endyear)
+		{
+			$legend[]=$i;
+			$i++;
+		}
+		$px2->SetLegend($legend);
+		$px2->SetMaxValue($px2->GetCeilMaxValue());
+		$px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
+		$px2->SetWidth($WIDTH);
+		$px2->SetHeight($HEIGHT);
+		$px2->SetYLabel($langs->trans("ProjectOppAmountOfProjectsByMonth"));
+		$px2->SetShading(3);
+		$px2->SetHorizTickIncrement(1);
+		$px2->SetPrecisionY(0);
+		$px2->mode='depth';
+		$px2->SetTitle($langs->trans("ProjectOppAmountOfProjectsByMonth"));
+
+		$px2->draw($filenamenb,$fileurlnb);
+	}
+}
+
+if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+{
+	// Build graphic with transformation rate
+	$data = $stats_project->getWeightedAmountByMonthWithPrevYear($endyear,$startyear);
+	//var_dump($data);
+	// $data = array(array('Lib',val1,val2,val3),...)
+
+	$filenamenb = $conf->project->dir_output . "/stats/projecttransrateprevyear-".$year.".png";
+	$fileurlnb = DOL_URL_ROOT . '/viewimage.php?modulepart=projectstats&amp;file=projecttransrateprevyear-'.$year.'.png';
+
+	$px3 = new DolGraph();
+	$mesg = $px3->isGraphKo();
+	if (! $mesg)
+	{
+		$px3->SetData($data);
+		$i=$startyear;$legend=array();
+		while ($i <= $endyear)
+		{
+			$legend[]=$i;
+			$i++;
+		}
+		$px3->SetLegend($legend);
+		$px3->SetMaxValue($px3->GetCeilMaxValue());
+		$px3->SetMinValue(min(0,$px3->GetFloorMinValue()));
+		$px3->SetWidth($WIDTH);
+		$px3->SetHeight($HEIGHT);
+		$px3->SetYLabel($langs->trans("ProjectWeightedOppAmountOfProjectsByMonth"));
+		$px3->SetShading(3);
+		$px3->SetHorizTickIncrement(1);
+		$px3->SetPrecisionY(0);
+		$px3->mode='depth';
+		$px3->SetTitle($langs->trans("ProjectWeightedOppAmountOfProjectsByMonth"));
+
+		$px3->draw($filenamenb,$fileurlnb);
+	}
+}
+
+
+// Show array
+$stats_project->year=0;
+$data_all_year = $stats_project->getAllByYear();
+if (!empty($year)) $stats_project->year=$year;
+$arrayyears=array();
+foreach($data_all_year as $val) {
+	$arrayyears[$val['year']]=$val['year'];
+}
+if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+
+
+$h=0;
+$head = array();
+$head[$h][0] = DOL_URL_ROOT . '/projet/stats/index.php?mode='.$mode;
+$head[$h][1] = $langs->trans("ByMonthYear");
+$head[$h][2] = 'byyear';
+$h++;
+
+complete_head_from_modules($conf,$langs,null,$head,$h,$type);
+
+dol_fiche_head($head,'byyear',$langs->trans("Statistics"), 0, '');
+
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<table class="border" width="100%">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+if ($mode == 'customer') $filter='s.client in (1,2,3)';
+if ($mode == 'supplier') $filter='s.fournisseur = 1';
+print $form->select_company($socid,'socid',$filter,1);
+print '</td></tr>';
+// User
+/*print '<tr><td>'.$langs->trans("ProjectCommercial").'</td><td>';
+print $form->select_dolusers($userid, 'userid', 1, array(),0,$includeuserlist);
+print '</td></tr>';*/
+// Year
+print '<tr><td>'.$langs->trans("Year").'</td><td>';
+if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+arsort($arrayyears);
+print $form->selectarray('year',$arrayyears,$year,0);
+print '</td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
+
+print '<table class="border" width="100%">';
+print '<tr height="24">';
+print '<td align="center">'.$langs->trans("Year").'</td>';
+print '<td align="center">'.$langs->trans("NbOfProjects").'</td>';
+if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+{
+	print '<td align="center">'.$langs->trans("AmountTotal").'</td>';
+	print '<td align="center">'.$langs->trans("AmountAverage").'</td>';
+}
+print '</tr>';
+
+$oldyear=0;
+foreach ($data_all_year as $val)
+{
+	$year = $val['year'];
+	while ($year && $oldyear > $year+1)
+	{	// If we have empty year
+		$oldyear--;
+		print '<tr height="24">';
+		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
+		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		{
+			print '<td align="right">0</td>';
+			print '<td align="right">0</td>';
+		}
+		print '<td align="right">0</td>';
+		print '</tr>';
+	}
+	print '<tr height="24">';
+	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
+	print '<td align="right">'.$val['nb'].'</td>';
+	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
+		print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';
+	}
+	print '</tr>';
+	$oldyear=$year;
+}
+
+print '</table>';
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+$stringtoshow.= '<table class="border" width="100%"><tr valign="top"><td align="center">';
+if ($mesg) { print $mesg; }
+else {
+	$stringtoshow.= $px1->show();
+	$stringtoshow.= "<br>\n";
+	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		$stringtoshow.= $px->show();
+		$stringtoshow.= "<br>\n";
+		$stringtoshow.= $px2->show();
+		$stringtoshow.= "<br>\n";
+		$stringtoshow.= $px3->show();
+	}
+}
+$stringtoshow.= '</td></tr></table>';
+
+print $stringtoshow;
+
+
+print '</div></div></div>';
+print '<div style="clear:both"></div>';
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index d49520f2f19..8a4c2e53d89 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -310,12 +310,12 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-	print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1);
+	print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1,1);
 	print '</td></tr>';
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-	print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1);
+	print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1,1);
 	print '</td></tr>';
 
 	// planned workload
@@ -437,7 +437,7 @@ else if ($id > 0 || ! empty($ref))
 	}
 	else
 	{
-		print '<tr><td colspan="9">'.$langs->trans("NoTasks").'</td></tr>';
+		print '<tr '.$bc[false].'><td colspan="9">'.$langs->trans("NoTasks").'</td></tr>';
 	}
 	print "</table>";
 
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index bc184133954..02a8eddbc59 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -41,7 +41,6 @@ $search_task_label=GETPOST('search_task_label');
 $search_project_user=GETPOST('search_project_user');
 $search_task_user=GETPOST('search_task_user');
 
-
 // Security check
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
@@ -63,7 +62,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_task_ref="";
 	$search_task_label="";
 }
-if (empty($search_status)) $search_status=1;
+if (empty($search_status) && $search_status == '') $search_status=1;
 
 
 /*
@@ -108,8 +107,8 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$so
 // Get list of tasks in tasksarray and taskarrayfiltered
 // We need all tasks (even not limited to a user because a task assigned to a user can have a parent that is not assigned to him and we need such parents).
 $morewherefilter='';
-if ($search_task_ref)   $morewherefilter.=natural_search('t.ref', $search_task_ref, 0, 1);
-if ($search_task_label) $morewherefilter.=natural_search('t.label', $search_task_label, 0, 1);
+if ($search_task_ref)   $morewherefilter.=natural_search('t.ref', $search_task_ref);
+if ($search_task_label) $morewherefilter.=natural_search('t.label', $search_task_label);
 $tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_project, $search_status, $morewherefilter, $search_project_user, $search_task_user);
 // We load also tasks limited to a particular user
 $tasksrole=($mine ? $taskstatic->getUserRolesForProjectsOrTasks(0,$user,$projectstatic->id,0) : '');
@@ -121,22 +120,26 @@ print '<table class="noborder" width="100%">';
 // If the user can view users
 if ($user->rights->user->user->lire)
 {
-	$moreforfilter.=($moreforfilter?' &nbsp; ':'');
+	$moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ' ';
-    $moreforfilter.=$form->select_dolusers($search_project_user,'search_project_user',1);
+    $moreforfilter.=$form->select_dolusers($search_project_user, 'search_project_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	$moreforfilter.='</div>';
 }
 if ($user->rights->user->user->lire)
 {
-	$moreforfilter.=($moreforfilter?' &nbsp; ':'');
+	$moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.=$langs->trans('TasksWithThisUserAsContact'). ' ';
-    $moreforfilter.=$form->select_dolusers($search_task_user,'search_task_user',1);
+    $moreforfilter.=$form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	$moreforfilter.='</div>';
 }
 if (! empty($moreforfilter))
 {
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre" colspan="10">';
-    print $moreforfilter;
-    print '</td></tr>';
+	print '<div class="liste_titre">';
+	print $moreforfilter;
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	print '</div>';
 }
 
 print '<tr class="liste_titre">';
@@ -165,10 +168,10 @@ foreach($projectstatic->statuts_short as $key => $val) $listofstatus[$key]=$lang
 print $form->selectarray('search_status', $listofstatus, $search_status);
 print '</td>';
 print '<td class="liste_titre">';
-print '<input type="text" class="flat" name="search_task_ref" value="'.$search_task_ref.'" size="4">';
+print '<input type="text" class="flat" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'" size="4">';
 print '</td>';
 print '<td class="liste_titre">';
-print '<input type="text" class="flat" name="search_task_label" value="'.$search_task_label.'" size="8">';
+print '<input type="text" class="flat" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'" size="8">';
 print '</td>';
 print '<td class="liste_titre" colspan="5">';
 print '&nbsp;';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 93dcc7226a2..8a3c3cc5d5b 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -336,12 +336,12 @@ if ($id > 0 || ! empty($ref))
 
 			// Date start
 			print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-			print $form->select_date($object->date_start,'dateo',1,1);
+			print $form->select_date($object->date_start,'dateo',1,1,0,'',1,0,1);
 			print '</td></tr>';
 
 			// Date end
 			print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-			print $form->select_date($object->date_end?$object->date_end:-1,'datee',1,1);
+			print $form->select_date($object->date_end?$object->date_end:-1,'datee',1,1,0,'',1,0,1);
 			print '</td></tr>';
 
 			// Planned workload
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 238b3c588ff..8f0398d3f69 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -385,7 +385,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td class="nowrap">';
 			//$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
 			$newdate='';
-			print $form->select_date($newdate,'time',1,1,2,"timespent_date");
+			print $form->select_date($newdate,'time',1,1,2,"timespent_date",1,0,1);
 			print '</td>';
 
 			// Contributor
@@ -486,7 +486,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td class="nowrap">';
 			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
-				print $form->select_date($db->jdate($date2?$date2:$date1),'timeline',1,1,2,"timespent_date");
+				print $form->select_date($db->jdate($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
 			}
 			else
 			{
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 3d5492dd62c..b3886824485 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -57,7 +57,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 // Security check
-if (empty($conf->agenda->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->agenda->enabled)) accessforbidden('',0,0,1);
 
 // Not older than
 if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;	// default limit
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index e6333526c7f..022a7641cab 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Nicolas Villa aka Boyquotes http://informetic.fr
  * Copyright (C) 2013      Florian Henry <forian.henry@open-cocnept.pro>
- * Copyright (C) 2013      Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -149,7 +149,7 @@ if (is_array($object->lines) && (count($object->lines)>0))
 			}
 			// Execut job
 			$result=$cronjob->run_jobs($userlogin);
-			if ($result<0)
+			if ($result < 0)
 			{
 				echo "Error:".$cronjob->error;
 				dol_syslog("cron_run_jobs.php:: run_jobs Error".$cronjob->error, LOG_ERR);
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 0fef24df949..ca50b39d061 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -42,7 +42,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT .'/don/class/don.class.php';
 
 // Security check
-if (empty($conf->don->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->don->enabled)) accessforbidden('',0,0,1);
 
 
 $langs->load("donations");
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index cfe73b8ce0d..2856fcb93a3 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -66,7 +66,7 @@ $langs->load("install");
 $langs->load("other");
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
 
 if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
 {
@@ -504,7 +504,7 @@ if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 }
 // Birthday
 print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateToBirth").'</td><td>';
-print $form->select_date($birthday,'birth',0,0,1,"newmember");
+print $form->select_date($birthday,'birth',0,0,1,"newmember",1,0,1);
 print '</td></tr>'."\n";
 // Photo
 print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" size="40" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index fc96ffed01c..8a98ea4c4c3 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
 
 
 $langs->load("main");
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 9064dd52879..ea2b70c2447 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -36,7 +36,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
 
 
 $langs->load("main");
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index e7a0b258986..0760ff291ec 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 47601fb8dab..09de4525b39 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index becfd7978c2..65f4545a4ba 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index d1ed853eb5d..4b9053cd4c2 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Security check
-if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index d6b1843b2b1..f21b2d2409c 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Security check
-if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index f7fad5ebb31..499952c1b85 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Security check
-if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1);
+if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 698046cf708..77d92e5d8eb 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -30,14 +30,14 @@ if (empty($usedolheader))
 	<link rel="shortcut icon" type="image/x-icon" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/img/favicon.ico"/>
 	<title>Test page</title>
 	<!-- Includes for JQuery (Ajax library) -->
-	<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/css/smoothness/jquery-ui-latest.custom.css" />
+	<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/css/smoothness/jquery-ui.custom.css" />
 	<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/css/jquery.dataTables.css" />
 	<?php if ($_GET["dol_use_jmobile"] == 1) { ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" />
 	<?php } ?>
 	<link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php<?php echo ($_GET["dol_use_jmobile"] == 1)?'?dol_use_jmobile=1&dol_optimize_smallscreen=1':''; ?>" />
 	<!-- Includes JS for JQuery -->
-	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery-latest.min.js"></script>
+	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery.min.js"></script>
 	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js"></script>
 	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/js/jquery.dataTables.js"></script>
 	<?php if ($_GET["dol_use_jmobile"] == 1) { ?>
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index fbe8df807c0..29ae4a42803 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -116,7 +116,7 @@ else
 	print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'t.ref','',$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('ResourceType'),$_SERVER['PHP_SELF'],'ty.code','',$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('Action'),"","","","",'width="60" align="center"',"","");
-	print '</tr>';
+	print "</tr>\n";
 
 	foreach ($object->lines as $resource)
 	{
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 4648992506b..847c23c6719 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005      Brice Davoleau       <brice.davoleau@gmail.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007      Patrick Raguin  		<patrick.raguin@gmail.com>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 383ed9e8ff8..b2b0f954a58 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -307,7 +307,7 @@ abstract class ActionsCardCommon
 
             if ($result >= 0)
             {
-                header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->name."");
+                header("Location: ".DOL_URL_ROOT."/societe/list.php?delsoc=".$this->object->name."");
                 exit;
             }
             else
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 8904d2573ed..336aab0ebbd 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -120,7 +120,7 @@ class CompanyBankAccount extends Account
     {
     	global $conf;
 
-        if (! $this->id) 
+        if (! $this->id)
         {
             $this->create();
         }
@@ -163,15 +163,15 @@ class CompanyBankAccount extends Account
      * 	Load record from database
      *
      *	@param	int		$id			Id of record
-     * 	@param	int		$socid		Id of company
+     * 	@param	int		$socid		Id of company. If this is filled, function will return the default RIB of company
      * 	@return	int					<0 if KO, >0 if OK
      */
-    function fetch($id,$socid=0)
+    function fetch($id, $socid=0)
     {
         if (empty($id) && empty($socid)) return -1;
 
         $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-        $sql.= " owner_address, default_rib, label, datec, tms as datem, frstrecur";
+        $sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
         if ($id)    $sql.= " WHERE rowid = ".$id;
         if ($socid) $sql.= " WHERE fk_soc  = ".$socid." AND default_rib = 1";
@@ -199,6 +199,7 @@ class CompanyBankAccount extends Account
                 $this->default_rib     = $obj->default_rib;
                 $this->datec           = $this->db->jdate($obj->datec);
                 $this->datem           = $this->db->jdate($obj->datem);
+                $this->rum             = $obj->rum;
                 $this->frstrecur       = $obj->frstrecur;
             }
             $this->db->free($resql);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 965727ef6e9..2c7d3f25053 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1652,7 +1652,7 @@ class Societe extends CommonObject
 
         $reparray=array();
 
-        $sql = "SELECT u.rowid, u.lastname, u.firstname";
+        $sql = "SELECT u.rowid, u.lastname, u.firstname, u.email";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
         $sql.= " WHERE u.rowid = sc.fk_user AND sc.fk_soc =".$this->id;
         $sql.= " AND entity in (0, ".$conf->entity.")";
@@ -1668,6 +1668,7 @@ class Societe extends CommonObject
                 $reparray[$i]['id']=$obj->rowid;
                 $reparray[$i]['lastname']=$obj->lastname;
                 $reparray[$i]['firstname']=$obj->firstname;
+                $reparray[$i]['email']=$obj->email;
                 $i++;
             }
             return $reparray;
@@ -2132,16 +2133,33 @@ class Societe extends CommonObject
 
 
     /**
-     *    Return bank number property of thirdparty
+     *  Return bank number property of thirdparty (label or rum)
      *
-     *    @return	string		Bank number
+     *	@param	string	$mode	'label' or 'rum'
+     *  @return	string			Bank number
      */
-    function display_rib()
+    function display_rib($mode='label')
     {
         require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
         $bac = new CompanyBankAccount($this->db);
         $bac->fetch(0,$this->id);
-        return $bac->getRibLabel(true);
+
+        if ($mode == 'label')
+        {
+        	return $bac->getRibLabel(true);
+        }
+        elseif ($mode == 'rum')
+        {
+        	if (empty($bac->rum))
+        	{
+        		$prelevement = new BonPrelevement($this->db);
+        		$bac->fetch_thirdparty();
+        		$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
+        	}
+        	return $bac->rum;
+        }
+
+        return 'BadParameterToFunctionDisplayRib';
     }
 
     /**
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index a883a2568d9..fc89d12effe 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2015 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2015	   Ferran Marcet		<fmarcet@2byte.es>
  *
  * Version V1.1 Initial version of Philippe Berthet
  * Version V2   Change to be compatible with 3.4 and enhanced to be more generic
@@ -205,7 +206,7 @@ if ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic=new Facture($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.facnumber as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, ';
+	$sql_select = 'SELECT f.rowid as doc_id, f.facnumber as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
 	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_facture = f.rowid";
@@ -236,7 +237,7 @@ if ($type_element == 'order')
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_commande = c.rowid";
 	$where.= " AND c.entity = ".$conf->entity;
-	$dateprint = 'c.datef';
+	$dateprint = 'c.date_commande';
 	$doc_number='c.ref';
 	$thirdTypeSelect='customer';
 }
@@ -314,6 +315,7 @@ print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','
 print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_status','',$param,'align="center"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
+print "</tr>\n";
 // Filters
 print '<tr class="liste_titre">';
 print '<td class="liste_titre" align="left">';
@@ -343,11 +345,12 @@ if ($sql_select)
 	{
 		$documentstatic->id=$objp->doc_id;
 		$documentstatic->ref=$objp->doc_number;
-		$documentstatic->type=$objp->type;
+		$documentstatic->type=$objp->doc_type;
 		$documentstatic->fk_statut=$objp->status;
 		$documentstatic->fk_status=$objp->status;
 		$documentstatic->statut=$objp->status;
 		$documentstatic->status=$objp->status;
+		$documentstatic->paye=$objp->paid;
 
 		$var=!$var;
 		print "<tr ".$bc[$var].">";
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index b03cb62eef0..12de6db7707 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -61,7 +61,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
  */
 $rowspan=2;
 if (! empty($conf->barcode->enabled)) $rowspan++;
-print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/societe/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">'."\n";
 print '<tr class="liste_titre">';
diff --git a/htdocs/societe/societe.php b/htdocs/societe/list.php
similarity index 81%
rename from htdocs/societe/societe.php
rename to htdocs/societe/list.php
index 4e539c4236c..281746fe824 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/list.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/societe/societe.php
+ *	\file       htdocs/societe/list.php
  *	\ingroup    societe
  *	\brief      Page to show list of third parties
  */
@@ -66,6 +66,10 @@ $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('thirdpartylist'));
+$extrafields = new ExtraFields($db);
+
 
 /*
  * Actions
@@ -181,7 +185,6 @@ if ($socname)
  */
 /*
  REM: Regle sur droits "Voir tous les clients"
- REM: Exemple, voir la page societe.php dans le mode liste.
  Utilisateur interne socid=0 + Droits voir tous clients        => Voit toute societe
  Utilisateur interne socid=0 + Pas de droits voir tous clients => Ne voit que les societes liees comme commercial
  Utilisateur externe socid=x + Droits voir tous clients        => Ne voit que lui meme
@@ -196,6 +199,12 @@ $sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idpr
 if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
 // We'll need these fields in order to filter by categ
 if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_soc";
+// Add fields for extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
 $sql.= " ".MAIN_DB_PREFIX."c_stcomm as st";
 // We'll need this table joined to the select in order to filter by sale
@@ -205,57 +214,31 @@ if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs";
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
 if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)	$sql.= " AND s.rowid = ".$socid;
-if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc";        // Join for the needed table to filter by sale
-if ($search_categ) $sql.= " AND s.rowid = cs.fk_soc";   // Join for the needed table to filter by categ
+if ($socid)           $sql.= " AND s.rowid = ".$socid;
+if ($search_sale)     $sql.= " AND s.rowid = sc.fk_soc";        // Join for the needed table to filter by sale
+if ($search_categ)    $sql.= " AND s.rowid = cs.fk_soc";   // Join for the needed table to filter by categ
 if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
-// Insert sale filter
-if ($search_sale)
-{
-    $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
-}
-// Insert categ filter
-if ($search_categ)
-{
-    $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ);
-}
-if ($search_nom_only)
-{
-	$sql.= " AND s.nom LIKE '%".$db->escape($search_nom_only)."%'";
-}
-if ($search_all)
-{
-	$sql.= " AND (";
-	$sql.= "s.nom LIKE '%".$db->escape($search_all)."%'";
-	$sql.= " OR s.code_client LIKE '%".$db->escape($search_all)."%'";
-	$sql.= " OR s.email LIKE '%".$db->escape($search_all)."%'";
-	$sql.= " OR s.url LIKE '%".$db->escape($search_all)."%'";
-	$sql.= " OR s.siren LIKE '%".$db->escape($search_all)."%'";
-	$sql.= ")";
-}
-if ($search_nom)
-{
-	$sql.= " AND (";
-	$sql.= "s.nom LIKE '%".$db->escape($search_nom)."%'";
-	$sql.= " OR s.code_client LIKE '%".$db->escape($search_nom)."%'";
-	$sql.= " OR s.email LIKE '%".$db->escape($search_nom)."%'";
-	$sql.= " OR s.url LIKE '%".$db->escape($search_nom)."%'";
-	$sql.= " OR s.siren LIKE '%".$db->escape($search_nom)."%'";
-	$sql.= ")";
-}
-if ($search_town)   $sql .= " AND s.town LIKE '%".$db->escape($search_town)."%'";
-if ($search_idprof1) $sql .= " AND s.siren LIKE '%".$db->escape($search_idprof1)."%'";
-if ($search_idprof2) $sql .= " AND s.siret LIKE '%".$db->escape($search_idprof2)."%'";
-if ($search_idprof3) $sql .= " AND s.ape LIKE '%".$db->escape($search_idprof3)."%'";
-if ($search_idprof4) $sql .= " AND s.idprof4 LIKE '%".$db->escape($search_idprof4)."%'";
-if ($search_idprof5) $sql .= " AND s.idprof5 LIKE '%".$db->escape($search_idprof5)."%'";
-if ($search_idprof6) $sql .= " AND s.idprof6 LIKE '%".$db->escape($search_idprof6)."%'";
+if ($search_sale)     $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
+if ($search_categ)    $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ);
+if ($search_nom_only) $sql.= natural_search("s.nom",$search_nom_only);
+if ($search_all)      $sql.= natural_search(array("s.nom", "s.name_alias", "s.code_client", "s.code_fournisseur", "s.email", "s.url","s.siren","s.siret","s.ape","s.idprof4","s.idprof5","s.idprof6"), $search_all);
+if ($search_nom)      $sql.= natural_search(array("s.nom", "s.name_alias", "s.code_client", "s.code_fournisseur", "s.email", "s.url","s.siren","s.siret","s.ape","s.idprof4","s.idprof5","s.idprof6"), $search_nom);
+if ($search_town)     $sql .= " AND s.town LIKE '%".$db->escape($search_town)."%'";
+if ($search_idprof1)  $sql .= " AND s.siren LIKE '%".$db->escape($search_idprof1)."%'";
+if ($search_idprof2)  $sql .= " AND s.siret LIKE '%".$db->escape($search_idprof2)."%'";
+if ($search_idprof3)  $sql .= " AND s.ape LIKE '%".$db->escape($search_idprof3)."%'";
+if ($search_idprof4)  $sql .= " AND s.idprof4 LIKE '%".$db->escape($search_idprof4)."%'";
+if ($search_idprof5)  $sql .= " AND s.idprof5 LIKE '%".$db->escape($search_idprof5)."%'";
+if ($search_idprof6)  $sql .= " AND s.idprof6 LIKE '%".$db->escape($search_idprof6)."%'";
 // Filter on type of thirdparty
 if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
 if ($search_type > 0 && in_array($search_type,array('4')))         $sql .= " AND s.fournisseur = 1";
 if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
 if (!empty($conf->barcode->enabled) && $sbarcode) $sql.= " AND s.barcode LIKE '%".$db->escape($sbarcode)."%'";
-//print $sql;
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 
 // Count total nb of records
 $nbtotalofrecords = 0;
@@ -281,7 +264,7 @@ if ($resql)
 	$params.= '&amp;search_idprof3='.htmlspecialchars($search_idprof3);
 	$params.= '&amp;search_idprof4='.htmlspecialchars($search_idprof4);
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies');
 
     // Show delete result message
     if (GETPOST('delsoc'))
@@ -305,8 +288,6 @@ if ($resql)
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	print '<table class="liste" width="100%">';
-
     // Filter on categories
     /* Not possible in this page because list is for ALL third parties type
 	$moreforfilter='';
@@ -330,6 +311,17 @@ if ($resql)
         print '</td></tr>';
     }
 	*/
+	if (! empty($moreforfilter))
+	{
+		print '<div class="liste_titre">';
+		print $moreforfilter;
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	    print $hookmanager->resPrint;
+	    print '</div>';
+	}
+
+	print '<table class="liste" width="100%">';
 
     // Lines of titles
     print '<tr class="liste_titre">';
@@ -341,10 +333,14 @@ if ($resql)
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$params,'class="nowrap"',$sortfield,$sortorder);
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$params,'class="nowrap"',$sortfield,$sortorder);
 	print_liste_field_titre('');
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$params,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
-	// Lignes des champs de filtre
+	// Fields title search
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -389,12 +385,19 @@ if ($resql)
 	print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
 	print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
 	print '</select></td>';
-	// Status
+
+	$parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+
+    // Status
+    print '<td></td>';
+
 	print '<td class="liste_titre" align="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '&nbsp; ';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
+
 	print "</tr>\n";
 
 	$var=True;
@@ -446,7 +449,15 @@ if ($resql)
 		}
 		print $s;
 		print '</td>';
-        print '<td align="right">'.$companystatic->getLibStatut(3).'</td>';
+
+		$parameters=array('obj' => $obj);
+        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+
+        // Status
+        print '<td align="right">'.$companystatic->getLibStatut(5).'</td>';
+
+        print '<td></td>';
 
 		print '</tr>'."\n";
 		$i++;
@@ -454,6 +465,10 @@ if ($resql)
 
 	$db->free($resql);
 
+	$parameters=array('sql' => $sql);
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
 	print "</table>";
 
 	print '</form>';
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 357947134f2..2855e82b076 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -209,7 +209,7 @@ if ($result > 0)
     print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder);
     print_liste_field_titre('');
-    print '</tr>';
+	print "</tr>\n";
 
     $var=false;
     $listofemails=$object->thirdparty_and_contact_email_array();
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index d9b7df8153f..57ca545a053 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
@@ -137,7 +137,7 @@ if ($action == 'add' && ! $_POST["cancel"])
 	    $account->proprio         = $_POST["proprio"];
 	    $account->owner_address   = $_POST["owner_address"];
 		$account->frstrecur       = GETPOST('frstrecur');
-		
+
 	    $result = $account->update($user);	// TODO Use create and include update into create method
 	    if (! $result)
 	    {
@@ -157,7 +157,7 @@ if ($action == 'setasdefault')
 {
     $account = new CompanyBankAccount($db);
     $res = $account->setAsDefault(GETPOST('ribid','int'));
-    if ($res) 
+    if ($res)
     {
         $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$soc->id;
         header('Location: '.$url);
@@ -230,7 +230,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 if ($socid && $action != 'edit' && $action != "create")
 {
 	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-	
+
 	// Confirm delete third party
     if ($action == 'delete')
     {
@@ -377,8 +377,8 @@ if ($socid && $action != 'edit' && $action != "create")
 			print '<td>'.$langs->trans("WithdrawMode").'</td>';
         }
         print_liste_field_titre($langs->trans("DefaultRIB"), '', '', '', '', 'align="center"');
-        print '<td width="40"></td>';
-        print '</tr>';
+        print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+		print "</tr>\n";
 
         foreach ($rib_list as $rib)
         {
@@ -396,8 +396,10 @@ if ($socid && $action != 'edit' && $action != "create")
 
             if (! empty($conf->prelevement->enabled))
             {
+            	// RUM
 				print '<td>'.$prelevement->buildRumNumber($soc->code_client, $rib->datec, $rib->id).'</td>';
-				
+
+				// FRSTRECUR
 				print '<td>'.$rib->frstrecur.'</td>';
             }
 
@@ -429,8 +431,8 @@ if ($socid && $action != 'edit' && $action != "create")
         	print '</td>';
 	        print '</tr>';
         }
-        
-        if (count($rib_list) == 0) 
+
+        if (count($rib_list) == 0)
         {
         	$colspan=7;
         	if (! empty($conf->prelevement->enabled)) $colspan+=2;
@@ -441,7 +443,7 @@ if ($socid && $action != 'edit' && $action != "create")
     } else {
         dol_print_error($db);
     }
-    
+
     dol_fiche_end();
 }
 
@@ -449,7 +451,7 @@ if ($socid && $action != 'edit' && $action != "create")
 if ($socid && $action == 'edit' && $user->rights->societe->creer)
 {
 	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-	
+
 	print '<table class="border" width="100%">';
 
     print '<tr><td valign="top" width="35%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
@@ -546,20 +548,24 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
     if ($conf->prelevement->enabled)
     {
 		print '<br>';
-		
+
     	print '<table class="border" width="100%">';
 
+    	if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($soc->code_client, $account->datec, $account->id);
+
+    	// RUM
     	print '<tr><td width="35%">'.$langs->trans("RUM").'</td>';
 	    print '<td colspan="4">'.$account->rum.'</td></tr>';
-	    
+
+	    // FRSTRECUR
 	    print '<tr><td width="35%">'.$langs->trans("WithdrawMode").'</td>';
 	    print '<td colspan="4"><input size="30" type="text" name="frstrecur" value="'.(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur).'"></td></tr>';
-	    
+
 	    print '</table>';
     }
-    
+
 	dol_fiche_end();
-    
+
 	print '<div align="center">';
 	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -572,7 +578,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 if ($socid && $action == 'create' && $user->rights->societe->creer)
 {
 	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-	
+
 	print '<table class="border" width="100%">';
 
 
@@ -633,27 +639,29 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     print "</textarea></td></tr>";
 
     print '</table>';
-    
+
     if ($conf->prelevement->enabled)
     {
 		print '<br>';
-		
+
     	print '<table class="border" width="100%">';
 
+    	// RUM
     	print '<tr><td width="35%">'.$langs->trans("RUM").'</td>';
 	    print '<td colspan="4">'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
-	    
+
+	    // FRSTRECUR
 	    print '<tr><td width="35%">'.$langs->trans("WithdrawMode").'</td>';
 	    print '<td colspan="4"><input size="30" type="text" name="frstrecur" value="'.(isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST').'"></td></tr>';
-	    
+
 	    print '</table>';
     }
-    
+
 	dol_fiche_end();
-    
+
 	print '<div align="center">';
 	print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; 
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
     print '</div>';
 }
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index b46bec9201c..c4e95abcb8e 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -643,7 +643,7 @@ if (empty($reshook))
 
         if ($result > 0)
         {
-            header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".urlencode($object->name));
+            header("Location: ".DOL_URL_ROOT."/societe/list.php?delsoc=".urlencode($object->name));
             exit;
         }
         else
@@ -2204,7 +2204,7 @@ else
             print '</td></tr>';
         }
 
-		// Categories
+		// Tags / categories
 	    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	    {
 	        print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
diff --git a/htdocs/support/default.css b/htdocs/support/default.css
index ea62df52ef0..1505e59d998 100644
--- a/htdocs/support/default.css
+++ b/htdocs/support/default.css
@@ -147,7 +147,7 @@ background: #DDDFDD;
 }
 
 table { font-size: 12px; }
-table.login {  border: 1px solid #C0C0C0; background: #F0F0F0; font-size: 12px; }
+table.login {  border: 1px solid #C0C0C0; background: #FFF; font-size: 12px; }
 
 .inline-block
 {
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index 755863707e5..afd7a4f6338 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2013	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  *
@@ -194,7 +194,8 @@ print '</td></tr></table>';
 
 print '</td>';
 print '</tr><tr>';
-$urlwiki='http://wiki.dolibarr.org/index.php/List of Dolibarr partners and providers';
+//$urlwiki='http://wiki.dolibarr.org/index.php/List of Dolibarr partners and providers';
+$urlwiki='http://partners.dolibarr.org';
 print '<td align="center" valign="top">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
@@ -228,7 +229,8 @@ print '</td></tr></table>';
 
 print '</td>';
 print '</tr><tr>';
-$urlwiki='http://wiki.dolibarr.org/index.php/List of Dolibarr partners and providers';
+//$urlwiki='http://wiki.dolibarr.org/index.php/List of Dolibarr partners and providers';
+$urlwiki='http://partners.dolibarr.org';
 print '<td align="center" valign="top">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 96febfcda9c..80f64e41561 100644
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -2266,6 +2266,101 @@ div.jnotify-background {
 }
 
 
+/* ============================================================================== */
+/*  Select2                                                                       */
+/* ============================================================================== */
+
+.selectoptiondisabledwhite {
+	background: #FFFFFF !important;
+}
+
+.select2-choice,
+.select2-drop.select2-drop-above.select2-drop-active,
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices,
+.select2-dropdown-open.select2-drop-above .select2-choice,
+.select2-dropdown-open.select2-drop-above .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+	border: 1px solid #aaa;
+}
+.select2-disabled
+{
+	color: #888;
+}
+.select2-drop-active
+{
+	border: 1px solid #aaa;
+	border-top: none;
+}
+a span.select2-chosen
+{
+	font-weight: normal !important;
+}
+.select2-container .select2-choice {
+	background-image: none;
+	height: 24px;
+	line-height: 24px;
+}
+.select2-choices .select2-search-choice {
+  border: 1px solid #aaa !important;
+}
+.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
+{
+	background: #FFFFFF;
+}
+.select2-container-multi.select2-container-disabled .select2-choices {
+	background-color: #FFFFFF;
+	background-image: none;
+	border: none;
+	cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice {
+  margin-bottom: 3px;
+}
+/* To emulate select 2 style */
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
+  padding: 2px 5px 1px 5px;
+  margin: 0 0 2px 3px;
+  position: relative;
+  line-height: 13px;
+  color: #333;
+  cursor: default;
+  border: 1px solid #aaaaaa;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  background-clip: padding-box;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
+	font-weight: normal;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr {
+  height: auto !important;
+  height: 1%;
+  margin: 0;
+  padding: 0 5px 0 0;
+  position: relative;
+  cursor: text;
+  overflow: hidden;
+}
+
+
 /* ============================================================================== */
 /*  JMobile                                                                       */
 /* ============================================================================== */
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index ec652179ac1..d1dd0ab4091 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -2440,6 +2440,101 @@ div.ecmjqft {
 }
 
 
+/* ============================================================================== */
+/*  Select2                                                                       */
+/* ============================================================================== */
+
+.selectoptiondisabledwhite {
+	background: #FFFFFF !important;
+}
+
+.select2-choice,
+.select2-drop.select2-drop-above.select2-drop-active,
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices,
+.select2-dropdown-open.select2-drop-above .select2-choice,
+.select2-dropdown-open.select2-drop-above .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+	border: 1px solid #aaa;
+}
+.select2-disabled
+{
+	color: #888;
+}
+.select2-drop-active
+{
+	border: 1px solid #aaa;
+	border-top: none;
+}
+a span.select2-chosen
+{
+	font-weight: normal !important;
+}
+.select2-container .select2-choice {
+	background-image: none;
+	height: 24px;
+	line-height: 24px;
+}
+.select2-choices .select2-search-choice {
+  border: 1px solid #aaa !important;
+}
+.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
+{
+	background: #FFFFFF;
+}
+.select2-container-multi.select2-container-disabled .select2-choices {
+	background-color: #FFFFFF;
+	background-image: none;
+	border: none;
+	cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice {
+  margin-bottom: 3px;
+}
+/* To emulate select 2 style */
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
+  padding: 2px 5px 1px 5px;
+  margin: 0 0 2px 3px;
+  position: relative;
+  line-height: 13px;
+  color: #333;
+  cursor: default;
+  border: 1px solid #aaaaaa;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  background-clip: padding-box;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
+	font-weight: normal;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr {
+  height: auto !important;
+  height: 1%;
+  margin: 0;
+  padding: 0 5px 0 0;
+  position: relative;
+  cursor: text;
+  overflow: hidden;
+}
+
+
 /* ============================================================================== */
 /*  JMobile                                                                       */
 /* ============================================================================== */
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 41a7b6fef87..eee7afcb9c0 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -2625,6 +2625,101 @@ div.ecmjqft {
 }
 
 
+/* ============================================================================== */
+/*  Select2                                                                       */
+/* ============================================================================== */
+
+.selectoptiondisabledwhite {
+	background: #FFFFFF !important;
+}
+
+.select2-choice,
+.select2-drop.select2-drop-above.select2-drop-active,
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices,
+.select2-dropdown-open.select2-drop-above .select2-choice,
+.select2-dropdown-open.select2-drop-above .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+	border: 1px solid #aaa;
+}
+.select2-disabled
+{
+	color: #888;
+}
+.select2-drop-active
+{
+	border: 1px solid #aaa;
+	border-top: none;
+}
+a span.select2-chosen
+{
+	font-weight: normal !important;
+}
+.select2-container .select2-choice {
+	background-image: none;
+	height: 24px;
+	line-height: 24px;
+}
+.select2-choices .select2-search-choice {
+  border: 1px solid #aaa !important;
+}
+.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
+{
+	background: #FFFFFF;
+}
+.select2-container-multi.select2-container-disabled .select2-choices {
+	background-color: #FFFFFF;
+	background-image: none;
+	border: none;
+	cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice {
+  margin-bottom: 3px;
+}
+/* To emulate select 2 style */
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
+  padding: 2px 5px 1px 5px;
+  margin: 0 0 2px 3px;
+  position: relative;
+  line-height: 13px;
+  color: #333;
+  cursor: default;
+  border: 1px solid #aaaaaa;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  background-clip: padding-box;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
+	font-weight: normal;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr {
+  height: auto !important;
+  height: 1%;
+  margin: 0;
+  padding: 0 5px 0 0;
+  position: relative;
+  cursor: text;
+  overflow: hidden;
+}
+
+
 /* ============================================================================== */
 /*  JMobile                                                                       */
 /* ============================================================================== */
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 640fea40575..4b8955953bd 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -195,7 +195,7 @@ legend { margin-bottom: 8px; }
 }
 .buttonRefused {
 	pointer-events: none;
-   	cursor: default;	
+   	cursor: default;
 	opacity: 0.4;
     filter: alpha(opacity=40); /* For IE8 and earlier */
     box-shadow: none;
@@ -2505,6 +2505,102 @@ div.ecmjqft {
 	background-image: none;
 }
 
+
+/* ============================================================================== */
+/*  Select2                                                                       */
+/* ============================================================================== */
+
+.selectoptiondisabledwhite {
+	background: #FFFFFF !important;
+}
+
+.select2-choice,
+.select2-drop.select2-drop-above.select2-drop-active,
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices,
+.select2-dropdown-open.select2-drop-above .select2-choice,
+.select2-dropdown-open.select2-drop-above .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+	border: 1px solid #aaa;
+}
+.select2-disabled
+{
+	color: #888;
+}
+.select2-drop-active
+{
+	border: 1px solid #aaa;
+	border-top: none;
+}
+a span.select2-chosen
+{
+	font-weight: normal !important;
+}
+.select2-container .select2-choice {
+	background-image: none;
+	height: 24px;
+	line-height: 24px;
+}
+.select2-choices .select2-search-choice {
+  border: 1px solid #aaa !important;
+}
+.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
+{
+	background: #FFFFFF;
+}
+.select2-container-multi.select2-container-disabled .select2-choices {
+	background-color: #FFFFFF;
+	background-image: none;
+	border: none;
+	cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice {
+  margin-bottom: 3px;
+}
+/* To emulate select 2 style */
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
+  padding: 2px 5px 1px 5px;
+  margin: 0 0 2px 3px;
+  position: relative;
+  line-height: 13px;
+  color: #333;
+  cursor: default;
+  border: 1px solid #aaaaaa;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  background-clip: padding-box;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
+	font-weight: normal;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr {
+  height: auto !important;
+  height: 1%;
+  margin: 0;
+  padding: 0 5px 0 0;
+  position: relative;
+  cursor: text;
+  overflow: hidden;
+}
+
+
 /* ============================================================================== */
 /*  JMobile                                                                       */
 /* ============================================================================== */
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 44c71a304eb..afe0e4502f1 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -114,12 +114,15 @@ $usegradient=1;
 // Eldy colors
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-	$conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180';    // topmenu (140,160,185)
-    $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
+	// Case of option always editable
+	if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180';   // topmenu (140,160,185)
+    if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180';       	// title of arrays TO MATCH ELDY (140,160,185)
+    //if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230';     // title of arrays TO MATCH BOOTSTRAP
+
+	// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
+	$conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
     $conf->global->THEME_ELDY_VERMENU_BACK2='255,255,255';
-    $conf->global->THEME_ELDY_BACKTITLE1='140,150,180';       // title of arrays TO MATCH ELDY (140,160,185)
-    //$conf->global->THEME_ELDY_BACKTITLE1='230,230,230';     // title of arrays TO MATCH BOOTSTRAP
     $conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
     $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';
     $conf->global->THEME_ELDY_BACKTABCARD2='210,210,210';     // card
@@ -136,7 +139,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
 
-$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
+// Cas of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
+$colorbackhmenu1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$conf->global->THEME_ELDY_TOPMENU_BACK2)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
 $colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
 $colorbackvmenu2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$conf->global->THEME_ELDY_VERMENU_BACK2)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$user->conf->THEME_ELDY_VERMENU_BACK2);
@@ -155,6 +159,7 @@ $colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
 $fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+
 // Hover can be disabled with THEME_ELDY_USE_HOVER=0
 if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && (isset($user->conf->THEME_ELDY_USE_HOVER) && $user->conf->THEME_ELDY_USE_HOVER == '0'))
 	|| (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && (isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0')))
@@ -399,7 +404,9 @@ th .button {
 	-webkit-border-radius:0px !important;
 	border-radius:0px !important;
 }
-
+.maxwidthsearch {		/* Max width of column with the search picto */
+	width: 54px;
+}
 .valignmiddle {
 	vertical-align: middle;
 }
@@ -465,7 +472,9 @@ div.divsearchfield {
 	float: <?php print $left; ?>;
 	margin-<?php print $right; ?>: 12px;
 }
-
+div.confirmmessage {
+	padding-top: 6px;
+}
 /* Style to move picto into left of button */
 /*
 .buttonactionview {
@@ -600,13 +609,18 @@ div.ficheaddleft {
 /* ============================================================================== */
 
 <?php
-$minwidthtmenu=66;
+$minwidthtmenu=66;		/* minimul widht for one top menu entry */
 $heightmenu=46;			/* height of top menu, part with image */
 $heightmenu2=48;        /* height of top menu, part with login  */
+$disableimages = 0;
+$maxwidthloginblock = 110;
+if (! empty($conf->global->THEME_ELDY_DISABLE_IMAGE) || $dol_optimize_smallscreen) { $disableimages = 1; $maxwidthloginblock = 180; }
 ?>
 
 div#id-top {
-	height: <?php print ($heightmenu2); ?>px;
+<?php if (GETPOST("optioncss") == 'print') {  ?>
+	display:none;
+<?php } else { ?>
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
 	<?php if ($usegradient) { ?>
 	background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
@@ -616,14 +630,19 @@ div#id-top {
 	background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
 	<?php } ?>
+	<?php if ($disableimages) { ?>
+	height: 28px;
+	<?php } else { ?>
+	height: <?php print $heightmenu2; ?>px;
+	<?php } ?>
+<?php } ?>
 }
 
 div#tmenu_tooltip {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	display:none;
 <?php } else { ?>
-	height: <?php print ($heightmenu2+1); ?>px;
-	padding-<?php echo $right; ?>: 100px;
+	padding-<?php echo $right; ?>: <? echo ($maxwidthloginblock - 10); ?>px;
 <?php } ?>
 }
 
@@ -641,7 +660,6 @@ div.tmenudiv {
     margin: 0px 0px 0px 0px;	/* t r b l */
 	font-size: 13px;
     font-weight: normal;
-    height: <?php print ($heightmenu+1); ?>px;
 	color: #000000;
     text-decoration: none;
 <?php } ?>
@@ -681,7 +699,7 @@ ul.tmenu {	/* t r b l */
     margin: 0px 0px 0px 0px;
 	list-style: none;
 }
-ul.tmenu li {
+ul.tmenu li {	/* We need this to have background color when menu entry wraps on new lines */
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
 	<?php if ($usegradient) { ?>
 	background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
@@ -698,12 +716,12 @@ li.tmenu, li.tmenusel {
 	vertical-align: bottom;
 	<?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
 	float: <?php print $left; ?>;
-    height: <?php print $heightmenu; ?>px;
+    /* height: <?php print $heightmenu; ?>px; */
     <?php } ?>
 	position:relative;
 	display: block;
-	padding: 0px 0px 2px 0px;
-	margin: 0px 0px 0px 0px;
+	padding: 0 0 0 0;
+	margin: 0 0 0 0;
 	font-weight: normal;
 }
 li.tmenusel, li.tmenu:hover {
@@ -713,25 +731,33 @@ li.tmenusel, li.tmenu:hover {
     background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
     background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
-	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */
 }
 .tmenuend .tmenuleft { width: 0px; }
+.tmenuend { display: none; }
 div.tmenuleft
 {
 	float: <?php print $left; ?>;
 	margin-top: 0px;
 	<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
 	width: 5px;
-	height: <?php print $heightmenu+4; ?>px;
 	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 -6px no-repeat;
 	<?php } ?>
+	<?php if ($disableimages) { ?>
+	height: 26px;
+	<?php } else { ?>
+	height: <?php print $heightmenu; ?>px;
+	<?php } ?>
 }
 div.tmenucenter
 {
-	padding-top: 2px;
+	padding-top: <?php print $disableimages?'4':'2'; ?>px;
 	padding-left: 0px;
 	padding-right: 0px;
+	<?php if ($disableimages) { ?>
+	height: 24px;
+	<?php } else { ?>
     height: <?php print $heightmenu; ?>px;
+	<?php } ?>
     width: 100%;
 }
 .mainmenuaspan
@@ -874,6 +900,9 @@ foreach($mainmenuusedarray as $val)
 .tmenuimage {
     padding:0 0 0 0 !important;
     margin:0 0px 0 0 !important;
+    <?php if ($disableimages) { ?>
+    	display: none;
+    <?php } ?>
 }
 
 
@@ -964,10 +993,11 @@ table.login_table_securitycode tr td {
 
 div.login_block {
 	position: absolute;
+	text-align: right;
 	<?php print $right; ?>: 5px;
 	top: 3px;
 	font-weight: bold;
-	max-width: 110px;
+	max-width: <?php echo $maxwidthloginblock; ?>px;
 	<?php if (GETPOST("optioncss") == 'print') { ?>
 	display: none;
 	<?php } ?>
@@ -990,7 +1020,13 @@ div.login a:hover {
 	color: #<?php echo $colortextbackvmenu; ?>;
 	text-decoration:underline;
 }
-div.login_block_user, div.login_block_other { clear: both; }
+div.login_block_user {
+	display: inline-block;
+}
+div.login_block_other {
+	display: inline-block;
+	clear: both;
+}
 div.login_block_other { padding-top: 3px; text-align: right; }
 .login_block_elem {
 	float: right;
@@ -1857,7 +1893,7 @@ div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border
 }
 div .tdtop {
     vertical-align: top;
-	padding-top: 5px;
+	padding-top: 5px !important;
 	padding-bottom: 0px;
 }
 
@@ -2511,18 +2547,20 @@ a.impayee:hover { font-weight: bold; color: #550000; }
 .legendColorBox, .legendLabel { border: none !important; }
 div.dolgraph div.legend, div.dolgraph div.legend div { background-color: rgba(255,255,255,0) !important; }
 div.dolgraph div.legend table tbody tr { height: auto; }
+td.legendColorBox { padding: 2px 2px 2px 0 !important; }
+td.legendLabel { padding: 2px 2px 2px 0 !important; }
 
 .photo {
 	border: 0px;
 }
 .photowithmargin {
 	margin-bottom: 2px;
-	margin-top: 2px;
+	margin-top: 10px;
 }
 .photowithmargin {
-	-webkit-box-shadow: 0px 0px 3px #777;
+/*	-webkit-box-shadow: 0px 0px 3px #777;
 	-moz-box-shadow: 0px 0px 3px #777;
-	box-shadow: 0px 0px 3px #777;
+	box-shadow: 0px 0px 3px #777;*/
 }
 .photointoolitp {
 	margin-top: 6px;
@@ -2536,6 +2574,7 @@ div.dolgraph div.legend table tbody tr { height: auto; }
 .logo_setup
 {
 	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg',1) ?>);
+	display: inline-block;
 }
 
 div.titre {
@@ -3392,8 +3431,50 @@ a span.select2-chosen
 	cursor: default;
 }
 .select2-container-multi .select2-choices .select2-search-choice {
-  margin-bottom: 2px;
+  margin-bottom: 3px;
 }
+/* To emulate select 2 style */
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
+  padding: 2px 5px 1px 5px;
+  margin: 0 0 2px 3px;
+  position: relative;
+  line-height: 13px;
+  color: #333;
+  cursor: default;
+  border: 1px solid #aaaaaa;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  background-clip: padding-box;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
+	font-weight: normal;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi-dolibarr .select2-choices-dolibarr {
+  height: auto !important;
+  height: 1%;
+  margin: 0;
+  padding: 0 5px 0 0;
+  position: relative;
+  cursor: text;
+  overflow: hidden;
+}
+
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php
index 543ae8a4a54..d1525b05af7 100644
--- a/htdocs/theme/md_exp/style.css.php
+++ b/htdocs/theme/md_exp/style.css.php
@@ -1773,13 +1773,9 @@ table.noborder, table.formdoc, div.noborder {
 	border-collapse: separate !important;
 	border-spacing: 0px;
 
-	border-right-width: 1px;
-	border-right-color: #CCC;
-	border-right-style: solid;
-
-	border-left-width: 1px;
-	border-left-color: #CCC;
-	border-left-style: solid;
+	border-width: 1px;
+	border-color: #CCC;
+	border-style: solid;
 
 	margin: 0px 0px 2px 0px;
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 5bf47eb19e0..102d275b968 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
@@ -1412,7 +1412,7 @@ else
             {
 				print '<tr><td>'.$langs->trans("ColorUser").'</td>';
 				print '<td colspan="2">';
-				if ($object->color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">';
+				print $formother->showColor($object->color, '');
 				print '</td>';
 				print "</tr>\n";
 			}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 9d29659bb68..f40f47adb80 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1855,7 +1855,7 @@ class User extends CommonObject
         if (! empty($this->photo))
         {
         	$label.= '<div class="photointooltip">';
-            $label.= Form::showphoto('userphoto', $this, 80);
+            $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip');
         	$label.= '</div><div style="clear: both;"></div>';
         }
 
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index fc09667f6ed..25dea7eb398 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  *
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3c8aff5b1b2..ccaf6687da9 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -46,6 +46,12 @@ $userstatic=new User($db);
 $companystatic = new Societe($db);
 $search_statut=GETPOST('search_statut','int');
 
+if ($search_statut == '') $search_statut='1';
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_statut="";
+}
 
 
 /*
@@ -85,6 +91,7 @@ foreach($fulltree as $key => $val)
 
 	$entity=$val['entity'];
 	$entitystring='';
+
 	// TODO Set of entitystring should be done with a hook
 	if (is_object($mc))
 	{
@@ -107,18 +114,36 @@ foreach($fulltree as $key => $val)
 	$data[] = array(
 		'rowid'=>$val['rowid'],
 		'fk_menu'=>$val['fk_user'],
-		'entry'=>'<table class="nobordernopadding centpercent"><tr><td>'.$li.'</td><td align="right">'.$userstatic->getLibStatut(5).'</td></tr></table>'
+		'statut'=>$val['statut'],
+		'entry'=>'<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut']?'usertdenabled':'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut']?'usertdenabled':'usertddisabled').'">'.$userstatic->getLibStatut(5).'</td></tr></table>'
 	);
 }
 
 
-/*print $langs->trans("Status").': ';
-print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-*/
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+
+$param="search_statut=".$search_statut;
 
 print '<table class="liste nohover" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("HierarchicView").'</td><td></td><td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
-print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td></tr>';
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("HierarchicView"));
+print '<td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
+print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';
+print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"",'',"",'align="right"');
+print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','','','','maxwidthsearch ');
+print '</tr>';
+
+print '<tr class="liste_titre">';
+print '<td>&nbsp;</td>';
+print '<td>&nbsp;</td>';
+// Status
+print '<td align="right">';
+print $form->selectarray('search_statut', array('-1'=>'','1'=>$langs->trans('Enabled')),$search_statut);
+print '</td>';
+print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+print '</td>';
+print '</tr>';
 
 $nbofentries=(count($data) - 1);
 
@@ -126,22 +151,39 @@ if ($nbofentries > 0)
 {
 	print '<tr '.$bc[false].'><td colspan="3">';
 	tree_recur($data,$data[0],0);
-	print '</td></tr>';
+	print '</td>';
+	print '<td></td>';
+	print '</tr>';
 }
 else
 {
 	print '<tr '.$bc[true].'>';
-	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+	print '<td colspan="3">';
+	print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
 	print $langs->trans("NoCategoryYet");
 	print '</td>';
 	print '<td>&nbsp;</td>';
-	print '</table></td>';
+	print '</table>';
+	print '</td>';
+	print '<td></td>';
 	print '</tr>';
 }
 
 print "</table>";
+print "</form>\n";
 
+//
+/*print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery(".usertddisabled").hide();
+	}
+	init_myfunc();
+});
+</script>';
+*/
 
 llxFooter();
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 80a5c52a232..75b996abe20 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -138,8 +138,8 @@ if ($result)
     print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre('');
+    print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
     // Search bar
@@ -153,7 +153,7 @@ if ($result)
     print '<td colspan="'.$colspan.'">&nbsp;</td>';
 
 	// Status
-    print '<td>';
+    print '<td align="right">';
     print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
     print '</td>';
 
@@ -256,7 +256,7 @@ if ($result)
 
         // Statut
 		$userstatic->statut=$obj->statut;
-		print '<td width="100" align="center">'.$userstatic->getLibStatut(5).'</td>';
+		print '<td align="right">'.$userstatic->getLibStatut(5).'</td>';
         print '<td>&nbsp;</td>';
         print "</tr>\n";
         $i++;
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 646754668bd..e2fdcc7b6ec 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@ $langs->load("users");
 
 // Security check
 $id = GETPOST('id','int');
-$fuser = new User($db);
-$fuser->fetch($id);
+$object = new User($db);
+$object->fetch($id);
 
 // Security check
 $socid=0;
@@ -45,7 +45,7 @@ if ($user->id == $id)	// A user can always read its own card
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
 // If user is not user that read and no permission to read other users, we stop
-if (($fuser->id != $user->id) && (! $user->rights->user->user->lire))
+if (($object->id != $user->id) && (! $user->rights->user->user->lire))
   accessforbidden();
 
 
@@ -56,16 +56,16 @@ if (($fuser->id != $user->id) && (! $user->rights->user->user->lire))
 
 llxHeader();
 
-$fuser->info($id);
+$object->info($id);
 
-$head = user_prepare_head($fuser);
+$head = user_prepare_head($object);
 
 $title = $langs->trans("User");
 dol_fiche_head($head, 'info', $title, 0, 'user');
 
 
 print '<table width="100%"><tr><td>';
-dol_print_object_info($fuser);
+dol_print_object_info($object);
 print '</td></tr></table>';
 
 print '</div>';
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 6ef0b4db688..2d1ac2f7464 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,9 +41,9 @@ $feature2 = (($socid && $user->rights->user->self->creer)?'':'user');
 if ($user->id == $id) $feature2=''; // A user can always read its own card
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
-$fuser = new User($db);
-$fuser->fetch($id);
-$fuser->getrights();
+$object = new User($db);
+$object->fetch($id);
+$object->getrights();
 
 
 /*
@@ -57,8 +57,8 @@ if ($_GET["action"] == 'dolibarr2ldap')
     $ldap=new Ldap();
     $result=$ldap->connect_bind();
 
-    $info=$fuser->_load_ldap_info();
-    $dn=$fuser->_load_ldap_dn($info);
+    $info=$object->_load_ldap_info();
+    $dn=$object->_load_ldap_dn($info);
     $olddn=$dn;	// We can say that old dn = dn as we force synchro
 
     $result=$ldap->update($dn,$info,$user,$olddn);
@@ -84,7 +84,7 @@ llxHeader();
 
 $form = new Form($db);
 
-$head = user_prepare_head($fuser);
+$head = user_prepare_head($object);
 
 $title = $langs->trans("User");
 dol_fiche_head($head, 'ldap', $title, 0, 'user');
@@ -94,29 +94,29 @@ print '<table class="border" width="100%">';
 // Ref
 print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
 print '<td>';
-print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
 print '</td>';
 print '</tr>';
 
 // Lastname
 print '<tr><td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
-print '<td>'.$fuser->lastname.'</td>';
+print '<td>'.$object->lastname.'</td>';
 print "</tr>\n";
 
 // Firstname
 print '<tr><td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
-print '<td>'.$fuser->firstname.'</td>';
+print '<td>'.$object->firstname.'</td>';
 print "</tr>\n";
 
 // Login
 print '<tr><td width="25%" valign="top">'.$langs->trans("Login").'</td>';
-if ($fuser->ldap_sid)
+if ($object->ldap_sid)
 {
     print '<td class="warning">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
 }
 else
 {
-    print '<td>'.$fuser->login.'</td>';
+    print '<td>'.$object->login.'</td>';
 }
 print '</tr>';
 
@@ -126,7 +126,7 @@ if ($conf->global->LDAP_SERVER_TYPE == "activedirectory")
     $result = $ldap->connect_bind();
     if ($result > 0)
     {
-        $userSID = $ldap->getObjectSid($fuser->login);
+        $userSID = $ldap->getObjectSid($object->login);
     }
     print '<tr><td width="25%" valign="top">'.$langs->trans("SID").'</td>';
     print '<td>'.$userSID.'</td>';
@@ -158,7 +158,7 @@ print '<div class="tabsAction">';
 
 if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
 {
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$fuser->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
+    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
@@ -182,9 +182,9 @@ $ldap=new Ldap();
 $result=$ldap->connect_bind();
 if ($result > 0)
 {
-    $info=$fuser->_load_ldap_info();
-    $dn=$fuser->_load_ldap_dn($info,1);
-    $search = "(".$fuser->_load_ldap_dn($info,2).")";
+    $info=$object->_load_ldap_info();
+    $dn=$object->_load_ldap_dn($info,1);
+    $search = "(".$object->_load_ldap_dn($info,2).")";
     $records=$ldap->getAttribute($dn,$search);
 
     //print_r($records);
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index af96d8149e8..7fe5766cd3a 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,11 +35,11 @@ $langs->load("members");
 $langs->load("bills");
 $langs->load("users");
 
-$fuser = new User($db);
-$fuser->fetch($id);
+$object = new User($db);
+$object->fetch($id);
 
 // If user is not user read and no permission to read other users, we stop
-if (($fuser->id != $user->id) && (! $user->rights->user->user->lire)) accessforbidden();
+if (($object->id != $user->id) && (! $user->rights->user->user->lire)) accessforbidden();
 
 // Security check
 $socid=0;
@@ -58,7 +58,7 @@ if ($action == 'update' && $user->rights->user->user->creer && ! $_POST["cancel"
 {
 	$db->begin();
 
-	$res=$fuser->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES));
+	$res=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES));
 	if ($res < 0)
 	{
 		$mesg='<div class="error">'.$adh->error.'</div>';
@@ -82,7 +82,7 @@ $form = new Form($db);
 
 if ($id)
 {
-	$head = user_prepare_head($fuser);
+	$head = user_prepare_head($object);
 
 	$title = $langs->trans("User");
 	dol_fiche_head($head, 'note', $title, 0, 'user');
@@ -97,19 +97,19 @@ if ($id)
     // Reference
 	print '<tr><td width="20%">'.$langs->trans('Ref').'</td>';
 	print '<td colspan="3">';
-	print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+	print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
 	print '</td>';
 	print '</tr>';
 
     // Lastname
-    print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur" colspan="3">'.$fuser->lastname.'&nbsp;</td>';
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur" colspan="3">'.$object->lastname.'&nbsp;</td>';
 	print '</tr>';
 
     // Firstname
-    print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur" colspan="3">'.$fuser->firstname.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur" colspan="3">'.$object->firstname.'&nbsp;</td></tr>';
 
     // Login
-    print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur" colspan="3">'.$fuser->login.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur" colspan="3">'.$object->login.'&nbsp;</td></tr>';
 
 	// Note
     print '<tr><td class="tdtop">'.$langs->trans("Note").'</td>';
@@ -117,15 +117,15 @@ if ($id)
 	if ($action == 'edit' && $user->rights->user->user->creer)
 	{
 		print "<input type=\"hidden\" name=\"action\" value=\"update\">";
-		print "<input type=\"hidden\" name=\"id\" value=\"".$fuser->id."\">";
+		print "<input type=\"hidden\" name=\"id\" value=\"".$object->id."\">";
 	    // Editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor=new DolEditor('note_private',$fuser->note,'',280,'dolibarr_notes','In',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80);
+		$doleditor=new DolEditor('note_private',$object->note,'',280,'dolibarr_notes','In',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80);
 		$doleditor->Create();
 	}
 	else
 	{
-		print dol_htmlentitiesbr($fuser->note);
+		print dol_htmlentitiesbr($object->note);
 	}
 	print "</td></tr>";
 
@@ -151,7 +151,7 @@ if ($id)
 
     if ($user->rights->user->user->creer && $action != 'edit')
     {
-        print "<a class=\"butAction\" href=\"note.php?id=".$fuser->id."&amp;action=edit\">".$langs->trans('Modify')."</a>";
+        print "<a class=\"butAction\" href=\"note.php?id=".$object->id."&amp;action=edit\">".$langs->trans('Modify')."</a>";
     }
 
     print "</div>";
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 53b98b5be98..5355a0f74fc 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -62,9 +62,9 @@ $dirtop = "../core/menus/standard";
 $dirleft = "../core/menus/standard";
 
 // Charge utilisateur edite
-$fuser = new User($db);
-$fuser->fetch($id);
-$fuser->getrights();
+$object = new User($db);
+$object->fetch($id);
+$object->getrights();
 
 // Liste des zone de recherche permanentes supportees
 $searchform=array("main_searchform_societe","main_searchform_contact","main_searchform_produitservice");
@@ -97,7 +97,7 @@ if ($action == 'update' && ($caneditfield || ! empty($user->admin)))
         $tabparam["MAIN_SEARCHFORM_SOCIETE"]=$_POST["main_searchform_societe"];
         $tabparam["MAIN_SEARCHFORM_PRODUITSERVICE"]=$_POST["main_searchform_produitservice"];
 
-        $result=dol_set_user_param($db, $conf, $fuser, $tabparam);
+        $result=dol_set_user_param($db, $conf, $object, $tabparam);
 
         header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
         exit;
@@ -112,7 +112,7 @@ if ($action == 'update' && ($caneditfield || ! empty($user->admin)))
 
 llxHeader();
 
-$head = user_prepare_head($fuser);
+$head = user_prepare_head($object);
 
 $title = $langs->trans("User");
 
@@ -133,18 +133,18 @@ print '<table class="border" width="100%">';
 // Ref
 print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
 print '<td colspan="2">';
-print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
 print '</td>';
 print '</tr>';
 
 // LastName
 print '<tr><td width="25%">'.$langs->trans("LastName").'</td>';
-print '<td colspan="2">'.$fuser->lastname.'</td>';
+print '<td colspan="2">'.$object->lastname.'</td>';
 print "</tr>\n";
 
 // FirstName
 print '<tr><td width="25%">'.$langs->trans("FirstName").'</td>';
-print '<td colspan="2">'.$fuser->firstname.'</td>';
+print '<td colspan="2">'.$object->firstname.'</td>';
 print "</tr>\n";
 
 print '</table><br>';
@@ -178,26 +178,26 @@ if ($action == 'edit')
     print $s?$s.' ':'';
     print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
     print '</td>';
-    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":"");
-    print empty($dolibarr_main_demo)?'':' disabled';	// Disabled for demo
+    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($object->conf->MAIN_LANG_DEFAULT)?" checked":"");
+    print empty($dolibarr_main_demo)?'':' disabled="disabled"';	// Disabled for demo
     print '> '.$langs->trans("UsePersonalValue").'</td>';
     print '<td>';
-    print $formadmin->select_language((! empty($fuser->conf->MAIN_LANG_DEFAULT)?$fuser->conf->MAIN_LANG_DEFAULT:''),'main_lang_default',1,null,0,0,(! empty($dolibarr_main_demo)));
+    print $formadmin->select_language((! empty($object->conf->MAIN_LANG_DEFAULT)?$object->conf->MAIN_LANG_DEFAULT:''),'main_lang_default',1,null,0,0,(! empty($dolibarr_main_demo)));
     print '</td></tr>';
 
     // Taille max des listes
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
     print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
-    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"");
-    print empty($dolibarr_main_demo)?'':' disabled';	// Disabled for demo
+    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"");
+    print empty($dolibarr_main_demo)?'':' disabled="disabled"';	// Disabled for demo
     print '> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="' . (! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?$fuser->conf->MAIN_SIZE_LISTE_LIMIT:'') . '"></td></tr>';
+    print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="' . (! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?$object->conf->MAIN_SIZE_LISTE_LIMIT:'') . '"></td></tr>';
 
     print '</table><br>';
 
     // Theme
-    show_theme($fuser,(($user->admin || empty($dolibarr_main_demo))?1:0),true);
+    show_theme($object,(($user->admin || empty($dolibarr_main_demo))?1:0),true);
 
     dol_fiche_end();
 
@@ -225,24 +225,24 @@ else
     print ($s?$s.' ':'');
     print (isset($conf->global->MAIN_LANG_DEFAULT) && $conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
     print '</td>';
-    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($object->conf->MAIN_LANG_DEFAULT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
     print '<td>';
-    $s=(isset($fuser->conf->MAIN_LANG_DEFAULT) ? picto_from_langcode($fuser->conf->MAIN_LANG_DEFAULT) : '');
+    $s=(isset($object->conf->MAIN_LANG_DEFAULT) ? picto_from_langcode($object->conf->MAIN_LANG_DEFAULT) : '');
     print ($s?$s.' ':'');
-    print (isset($fuser->conf->MAIN_LANG_DEFAULT) && $fuser->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):(! empty($fuser->conf->MAIN_LANG_DEFAULT)?$langs->trans("Language_".$fuser->conf->MAIN_LANG_DEFAULT):''));
+    print (isset($object->conf->MAIN_LANG_DEFAULT) && $object->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):(! empty($object->conf->MAIN_LANG_DEFAULT)?$langs->trans("Language_".$object->conf->MAIN_LANG_DEFAULT):''));
     print '</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
     print '<td>'.(! empty($conf->global->MAIN_SIZE_LISTE_LIMIT)?$conf->global->MAIN_SIZE_LISTE_LIMIT:'&nbsp;').'</td>';
-    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>' . (! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?$fuser->conf->MAIN_SIZE_LISTE_LIMIT:'&nbsp;') . '</td></tr>';
+    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+    print '<td>' . (! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?$object->conf->MAIN_SIZE_LISTE_LIMIT:'&nbsp;') . '</td></tr>';
 
     print '</table><br>';
 
 
     // Skin
-    show_theme($fuser,0,true);
+    show_theme($object,0,true);
 
     dol_fiche_end();
 
@@ -256,7 +256,7 @@ else
     {
         if ($caneditfield || ! empty($user->admin))       // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
         {
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$fuser->id.'">'.$langs->trans("Modify").'</a>';
+            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
         }
         else
         {
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 2a5a8422231..d611e1f5c70 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -114,11 +114,11 @@ llxHeader('',$langs->trans("Permissions"));
 
 $form=new Form($db);
 
-$fuser = new User($db);
-$fuser->fetch($id);
-$fuser->getrights();
+$object = new User($db);
+$object->fetch($id);
+$object->getrights();
 
-$head = user_prepare_head($fuser);
+$head = user_prepare_head($object);
 
 $title = $langs->trans("User");
 dol_fiche_head($head, 'rights', $title, 0, 'user');
@@ -146,26 +146,26 @@ foreach($modulesdir as $dir)
 					include_once $dir.$file;
 					$objMod = new $modName($db);
 
-					// Load all lang files of module
-					if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-					{
-						foreach($objMod->langfiles as $domain)
-						{
-							$langs->load($domain);
-						}
-					}
-					// Load all permissions
-					if ($objMod->rights_class)
-					{
-						$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($fuser->entity)) ? $fuser->entity : null);
-						$ret=$objMod->insert_permissions(0, $forceEntity);
-						$modules[$objMod->rights_class]=$objMod;
-						//print "modules[".$objMod->rights_class."]=$objMod;";
-					}
-				}
-			}
-		}
-	}
+    	            // Load all lang files of module
+    	            if (isset($objMod->langfiles) && is_array($objMod->langfiles))
+    	            {
+    	            	foreach($objMod->langfiles as $domain)
+    	            	{
+    	            		$langs->load($domain);
+    	            	}
+    	            }
+    	            // Load all permissions
+    	            if ($objMod->rights_class)
+    	            {
+    	            	$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : null);
+    	                $ret=$objMod->insert_permissions(0, $forceEntity);
+    	                $modules[$objMod->rights_class]=$objMod;
+    	                //print "modules[".$objMod->rights_class."]=$objMod;";
+    	            }
+    	        }
+    	    }
+    	}
+    }
 }
 
 $db->commit();
@@ -182,14 +182,14 @@ if (! empty($conf->multicompany->enabled))
 	if (1==2 && ! empty($conf->multicompany->transverse_mode)) {
 		$sql.= " AND r.entity = ".(GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity); // TODO unused for the moment
 	} else {
-		$sql.= " AND r.entity = ".(! empty($fuser->entity) ? $fuser->entity : $conf->entity);
+		$sql.= " AND r.entity = ".(! empty($object->entity) ? $object->entity : $conf->entity);
 	}
 }
 else
 {
 	$sql.= " AND r.entity = ".$conf->entity;
 }
-$sql.= " AND ur.fk_user = ".$fuser->id;
+$sql.= " AND ur.fk_user = ".$object->id;
 
 dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
@@ -222,10 +222,10 @@ $sql.= " WHERE gr.fk_id = r.id";
 if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) {
 	$sql.= " AND gu.entity IS NOT NULL";
 } else {
-	$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($fuser->entity)) ? $fuser->entity : $conf->entity);
+	$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : $conf->entity);
 }
 $sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
-$sql.= " AND gu.fk_user = ".$fuser->id;
+$sql.= " AND gu.fk_user = ".$object->id;
 
 dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
@@ -258,18 +258,18 @@ print '<table class="border" width="100%">';
 // Ref
 print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
 print '<td>';
-print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
 print '</td>';
 print '</tr>'."\n";
 
 // Lastname
 print '<tr><td width="25%">'.$langs->trans("Lastname").'</td>';
-print '<td>'.$fuser->lastname.'</td>';
+print '<td>'.$object->lastname.'</td>';
 print '</tr>'."\n";
 
 // Firstname
 print '<tr><td width="25%">'.$langs->trans("Firstname").'</td>';
-print '<td>'.$fuser->firstname.'</td>';
+print '<td>'.$object->firstname.'</td>';
 print '</tr>'."\n";
 
 print '</table><br>';
@@ -285,7 +285,7 @@ if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transv
 	$aEntities=array_keys($permsgroupbyentity);
 	sort($aEntities);
 	$entity = (GETPOST('entity', 'int')?GETPOST('entity', 'int'):$aEntities[0]);
-	$head = entity_prepare_head($fuser, $aEntities);
+	$head = entity_prepare_head($object, $aEntities);
 	$title = $langs->trans("Entities");
 	dol_fiche_head($head, $entity, $title, 1, 'multicompany@multicompany');
 }
@@ -303,7 +303,7 @@ print '</tr>'."\n";
 $sql = "SELECT r.id, r.libelle, r.module";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($fuser->entity)) ? $fuser->entity : $conf->entity);
+$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : $conf->entity);
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is disable
 $sql.= " ORDER BY r.module, r.id";
 
@@ -335,82 +335,82 @@ if ($result)
 			$objMod=$modules[$obj->module];
 			$picto=($objMod->picto?$objMod->picto:'generic');
 
-			if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
-			{
-				// On affiche ligne pour modifier droits
-				print '<tr '. $bc[$var].'>';
-				print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
-				print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
-				print '<td align="center" class="nowrap">';
-				print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
-				print '/';
-				print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
-				print '</td>';
-				print '<td colspan="2">&nbsp;</td>';
-				print '</tr>'."\n";
-			}
-		}
+        	if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($object->admin)))
+        	{
+        		// On affiche ligne pour modifier droits
+        		print '<tr '. $bc[$var].'>';
+        		print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
+        		print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
+        		print '<td align="center" class="nowrap">';
+        		print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+        		print '/';
+        		print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+        		print '</td>';
+        		print '<td colspan="2">&nbsp;</td>';
+        		print '</tr>'."\n";
+        	}
+        }
 
 		print '<tr '. $bc[$var].'>';
 
 		// Picto and label of permission
 		print '<td>'.img_object('',$picto).' '.$objMod->getName().'</td>';
 
-		// Permission and tick
-		if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
-		{
-			if ($caneditperms)
-			{
-				print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
-			}
-			print '<td align="center" class="nowrap">';
-			print img_picto($langs->trans("Active"),'tick');
-			print '</td>';
-		}
-		else if (in_array($obj->id, $permsuser))					// Permission own by user
-		{
-			if ($caneditperms)
-			{
-				print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-			}
-			print '<td align="center" class="nowrap">';
-			print img_picto($langs->trans("Active"),'tick');
-			print '</td>';
-		}
+        // Permission and tick
+        if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
+        {
+        	if ($caneditperms)
+        	{
+        		print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
+        	}
+        	print '<td align="center" class="nowrap">';
+        	print img_picto($langs->trans("Active"),'tick');
+        	print '</td>';
+        }
+        else if (in_array($obj->id, $permsuser))					// Permission own by user
+        {
+        	if ($caneditperms)
+        	{
+        		print '<td align="center"><a href="perms.php?id='.$object->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+        	}
+        	print '<td align="center" class="nowrap">';
+        	print img_picto($langs->trans("Active"),'tick');
+        	print '</td>';
+        }
 
-		else if (is_array($permsgroupbyentity[$entity]))
-		{
-			if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
-			{
-				if ($caneditperms)
-				{
-					print '<td align="center">';
-					print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
-					print '</td>';
-				}
-				print '<td align="center" class="nowrap">';
-				print img_picto($langs->trans("Active"),'tick');
-				print '</td>';
-			}
-			else
-			{
-				// Do not own permission
-				if ($caneditperms)
-				{
-					print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-				}
-				print '<td>&nbsp</td>';
-			}
-		}
-		else
-		{
-			// Do not own permission
-			if ($caneditperms)
-			{
-				print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-			}
-			print '<td>&nbsp</td>';
-		}
+        else if (is_array($permsgroupbyentity[$entity]))
+        {
+	        if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
+	        {
+	        	if ($caneditperms)
+	        	{
+	        		print '<td align="center">';
+	        		print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
+	        		print '</td>';
+	        	}
+	        	print '<td align="center" class="nowrap">';
+	        	print img_picto($langs->trans("Active"),'tick');
+	        	print '</td>';
+	        }
+	        else
+	        {
+	        	// Do not own permission
+	        	if ($caneditperms)
+	        	{
+	        		print '<td align="center"><a href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+	        	}
+	        	print '<td>&nbsp</td>';
+	        }
+        }
+        else
+        {
+        	// Do not own permission
+        	if ($caneditperms)
+        	{
+        		print '<td align="center"><a href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+        	}
+        	print '<td>&nbsp</td>';
+        }
 
 		$perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
 		print '<td>'.$perm_libelle. '</td>';